商品名称逻辑修改;

mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java

@@ -177,8 +177,8 @@ public class HandoverTaskOrderDomainService {
                     //库存调整记录
                     InventoryAdjustmentRecord inventoryAdjustmentRecord = new InventoryAdjustmentRecord();
                     inventoryAdjustmentRecord.setMaterialBaseInfoId(materialInventoryPO.getMaterialBaseInfoId());
-                    inventoryAdjustmentRecord.setMaterialCode(outMaterialDetail.getMaterialCode());
+                    inventoryAdjustmentRecord.setMaterialCode(outMaterialDetail.getMaterialNo());
-                    inventoryAdjustmentRecord.setMaterialName(outMaterialDetail.getMaterialName());
+                    inventoryAdjustmentRecord.setMaterialName(outMaterialDetail.getCommodityName());
                     inventoryAdjustmentRecord.setBarCode(outMaterialDetail.getBarCode());
                     inventoryAdjustmentRecord.setMaterialBaseInfoId(outMaterialDetail.getMaterialBaseInfoId());
 

mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java

@@ -14,6 +14,8 @@ import com.mhd.common.security.utils.SecurityUtils;
 import com.mhd.system.api.model.LoginUser;
 import com.mhd.wms.domain.inventoryAdjustmentRecord.entity.InventoryAdjustmentRecord;
 import com.mhd.wms.domain.inventoryAdjustmentRecord.repository.mapper.InventoryAdjustmentRecordMapper;
+import com.mhd.wms.domain.materialBaseInfo.entity.MaterialBaseInfo;
+import com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper;
 import com.mhd.wms.domain.materialInventory.entity.MaterialInventory;
 import com.mhd.wms.domain.materialInventory.repository.mapper.MaterialInventoryMapper;
 import com.mhd.wms.domain.materialInventory.repository.po.MaterialInventoryPO;
@@ -62,6 +64,8 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
     private MaterialInventoryMapper materialInventoryMapper;
     @Autowired
     private InventoryAdjustmentRecordMapper inventoryAdjustmentRecordMapper;
+    @Autowired
+    private MaterialBaseInfoMapper materialBaseInfoMapper;
 
     /**
      * 查询物料明细列表
@@ -156,6 +160,11 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
             outMaterialDetail.setCreateByName(loginUser.getUsername());
             outMaterialDetail.setCreateTime(new Date());
             outMaterialDetail.setQuantity(outMaterialDetail.getOutboundQuantity());
+            String materialNo = outMaterialDetail.getMaterialNo();
+            List<MaterialBaseInfo> materialBaseInfos = materialBaseInfoMapper.selectList(new QueryWrapper<MaterialBaseInfo>().lambda().eq(MaterialBaseInfo::getMaterialCode, materialNo));
+            if (!CollectionUtils.isEmpty(materialBaseInfos) && materialBaseInfos.size() > 0) {
+                outMaterialDetail.setCommodityName(materialBaseInfos.get(0).getMaterialName());
+            }
             outMaterialDetailList.add(outMaterialDetail);
         }
         return saveBatch(outMaterialDetailList);
@@ -306,8 +315,8 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
                 //库存调整记录
                 InventoryAdjustmentRecord inventoryAdjustmentRecord = new InventoryAdjustmentRecord();
                 inventoryAdjustmentRecord.setMaterialBaseInfoId(materialInventoryPO.getMaterialBaseInfoId());
-                inventoryAdjustmentRecord.setMaterialCode(outMaterialDetail.getMaterialCode());
+                inventoryAdjustmentRecord.setMaterialCode(outMaterialDetail.getMaterialNo());
-                inventoryAdjustmentRecord.setMaterialName(outMaterialDetail.getMaterialName());
+                inventoryAdjustmentRecord.setMaterialName(outMaterialDetail.getCommodityName());
                 inventoryAdjustmentRecord.setBarCode(outMaterialDetail.getBarCode());
                 inventoryAdjustmentRecord.setMaterialBaseInfoId(outMaterialDetail.getMaterialBaseInfoId());
                 inventoryAdjustmentRecord.setOrganizationId(stockOutOrderPO.getOrganizationId());

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java

@@ -22,7 +22,9 @@ import com.mhd.wms.domain.handoverTaskOrder.repository.todo.HandoverTaskOrderDO;
 import com.mhd.wms.domain.inMaterialDetail.repository.todo.InMaterialDetailDO;
 import com.mhd.wms.domain.inventoryStandingDetail.repository.facade.IInventoryStandingDetailService;
 import com.mhd.wms.domain.inventoryStandingDetail.repository.todo.InventoryStandingDetailDO;
+import com.mhd.wms.domain.materialBaseInfo.entity.MaterialBaseInfo;
 import com.mhd.wms.domain.materialBaseInfo.repository.facade.IMaterialBaseInfoService;
+import com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper;
 import com.mhd.wms.domain.materialBaseInfo.repository.po.MaterialBaseInfoPO;
 import com.mhd.wms.domain.materialInventory.repository.facade.IMaterialInventoryService;
 import com.mhd.wms.domain.materialWarehouseControl.repository.facade.IMaterialWarehouseControlService;
@@ -107,6 +109,8 @@ public class StockOutOrderDomainService {
     private SystemServiceFeign systemServiceFeign;
     @Autowired
     private PushSyncBmsDomainService pushSyncBmsDomainService;
+    @Autowired
+    private MaterialBaseInfoMapper materialBaseInfoMapper;
 
 
     /**
@@ -335,6 +339,13 @@ public class StockOutOrderDomainService {
         OutMaterialDetailDO outMaterialDetailDO = new OutMaterialDetailDO();
         outMaterialDetailDO.setOutOrderNumber(stockOutOrderPO.getOutOrderNumber());
         List<OutMaterialDetailPO> materialDetailPOList = outMaterialDetailService.queryListChildren(outMaterialDetailDO);
+        for (OutMaterialDetailPO outMaterialDetailPO : materialDetailPOList) {
+            String materialNo = outMaterialDetailPO.getMaterialNo();
+            List<MaterialBaseInfo> materialBaseInfos = materialBaseInfoMapper.selectList(new QueryWrapper<MaterialBaseInfo>().lambda().eq(MaterialBaseInfo::getMaterialCode, materialNo));
+            if (!CollectionUtils.isEmpty(materialBaseInfos) && materialBaseInfos.size() > 0) {
+                outMaterialDetailPO.setCommodityName(materialBaseInfos.get(0).getMaterialName());
+            }
+        }
         stockOutOrderPO.setMaterialDetailList(materialDetailPOList);
         return stockOutOrderPO;
     }
@@ -432,6 +443,9 @@ public class StockOutOrderDomainService {
                     pickingMaterialDetailDO.setQuantity(outMaterialDetailPO.getAllocationQuantity());
                     //设置出库明细关联id
                     pickingMaterialDetailDO.setOutUniqueId(outMaterialDetailPO.getUniqueId());
+                    pickingMaterialDetailDO.setMaterialCode(outMaterialDetailPO.getMaterialNo());
+                    pickingMaterialDetailDO.setMaterialName(outMaterialDetailPO.getCommodityName());
+                    pickingMaterialDetailDO.setBarCode(outMaterialDetailPO.getBarCode());
                     pickingMaterialDetailList.add(pickingMaterialDetailDO);
                     List<OutMaterialDetailPO> outMaterialDetailPOListChildren = outMaterialDetailPO.getChildren();
                     if (!CollectionUtils.isEmpty(outMaterialDetailPOListChildren)){
@@ -443,6 +457,9 @@ public class StockOutOrderDomainService {
                             pickingMaterialDetailDOChildren.setQuantity(outMaterialDetailPOChildren.getAllocationQuantity());
                             //设置出库明细关联id
                             pickingMaterialDetailDOChildren.setOutUniqueId(outMaterialDetailPOChildren.getUniqueId());
+                            pickingMaterialDetailDOChildren.setMaterialCode(outMaterialDetailPOChildren.getMaterialNo());
+                            pickingMaterialDetailDOChildren.setMaterialName(outMaterialDetailPOChildren.getCommodityName());
+                            pickingMaterialDetailDOChildren.setBarCode(outMaterialDetailPOChildren.getBarCode());
                             pickingMaterialDetailList.add(pickingMaterialDetailDO);
                         });
                     }
@@ -535,6 +552,10 @@ public class StockOutOrderDomainService {
         OutMaterialDetailDO outMaterialDetailDO = new OutMaterialDetailDO();
         outMaterialDetailDO.setOutOrderNumber(stockOutOrderPO.getOutOrderNumber());
         List<OutMaterialDetailPO> outMaterialDetailPOList = outMaterialDetailService.queryListChildren(outMaterialDetailDO);
+        for (OutMaterialDetailPO outMaterialDetailPO : outMaterialDetailPOList) {
+            outMaterialDetailPO.setMaterialCode(outMaterialDetailPO.getMaterialNo());
+            outMaterialDetailPO.setMaterialName(outMaterialDetailPO.getCommodityName());
+        }
         stockOutOrderPO.setMaterialDetailList(outMaterialDetailPOList);
         BigDecimal weightLimit = BigDecimal.ZERO;
         BigDecimal volumeLimit = BigDecimal.ZERO;