样品出库不修改库存;

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

@@ -295,7 +295,14 @@ public class HandoverTaskOrderDomainService {
         xgkc(handoverTaskOrderIds,loginUser);
         //推送oms
         for (Long handoverTaskOrderId : handoverTaskOrderIds) {
-            pushOms(handoverTaskOrderId);
+            HandoverTaskOrder handoverTaskOrder = handoverTaskOrderService.getById(handoverTaskOrderId);
+            String orderNumber = handoverTaskOrder.getOrderNumber();
+            StockOutOrder stockOutOrder = stockOutOrderService.getOne(new LambdaQueryWrapper<StockOutOrder>()
+                    .eq(StockOutOrder::getOutOrderNumber, orderNumber)
+                    .eq(StockOutOrder::getDelFlag, 1), false);
+            if (stockOutOrder != null && !"yang_pin_chu_ku".equals(stockOutOrder.getBusinessType())) {
+                pushOms(handoverTaskOrderId);
+            }
         }
         HandoverTaskOrder handoverTaskOrder = handoverTaskOrderService.getById(handoverTaskOrderIds.get(0));
         stockOutOrderService.update(null,new UpdateWrapper<StockOutOrder>().lambda().set(StockOutOrder::getBillingJson,handoverTaskOrderDO.getBillingJson()).eq(StockOutOrder::getOutOrderNumber,handoverTaskOrder.getOrderNumber()));
@@ -443,14 +450,24 @@ public class HandoverTaskOrderDomainService {
                     materialInventoryParamDO.setExpiryDate(materialInventoryPO.getExpiryDate());
                     materialInventoryParamDO.setType("4");
                     materialInventoryParamDO.setWarehouseId(materialInventoryPO.getWarehouseId());
-                    materialInventoryService.kctzjl(materialInventoryParamDO,"出库",loginUser);
+
-                    materialInventoryService.xgkc(materialInventoryParamDO);
+                    //样品出库不修改库存
                     MaterialInventoryOmsParamDO materialInventoryOmsParamDO = new MaterialInventoryOmsParamDO();
                     BeanUtils.copyProperties(materialInventoryParamDO, materialInventoryOmsParamDO);
                     materialInventoryOmsParamDO.setKctzType("出库");
                     materialInventoryOmsParamDO.setLoginUser(loginUser);
-                    //库存推送oms
+                    HandoverTaskOrder h = handoverTaskOrderService.getById(handoverTaskOrderId);
-                    omsServiceFeign.omsEdit(materialInventoryOmsParamDO);
+                    String number = h.getOrderNumber();
+                    StockOutOrder out = stockOutOrderService.getOne(new LambdaQueryWrapper<StockOutOrder>()
+                            .eq(StockOutOrder::getOutOrderNumber, number)
+                            .eq(StockOutOrder::getDelFlag, 1), false);
+                    if (out != null && !"yang_pin_chu_ku".equals(out.getBusinessType())) {
+                        materialInventoryService.kctzjl(materialInventoryParamDO,"出库",loginUser);
+                        materialInventoryService.xgkc(materialInventoryParamDO);
+                        //库存推送oms
+                        omsServiceFeign.omsEdit(materialInventoryOmsParamDO);
+                    }
+
                     //库存调整记录
 //                    InventoryAdjustmentRecord inventoryAdjustmentRecord = new InventoryAdjustmentRecord();
 //                    inventoryAdjustmentRecord.setAdjustAction("出库");

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

@@ -397,7 +397,12 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
         stockOutOrderPO.setAlreadyAllocationQuantity(orderThisAssignIncrement);
         stockOutOrderPO.setAllocationQuantity(totalAllocationQuantity);
         //分配(修改库存)
-        xgkc(outMaterialDetailList,outOrderNumber,loginUser);
+        List<StockOutOrder> stockOutOrderList = stockOutOrderMapper.selectList(new QueryWrapper<StockOutOrder>().lambda()
+                .eq(StockOutOrder::getOutOrderNumber, outOrderNumber)
+                .eq(StockOutOrder::getDelFlag, 1));
+        if (!CollectionUtils.isEmpty(stockOutOrderList) && "yang_pin_chu_ku".equals(stockOutOrderList.get(0).getBusinessType())) {
+            xgkc(outMaterialDetailList,outOrderNumber,loginUser);
+        }
         //保存物料明细信息
         outMaterialDetailList.forEach(outMaterialDetail -> {
             outMaterialDetail.setIsAllocated("1");
@@ -527,7 +532,12 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
         //保存物料明细信息
         saveOrUpdateBatch(outMaterialDetailList);
         //取消分配(修改库存)
-        qxfp(outMaterialDetailDOList,outOrderNumber,loginUser);
+        List<StockOutOrder> stockOutOrderList = stockOutOrderMapper.selectList(new QueryWrapper<StockOutOrder>().lambda()
+                .eq(StockOutOrder::getOutOrderNumber, outOrderNumber)
+                .eq(StockOutOrder::getDelFlag, 1));
+        if (!CollectionUtils.isEmpty(stockOutOrderList) && "yang_pin_chu_ku".equals(stockOutOrderList.get(0).getBusinessType())) {
+            qxfp(outMaterialDetailDOList,outOrderNumber,loginUser);
+        }
 
         return stockOutOrderPO;
     }
@@ -965,7 +975,14 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
         //保存物料明细信息
         updateBatchById(outMaterialDetailList);
         //取消分配
-        qxfp(outMaterialDetailDOList,outOrderNumber,loginUser);
+
+        List<StockOutOrder> stockOutOrderList = stockOutOrderMapper.selectList(new QueryWrapper<StockOutOrder>().lambda()
+                .eq(StockOutOrder::getOutOrderNumber, outOrderNumber)
+                .eq(StockOutOrder::getDelFlag, 1));
+        if (!CollectionUtils.isEmpty(stockOutOrderList) && "yang_pin_chu_ku".equals(stockOutOrderList.get(0).getBusinessType())) {
+            qxfp(outMaterialDetailDOList,outOrderNumber,loginUser);
+        }
+
         return stockOutOrderPO;
     }
 
@@ -1068,7 +1085,12 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
 
             List<OutMaterialDetailDO> children = outMaterialDetail.getChildren();
             if (!CollectionUtils.isEmpty(children)) {
-                childrenqxfp(children,outOrderNumber,loginUser);
+                List<StockOutOrder> stockOutOrderList = stockOutOrderMapper.selectList(new QueryWrapper<StockOutOrder>().lambda()
+                        .eq(StockOutOrder::getOutOrderNumber, outOrderNumber)
+                        .eq(StockOutOrder::getDelFlag, 1));
+                if (!CollectionUtils.isEmpty(stockOutOrderList) && "yang_pin_chu_ku".equals(stockOutOrderList.get(0).getBusinessType())) {
+                    childrenqxfp(children,outOrderNumber,loginUser);
+                }
             }
         }
     }

mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java

@@ -127,7 +127,12 @@ public class StockInOrderDomainService {
     public List<StockInOrderPO> querySignatureList(StockInOrderDO stockInOrderDO) {
         // 入库签名列表固定按「已入库」状态过滤
         if (stockInOrderDO.getStatus() == null) {
-            stockInOrderDO.setStatus(5);
+//            stockInOrderDO.setStatus(5);
+            List<Integer> list = new ArrayList<>();
+            list.add(3);
+            list.add(4);
+            list.add(5);
+            stockInOrderDO.setStatusList(list);
         }
         // 委托给 queryList，复用 selectStockInOrderPo1 中现有的查询条件（包括新加的 workUserNameLike、signatureStatus）
         return stockInOrderService.queryList(stockInOrderDO);