合同编号跳转

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/PurchaseOrder.java

@@ -292,6 +292,16 @@ public class PurchaseOrder extends BaseModel<PurchaseOrder> {
     @TableField(exist = false)
     private String procurementPlanType;
 
+    /**
+     * 合同ID
+     */
+    @TableField(exist = false)
+    private String contractId;
+    /**
+     * 合同类型
+     */
+    @TableField(exist = false)
+    private String goodsType;
 
     @Override
     protected Serializable pkVal() {

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/SaleOrder.java

@@ -286,6 +286,16 @@ public class SaleOrder extends BaseModel<SaleOrder> {
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date submitDate;
+    /**
+     * 合同ID
+     */
+    @TableField(exist = false)
+    private String contractId;
+    /**
+     * 合同类型
+     */
+    @TableField(exist = false)
+    private String goodsType;
 
 
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PurchaseOrderServiceImpl.java

@@ -62,6 +62,8 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
     private IProcurementPlanInfoService procurementPlanInfoService;
     @Autowired
     private ICustomerInfoService customerInfoService;
+    @Autowired
+    private IContractManagementInfoService contractManagementInfoService;
 
     /**
      * 成交
@@ -276,6 +278,14 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
                     purchaseOrdera.setProcurementPlanType(procurementPlanInfo.getProcurementPlanType());
                     purchaseOrdera.setTradingTarget(procurementPlanInfo.getTitle());
                 }
+                //查询合同Id
+                ContractManagementInfo contractManagementInfo=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                         .eq("contract_no",purchaseOrdera.getContractNo())
+                         .eq("delete_flag","0"));
+                if (contractManagementInfo!=null){
+                    purchaseOrdera.setContractId(contractManagementInfo.getId());
+                    purchaseOrdera.setGoodsType(contractManagementInfo.getGoodsType());
+                }
                 //定义已入库量
                 Float stockInQuantity = 0.0f;
                 //查询入库量

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/SaleOrderServiceImpl.java

@@ -57,7 +57,8 @@ public class SaleOrderServiceImpl extends ServiceImpl<SaleOrderMapper, SaleOrder
     private ICustomerInfoService customerInfoService;
     @Autowired
     private ICollectionManagementService collectionManagementService;
-
+    @Autowired
+    private IContractManagementInfoService contractManagementInfoService;
     /**
      * 成交
      */
@@ -300,6 +301,14 @@ public class SaleOrderServiceImpl extends ServiceImpl<SaleOrderMapper, SaleOrder
                     saleOrdera.setSalePlanType(salePlanInfo.getSalePlanType());
                     saleOrdera.setTradingTarget(salePlanInfo.getTitle());
                 }
+                //查询合同Id
+                ContractManagementInfo contractManagementInfo=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                        .eq("contract_no",saleOrdera.getContractNo())
+                        .eq("delete_flag","0"));
+                if (contractManagementInfo!=null){
+                    saleOrdera.setContractId(contractManagementInfo.getId());
+                    saleOrdera.setGoodsType(contractManagementInfo.getGoodsType());
+                }
                 //定义已出库量
                 Float stockOutQuantity = 0.0f;
                 //查询出库量