WMS入库管理模块bug修改

mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/entity/InMaterialDetail.java

@@ -253,12 +253,12 @@ public class InMaterialDetail extends BaseVOEntity {
     private Long overStockType;
 
     // ========== 报关相关明细字段 ==========
-    @ApiModelProperty("规格型号/ITEM")
+    @ApiModelProperty("规格型号")
     @Excel(name = "规格型号/ITEM")
-    private String specification;
+    private String specificationModel;
 
-    @ApiModelProperty("商品SKU码")
-    @Excel(name = "商品SKU码")
+    @ApiModelProperty("SKU码")
+    @Excel(name = "SKU码")
     private String skuCode;
 
     @ApiModelProperty("Invoice No.")
@@ -275,7 +275,7 @@ public class InMaterialDetail extends BaseVOEntity {
 
     @ApiModelProperty("申报单位")
     @Excel(name = "申报单位")
-    private String declaredUnit;
+    private String declarationUnit;
 
     @ApiModelProperty("Batch Ref NO's")
     @Excel(name = "Batch Ref NO's")
@@ -287,7 +287,7 @@ public class InMaterialDetail extends BaseVOEntity {
 
     @ApiModelProperty("原产国")
     @Excel(name = "原产国")
-    private String countryOfOrigin;
+    private String originCountry;
 
     @ApiModelProperty("箱号/卡板号")
     @Excel(name = "箱号/卡板号")

mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailPO.java

@@ -264,12 +264,12 @@ public class InMaterialDetailPO extends StockInOrderBasePO {
     private Long overStockType;
 
     // ========== 报关相关明细字段 ==========
-    @ApiModelProperty("规格型号/ITEM")
+    @ApiModelProperty("规格型号")
     @Excel(name = "规格型号/ITEM")
-    private String specification;
+    private String specificationModel;
 
-    @ApiModelProperty("商品SKU码")
-    @Excel(name = "商品SKU码")
+    @ApiModelProperty("SKU码")
+    @Excel(name = "SKU码")
     private String skuCode;
 
     @ApiModelProperty("Invoice No.")
@@ -286,7 +286,7 @@ public class InMaterialDetailPO extends StockInOrderBasePO {
 
     @ApiModelProperty("申报单位")
     @Excel(name = "申报单位")
-    private String declaredUnit;
+    private String declarationUnit;
 
     @ApiModelProperty("Batch Ref NO's")
     @Excel(name = "Batch Ref NO's")
@@ -298,7 +298,7 @@ public class InMaterialDetailPO extends StockInOrderBasePO {
 
     @ApiModelProperty("原产国")
     @Excel(name = "原产国")
-    private String countryOfOrigin;
+    private String originCountry;
 
     @ApiModelProperty("箱号/卡板号")
     @Excel(name = "箱号/卡板号")

mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/todo/InMaterialDetailDO.java

@@ -260,12 +260,12 @@ public class InMaterialDetailDO extends StockInOrderBaseDO {
     private List<String> inOrderNumberList;
 
     // ========== 报关相关明细字段 ==========
-    @ApiModelProperty("规格型号/ITEM（选择物料后自动带出，不可编辑）")
+    @ApiModelProperty("规格型号（选择物料后自动带出，不可编辑）")
     @Excel(name = "规格型号/ITEM")
-    private String specification;
+    private String specificationModel;
 
-    @ApiModelProperty("商品SKU码（选择物料后自动带出，不可编辑）")
-    @Excel(name = "商品SKU码")
+    @ApiModelProperty("SKU码（选择物料后自动带出，不可编辑）")
+    @Excel(name = "SKU码")
     private String skuCode;
 
     @ApiModelProperty("Invoice No.")
@@ -282,7 +282,7 @@ public class InMaterialDetailDO extends StockInOrderBaseDO {
 
     @ApiModelProperty("申报单位")
     @Excel(name = "申报单位")
-    private String declaredUnit;
+    private String declarationUnit;
 
     @ApiModelProperty("Batch Ref NO's")
     @Excel(name = "Batch Ref NO's")
@@ -294,7 +294,7 @@ public class InMaterialDetailDO extends StockInOrderBaseDO {
 
     @ApiModelProperty("原产国")
     @Excel(name = "原产国")
-    private String countryOfOrigin;
+    private String originCountry;
 
     @ApiModelProperty("箱号/卡板号")
     @Excel(name = "箱号/卡板号")

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

@@ -107,7 +107,6 @@ public class StockInOrderDomainService {
     /**
      * 批量新增入库单
      */
-    @Transactional(rollbackFor = Exception.class)
     public Boolean batchInsert(List<StockInOrderDO> stockInOrderDOList) {
         for (StockInOrderDO stockInOrderDO : stockInOrderDOList){
             if (StringUtils.isBlank(stockInOrderDO.getInOrderNumber())){
@@ -409,12 +408,12 @@ public class StockInOrderDomainService {
             
             //自动填充规格型号和SKU码（如果物料基础信息中有相关字段且明细中未设置）
             //规格型号：优先使用物料种类名称，如果为空则使用物料类型名称
-            if (StringUtils.isBlank(inMaterialDetailDO.getSpecification())) {
+            if (StringUtils.isBlank(inMaterialDetailDO.getSpecificationModel())) {
                 if (StringUtils.isNotBlank(materialBaseInfoPO.getMaterialTypeName())) {
-                    inMaterialDetailDO.setSpecification(materialBaseInfoPO.getMaterialTypeName());
+                    inMaterialDetailDO.setSpecificationModel(materialBaseInfoPO.getMaterialTypeName());
                 }
             }
-            //商品SKU码：使用物料条形码
+            //SKU码：使用物料条形码
             if (StringUtils.isBlank(inMaterialDetailDO.getSkuCode())) {
                 if (StringUtils.isNotBlank(materialBaseInfoPO.getBarCode())) {
                     inMaterialDetailDO.setSkuCode(materialBaseInfoPO.getBarCode());

mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/repository/todo/StockReceiptOrderDO.java

@@ -158,4 +158,7 @@ public class StockReceiptOrderDO extends StockInOrderBaseDO {
     @ApiModelProperty("物料明细")
     private List<ReceiptMaterialDetailDO> materialDetailList;
 
+    @ApiModelProperty("仓库绑定的用户ID列表（用于任务下发时筛选操作人员）")
+    private List<Long> warehouseUserIds;
+
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java

@@ -53,6 +53,9 @@ import com.mhd.wms.domain.stockReceiptOrder.repository.facade.IStockReceiptOrder
 import com.mhd.wms.domain.stockReceiptOrder.repository.po.StockReceiptOrderPO;
 import com.mhd.wms.domain.stockReceiptOrder.repository.todo.NoReceiptOrderDO;
 import com.mhd.wms.domain.stockReceiptOrder.repository.todo.StockReceiptOrderDO;
+import com.mhd.wms.domain.stockShelfOrder.entity.StockShelfOrder;
+import com.mhd.wms.domain.stockShelfOrder.repository.facade.IStockShelfOrderService;
+import com.mhd.wms.domain.stockShelfOrder.repository.po.StockShelfOrderPO;
 import com.mhd.wms.domain.stockShelfOrder.repository.todo.StockShelfOrderDO;
 import com.mhd.wms.domain.stockShelfOrder.service.StockShelfOrderDomainService;
 import com.mhd.wms.domain.taskReceiptMaterialDetail.repository.todo.TaskReceiptMaterialDetailDO;
@@ -88,6 +91,8 @@ public class StockReceiptOrderDomainService {
     @Autowired
     private StockShelfOrderDomainService stockShelfOrderDomainService;
     @Autowired
+    private IStockShelfOrderService stockShelfOrderService;
+    @Autowired
     private IQualityInspectionService qualityInspectionService;
     @Autowired
     private IInMaterialDetailSerialNumberService inMaterialDetailSerialNumberService;
@@ -145,6 +150,7 @@ public class StockReceiptOrderDomainService {
                 receiptMaterialDetail.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
                 receiptMaterialDetail.setUniqueId(idGenerator.snowflakeId(SnowFlakeConstants.wmsId));
                 receiptMaterialDetail.setReceiptOrderNumber(stockReceiptOrder.getReceiptOrderNumber());
+                receiptMaterialDetail.setGenStockShelf(2); // 设置需要生成上架单
                 receiptMaterialDetail.setCreateBy(loginUser.getUserid());
                 receiptMaterialDetail.setCreateByName(loginUser.getUsername());
                 receiptMaterialDetail.setCreateTime(new Date());
@@ -455,6 +461,40 @@ public class StockReceiptOrderDomainService {
         //根据收货数量生成上架
         genStockShelfOrder(stockReceiptOrderPO);
 
+        //收货完成后自动生成上架任务
+        try {
+            //查询刚生成的上架单
+            StockShelfOrderDO stockShelfOrderDOQuery = new StockShelfOrderDO();
+            stockShelfOrderDOQuery.setReceiptOrderNumber(stockReceiptOrderPO.getReceiptOrderNumber());
+            stockShelfOrderDOQuery.setTaskDistribution(2); // 查询未下发的上架单
+            List<StockShelfOrderPO> stockShelfOrderPOList = stockShelfOrderService.queryList(stockShelfOrderDOQuery);
+            if (!CollectionUtils.isEmpty(stockShelfOrderPOList)) {
+                //创建上架任务参数
+                StockShelfOrderDO stockShelfOrderDO = new StockShelfOrderDO();
+                stockShelfOrderDO.setShelfOrderIds(stockShelfOrderPOList.stream()
+                        .map(StockShelfOrderPO::getShelfOrderId)
+                        .collect(Collectors.toList()));
+                //如果没有指定操作人员，使用当前登录用户
+                if (stockShelfOrderDO.getOperatorsBy() == null) {
+                    stockShelfOrderDO.setOperatorsBy(loginUser.getUserid());
+                    stockShelfOrderDO.setOperatorsName(loginUser.getUsername());
+                }
+                //生成上架任务
+                stockShelfOrderDomainService.genDeliveTask(stockShelfOrderPOList, stockShelfOrderDO);
+                //标记上架单任务已下发
+                stockShelfOrderService.update(null, new UpdateWrapper<StockShelfOrder>().lambda()
+                        .set(StockShelfOrder::getTaskDistribution, 1)
+                        .set(StockShelfOrder::getTaskDistributionTime, new Date())
+                        .set(StockShelfOrder::getUpdateBy, loginUser.getUserid())
+                        .set(StockShelfOrder::getUpdateByName, loginUser.getUsername())
+                        .set(StockShelfOrder::getUpdateTime, new Date())
+                        .in(StockShelfOrder::getShelfOrderId, stockShelfOrderDO.getShelfOrderIds()));
+            }
+        } catch (Exception e) {
+            //如果生成上架任务失败，记录日志但不影响收货完成流程
+            log.error("收货完成后生成上架任务失败，收货单号：{}", stockReceiptOrderPO.getReceiptOrderNumber(), e);
+        }
+
         //生成收货追溯记录
         genInventoryStandingDetail(stockReceiptOrderPO);
         //存在异常 生成记录