添加批次号管理

(cherry picked from commit 6188be08)

erp-system/src/main/java/com/topsunit/scanservice/ximai/common/Constants.java

@@ -59,7 +59,7 @@ public class Constants {
     /**
      * 默认批号
      */
-    public static final String BATCH_DEF = Constants.BATCH_DEF;
+    public static final String BATCH_DEF = "********************";
 
     /**
      * 验证码 redis key

erp-system/src/main/java/com/topsunit/scanservice/ximai/controller/StockController.java

@@ -2,6 +2,8 @@ package com.topsunit.scanservice.ximai.controller;
 
 import com.topsunit.scanservice.ximai.dao.WarehouseArriveDao;
 import com.topsunit.scanservice.ximai.dto.*;
+import com.topsunit.scanservice.ximai.entity.Invmb;
+import com.topsunit.scanservice.ximai.entity.Purtd;
 import com.topsunit.scanservice.ximai.entity.WarehouseArrive;
 import com.topsunit.scanservice.ximai.service.*;
 import io.swagger.annotations.ApiModelProperty;
@@ -71,9 +73,12 @@ public class StockController {
     }
 
     @ApiModelProperty("到货校验")
-        @PostMapping("/stockArrival/validate")
-    public void stockArrivalValidate(@RequestBody StockArrivalValidateParams params) {
-        purccService.validate(params);
+    @PostMapping("/stockArrival/validate")
+    public StockArrivalValidateDto stockArrivalValidate(@RequestBody StockArrivalValidateParams params) {
+        Invmb invmb = purccService.validate(params);
+        StockArrivalValidateDto rst = new StockArrivalValidateDto();
+        rst.setInvmb(invmb);
+        return rst;
     }
 
     @ApiModelProperty("到货仓查询")

erp-system/src/main/java/com/topsunit/scanservice/ximai/dto/StockArrivalValidateDto.java

+package com.topsunit.scanservice.ximai.dto;
+
+import com.topsunit.scanservice.ximai.common.Constants;
+import com.topsunit.scanservice.ximai.entity.Invmb;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+public class StockArrivalValidateDto {
+    @ApiModelProperty("物料信息")
+    Invmb invmb;
+    @ApiModelProperty("默认批次")
+    String defBatchNo= Constants.BATCH_DEF;
+
+}

erp-system/src/main/java/com/topsunit/scanservice/ximai/service/MoctcService.java

@@ -254,7 +254,7 @@ public class MoctcService {
 //                throw new TopsunitException(MessageUtils.getMessage("批管理品号{0}必须录入批号。", mocteCreateParams.getTb003()));
 //            }
 //        });
-        invmlDao.findFirstByMl001AndMl002AndMl003AndMl004(mocteCreateParams.getTb003(), mocteCreateParams.getTe008(), mocteCreateParams.getTe025(), Constants.BATCH_DEF)
+        invmlDao.findFirstByMl001AndMl002AndMl003AndMl004(mocteCreateParams.getTb003(), mocteCreateParams.getTe008(), mocteCreateParams.getTe025(), mocteCreateParams.getTe010())
                 .filter(i -> i.getMl005().compareTo(mocteCreateParams.getQuantity()) >= 0)
                 .orElseThrow(() -> new TopsunitException(MessageUtils.getMessage("品号{0}库存不足。", mocteCreateParams.getTb003().trim())));
 

erp-system/src/main/java/com/topsunit/scanservice/ximai/service/PurccService.java

@@ -290,7 +290,7 @@ public class PurccService {
         purccDao.save(purcc);
     }
 
-    public void validate(StockArrivalValidateParams params){
+    public Invmb validate(StockArrivalValidateParams params){
         Optional<Purtd> purtdOp = purtdDao.findFirstByTd001AndTd002AndTd003(params.getPurchaseType(), params.getPurchaseNo(), params.getPurchaseSerial());
         if(!purtdOp.isPresent()){
             throw new TopsunitException(MessageUtils.getMessage("未找到采购订单{0},{1},{2}", params.getPurchaseType(), params.getPurchaseNo(), params.getPurchaseSerial()));
@@ -298,6 +298,12 @@ public class PurccService {
         if(!purtdOp.get().getTd004().trim().equals(params.getMaterialNo().trim())){
             throw new TopsunitException(MessageUtils.getMessage("未找到采购订单{0},{1},{2}", params.getPurchaseType(), params.getPurchaseNo(), params.getPurchaseSerial()));
         }
+        Optional<Invmb> invmbOp = invmbDao.findById(params.getMaterialNo());
+        if(!purtdOp.get().getTd004().trim().equals(params.getMaterialNo().trim())){
+            throw new TopsunitException(MessageUtils.getMessage("未找到对应物料：{0}", params.getMaterialNo()));
+        }
+        return invmbOp.get();
+
     }
 
     private String getNewCc002(String tg001) {