From 08177986cfe7db70abd2eeeea71badc05b16c83f Mon Sep 17 00:00:00 2001
From: vayne <vayne0702@163.com>
Date: Wed, 31 Jul 2024 14:00:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E7=BB=93=E7=AE=97=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scm/WarehousingOutboundProductMapper.xml  |   5 +-
 .../service/impl/CwsettlementServiceImpl.java | 272 ++++++++++--------
 .../WarehousingOutboundProductEntity.java     |   2 +
 3 files changed, 163 insertions(+), 116 deletions(-)

diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundProductMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundProductMapper.xml
index 5a5eccdc..bd5620bd 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundProductMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundProductMapper.xml
@@ -26,7 +26,7 @@
         <result column="code" property="code"/>
         <result column="name" property="name"/>
         <result column="contractName" property="contractName"/>
-        <result column="ordLn" property="ordLn"/>
+        <result column="ord_ln" property="ordLn"/>
 
 
 
@@ -41,10 +41,11 @@
 
     <select id="queryOutboundProductPurchase" resultMap="OutboundProduct">
         SELECT
+            b.*,
             e.CODE,
             f.NAME,
             g.contract_number AS contractName,
-            c.ord_ln AS  ordLn
+            c.ord_ln AS  ordLnPurchase
         FROM
             jg_warehousing_outbound a
                 LEFT JOIN jg_warehousing_outbound_product b ON a.id = b.warehousing_outbound_id
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 aa0af84c..1f4dc2f6 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
@@ -1065,134 +1065,178 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
                         settlementRelationPurchaseEntityQueryWrapper.lambda().eq(SettlementRelationPurchaseEntity::getPurchaseSettlementCode, entity.getCode());
                         settlementRelationPurchaseService.remove(settlementRelationPurchaseEntityQueryWrapper);
                     }
-
                     SettlementRelationPurchaseEntity settlementRelationPurchaseEntity = new SettlementRelationPurchaseEntity();
-                    for (CwsettlementaccountModel model : cwsettlementForm.getCwsettlementaccountList()) {
-
-                        //采购结算
-                        QueryWrapper<CwaccountstorageEntity> cwaccountstorageQueryWrapper = new QueryWrapper<>();
-                        cwaccountstorageQueryWrapper.lambda().eq(CwaccountstorageEntity::getAccountId, model.getAccountId());
-                        cwaccountstorageQueryWrapper.lambda().isNull(CwaccountstorageEntity::getDeleteMark);
-                        List<CwaccountstorageEntity> cwaccountstorageEntityList = cwaccountstorageService.list(cwaccountstorageQueryWrapper);
-                        for (CwaccountstorageEntity cwaccountstorage : cwaccountstorageEntityList) {
-                            //入库单的采购订单
-                            QueryWrapper<WarehousingStorageEntity> warehousingStorageQueryWrapper = new QueryWrapper<>();
-                            warehousingStorageQueryWrapper.lambda().eq(WarehousingStorageEntity::getDocumentNo, cwaccountstorage.getDocumentNo());
-                            warehousingStorageQueryWrapper.lambda().isNull(WarehousingStorageEntity::getDeleteMark);
-                            List<WarehousingStorageEntity> warehousingStorageEntityList = warehousingStorageService.list(warehousingStorageQueryWrapper);
-                            if (warehousingStorageEntityList != null && warehousingStorageEntityList.size() > 0) {
-                                //收货单
-                                QueryWrapper<ReceiptOrderEntity> receiptOrderEntityQueryWrapper = new QueryWrapper<>();
-                                receiptOrderEntityQueryWrapper.lambda().eq(ReceiptOrderEntity::getId, warehousingStorageEntityList.get(0).getWarehousingId());
-                                receiptOrderEntityQueryWrapper.lambda().isNull(ReceiptOrderEntity::getDeleteMark);
-                                List<ReceiptOrderEntity> receiptOrderEntities = receiptOrderService.list(receiptOrderEntityQueryWrapper);
-                                if (receiptOrderEntities != null && receiptOrderEntities.size() > 0) {
-                                    //采购订单
-                                    BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(receiptOrderEntities.get(0).getBusinessId());
-                                    if (ObjectUtil.isNotEmpty(businessOrderEntity)) {
-                                        //采购订单子表
-                                        QueryWrapper<BusinessOrderProductRelationalEntity> businessOrderSonQueryWrapper = new QueryWrapper<>();
-                                        businessOrderSonQueryWrapper.lambda().eq(BusinessOrderProductRelationalEntity::getBusinessOrderId, businessOrderEntity.getId());
-                                        businessOrderSonQueryWrapper.lambda().isNull(BusinessOrderProductRelationalEntity::getDeleteMark);
-                                        List<BusinessOrderProductRelationalEntity> businessOrderProductRelationalEntityList = businessOrderProductRelationalService.list(businessOrderSonQueryWrapper);
-                                        for (BusinessOrderProductRelationalEntity businessSon : businessOrderProductRelationalEntityList) {
-                                            settlementRelationPurchaseEntity.setPurchaseSettlementCode(entity.getCode()); //采购结算单
-                                            settlementRelationPurchaseEntity.setReceiptCode(receiptOrderEntities.get(0).getReceiptCode()); //收货单
-                                            //采购合同编号
-                                            ContractLEntity contractLEntity = contractLService.getInfo(businessOrderEntity.getContractId());
-                                            if (ObjectUtil.isNotEmpty(contractLEntity)) {
-                                                settlementRelationPurchaseEntity.setContract(contractLEntity.getContractNumber());
-                                            }
-                                            settlementRelationPurchaseEntity.setPurchaseCode(businessOrderEntity.getCode());
-                                            settlementRelationPurchaseEntity.setOrdLn(businessSon.getOrdLn()); //订单行
-                                            settlementRelationPurchaseEntity.setSettlementSum(tableField207.get(i).getSettlementSum()); //结算量
-                                            settlementRelationPurchaseEntity.setSettlementPrice(tableField207.get(i).getSettlementPrice()); //单价量
-                                            settlementRelationPurchaseEntity.setSettlementCount(tableField207.get(i).getSettlementSubtotal()); //单价量
-                                            SubjectbasicEntity subjectbasicEntity = subjectbasicService.getInfo(businessOrderEntity.getFirstSubjectBasicId());
-                                            if (ObjectUtil.isNotEmpty(subjectbasicEntity)) {
-                                                settlementRelationPurchaseEntity.setSupplier(subjectbasicEntity.getName());
-                                            }
-                                            BusinessLineEntity businessLineEntity = businessLineService.getInfo(businessOrderEntity.getBusinessLineId());
-                                            if (ObjectUtil.isNotEmpty(businessLineEntity)) {
-                                                settlementRelationPurchaseEntity.setPurchaseBusinessLine(businessLineEntity.getName());
-                                            }
-                                            settlementRelationPurchaseEntity.setPaymentAmount(cwsettlementForm.getPaymentAmount()); //已付款金额
-//                                settlementRelationPurchaseEntity.setPurchaseBusinessLine(cwsettlementForm.getBusinessLine());
-
-                                            settlementRelationPurchaseService.saveOrUpdate(settlementRelationPurchaseEntity);
-                                        }
-                                    }
-
-                                }
-
-                            }
-
+                    settlementRelationPurchaseEntity.setId(RandomUtil.uuId());
+                    settlementRelationPurchaseEntity.setPurchaseSettlementCode(entity.getCode()); //采购结算单
+                    QueryWrapper<WarehousingStorageEntity> warehousingStorageQueryWrapper = new QueryWrapper<>();
+                    warehousingStorageQueryWrapper.lambda().eq(WarehousingStorageEntity::getDocumentNo, tableField207.get(i).getDocmentNo());
+                    warehousingStorageQueryWrapper.lambda().isNull(WarehousingStorageEntity::getDeleteMark);
+                    WarehousingStorageEntity warehousingStorageEntity = warehousingStorageService.getOne(warehousingStorageQueryWrapper);
+                    if (ObjectUtil.isNotEmpty(warehousingStorageEntity)) {
+                        ReceiptOrderEntity receiptOrderEntity = receiptOrderService.getInfo(warehousingStorageEntity.getWarehousingId());
+                        if (ObjectUtil.isNotEmpty(receiptOrderEntity)) {
+                            settlementRelationPurchaseEntity.setReceiptCode(receiptOrderEntity.getReceiptCode()); //收货单
                         }
                     }
-                }else if(entity.getType().equals("2") && entity.getBusinessLine().equals("550709408384942213")){
-
-                    if(!isSave){
-                        QueryWrapper<SettlementRelationSaleEntity> settlementRelationPurchaseEntityQueryWrapper = new QueryWrapper<>();
-                        settlementRelationPurchaseEntityQueryWrapper.lambda().eq(SettlementRelationSaleEntity::getSettlementCode, entity.getCode());
-                        settlementRelationSaleService.remove(settlementRelationPurchaseEntityQueryWrapper);
+                    QueryWrapper<BusinessOrderEntity> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.lambda().eq(BusinessOrderEntity::getCode,tableField207.get(i).getBusinessCode());
+                    queryWrapper.lambda().isNull(BusinessOrderEntity::getDeleteMark);
+                    BusinessOrderEntity businessOrderEntity = businessOrderService.getOne(queryWrapper);
+                    if (ObjectUtil.isNotEmpty(businessOrderEntity)) {
+                        //采购合同编号
+                        ContractLEntity contractLEntity = contractLService.getInfo(businessOrderEntity.getContractId());
+                        if (ObjectUtil.isNotEmpty(contractLEntity)) {
+                            settlementRelationPurchaseEntity.setContract(contractLEntity.getContractNumber()); //合同号
+                        }
+                        settlementRelationPurchaseEntity.setPurchaseCode(businessOrderEntity.getCode()); //采购单号
+                        settlementRelationPurchaseEntity.setOrdLn(tableField207.get(i).getOrdLn()); //订单行
+                        settlementRelationPurchaseEntity.setSettlementSum(tableField207.get(i).getSettlementSum()); //结算量
+                        settlementRelationPurchaseEntity.setSettlementPrice(tableField207.get(i).getSettlementPrice()); //单价量
+                        settlementRelationPurchaseEntity.setSettlementCount(tableField207.get(i).getSettlementSubtotal()); //单价量
+                        SubjectbasicEntity subjectbasicEntity = subjectbasicService.getInfo(businessOrderEntity.getFirstSubjectBasicId());
+                        if (ObjectUtil.isNotEmpty(subjectbasicEntity)) {
+                            settlementRelationPurchaseEntity.setSupplier(subjectbasicEntity.getName());
+                        }
+                        BusinessLineEntity businessLineEntity = businessLineService.getInfo(businessOrderEntity.getBusinessLineId());
+                        if (ObjectUtil.isNotEmpty(businessLineEntity)) {
+                            settlementRelationPurchaseEntity.setPurchaseBusinessLine(businessLineEntity.getName());
+                        }
+                        settlementRelationPurchaseEntity.setPaymentAmount(cwsettlementForm.getPaymentAmount()); //已付款金额
+                        settlementRelationPurchaseService.saveOrUpdate(settlementRelationPurchaseEntity);
                     }
 
-                    SettlementRelationSaleEntity settlementRelationSaleEntity=new SettlementRelationSaleEntity();
+//                    for (CwsettlementaccountModel model : cwsettlementForm.getCwsettlementaccountList()) {
+//
+//                        //采购结算
+//                        QueryWrapper<CwaccountstorageEntity> cwaccountstorageQueryWrapper = new QueryWrapper<>();
+//                        cwaccountstorageQueryWrapper.lambda().eq(CwaccountstorageEntity::getAccountId, model.getAccountId());
+//                        cwaccountstorageQueryWrapper.lambda().isNull(CwaccountstorageEntity::getDeleteMark);
+//                        List<CwaccountstorageEntity> cwaccountstorageEntityList = cwaccountstorageService.list(cwaccountstorageQueryWrapper);
+//                        for (CwaccountstorageEntity cwaccountstorage : cwaccountstorageEntityList) {
+//                            //入库单的采购订单
+//                            QueryWrapper<WarehousingStorageEntity> warehousingStorageQueryWrapper = new QueryWrapper<>();
+//                            warehousingStorageQueryWrapper.lambda().eq(WarehousingStorageEntity::getDocumentNo, cwaccountstorage.getDocumentNo());
+//                            warehousingStorageQueryWrapper.lambda().isNull(WarehousingStorageEntity::getDeleteMark);
+//                            List<WarehousingStorageEntity> warehousingStorageEntityList = warehousingStorageService.list(warehousingStorageQueryWrapper);
+//                            if (warehousingStorageEntityList != null && warehousingStorageEntityList.size() > 0) {
+//                                //收货单
+//                                QueryWrapper<ReceiptOrderEntity> receiptOrderEntityQueryWrapper = new QueryWrapper<>();
+//                                receiptOrderEntityQueryWrapper.lambda().eq(ReceiptOrderEntity::getId, warehousingStorageEntityList.get(0).getWarehousingId());
+//                                receiptOrderEntityQueryWrapper.lambda().isNull(ReceiptOrderEntity::getDeleteMark);
+//                                List<ReceiptOrderEntity> receiptOrderEntities = receiptOrderService.list(receiptOrderEntityQueryWrapper);
+//                                if (receiptOrderEntities != null && receiptOrderEntities.size() > 0) {
+//                                    //采购订单
+//                                    BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(receiptOrderEntities.get(0).getBusinessId());
+//                                    if (ObjectUtil.isNotEmpty(businessOrderEntity)) {
+//                                        //采购订单子表
+//                                        QueryWrapper<BusinessOrderProductRelationalEntity> businessOrderSonQueryWrapper = new QueryWrapper<>();
+//                                        businessOrderSonQueryWrapper.lambda().eq(BusinessOrderProductRelationalEntity::getBusinessOrderId, businessOrderEntity.getId());
+//                                        businessOrderSonQueryWrapper.lambda().isNull(BusinessOrderProductRelationalEntity::getDeleteMark);
+//                                        List<BusinessOrderProductRelationalEntity> businessOrderProductRelationalEntityList = businessOrderProductRelationalService.list(businessOrderSonQueryWrapper);
+//                                        for (BusinessOrderProductRelationalEntity businessSon : businessOrderProductRelationalEntityList) {
+//                                            settlementRelationPurchaseEntity.setId(RandomUtil.uuId());
+//                                            settlementRelationPurchaseEntity.setPurchaseSettlementCode(entity.getCode()); //采购结算单
+//                                            settlementRelationPurchaseEntity.setReceiptCode(receiptOrderEntities.get(0).getReceiptCode()); //收货单
+//                                            //采购合同编号
+//                                            ContractLEntity contractLEntity = contractLService.getInfo(businessOrderEntity.getContractId());
+//                                            if (ObjectUtil.isNotEmpty(contractLEntity)) {
+//                                                settlementRelationPurchaseEntity.setContract(contractLEntity.getContractNumber());
+//                                            }
+//                                            settlementRelationPurchaseEntity.setPurchaseCode(businessOrderEntity.getCode());
+//                                            settlementRelationPurchaseEntity.setOrdLn(businessSon.getOrdLn()); //订单行
+//                                            settlementRelationPurchaseEntity.setSettlementSum(tableField207.get(i).getSettlementSum()); //结算量
+//                                            settlementRelationPurchaseEntity.setSettlementPrice(tableField207.get(i).getSettlementPrice()); //单价量
+//                                            settlementRelationPurchaseEntity.setSettlementCount(tableField207.get(i).getSettlementSubtotal()); //单价量
+//                                            SubjectbasicEntity subjectbasicEntity = subjectbasicService.getInfo(businessOrderEntity.getFirstSubjectBasicId());
+//                                            if (ObjectUtil.isNotEmpty(subjectbasicEntity)) {
+//                                                settlementRelationPurchaseEntity.setSupplier(subjectbasicEntity.getName());
+//                                            }
+//                                            BusinessLineEntity businessLineEntity = businessLineService.getInfo(businessOrderEntity.getBusinessLineId());
+//                                            if (ObjectUtil.isNotEmpty(businessLineEntity)) {
+//                                                settlementRelationPurchaseEntity.setPurchaseBusinessLine(businessLineEntity.getName());
+//                                            }
+//                                            settlementRelationPurchaseEntity.setPaymentAmount(cwsettlementForm.getPaymentAmount()); //已付款金额
+//                                            settlementRelationPurchaseService.saveOrUpdate(settlementRelationPurchaseEntity);
+//                                        }
+//                                    }
+//
+//                                }
+//
+//                            }
+//
+//                        }
+//                    }
+                }
+
+            }
+//            throw new NullPointerException();
+            if(entity.getType().equals("2") && entity.getBusinessLine().equals("550709408384942213")){
 
-                    for (CwsettlementaccountModel model : cwsettlementForm.getCwsettlementaccountList()) {
+                if(!isSave){
+                    QueryWrapper<SettlementRelationSaleEntity> settlementRelationPurchaseEntityQueryWrapper = new QueryWrapper<>();
+                    settlementRelationPurchaseEntityQueryWrapper.lambda().eq(SettlementRelationSaleEntity::getSettlementCode, entity.getCode());
+                    settlementRelationSaleService.remove(settlementRelationPurchaseEntityQueryWrapper);
+                }
+                for (CwsettlementaccountModel model : cwsettlementForm.getCwsettlementaccountList()) {
+                    //销售结算
+                    QueryWrapper<CwaccountstorageEntity> cwaccountstorageQueryWrapper = new QueryWrapper<>();
+                    cwaccountstorageQueryWrapper.lambda().eq(CwaccountstorageEntity::getAccountId, model.getAccountId());
+                    List<CwaccountstorageEntity> cwaccountstorageEntityList = cwaccountstorageService.list(cwaccountstorageQueryWrapper);
+                    for (CwaccountstorageEntity cwaccountstorageEntity : cwaccountstorageEntityList) {
                         //销售结算
-                            QueryWrapper<CwaccountstorageEntity> cwaccountstorageQueryWrapper = new QueryWrapper<>();
-                            cwaccountstorageQueryWrapper.lambda().eq(CwaccountstorageEntity::getAccountId, model.getAccountId());
-                            List<CwaccountstorageEntity> cwaccountstorageEntityList = cwaccountstorageService.list(cwaccountstorageQueryWrapper);
-                            for (CwaccountstorageEntity cwaccountstorageEntity : cwaccountstorageEntityList) {
-                                //销售结算
-                                QueryWrapper<WarehousingOutboundEntity> warehousingOutboundQueryWrapper = new QueryWrapper<>();
-                                warehousingOutboundQueryWrapper.lambda().eq(WarehousingOutboundEntity::getDocumentNo, cwaccountstorageEntity.getDocumentNo());
-                                List<WarehousingOutboundEntity> warehousingOutboundEntityList = warehousingOutboundService.list(warehousingOutboundQueryWrapper);
-                                if (warehousingOutboundEntityList != null && warehousingOutboundEntityList.size() > 0) {
-                                    //发货单
-                                    DeliveryOrderEntity deliveryOrderEntity = deliveryOrderService.getInfo(warehousingOutboundEntityList.get(0).getWarehousingId());
-                                    if (ObjectUtil.isNotEmpty(deliveryOrderEntity)) {
-                                        BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(deliveryOrderEntity.getBusinessId());
-                                        List<WarehousingOutboundProductEntity> warehousingOutboundProductList = warehousingOutboundProductService.queryOutboundProductPurchase(model.getAccountId());
-                                        for (WarehousingOutboundProductEntity warehousingOutboundProductEntity : warehousingOutboundProductList) {
-                                            settlementRelationSaleEntity.setPurchaseCode(warehousingOutboundProductEntity.getCode()); //采购订单
-                                            settlementRelationSaleEntity.setContract(warehousingOutboundProductEntity.getContractName()); //采购合同编号
-                                            settlementRelationSaleEntity.setSupplier(warehousingOutboundProductEntity.getName());  //供应商
-                                            settlementRelationSaleEntity.setOrdLn(warehousingOutboundProductEntity.getOrdLn());  //供应商
-
-                                            settlementRelationSaleEntity.setSettlementCode(entity.getCode()); //销售结算单
-                                            settlementRelationSaleEntity.setDeliveryCode(deliveryOrderEntity.getDeliveryCode()); //发货单
-                                            if (ObjectUtil.isNotEmpty(businessOrderEntity)){
-                                                settlementRelationSaleEntity.setSaleCode(businessOrderEntity.getCode());
-                                                ContractLEntity contractLEntity = contractLService.getInfo(businessOrderEntity.getContractId());
-                                                SubjectbasicEntity subjectbasicEntity = subjectbasicService.getInfo(businessOrderEntity.getFirstSubjectBasicId());
-                                                BusinessLineEntity businessLineEntity = businessLineService.getInfo(businessOrderEntity.getBusinessLineId());
-                                                if (ObjectUtil.isNotEmpty(contractLEntity)){
-                                                    settlementRelationSaleEntity.setSaleContract(contractLEntity.getContractNumber());//合同号
-                                                }
-                                                if(ObjectUtil.isNotEmpty(subjectbasicEntity)) {
-                                                    settlementRelationSaleEntity.setCustomer(subjectbasicEntity.getName());//客户
-                                                }
-                                                if (ObjectUtil.isNotEmpty(businessLineEntity)){
-                                                    settlementRelationSaleEntity.setPurchaseBusinessLine(businessLineEntity.getName());//业务线
-                                                }
-                                            }
-                                            settlementRelationSaleEntity.setSaleOrdLn(tableField207.get(i).getOrdLn()); //订单行
-                                            settlementRelationSaleEntity.setSaleSettlementSum(tableField207.get(i).getSettlementSum()); //结算量
-                                            settlementRelationSaleEntity.setSettlementPrice(tableField207.get(i).getSettlementPrice()); //单价量
-                                            settlementRelationSaleEntity.setSettlementCount(tableField207.get(i).getSettlementSubtotal()); //单价量
-                                            settlementRelationSaleEntity.setPaymentAmount(cwsettlementForm.getPaymentAmount()); //已收款金额
+                        QueryWrapper<WarehousingOutboundEntity> warehousingOutboundQueryWrapper = new QueryWrapper<>();
+                        warehousingOutboundQueryWrapper.lambda().eq(WarehousingOutboundEntity::getDocumentNo, cwaccountstorageEntity.getDocumentNo());
+                        List<WarehousingOutboundEntity> warehousingOutboundEntityList = warehousingOutboundService.list(warehousingOutboundQueryWrapper);
+                        if (warehousingOutboundEntityList != null && warehousingOutboundEntityList.size() > 0) {
+                            //发货单
+                            DeliveryOrderEntity deliveryOrderEntity = deliveryOrderService.getInfo(warehousingOutboundEntityList.get(0).getWarehousingId());
+                            if (ObjectUtil.isNotEmpty(deliveryOrderEntity)) {
+                                BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(deliveryOrderEntity.getBusinessId());
+                                List<WarehousingOutboundProductEntity> warehousingOutboundProductList = warehousingOutboundProductService.queryOutboundProductPurchase(warehousingOutboundEntityList.get(0).getId());
+                                for (WarehousingOutboundProductEntity warehousingOutboundProductEntity : warehousingOutboundProductList) {
+                                    SettlementRelationSaleEntity settlementRelationSaleEntity=new SettlementRelationSaleEntity();
+                                    settlementRelationSaleEntity.setId(RandomUtil.uuId());
+                                    settlementRelationSaleEntity.setPurchaseCode(warehousingOutboundProductEntity.getCode()); //采购订单
+                                    settlementRelationSaleEntity.setContract(warehousingOutboundProductEntity.getContractName()); //采购合同编号
+                                    settlementRelationSaleEntity.setSupplier(warehousingOutboundProductEntity.getName());  //供应商
+                                    settlementRelationSaleEntity.setOrdLn(warehousingOutboundProductEntity.getOrdLnPurchase());  //供应商
+
+                                    settlementRelationSaleEntity.setSettlementCode(entity.getCode()); //销售结算单
+                                    settlementRelationSaleEntity.setDeliveryCode(deliveryOrderEntity.getDeliveryCode()); //发货单
+                                    if (ObjectUtil.isNotEmpty(businessOrderEntity)){
+                                        settlementRelationSaleEntity.setSaleCode(businessOrderEntity.getCode());
+                                        ContractLEntity contractLEntity = contractLService.getInfo(businessOrderEntity.getContractId());
+                                        SubjectbasicEntity subjectbasicEntity = subjectbasicService.getInfo(businessOrderEntity.getFirstSubjectBasicId());
+                                        BusinessLineEntity businessLineEntity = businessLineService.getInfo(businessOrderEntity.getBusinessLineId());
+                                        if (ObjectUtil.isNotEmpty(contractLEntity)){
+                                            settlementRelationSaleEntity.setSaleContract(contractLEntity.getContractNumber());//合同号
+                                        }
+                                        if(ObjectUtil.isNotEmpty(subjectbasicEntity)) {
+                                            settlementRelationSaleEntity.setCustomer(subjectbasicEntity.getName());//客户
+                                        }
+                                        if (ObjectUtil.isNotEmpty(businessLineEntity)){
+                                            settlementRelationSaleEntity.setPurchaseBusinessLine(businessLineEntity.getName());//业务线
                                         }
                                     }
+                                    settlementRelationSaleEntity.setSaleOrdLn(warehousingOutboundProductEntity.getOrdLn()); //销售订单行
+                                    QueryWrapper<CwsettlementsummaryEntity> queryWrapper = new QueryWrapper<>();
+                                    queryWrapper.lambda().eq(CwsettlementsummaryEntity::getSettlementId,entity.getId());
+                                    queryWrapper.lambda().eq(CwsettlementsummaryEntity::getBusinessCode,businessOrderEntity.getCode());
+                                    queryWrapper.lambda().eq(CwsettlementsummaryEntity::getOrdLn,warehousingOutboundProductEntity.getOrdLn());
+                                    CwsettlementsummaryEntity cwsettlementsummaryEntity = cwsettlementsummaryService.getOne(queryWrapper);
+                                    if (ObjectUtil.isNotEmpty(cwsettlementsummaryEntity)) {
+                                        settlementRelationSaleEntity.setSaleSettlementSum(cwsettlementsummaryEntity.getSettlementSum());
+                                        settlementRelationSaleEntity.setSettlementSum(cwsettlementsummaryEntity.getSettlementSum()); //结算量
+                                        settlementRelationSaleEntity.setSettlementPrice(cwsettlementsummaryEntity.getSettlementPrice()); //单价量
+                                        settlementRelationSaleEntity.setSettlementCount(cwsettlementsummaryEntity.getSettlementSubtotal()); //结算金额
+                                    }
+                                    settlementRelationSaleEntity.setPaymentAmount(cwsettlementForm.getPaymentAmount()); //已收款金额
                                     settlementRelationSaleService.saveOrUpdate(settlementRelationSaleEntity);
-
-
                                 }
-
                             }
                         }
 
+                    }
                 }
 
             }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingOutboundProductEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingOutboundProductEntity.java
index 04bf0213..24b9968f 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingOutboundProductEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingOutboundProductEntity.java
@@ -110,6 +110,8 @@ public class WarehousingOutboundProductEntity  {
     private String name;
     @TableField(exist = false)
     private String contractName;
+    @TableField(exist = false)
+    private String ordLnPurchase;