Bladeren bron

采购合同

24282 1 jaar geleden
bovenliggende
commit
0067b107d8

+ 13 - 8
sd-business/src/main/java/com/sd/business/entity/purchase/po/Purchase.java

@@ -122,24 +122,24 @@ public class Purchase extends BasePo {
     private BigDecimal advancePayment;
 
     /**
-     * 含税总金额
+     * 合同模板id
      */
-    private BigDecimal totalAmountIncludingTax;
+    private Long contractTemplateId;
 
     /**
-     * 不含税总金额
+     * 合同内容
      */
-    private BigDecimal totalAmountExcludingTax;
+    private String contract;
 
     /**
-     * 合同模板id
+     * 含税总金额
      */
-    private Long contractTemplateId;
+    private BigDecimal totalAmountIncludingTax;
 
     /**
-     * 合同内容
+     * 不含税总金额
      */
-    private String contract;
+    private BigDecimal totalAmountExcludingTax;
 
     /**
      * 退货总金额
@@ -162,6 +162,11 @@ public class Purchase extends BasePo {
     private Integer paymentStatus;
 
     /**
+     * 入库状态 0未完成 1已完成
+     */
+    private Integer storageStatus;
+
+    /**
      * 流程id
      */
     private Long flowId;

+ 1 - 0
sd-business/src/main/java/com/sd/business/service/purchase/impl/PurchaseServiceImpl.java

@@ -120,6 +120,7 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase> i
         purchaseDto.setClosedAccountAmount(BigDecimal.ZERO);
         purchaseDto.setDeductibleAmount(BigDecimal.ZERO);
         purchaseDto.setPaymentStatus(StatusConstant.NO);
+        purchaseDto.setStorageStatus(StatusConstant.NO);
         this.save(purchaseDto);
 
         // 保存采购明细