杰生重构

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/entity/contract/ContractDetails.java

@@ -57,6 +57,11 @@ public class ContractDetails extends StorageBaseEntity {
     private Long materialId;
 
     /**
+     * 供应商id
+     */
+    private Long supplierId;
+
+    /**
      * 单价
      */
     private BigDecimal price;

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/entity/water/Water.java

@@ -1,14 +1,14 @@
 package com.fjhx.entity.water;
 
-import java.math.BigDecimal;
-
 import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.fjhx.base.StorageBaseEntity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fjhx.base.StorageBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+
 /**
  * <p>
  * 流水表
@@ -21,7 +21,6 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class Water extends StorageBaseEntity {
 
-
     /**
      * 仓库id
      */
@@ -43,7 +42,11 @@ public class Water extends StorageBaseEntity {
     private Long materialId;
 
     /**
-     * 库存变更类型 （6库存初始化，10入库，11盘盈，12数量添加修正，13补入库，14标签损坏入库，15归还入库，16现场回仓，17调仓入库，20出库，21盘亏，22数量减少修正，23补出库，24绑定错误，25标签损坏出库，26退货出库，27报废出库，28调仓出库）
+     * 库存变更类型
+     * <p>
+     * 6: 库存初始化
+     * 10:入库， 11:盘盈， 12:数量添加修正， 13:补入库， 14:标签损坏入库，15:归还入库，    16:现场回仓， 17:调仓入库
+     * 20:出库， 21:盘亏， 22:数量减少修正， 23:补出库， 24:绑定错误，   25:标签损坏出库， 26:退货出库， 27:报废出库， 28:调仓出库
      */
     private Integer type;
 

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/entity/water/WaterBatch.java

@@ -34,6 +34,11 @@ public class WaterBatch extends StorageBaseEntity {
     private Long materialId;
 
     /**
+     * 供应商id
+     */
+    private Long supplierId;
+
+    /**
      * 单价
      */
     private BigDecimal price;

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/entity/water/WaterTag.java

@@ -21,7 +21,6 @@ import java.math.BigDecimal;
 @EqualsAndHashCode(callSuper = true)
 public class WaterTag extends StorageBaseEntity {
 
-
     /**
      * 物料id
      */

hx-service/storage-restructure/src/main/java/com/fjhx/service/flow/ContractFlowService.java

@@ -66,12 +66,13 @@ public class ContractFlowService {
     @Transactional(rollbackFor = Exception.class)
     public void create(ContractVo contractVo) {
 
+        Long id = contractVo.getId();
+        Long supplierId = contractVo.getSupplierId();
         BigDecimal price = contractVo.getPrice();
         BigDecimal quantity = contractVo.getQuantity();
-        Long id = contractVo.getId();
 
         Assert.notEmpty(id, "合同id不能为空");
-        Assert.notEmpty(contractVo.getSupplierId(), "供应商id不能为空");
+        Assert.notEmpty(supplierId, "供应商id不能为空");
         Assert.notEmpty(contractVo.getAccountDate(), "账期不能为空");
         Assert.notEmpty(contractVo.getSignTime(), "签约日期不能为空");
         Assert.notEmpty(contractVo.getDeliverTime(), "交付日期不能为空");
@@ -89,7 +90,8 @@ public class ContractFlowService {
 
         contractDetailsService.update(Wrappers.<ContractDetails>lambdaUpdate()
                 .eq(ContractDetails::getContractId, id)
-                .set(ContractDetails::getPrice, price));
+                .set(ContractDetails::getPrice, price)
+                .set(ContractDetails::getSupplierId, supplierId));
 
         flowConstructor.create(id, "合同审批", contractVo.getRemark(), contractVo);
     }

hx-service/storage-restructure/src/main/java/com/fjhx/service/water/impl/WaterBatchServiceImpl.java

@@ -90,6 +90,7 @@ public class WaterBatchServiceImpl extends ServiceImpl<WaterBatchMapper, WaterBa
         Assert.notEmpty(contractDetails, "没有找到合同明细");
 
         waterBatchVo.setMaterialId(contractDetails.getMaterialId());
+        waterBatchVo.setSupplierId(contractDetails.getSupplierId());
         waterBatchVo.setPrice(contractDetails.getPrice());
         waterBatchVo.setApplyPurchaseId(contractDetails.getApplyPurchaseId());
         waterBatchVo.setApplyPurchaseDetailsId(contractDetails.getApplyPurchaseDetailsId());