Merge branch 'dev' into dev_WMS20260401

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

@@ -8,6 +8,8 @@ import com.mhd.common.core.exception.ServiceException;
 import com.mhd.common.core.utils.OrderSequence;
 import com.mhd.common.core.utils.bean.BeanUtils;
 import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.OmsServiceFeign;
+import com.mhd.system.api.domain.MaterialInventoryOmsParamDO;
 import com.mhd.system.api.model.LoginUser;
 import com.mhd.wms.domain.copyCodeReference.entity.CopyCodeReference;
 import com.mhd.wms.domain.copyCodeReference.repository.facade.ICopyCodeReferenceService;
@@ -81,6 +83,8 @@ public class HandoverTaskOrderDomainService {
     private IStockOutOrderService stockOutOrderService;
     @Autowired
     private CopyCodeReferenceDomainService copyCodeReferenceDomainService;
+    @Autowired
+    private OmsServiceFeign omsServiceFeign;
 
 
     /**
@@ -427,6 +431,12 @@ public class HandoverTaskOrderDomainService {
                     materialInventoryParamDO.setType("4");
                     materialInventoryService.kctzjl(materialInventoryParamDO,"出库",loginUser);
                     materialInventoryService.xgkc(materialInventoryParamDO);
+                    MaterialInventoryOmsParamDO materialInventoryOmsParamDO = new MaterialInventoryOmsParamDO();
+                    BeanUtils.copyProperties(materialInventoryParamDO, materialInventoryOmsParamDO);
+                    materialInventoryOmsParamDO.setKctzType("出库");
+                    materialInventoryOmsParamDO.setLoginUser(loginUser);
+                    //库存推送oms
+                    omsServiceFeign.omsEdit(materialInventoryOmsParamDO);
                     //库存调整记录
 //                    InventoryAdjustmentRecord inventoryAdjustmentRecord = new InventoryAdjustmentRecord();
 //                    inventoryAdjustmentRecord.setAdjustAction("出库");

mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/service/InventoryAdjustmentRecordDomainService.java

@@ -11,6 +11,7 @@ import com.mhd.common.core.web.domain.BaseVOEntity;
 import com.mhd.common.security.utils.SecurityUtils;
 import com.mhd.system.api.OmsServiceFeign;
 import com.mhd.system.api.domain.InMaterialDetail;
+import com.mhd.system.api.domain.MaterialInventoryOmsParamDO;
 import com.mhd.system.api.domain.OutMaterialDetail;
 import com.mhd.system.api.domain.StockOutOrder;
 import com.mhd.system.api.model.LoginUser;
@@ -466,6 +467,11 @@ public class InventoryAdjustmentRecordDomainService {
             materialInventoryParamDO.setType("7");
             materialInventoryService.kctzjl(materialInventoryParamDO,"库存冻结",loginUser);
             materialInventoryService.xgkc(materialInventoryParamDO);
+            MaterialInventoryOmsParamDO materialInventoryOmsParamDO = new MaterialInventoryOmsParamDO();
+            BeanUtils.copyProperties(materialInventoryParamDO, materialInventoryOmsParamDO);
+            materialInventoryOmsParamDO.setKctzType("库存冻结");
+            materialInventoryOmsParamDO.setLoginUser(loginUser);
+            omsServiceFeign.omsEdit(materialInventoryOmsParamDO);
             return true;
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -13,6 +13,8 @@ import com.mhd.common.core.utils.StringUtils;
 import com.mhd.common.core.utils.bean.BeanUtils;
 import com.mhd.common.core.utils.uuid.IdGenerator;
 import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.OmsServiceFeign;
+import com.mhd.system.api.domain.MaterialInventoryOmsParamDO;
 import com.mhd.system.api.model.LoginUser;
 import com.mhd.wms.domain.copyCodeReference.entity.CopyCodeReference;
 import com.mhd.wms.domain.copyCodeReference.repository.facade.ICopyCodeReferenceService;
@@ -84,6 +86,8 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
     private IMaterialBarCodeService materialBarCodeService;
     @Autowired
     private IMaterialInventoryService materialInventoryService;
+    @Autowired
+    private OmsServiceFeign omsServiceFeign;
 
 
     /**
@@ -570,6 +574,12 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
                 materialInventoryParamDO.setInOrderNumber(outMaterialDetail.getInOrderNumber());
                 materialInventoryService.kctzjl(materialInventoryParamDO,"分配库存",loginUser);
                 materialInventoryService.xgkc(materialInventoryParamDO);
+                MaterialInventoryOmsParamDO materialInventoryOmsParamDO = new MaterialInventoryOmsParamDO();
+                BeanUtils.copyProperties(materialInventoryParamDO, materialInventoryOmsParamDO);
+                materialInventoryOmsParamDO.setKctzType("分配库存");
+                materialInventoryOmsParamDO.setLoginUser(loginUser);
+                omsServiceFeign.omsEdit(materialInventoryOmsParamDO);
+
                 //materialInventoryMapper.updateById(materialInventory);
 
                 //库存调整记录
@@ -955,6 +965,11 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
                 materialInventoryParamDO.setRelateNo(cancelRelateNo);
                 materialInventoryService.kctzjl(materialInventoryParamDO,"取消分配",loginUser);
                 materialInventoryService.xgkc(materialInventoryParamDO);
+                MaterialInventoryOmsParamDO materialInventoryOmsParamDO = new MaterialInventoryOmsParamDO();
+                BeanUtils.copyProperties(materialInventoryParamDO, materialInventoryOmsParamDO);
+                materialInventoryOmsParamDO.setKctzType("取消分配");
+                materialInventoryOmsParamDO.setLoginUser(loginUser);
+                omsServiceFeign.omsEdit(materialInventoryOmsParamDO);
 //                //更新库存数量
 //                //可用数量
 //                BigDecimal oldAllocationQuantity = materialInventoryPO.getAllocationQuantity();
@@ -1050,6 +1065,11 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
                 materialInventoryParamDO.setRelateNo(cancelRelateNoCh);
                 materialInventoryService.kctzjl(materialInventoryParamDO,"取消分配",loginUser);
                 materialInventoryService.xgkc(materialInventoryParamDO);
+                MaterialInventoryOmsParamDO materialInventoryOmsParamDO = new MaterialInventoryOmsParamDO();
+                BeanUtils.copyProperties(materialInventoryParamDO, materialInventoryOmsParamDO);
+                materialInventoryOmsParamDO.setKctzType("取消分配");
+                materialInventoryOmsParamDO.setLoginUser(loginUser);
+                omsServiceFeign.omsEdit(materialInventoryOmsParamDO);
 
 //                //更新库存数量
 //                //可用数量

mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java

@@ -19,8 +19,10 @@ import com.mhd.common.core.utils.bean.BeanUtils;
 import com.mhd.common.core.utils.uuid.IdGenerator;
 import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.OmsServiceFeign;
 import com.mhd.system.api.SystemServiceFeign;
 import com.mhd.system.api.domain.ContainerFeignPO;
+import com.mhd.system.api.domain.MaterialInventoryOmsParamDO;
 import com.mhd.system.api.model.LoginUser;
 import com.mhd.wms.domain.containerUsageRecord.repository.facade.IContainerUsageRecordService;
 import com.mhd.wms.domain.containerUsageRecord.repository.todo.ContainerUsageRecordDO;
@@ -135,6 +137,8 @@ public class StockShelfOrderDomainService {
     private MaterialBaseInfoMapper materialBaseInfoMapper;
     @Autowired
     private ICopyCodeReferenceService copyCodeReferenceService;
+    @Autowired
+    private OmsServiceFeign omsServiceFeign;
 
     /**
      * 分页查询上架单列表
@@ -1068,6 +1072,11 @@ public class StockShelfOrderDomainService {
                 //库存调整记录
                 materialInventoryService.xgkc(inventoryParamDO);
                 materialInventoryService.kctzjl(inventoryParamDO,"入库", loginUser);
+                MaterialInventoryOmsParamDO materialInventoryOmsParamDO = new MaterialInventoryOmsParamDO();
+                BeanUtils.copyProperties(inventoryParamDO, materialInventoryOmsParamDO);
+                materialInventoryOmsParamDO.setKctzType("入库");
+                materialInventoryOmsParamDO.setLoginUser(loginUser);
+                omsServiceFeign.omsEdit(materialInventoryOmsParamDO);
                 //抄码商品对照数据插入
                 copyCodeProductComparison(materialBaseInfo,shelfMaterialDetail,inventoryParamDO);
             } else if (materialInventoryPOS.size() == 1) {
@@ -1125,6 +1134,11 @@ public class StockShelfOrderDomainService {
                 //库存调整记录
                 materialInventoryService.kctzjl(inventoryParamDO, "入库", loginUser);
                 materialInventoryService.xgkc(inventoryParamDO);
+                MaterialInventoryOmsParamDO  materialInventoryOmsParamDO = new MaterialInventoryOmsParamDO();
+                BeanUtils.copyProperties(inventoryParamDO, materialInventoryOmsParamDO);
+                materialInventoryOmsParamDO.setKctzType("入库");
+                materialInventoryOmsParamDO.setLoginUser(loginUser);
+                omsServiceFeign.omsEdit(materialInventoryOmsParamDO);
                 //抄码商品对照数据插入
                 copyCodeProductComparison(materialBaseInfo,shelfMaterialDetail,inventoryParamDO);
             }