库存调整记录获取物料条码

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

@@ -17,6 +17,8 @@ import com.mhd.wms.domain.handoverTaskOrder.repository.po.HandoverTaskOrderPO;
 import com.mhd.wms.domain.handoverTaskOrder.repository.todo.HandoverTaskOrderDO;
 import com.mhd.wms.domain.inventoryAdjustmentRecord.entity.InventoryAdjustmentRecord;
 import com.mhd.wms.domain.inventoryAdjustmentRecord.repository.mapper.InventoryAdjustmentRecordMapper;
+import com.mhd.wms.domain.materialBarCode.repository.facade.IMaterialBarCodeService;
+import com.mhd.wms.domain.materialBarCode.repository.po.MaterialBarCodePO;
 import com.mhd.wms.domain.materialInventory.entity.MaterialInventory;
 import com.mhd.wms.domain.materialInventory.repository.mapper.MaterialInventoryMapper;
 import com.mhd.wms.domain.outMaterialDetail.entity.OutMaterialDetail;
@@ -39,6 +41,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -65,6 +68,8 @@ public class HandoverTaskOrderDomainService {
     private IDeliveTaskService deliveTaskService;
     @Autowired
     private PickingMaterialDetailMapper pickingMaterialDetailMapper;
+    @Autowired
+    private IMaterialBarCodeService materialBarCodeService;
 
 
     /**
@@ -384,6 +389,9 @@ public class HandoverTaskOrderDomainService {
                     inventoryAdjustmentRecord.setMaterialCode(outMaterialDetail.getMaterialNo());
                     inventoryAdjustmentRecord.setMaterialName(outMaterialDetail.getCommodityName());
                     inventoryAdjustmentRecord.setBarCode(outMaterialDetail.getBarCode());
+                    if (inventoryAdjustmentRecord.getBarCode().equals("")){
+                        getBarCode(materialInventoryPO, inventoryAdjustmentRecord);
+                    }
                     inventoryAdjustmentRecord.setMaterialBaseInfoId(outMaterialDetail.getMaterialBaseInfoId());
                     inventoryAdjustmentRecord.setAdjustType(1L);
                     inventoryAdjustmentRecord.setOrganizationId(stockOutOrder.getOrganizationId());
@@ -431,6 +439,23 @@ public class HandoverTaskOrderDomainService {
     }
 
 
+    private void getBarCode(MaterialInventory materialInventoryPO, InventoryAdjustmentRecord inventoryAdjustmentRecord) {
+        List<MaterialBarCodePO> materialBarCodePOList = materialBarCodeService.getInfoByMaterialBaseInfoIds(materialInventoryPO.getMaterialBaseInfoId());
+        if (materialBarCodePOList != null && !materialBarCodePOList.isEmpty()) {
+            Map<Long, MaterialBarCodePO> collect = materialBarCodePOList.stream()
+                    .collect(Collectors.toMap(
+                            MaterialBarCodePO::getMaterialBaseInfoId,
+                            po -> po,
+                            (existing, replacement) -> existing
+                    ));
+            MaterialBarCodePO materialBarCodePO = collect.get(materialInventoryPO.getMaterialBaseInfoId());
+            if (materialBarCodePO != null && materialBarCodePO.getBarCode() != null) {
+                inventoryAdjustmentRecord.setBarCode(materialBarCodePO.getBarCode());
+            }
+        }
+    }
+
+
     /**
      * @description 任务下发
      */

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

@@ -15,6 +15,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.materialBarCode.repository.facade.IMaterialBarCodeService;
+import com.mhd.wms.domain.materialBarCode.repository.po.MaterialBarCodePO;
 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;
@@ -75,6 +77,8 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
     private StockOutOrderMapper stockOutOrderMapper;
     @Autowired
     private IPickingMaterialDetailService pickingMaterialDetailService;
+    @Autowired
+    private IMaterialBarCodeService materialBarCodeService;
 
     /**
      * 查询物料明细列表
@@ -478,6 +482,9 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
                 inventoryAdjustmentRecord.setMaterialCode(outMaterialDetail.getMaterialNo());
                 inventoryAdjustmentRecord.setMaterialName(outMaterialDetail.getCommodityName());
                 inventoryAdjustmentRecord.setBarCode(outMaterialDetail.getBarCode());
+                if (inventoryAdjustmentRecord.getBarCode().equals("")){
+                    getBarCode(materialInventoryPO, inventoryAdjustmentRecord);
+                }
                 inventoryAdjustmentRecord.setMaterialBaseInfoId(outMaterialDetail.getMaterialBaseInfoId());
                 inventoryAdjustmentRecord.setOrganizationId(stockOutOrder.getOrganizationId());
                 inventoryAdjustmentRecord.setOrganizationName(stockOutOrder.getOrganizationName());
@@ -525,6 +532,22 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
         }
     }
 
+    private void getBarCode(MaterialInventory materialInventoryPO, InventoryAdjustmentRecord inventoryAdjustmentRecord) {
+        List<MaterialBarCodePO> materialBarCodePOList = materialBarCodeService.getInfoByMaterialBaseInfoIds(materialInventoryPO.getMaterialBaseInfoId());
+        if (materialBarCodePOList != null && !materialBarCodePOList.isEmpty()) {
+            Map<Long, MaterialBarCodePO> collect = materialBarCodePOList.stream()
+                    .collect(Collectors.toMap(
+                            MaterialBarCodePO::getMaterialBaseInfoId,
+                            po -> po,
+                            (existing, replacement) -> existing
+                    ));
+            MaterialBarCodePO materialBarCodePO = collect.get(materialInventoryPO.getMaterialBaseInfoId());
+            if (materialBarCodePO != null && materialBarCodePO.getBarCode() != null) {
+                inventoryAdjustmentRecord.setBarCode(materialBarCodePO.getBarCode());
+            }
+        }
+    }
+
     public synchronized void childrenxgkc(List<OutMaterialDetail> outMaterialDetailList,String outOrderNumber,LoginUser loginUser) {
         StockOutOrder stockOutOrder = stockOutOrderMapper.selectOne(new QueryWrapper<StockOutOrder>().lambda().eq(StockOutOrder::getOutOrderNumber, outOrderNumber));
         for (OutMaterialDetail outMaterialDetail : outMaterialDetailList) {
@@ -569,6 +592,9 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
                 inventoryAdjustmentRecord.setMaterialCode(outMaterialDetail.getMaterialNo());
                 inventoryAdjustmentRecord.setMaterialName(outMaterialDetail.getCommodityName());
                 inventoryAdjustmentRecord.setBarCode(outMaterialDetail.getBarCode());
+                if (inventoryAdjustmentRecord.getBarCode().equals("")){
+                    getBarCode(materialInventoryPO, inventoryAdjustmentRecord);
+                }
                 inventoryAdjustmentRecord.setMaterialBaseInfoId(outMaterialDetail.getMaterialBaseInfoId());
                 inventoryAdjustmentRecord.setOrganizationId(stockOutOrder.getOrganizationId());
                 inventoryAdjustmentRecord.setOrganizationName(stockOutOrder.getOrganizationName());
@@ -805,6 +831,9 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
                 inventoryAdjustmentRecord.setMaterialCode(outMaterialDetail.getMaterialNo());
                 inventoryAdjustmentRecord.setMaterialName(outMaterialDetail.getCommodityName());
                 inventoryAdjustmentRecord.setBarCode(outMaterialDetail.getBarCode());
+                if (inventoryAdjustmentRecord.getBarCode().equals("")){
+                    getBarCode(materialInventoryPO, inventoryAdjustmentRecord);
+                }
                 inventoryAdjustmentRecord.setMaterialBaseInfoId(outMaterialDetail.getMaterialBaseInfoId());
                 inventoryAdjustmentRecord.setOrganizationId(stockOutOrder.getOrganizationId());
                 inventoryAdjustmentRecord.setOrganizationName(stockOutOrder.getOrganizationName());
@@ -879,6 +908,9 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
                 inventoryAdjustmentRecord.setMaterialCode(outMaterialDetail.getMaterialNo());
                 inventoryAdjustmentRecord.setMaterialName(outMaterialDetail.getCommodityName());
                 inventoryAdjustmentRecord.setBarCode(outMaterialDetail.getBarCode());
+                if (inventoryAdjustmentRecord.getBarCode().equals("")){
+                    getBarCode(materialInventoryPO, inventoryAdjustmentRecord);
+                }
                 inventoryAdjustmentRecord.setMaterialBaseInfoId(outMaterialDetail.getMaterialBaseInfoId());
                 inventoryAdjustmentRecord.setOrganizationId(stockOutOrder.getOrganizationId());
                 inventoryAdjustmentRecord.setOrganizationName(stockOutOrder.getOrganizationName());