From 5c802b673de310c4bbdd0b6b8c8f9e15ca8a625c Mon Sep 17 00:00:00 2001
From: "XI_TENG\\xixi_" <971623072>
Date: Fri, 26 Jul 2024 15:02:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=8D=95=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BA=BF=EF=BC=8C=E5=BA=93=E5=AD=98=E5=92=8C?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E7=BB=91=E5=AE=9A=E5=90=88?=
 =?UTF-8?q?=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CwsettlementServiceImpl.java | 10 +++++++++
 .../impl/WarehousingOutboundServiceImpl.java  | 22 ++++++++++++++++++-
 .../impl/WarehousingStorageServiceImpl.java   |  6 ++++-
 .../jnpf/entity/ContractRelationEntity.java   |  2 ++
 .../java/jnpf/entity/CwsettlementEntity.java  |  2 ++
 .../java/jnpf/entity/InventoryEntity.java     |  4 ++++
 .../contractl/ContractRelationModel.java      |  4 ++++
 .../model/cwsettlement/CwsettlementForm.java  |  3 +++
 .../contractLRelation/formContractBatch.vue   | 14 ++++++++++++
 9 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
index 1e761db9..2ff42558 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
@@ -878,6 +878,16 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
                 generaterSwapUtil.swapDatetime(CwsettlementConstant.getFormData(),cwsettlementForm),CwsettlementForm.class);
         CwsettlementEntity entity = JsonUtil.getJsonToBean(cwsettlementForm, CwsettlementEntity.class);
 
+
+        if (cwsettlementForm.getCwsettlementcontractList()!=null){
+            QueryWrapper<ContractLEntity> contractLEntityQueryWrapper =new QueryWrapper<>();
+            contractLEntityQueryWrapper.lambda().eq(ContractLEntity::getId,cwsettlementForm.getCwsettlementcontractList().get(0).getContractId());
+            List<ContractLEntity> contractLEntityList=contractLService.list(contractLEntityQueryWrapper);
+            if (contractLEntityList!=null && contractLEntityList.size()>0){
+                entity.setBusinessLine(contractLEntityList.get(0).getBusinessId());
+            }
+        }
+
         if(isSave){
             String mainId = id ;
             entity.setCode(generaterSwapUtil.getBillNumber("JSD", false));
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java
index f64ee5a4..cd7d4d30 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java
@@ -81,6 +81,8 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
     private VoucherMapper voucherMapper;
     @Resource
     private WarehousingNotificationMapper warehousingNotificationMapper;
+    @Resource
+    private ContractRelationService contractRelationService;
     @Override
     public List<WarehousingOutboundEntity> getList(WarehousingOutboundPagination warehousingOutboundPagination){
         return getTypeList(warehousingOutboundPagination,warehousingOutboundPagination.getDataType());
@@ -685,6 +687,8 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
         DeliveryOrderEntity deliveryOrder = deliveryOrderService.getInfo(deliveryOrderForm.getId());
         UserInfo userInfo=userProvider.get();
         UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
+        String contractSale=null;
+
 //        warehousingOutboundForm = JsonUtil.getJsonToBean(
 //                generaterSwapUtil.swapDatetime(WarehousingOutboundConstant.getFormData(),warehousingOutboundForm),WarehousingOutboundForm.class);
 //        WarehousingOutboundEntity entity = JsonUtil.getJsonToBean(warehousingOutboundForm, WarehousingOutboundEntity.class);
@@ -698,6 +702,7 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
             BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(deliveryOrderForm.getBusinessId());
             if (ObjectUtil.isNotEmpty(businessOrderEntity)){
                 entity.setBusinessOrderNo(businessOrderEntity.getCode()); //添加销售订单编号
+                contractSale=businessOrderEntity.getContractId();
             }
         }
         entity.setWarehousingOutboundStatus("3");//已出库
@@ -759,7 +764,7 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
                 if(inventoryList != null && inventoryList.size() > 0){
                     inventoryEntity = inventoryList.get(0);
                     inventoryEntity.setInventoryNumber(inventoryEntity.getInventoryNumber().subtract((entitys.getDeliveryNum())));//库存数量
-
+                    inventoryEntity.setContractSaleId(contractSale);
                     if (deliveryType.equals("1")) {
                         inventoryEntity.setPurchasePrice(entitys.getReturnUnit());//平均采购单价
                     }else if (deliveryType.equals("2")){
@@ -783,6 +788,8 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
                     inventoryEntity.setOrganizeJsonId(deliveryOrder.getOrganizeJsonId());
                     inventoryEntity.setCompanyId(deliveryOrder.getCompanyId());
                     inventoryEntity.setDepartmentId(deliveryOrder.getDepartmentId());
+                    inventoryEntity.setContractSaleId(contractSale);
+
                     if (deliveryType.equals("1")) {
                         inventoryEntity.setPurchasePrice(entitys.getReturnUnit());//平均采购单价
                     }else if (deliveryType.equals("2")){
@@ -792,6 +799,19 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
                 }
                 inventoryService.saveOrUpdate(inventoryEntity);
 
+                QueryWrapper<ContractRelationEntity> contractRelationQueryWrapper = new QueryWrapper<>();
+                contractRelationQueryWrapper.lambda().eq(ContractRelationEntity::getBusinessId, contractSale); //销售合同ud
+                contractRelationQueryWrapper.lambda().eq(ContractRelationEntity::getBusinessIds, inventoryEntity.getContractPurchaseId()); //采购合同id
+                List<ContractRelationEntity> contractRelationEntityList = contractRelationService.list(contractRelationQueryWrapper);
+                if(contractRelationEntityList != null && contractRelationEntityList.size() > 0){
+                    //查询到则不做处理
+                }else {
+                    ContractRelationEntity contractRelationEntity = new ContractRelationEntity();
+                    contractRelationEntity.setBusinessId(contractSale);//合同主表id
+                    contractRelationEntity.setBusinessIds(inventoryEntity.getContractPurchaseId()); //合同对应id
+                    contractRelationService.saveOrUpdate(contractRelationEntity);
+                }
+
                 //更新库存流水
                 InventoryLogEntity inventoryLogEntity = new InventoryLogEntity();
                 inventoryLogEntity.setProductId(entitys.getProductId());
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java
index 262240f0..5d5d1722 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java
@@ -749,11 +749,13 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
 //        WarehousingStorageEntity entity = JsonUtil.getJsonToBean(receiptOrderForm, WarehousingStorageEntity.class);
         WarehousingStorageEntity entity = new WarehousingStorageEntity();
         entity.setDocumentNo(generaterSwapUtil.getBillNumber("rukudanbianhao", false));
+        String contractPurchase=null;
         if (receiptType.equals("1")) {
             entity.setWarehousingStorageType("15");//采购收货单入库
             BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(receiptOrderForm.getBusinessId());
             if (ObjectUtil.isNotEmpty(businessOrderEntity)){
                 entity.setBusinessOrderNo(businessOrderEntity.getCode()); //添加采购订单编号
+                contractPurchase=businessOrderEntity.getContractId();
             }
         }else if (receiptType.equals("2")){
             entity.setWarehousingStorageType("16");//销售收货单入库
@@ -816,6 +818,8 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
                     inventoryEntity = inventoryList.get(0);
                     inventoryEntity.setInventoryNumber(inventoryEntity.getInventoryNumber().add((entitys.getDeliveryNum())));//库存数量
                     inventoryEntity.setSpec(entitys.getSpec());
+                    inventoryEntity.setContractPurchaseId(contractPurchase);
+
                 }else{
                     inventoryEntity.setProductId(entitys.getProductId());
                     inventoryEntity.setCode(productWarehouseEntity.getCode());
@@ -833,7 +837,7 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
                     inventoryEntity.setOrganizeJsonId(receiptOrder.getOrganizeJsonId());
                     inventoryEntity.setCompanyId(receiptOrder.getCompanyId());
                     inventoryEntity.setDepartmentId(receiptOrder.getDepartmentId());
-
+                    inventoryEntity.setContractPurchaseId(contractPurchase);
                     if (receiptType.equals("1")) {
                     inventoryEntity.setPurchasePrice(entitys.getReturnUnit());//平均采购单价
                     }else if (receiptType.equals("2")){
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractRelationEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractRelationEntity.java
index 73afd3d8..d1210f39 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractRelationEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractRelationEntity.java
@@ -18,6 +18,8 @@ public class ContractRelationEntity  {
     private String id;
     @TableField(value = "BUSINESS_ID" , updateStrategy = FieldStrategy.IGNORED)
     private String businessId;
+    @TableField(value = "BUSINESS_IDS" , updateStrategy = FieldStrategy.IGNORED)
+    private String businessIds;
     @TableField("PURCHASE_CONTRACT_CODE")
     private String purchaseContractCode;
     @TableField("PURCHASE_CONTRACT_NAME")
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementEntity.java
index e4515d57..8e8f56af 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementEntity.java
@@ -176,4 +176,6 @@ public class CwsettlementEntity  {
     private String applyState;
     @TableField(exist = false)
     private String contractName;
+    @TableField(value = "BUSINESS_LINE" , updateStrategy = FieldStrategy.IGNORED)
+    private String businessLine;
 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/InventoryEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/InventoryEntity.java
index 7c58304b..fa87d992 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/InventoryEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/InventoryEntity.java
@@ -41,6 +41,10 @@ public class InventoryEntity  {
     private String storageAreaId;
     @TableField(value = "BATCH_NUMBER" , updateStrategy = FieldStrategy.IGNORED)
     private String batchNumber;
+    @TableField(value = "CONTRACT_PURCHASE_ID" , updateStrategy = FieldStrategy.IGNORED)
+    private String contractPurchaseId;
+    @TableField(value = "CONTRACT_SALE_ID" , updateStrategy = FieldStrategy.IGNORED)
+    private String contractSaleId;
     @TableField(value = "INVENTORY_NUMBER" , updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal inventoryNumber;
     @TableField(value = "PURCHASE_PRICE" , updateStrategy = FieldStrategy.IGNORED)
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/contractl/ContractRelationModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/contractl/ContractRelationModel.java
index 00f8a367..e90eb525 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/contractl/ContractRelationModel.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/contractl/ContractRelationModel.java
@@ -17,6 +17,10 @@ public class ContractRelationModel {
     @JSONField(name = "businessId")
     private Object businessId;
 
+    /** 主表id **/
+    @JSONField(name = "businessIds")
+    private Object businessIds;
+
     /** 合同编码 **/
     @JSONField(name = "purchaseContractCode")
     private Object purchaseContractCode;
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementForm.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementForm.java
index 1671f91a..dda093fc 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementForm.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/cwsettlement/CwsettlementForm.java
@@ -170,4 +170,7 @@ public class CwsettlementForm  {
     private BigDecimal settlementSum;
     @JsonProperty("applyState")
     private String applyState;
+
+    @JsonProperty("businessLine")
+    private String businessLine;
 }
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/contractLRelation/formContractBatch.vue b/jnpf-java-boot/jnpf-web/src/views/scm/contractLRelation/formContractBatch.vue
index 996884f4..9fa4b4b8 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/contractLRelation/formContractBatch.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/contractLRelation/formContractBatch.vue
@@ -178,6 +178,18 @@
                     </template>
                   </el-table-column>
 
+                  <!-- <el-table-column label="1" prop="buinessIds">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>1
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfInput v-model="scope.row.buinessIds"
+                        @change="changeData('voucherproduct-remark',scope.$index)" placeholder="请输入"
+                        clearable :style='{"width":"100%"}'>
+                      </JnpfInput>
+                    </template>
+                  </el-table-column> -->
+
                   <el-table-column label="操作" width="50">
                     <template slot-scope="scope">
                       <el-button size="mini" type="text" class="JNPF-table-delBtn"
@@ -406,6 +418,8 @@ export default {
           purchaseContractCode: e.contractNumber,
           purchaseContractName: e.contractName,
           purchaseContractNo: e.contractNo,
+          buinessIds: e.id,
+
         }
         this.dataForm.contractRelationList.push(item)
       }