到货样验添加

src/main/java/com/topsunit/scanservice/ximai/controller/StockController.java

@@ -63,9 +63,15 @@ public class StockController {
         copthService.create(params);
     }
     @ApiModelProperty("到货确认")
-        @PostMapping("/stockArrival/confirm")
+    @PostMapping("/stockArrival/confirm")
     public void stockArrivalConfirm(@RequestBody StockArrivalParams params) {
         purccService.create(params);
     }
 
+    @ApiModelProperty("到货校验")
+        @PostMapping("/stockArrival/validate")
+    public void stockArrivalValidate(@RequestBody StockArrivalValidateParams params) {
+        purccService.validate(params);
+    }
+
 }

src/main/java/com/topsunit/scanservice/ximai/dao/PurtdDao.java

@@ -5,6 +5,8 @@ import com.topsunit.scanservice.ximai.entity.PurtdId;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
+import java.util.Optional;
+
 /**
  * <p>Title: PurtdDao</p>
  * <p>Description: PurtdDao</p>
@@ -14,4 +16,6 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
  * @date 2021/10/22
  */
 public interface PurtdDao extends JpaRepository<Purtd, PurtdId>, JpaSpecificationExecutor<Purtd> {
+    public Optional<Purtd> findFirstByTd001AndTd002AndTd003(String td001,String td002,String td003);
+
 }

src/main/java/com/topsunit/scanservice/ximai/dto/StockArrivalValidateParams.java

+package com.topsunit.scanservice.ximai.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 销售出库参数
+ */
+@Data
+public class StockArrivalValidateParams {
+    @ApiModelProperty("采购单单别")
+    String purchaseType;
+    @ApiModelProperty("采购单单号")
+    String purchaseNo;
+    @ApiModelProperty("采购单序号")
+    String purchaseSerial;
+    @ApiModelProperty("品号")
+    String materialNo;
+}

src/main/java/com/topsunit/scanservice/ximai/dto/StockSaleOutParams.java

@@ -15,7 +15,6 @@ public class StockSaleOutParams {
     @ApiModelProperty("交货单号")
     String applyNo;
 
-
     @ApiModelProperty("确认明细")
     List<StockSaleOutParams.StockSaleOutDetail> data;
     @Data

src/main/java/com/topsunit/scanservice/ximai/entity/Purtd.java

 package com.topsunit.scanservice.ximai.entity;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -14,6 +17,7 @@ import java.math.BigDecimal;
  * @version V1.0
  * @date 2021/10/22
  */
+@Data
 @Entity
 @IdClass(PurtdId.class)
 public class Purtd extends EntityBase {
@@ -23,58 +27,12 @@ public class Purtd extends EntityBase {
     private String td002;
     @Id
     private String td003;
+    @ApiModelProperty("品号")
+    private String td004;
     @Column
     private BigDecimal td010;
     @Column
     private BigDecimal td015;
     @Column
     private BigDecimal tdc04;
-
-    public String getTd001() {
-        return td001;
-    }
-
-    public void setTd001(String td001) {
-        this.td001 = td001;
-    }
-
-    public String getTd002() {
-        return td002;
-    }
-
-    public void setTd002(String td002) {
-        this.td002 = td002;
-    }
-
-    public String getTd003() {
-        return td003;
-    }
-
-    public void setTd003(String td003) {
-        this.td003 = td003;
-    }
-
-    public BigDecimal getTd010() {
-        return td010;
-    }
-
-    public void setTd010(BigDecimal td010) {
-        this.td010 = td010;
-    }
-
-    public BigDecimal getTd015() {
-        return td015;
-    }
-
-    public void setTd015(BigDecimal td015) {
-        this.td015 = td015;
-    }
-
-    public BigDecimal getTdc04() {
-        return tdc04;
-    }
-
-    public void setTdc04(BigDecimal tdc04) {
-        this.tdc04 = tdc04;
-    }
 }

src/main/java/com/topsunit/scanservice/ximai/service/PurccService.java

@@ -250,6 +250,16 @@ public class PurccService {
         }
     }
 
+    public void validate(StockArrivalValidateParams params){
+        Optional<Purtd> purtdOp = purtdDao.findFirstByTd001AndTd002AndTd003(params.getPurchaseType(), params.getPurchaseNo(), params.getPurchaseSerial());
+        if(!purtdOp.isPresent()){
+            throw new TopsunitException(String.format("未找到采购订单%s,%s,%s", params.getPurchaseType(), params.getPurchaseNo(), params.getPurchaseSerial()));
+        }
+        if(!purtdOp.get().getTd004().trim().equals(params.getMaterialNo().trim())){
+            throw new TopsunitException(String.format("未找到采购订单%s,%s,%s", params.getPurchaseType(), params.getPurchaseNo(), params.getPurchaseSerial()));
+        }
+    }
+
     private String getNewCc002(String tg001) {
         String prefix = DateUtil.currentDateString();
         return purccDao.findFirstByCc001AndCc002StartingWithOrderByCc002Desc(tg001, prefix)