采购销售结算，收发货，合并销售，订单删除修改

jnpf-java-boot/jnpf-admin/src/main/resources/application-test.yml

@@ -17,11 +17,14 @@ spring:
   exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure #排除自动配置，手动配置druid
   datasource:
     db-type: MySQL #数据库类型(可选值 MySQL、SQLServer、Oracle、DM8、KingbaseES、PostgreSQL，请严格按可选值填写)
-    host: 222.71.165.188
+#    host: 222.71.165.188
+    host: 221.214.32.166
     port: 3309
     username: root
-    password: linus,.123
+#    password: linus,.123
-    db-name: jnpf_jigang_test
+#    db-name: jnpf_jigang_test
+    password: qawsed,.123
+    db-name: jnpf_init
     db-schema: #金仓达梦选填
     prepare-url: #自定义url
 

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/DeliveryRelationMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="jnpf.mapper.DeliveryRelationMapper">
+
+
+
+</mapper>

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ReceiptRelationMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="jnpf.mapper.ReceiptRelationMapper">
+
+
+
+</mapper>

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/SettlementRelationPurchaseMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="jnpf.mapper.SettlementRelationPurchaseMapper">
+
+
+
+</mapper>

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/SettlementRelationSaleMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="jnpf.mapper.SettlementRelationSaleMapper">
+
+
+
+</mapper>

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundProductMapper.xml

@@ -22,6 +22,14 @@
         <result column="f_creator_user_id" property="creatorUserId"/>
         <result column="f_last_modify_time" property="lastModifyTime"/>
         <result column="f_last_modify_user_id" property="lastModifyUserId"/>
+        <result column="deliveryCode" property="deliveryCode"/>
+        <result column="code" property="code"/>
+        <result column="name" property="name"/>
+        <result column="contractName" property="contractName"/>
+        <result column="ordLn" property="ordLn"/>
+
+
+
     </resultMap>
 
     <select id="queryOutboundProduct" resultMap="OutboundProduct">
@@ -30,4 +38,33 @@
         where a.f_delete_mark is null and a.id = #{id}
     </select>
 
+
+    <select id="queryOutboundProductPurchase" resultMap="OutboundProduct">
+        SELECT
+            a.*,
+            b.batch_no,
+            c.receipt_code AS deliveryCode,
+            d.CODE,
+            e.NAME,
+            g.contract_name AS contractName,
+            b.ord_ln AS  ordLn
+
+        FROM
+            jg_warehousing_outbound_product a
+                LEFT JOIN jg_delivery_product_relation b ON a.batch_number = b.batch_no
+                LEFT JOIN jg_receipt_order c ON b.order_id = c.id
+                LEFT JOIN jg_business_order d ON c.business_id = d.id
+                LEFT JOIN jg_subject_basic e ON d.first_subject_basic_id = e.id
+                LEFT JOIN jg_contract g ON d.contract_id = g.id
+                LEFT JOIN jg_warehousing_outbound h ON a.warehousing_outbound_id = h.id
+                LEFT JOIN jg_cw_account_storage i ON h.document_no = i.document_no
+        WHERE
+            i.account_id = #{id}
+          AND b.business_type = '1'
+          AND a.ord_ln  =#{ordLn}
+          AND a.f_delete_mark IS NULL
+        GROUP BY
+            a.ord_ln
+    </select>
+
 </mapper>

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/DeliveryRelationMapper.java

@@ -0,0 +1,16 @@
+package jnpf.mapper;
+
+
+import jnpf.entity.DeliveryRelationEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * deliveryRelation
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-07-29
+ */
+public interface DeliveryRelationMapper extends BaseMapper<DeliveryRelationEntity> {
+
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/ReceiptRelationMapper.java

@@ -0,0 +1,16 @@
+package jnpf.mapper;
+
+
+import jnpf.entity.ReceiptRelationEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * receiptRelation
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-07-29
+ */
+public interface ReceiptRelationMapper extends BaseMapper<ReceiptRelationEntity> {
+
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/SettlementRelationPurchaseMapper.java

@@ -0,0 +1,16 @@
+package jnpf.mapper;
+
+
+import jnpf.entity.SettlementRelationPurchaseEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * settlementRelationPurchase
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-07-29
+ */
+public interface SettlementRelationPurchaseMapper extends BaseMapper<SettlementRelationPurchaseEntity> {
+
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/SettlementRelationSaleMapper.java

@@ -0,0 +1,16 @@
+package jnpf.mapper;
+
+
+import jnpf.entity.SettlementRelationSaleEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * settlementRelationSale
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-07-29
+ */
+public interface SettlementRelationSaleMapper extends BaseMapper<SettlementRelationSaleEntity> {
+
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/WarehousingOutboundProductMapper.java

@@ -3,6 +3,7 @@ package jnpf.mapper;
 
 import jnpf.entity.WarehousingOutboundProductEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -16,4 +17,7 @@ import java.util.List;
 public interface WarehousingOutboundProductMapper extends BaseMapper<WarehousingOutboundProductEntity> {
 
     List<WarehousingOutboundProductEntity> queryOutboundProduct(String id);
+
+
+    List<WarehousingOutboundProductEntity> queryOutboundProductPurchase(@Param("id") String id, @Param("ordLn") String ordLn);
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/DeliveryRelationService.java

@@ -0,0 +1,35 @@
+package jnpf.service;
+
+import jnpf.model.deliveryrelation.*;
+import jnpf.entity.*;
+import java.util.*;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+/**
+ * deliveryRelation
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-07-29
+ */
+public interface DeliveryRelationService extends IService<DeliveryRelationEntity> {
+    List<DeliveryRelationEntity> getList(DeliveryRelationPagination deliveryRelationPagination);
+
+    List<DeliveryRelationEntity> getTypeList(DeliveryRelationPagination deliveryRelationPagination,String dataType);
+
+    DeliveryRelationEntity getInfo(String id);
+
+    void delete(DeliveryRelationEntity entity);
+
+    void create(DeliveryRelationEntity entity);
+
+    boolean update(String id, DeliveryRelationEntity entity);
+
+    //子表方法
+    //副表数据方法
+	String checkForm(DeliveryRelationForm form,int i);
+
+    void saveOrUpdate(DeliveryRelationForm deliveryRelationForm,String id, boolean isSave) throws Exception;
+
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/ReceiptRelationService.java

@@ -0,0 +1,35 @@
+package jnpf.service;
+
+import jnpf.model.receiptrelation.*;
+import jnpf.entity.*;
+import java.util.*;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+/**
+ * receiptRelation
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-07-29
+ */
+public interface ReceiptRelationService extends IService<ReceiptRelationEntity> {
+    List<ReceiptRelationEntity> getList(ReceiptRelationPagination receiptRelationPagination);
+
+    List<ReceiptRelationEntity> getTypeList(ReceiptRelationPagination receiptRelationPagination,String dataType);
+
+    ReceiptRelationEntity getInfo(String id);
+
+    void delete(ReceiptRelationEntity entity);
+
+    void create(ReceiptRelationEntity entity);
+
+    boolean update(String id, ReceiptRelationEntity entity);
+
+    //子表方法
+    //副表数据方法
+	String checkForm(ReceiptRelationForm form,int i);
+
+    void saveOrUpdate(ReceiptRelationForm receiptRelationForm,String id, boolean isSave) throws Exception;
+
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/SettlementRelationPurchaseService.java

@@ -0,0 +1,35 @@
+package jnpf.service;
+
+import jnpf.model.settlementrelationpurchase.*;
+import jnpf.entity.*;
+import java.util.*;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+/**
+ * settlementRelationPurchase
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-07-29
+ */
+public interface SettlementRelationPurchaseService extends IService<SettlementRelationPurchaseEntity> {
+    List<SettlementRelationPurchaseEntity> getList(SettlementRelationPurchasePagination settlementRelationPurchasePagination);
+
+    List<SettlementRelationPurchaseEntity> getTypeList(SettlementRelationPurchasePagination settlementRelationPurchasePagination,String dataType);
+
+    SettlementRelationPurchaseEntity getInfo(String id);
+
+    void delete(SettlementRelationPurchaseEntity entity);
+
+    void create(SettlementRelationPurchaseEntity entity);
+
+    boolean update(String id, SettlementRelationPurchaseEntity entity);
+
+    //子表方法
+    //副表数据方法
+	String checkForm(SettlementRelationPurchaseForm form,int i);
+
+    void saveOrUpdate(SettlementRelationPurchaseForm settlementRelationPurchaseForm,String id, boolean isSave) throws Exception;
+
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/SettlementRelationSaleService.java

@@ -0,0 +1,35 @@
+package jnpf.service;
+
+import jnpf.model.settlementrelationsale.*;
+import jnpf.entity.*;
+import java.util.*;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+/**
+ * settlementRelationSale
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-07-29
+ */
+public interface SettlementRelationSaleService extends IService<SettlementRelationSaleEntity> {
+    List<SettlementRelationSaleEntity> getList(SettlementRelationSalePagination settlementRelationSalePagination);
+
+    List<SettlementRelationSaleEntity> getTypeList(SettlementRelationSalePagination settlementRelationSalePagination,String dataType);
+
+    SettlementRelationSaleEntity getInfo(String id);
+
+    void delete(SettlementRelationSaleEntity entity);
+
+    void create(SettlementRelationSaleEntity entity);
+
+    boolean update(String id, SettlementRelationSaleEntity entity);
+
+    //子表方法
+    //副表数据方法
+	String checkForm(SettlementRelationSaleForm form,int i);
+
+    void saveOrUpdate(SettlementRelationSaleForm settlementRelationSaleForm,String id, boolean isSave) throws Exception;
+
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WarehousingOutboundProductService.java

@@ -16,4 +16,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 public interface WarehousingOutboundProductService extends IService<WarehousingOutboundProductEntity> {
     QueryWrapper<WarehousingOutboundProductEntity> getChild(WarehousingOutboundPagination pagination,QueryWrapper<WarehousingOutboundProductEntity> warehousingOutboundProductQueryWrapper);
     List<WarehousingOutboundProductEntity> queryOutboundProductInfo(String id);
+
+    List<WarehousingOutboundProductEntity> queryOutboundProductPurchase(String id,String ordLn);
+
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import jnpf.base.ActionResult;
 import jnpf.entity.*;
 import jnpf.mapper.CwsettlementMapper;
+import jnpf.mapper.WarehousingOutboundProductMapper;
 import jnpf.model.yunguan.YunguanPurchaseSettlementModel;
 import jnpf.model.yunguan.YunguanPurchaseSettlementProductModel;
 import jnpf.model.yunguan.YunguanSaleSettlementModel;
@@ -82,7 +83,24 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
     @Resource
     private CwsettlementMapper cwsettlementMapper;
     @Resource
+    private WarehousingOutboundProductMapper warehousingOutboundProductMapper;
+    @Resource
+    private WarehousingOutboundProductService warehousingOutboundProductService;
+    @Resource
     private ProductWarehouseService productWarehouseService;
+    @Resource
+    private WarehousingStorageService warehousingStorageService;
+    @Resource
+    private ReceiptOrderService receiptOrderService;
+    @Resource
+    private DeliveryOrderService deliveryOrderService;
+    @Resource
+    private WarehousingOutboundService warehousingOutboundService;
+    @Resource
+    private SettlementRelationPurchaseService settlementRelationPurchaseService;
+    @Resource
+    private SettlementRelationSaleService settlementRelationSaleService;
+
     @Override
     public List<CwsettlementEntity> getList(CwsettlementPagination cwsettlementPagination){
         return getTypeList(cwsettlementPagination,cwsettlementPagination.getDataType());
@@ -1019,6 +1037,111 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
                 }else{
                 }
                 cwsettlementsummaryService.saveOrUpdate(tableField207.get(i));
+
+                if (entity.getType().equals("1") && entity.getBusinessLine().equals("550709408384942213")){
+
+                    if(!isSave){
+                        QueryWrapper<SettlementRelationPurchaseEntity> settlementRelationPurchaseEntityQueryWrapper = new QueryWrapper<>();
+                        settlementRelationPurchaseEntityQueryWrapper.lambda().eq(SettlementRelationPurchaseEntity::getPurchaseSettlementCode, entity.getCode());
+                        settlementRelationPurchaseService.remove(settlementRelationPurchaseEntityQueryWrapper);
+                    }
+
+                    SettlementRelationPurchaseEntity settlementRelationPurchaseEntity=new SettlementRelationPurchaseEntity();
+                    //采购结算
+                    QueryWrapper<CwaccountstorageEntity> cwaccountstorageQueryWrapper=new QueryWrapper<>();
+                    cwaccountstorageQueryWrapper.lambda().eq(CwaccountstorageEntity::getAccountId,cwsettlementForm.getCwsettlementaccountList().get(0).getAccountId());
+                    List<CwaccountstorageEntity> cwaccountstorageEntityList=cwaccountstorageService.list(cwaccountstorageQueryWrapper);
+                    if (cwaccountstorageEntityList!=null && cwaccountstorageEntityList.size()>0){
+                        //入库单的采购订单
+                        QueryWrapper<WarehousingStorageEntity> warehousingStorageQueryWrapper=new QueryWrapper<>();
+                        warehousingStorageQueryWrapper.lambda().eq(WarehousingStorageEntity::getDocumentNo,cwaccountstorageEntityList.get(0).getDocumentNo());
+                        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());
+                            List<ReceiptOrderEntity> receiptOrderEntities=receiptOrderService.list(receiptOrderEntityQueryWrapper);
+                            if (receiptOrderEntities!=null && receiptOrderEntities.size()>0){
+                                settlementRelationPurchaseEntity.setPurchaseSettlementCode(entity.getCode()); //采购结算单
+                                settlementRelationPurchaseEntity.setReceiptCode(receiptOrderEntities.get(0).getReceiptCode()); //收货单
+                                settlementRelationPurchaseEntity.setContract(cwsettlementForm.getCwsettlementaccountList().get(0).getContractCode());
+                                settlementRelationPurchaseEntity.setPurchaseCode(warehousingStorageEntityList.get(0).getBusinessOrderNo());
+                                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(cwsettlementForm.getCwsettlementsubjectList().get(0).getSubjectId());
+                                settlementRelationPurchaseEntity.setSupplier(subjectbasicEntity.getName());
+                                settlementRelationPurchaseEntity.setPurchaseBusinessLine(entity.getBusinessLine());
+                                settlementRelationPurchaseEntity.setPaymentAmount(cwsettlementForm.getPaymentAmount()); //已付款金额
+//                                settlementRelationPurchaseEntity.setPurchaseBusinessLine(cwsettlementForm.getBusinessLine());
+
+                                settlementRelationPurchaseService.saveOrUpdate(settlementRelationPurchaseEntity);
+
+                            }
+
+                        }
+
+                    }
+
+                }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);
+                    }
+
+                    SettlementRelationSaleEntity settlementRelationSaleEntity=new SettlementRelationSaleEntity();
+
+                    //销售结算
+                    //入库单的采购订单
+                    List<WarehousingOutboundProductEntity> warehousingOutboundProductList =warehousingOutboundProductService.queryOutboundProductPurchase(cwsettlementForm.getCwsettlementaccountList().get(0).getAccountId(),  tableField207.get(i).getOrdLn());
+                        if (warehousingOutboundProductList!=null && warehousingOutboundProductList.size()>0){
+                            settlementRelationSaleEntity.setPurchaseCode(warehousingOutboundProductList.get(0).getCode()); //采购订单
+                            settlementRelationSaleEntity.setContract(warehousingOutboundProductList.get(0).getContractName()); //采购合同
+                            settlementRelationSaleEntity.setSupplier(warehousingOutboundProductList.get(0).getName());  //供应商
+                            settlementRelationSaleEntity.setOrdLn(warehousingOutboundProductList.get(0).getOrdLn());  //供应商
+
+                        }
+
+                    QueryWrapper<CwaccountstorageEntity> cwaccountstorageQueryWrapper=new QueryWrapper<>();
+                    cwaccountstorageQueryWrapper.lambda().eq(CwaccountstorageEntity::getAccountId,cwsettlementForm.getCwsettlementaccountList().get(0).getAccountId());
+                    List<CwaccountstorageEntity> cwaccountstorageEntityList=cwaccountstorageService.list(cwaccountstorageQueryWrapper);
+                    if (cwaccountstorageEntityList!=null && cwaccountstorageEntityList.size()>0){
+                        //销售结算
+                        QueryWrapper<WarehousingOutboundEntity> warehousingOutboundQueryWrapper=new QueryWrapper<>();
+                        warehousingOutboundQueryWrapper.lambda().eq(WarehousingOutboundEntity::getDocumentNo,cwaccountstorageEntityList.get(0).getDocumentNo());
+                        List<WarehousingOutboundEntity> warehousingOutboundEntityList=warehousingOutboundService.list(warehousingOutboundQueryWrapper);
+                        if (warehousingOutboundEntityList!=null && warehousingOutboundEntityList.size()>0){
+                            //收货单
+                            QueryWrapper<DeliveryOrderEntity> deliveryOrderQueryWrapper=new QueryWrapper<>();
+                            deliveryOrderQueryWrapper.lambda().eq(DeliveryOrderEntity::getId,warehousingOutboundEntityList.get(0).getWarehousingId());
+                            List<DeliveryOrderEntity> deliveryOrderEntityList=deliveryOrderService.list(deliveryOrderQueryWrapper);
+                            if (deliveryOrderEntityList!=null && deliveryOrderEntityList.size()>0){
+                                settlementRelationSaleEntity.setSettlementCode(entity.getCode()); //销售结算单
+                                settlementRelationSaleEntity.setDeliveryCode(deliveryOrderEntityList.get(0).getDeliveryCode()); //发货单
+                                settlementRelationSaleEntity.setSaleContract(cwsettlementForm.getCwsettlementaccountList().get(0).getContractCode());
+                                settlementRelationSaleEntity.setSaleCode(warehousingOutboundEntityList.get(0).getBusinessOrderNo());
+                                settlementRelationSaleEntity.setSaleOrdLn( tableField207.get(i).getOrdLn()); //订单行
+                                settlementRelationSaleEntity.setSaleSettlementSum( tableField207.get(i).getSettlementSum()); //结算量
+                                settlementRelationSaleEntity.setSettlementPrice( tableField207.get(i).getSettlementPrice()); //单价量
+                                settlementRelationSaleEntity.setSettlementCount( tableField207.get(i).getSettlementSubtotal()); //单价量
+                                SubjectbasicEntity subjectbasicEntity =subjectbasicService.getInfo(cwsettlementForm.getCwsettlementsubjectList().get(0).getSubjectId());
+                                settlementRelationSaleEntity.setCustomer(subjectbasicEntity.getName());
+                                settlementRelationSaleEntity.setPurchaseBusinessLine(entity.getBusinessLine());
+                                settlementRelationSaleEntity.setPaymentAmount(cwsettlementForm.getPaymentAmount()); //已收款金额
+                            }
+                            settlementRelationSaleService.saveOrUpdate(settlementRelationSaleEntity);
+
+
+                        }
+
+                    }
+
+
+                }
+
             }
         }
         entity.setSettlementSum(settlementSum);

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/DeliveryRelationServiceImpl.java

@@ -0,0 +1,255 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.DeliveryRelationMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.deliveryrelation.*;
+import java.math.BigDecimal;
+import cn.hutool.core.util.ObjectUtil;
+import jnpf.permission.model.authorize.AuthorizeConditionModel;
+import jnpf.util.GeneraterSwapUtil;
+import jnpf.database.model.superQuery.SuperQueryJsonModel;
+import jnpf.database.model.superQuery.ConditionJsonModel;
+import jnpf.database.model.superQuery.SuperQueryConditionModel;
+import java.lang.reflect.Field;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.util.regex.Pattern;
+import jnpf.model.QueryModel;
+import java.util.stream.Collectors;
+import jnpf.base.model.ColumnDataModel;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import jnpf.database.model.superQuery.SuperJsonModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import java.text.SimpleDateFormat;
+import jnpf.util.*;
+import java.util.*;
+import jnpf.base.UserInfo;
+import jnpf.permission.entity.UserEntity;
+/**
+ *
+ * deliveryRelation
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-07-29
+ */
+@Service
+public class DeliveryRelationServiceImpl extends ServiceImpl<DeliveryRelationMapper, DeliveryRelationEntity> implements DeliveryRelationService{
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Override
+    public List<DeliveryRelationEntity> getList(DeliveryRelationPagination deliveryRelationPagination){
+        return getTypeList(deliveryRelationPagination,deliveryRelationPagination.getDataType());
+    }
+    /** 列表查询 */
+    @Override
+    public List<DeliveryRelationEntity> getTypeList(DeliveryRelationPagination deliveryRelationPagination,String dataType){
+        String userId=userProvider.get().getUserId();
+        List<String> AllIdList =new ArrayList();
+        List<List<String>> intersectionList =new ArrayList<>();
+        boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+        String columnData = !isPc ? DeliveryRelationConstant.getAppColumnData() : DeliveryRelationConstant.getColumnData();
+        ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
+        String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
+
+        int total=0;
+        int deliveryRelationNum =0;
+        QueryWrapper<DeliveryRelationEntity> deliveryRelationQueryWrapper=new QueryWrapper<>();
+        List<String> allSuperIDlist = new ArrayList<>();
+        String superOp ="";
+        if (ObjectUtil.isNotEmpty(deliveryRelationPagination.getSuperQueryJson())){
+            List<String> allSuperList = new ArrayList<>();
+            List<List<String>> intersectionSuperList  = new ArrayList<>();
+            String queryJson = deliveryRelationPagination.getSuperQueryJson();
+            SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
+            int superNum = 0;
+            QueryWrapper<DeliveryRelationEntity> deliveryRelationSuperWrapper = new QueryWrapper<>();
+            deliveryRelationSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(deliveryRelationSuperWrapper,DeliveryRelationEntity.class,queryJson,"0"));
+            int deliveryRelationNum1 = deliveryRelationSuperWrapper.getExpression().getNormal().size();
+            if (deliveryRelationNum1>0){
+                List<String> deliveryRelationList =this.list(deliveryRelationSuperWrapper).stream().map(DeliveryRelationEntity::getId).collect(Collectors.toList());
+                allSuperList.addAll(deliveryRelationList);
+                intersectionSuperList.add(deliveryRelationList);
+                superNum++;
+            }
+            superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
+            //and or
+            if(superOp.equalsIgnoreCase("and")){
+                allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
+            }else{
+                allSuperIDlist = allSuperList;
+            }
+        }
+        List<String> allRuleIDlist = new ArrayList<>();
+        String ruleOp ="";
+        if (ObjectUtil.isNotEmpty(ruleJson)){
+            List<String> allRuleList = new ArrayList<>();
+            List<List<String>> intersectionRuleList  = new ArrayList<>();
+            SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
+            int ruleNum = 0;
+            QueryWrapper<DeliveryRelationEntity> deliveryRelationSuperWrapper = new QueryWrapper<>();
+            deliveryRelationSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(deliveryRelationSuperWrapper,DeliveryRelationEntity.class,ruleJson,"0"));
+            int deliveryRelationNum1 = deliveryRelationSuperWrapper.getExpression().getNormal().size();
+            if (deliveryRelationNum1>0){
+                List<String> deliveryRelationList =this.list(deliveryRelationSuperWrapper).stream().map(DeliveryRelationEntity::getId).collect(Collectors.toList());
+                allRuleList.addAll(deliveryRelationList);
+                intersectionRuleList.add(deliveryRelationList);
+                ruleNum++;
+            }
+            ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
+            //and or
+            if(ruleOp.equalsIgnoreCase("and")){
+                allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
+            }else{
+                allRuleIDlist = allRuleList;
+            }
+        }
+    boolean pcPermission = false;
+    boolean appPermission = false;
+    if(isPc && pcPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object deliveryRelationObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(deliveryRelationQueryWrapper,DeliveryRelationEntity.class,deliveryRelationPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(deliveryRelationObj)){
+        return new ArrayList<>();
+        } else {
+        deliveryRelationQueryWrapper = (QueryWrapper<DeliveryRelationEntity>)deliveryRelationObj;
+        if( deliveryRelationQueryWrapper.getExpression().getNormal().size()>0){
+        deliveryRelationNum++;
+        }
+        }
+    }
+    }
+    if(!isPc && appPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object deliveryRelationObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(deliveryRelationQueryWrapper,DeliveryRelationEntity.class,deliveryRelationPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(deliveryRelationObj)){
+        return new ArrayList<>();
+        } else {
+        deliveryRelationQueryWrapper = (QueryWrapper<DeliveryRelationEntity>)deliveryRelationObj;
+        if( deliveryRelationQueryWrapper.getExpression().getNormal().size()>0){
+        deliveryRelationNum++;
+        }
+        }
+
+
+    }
+    }
+        List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
+        if (total>0){
+            if (intersection.size()==0){
+                intersection.add("jnpfNullList");
+            }
+            deliveryRelationQueryWrapper.lambda().in(DeliveryRelationEntity::getId, intersection);
+        }
+    //是否有高级查询
+        if (StringUtil.isNotEmpty(superOp)){
+            if (allSuperIDlist.size()==0){
+                allSuperIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllSuperIDlist = allSuperIDlist;
+            deliveryRelationQueryWrapper.lambda().and(t->t.in(DeliveryRelationEntity::getId, finalAllSuperIDlist));
+        }
+    //是否有数据过滤查询
+        if (StringUtil.isNotEmpty(ruleOp)){
+            if (allRuleIDlist.size()==0){
+                allRuleIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllRuleIDlist = allRuleIDlist;
+            deliveryRelationQueryWrapper.lambda().and(t->t.in(DeliveryRelationEntity::getId, finalAllRuleIDlist));
+        }
+
+        //排序
+        if(StringUtil.isEmpty(deliveryRelationPagination.getSidx())){
+            deliveryRelationQueryWrapper.lambda().orderByDesc(DeliveryRelationEntity::getId);
+        }else{
+            try {
+                String sidx = deliveryRelationPagination.getSidx();
+                String[] strs= sidx.split("_name");
+                DeliveryRelationEntity deliveryRelationEntity = new DeliveryRelationEntity();
+                Field declaredField = deliveryRelationEntity.getClass().getDeclaredField(strs[0]);
+                declaredField.setAccessible(true);
+                String value = declaredField.getAnnotation(TableField.class).value();
+                deliveryRelationQueryWrapper="asc".equals(deliveryRelationPagination.getSort().toLowerCase())?deliveryRelationQueryWrapper.orderByAsc(value):deliveryRelationQueryWrapper.orderByDesc(value);
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+
+        if("0".equals(dataType)){
+            if((total>0 && AllIdList.size()>0) || total==0){
+                Page<DeliveryRelationEntity> page=new Page<>(deliveryRelationPagination.getCurrentPage(), deliveryRelationPagination.getPageSize());
+                IPage<DeliveryRelationEntity> userIPage=this.page(page, deliveryRelationQueryWrapper);
+                return deliveryRelationPagination.setData(userIPage.getRecords(),userIPage.getTotal());
+            }else{
+                List<DeliveryRelationEntity> list = new ArrayList();
+                return deliveryRelationPagination.setData(list, list.size());
+            }
+        }else{
+            return this.list(deliveryRelationQueryWrapper);
+        }
+    }
+    @Override
+    public DeliveryRelationEntity getInfo(String id){
+        QueryWrapper<DeliveryRelationEntity> queryWrapper=new QueryWrapper<>();
+        queryWrapper.lambda().eq(DeliveryRelationEntity::getId,id);
+        return this.getOne(queryWrapper);
+    }
+    @Override
+    public void create(DeliveryRelationEntity entity){
+        this.save(entity);
+    }
+    @Override
+    public boolean update(String id, DeliveryRelationEntity entity){
+        return this.updateById(entity);
+    }
+    @Override
+    public void delete(DeliveryRelationEntity entity){
+        if(entity!=null){
+            this.removeById(entity.getId());
+        }
+    }
+    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+    @Override
+    public String checkForm(DeliveryRelationForm form,int i) {
+        boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
+        String id="";
+        String countRecover = "";
+        if (isUp){
+            id = form.getId();
+        }
+        //主表字段验证
+        return countRecover;
+    }
+    /**
+    * 新增修改数据(事务回滚)
+    * @param id
+    * @param deliveryRelationForm
+    * @return
+    */
+    @Override
+    @Transactional
+    public void saveOrUpdate(DeliveryRelationForm deliveryRelationForm,String id, boolean isSave) throws Exception{
+        UserInfo userInfo=userProvider.get();
+        UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
+        deliveryRelationForm = JsonUtil.getJsonToBean(
+        generaterSwapUtil.swapDatetime(DeliveryRelationConstant.getFormData(),deliveryRelationForm),DeliveryRelationForm.class);
+        DeliveryRelationEntity entity = JsonUtil.getJsonToBean(deliveryRelationForm, DeliveryRelationEntity.class);
+
+        if(isSave){
+            String mainId =  RandomUtil.uuId() ;
+            entity.setId(mainId);
+        }else{
+        }
+        this.saveOrUpdate(entity);
+
+    }
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ReceiptRelationServiceImpl.java

@@ -0,0 +1,255 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.ReceiptRelationMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.receiptrelation.*;
+import java.math.BigDecimal;
+import cn.hutool.core.util.ObjectUtil;
+import jnpf.permission.model.authorize.AuthorizeConditionModel;
+import jnpf.util.GeneraterSwapUtil;
+import jnpf.database.model.superQuery.SuperQueryJsonModel;
+import jnpf.database.model.superQuery.ConditionJsonModel;
+import jnpf.database.model.superQuery.SuperQueryConditionModel;
+import java.lang.reflect.Field;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.util.regex.Pattern;
+import jnpf.model.QueryModel;
+import java.util.stream.Collectors;
+import jnpf.base.model.ColumnDataModel;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import jnpf.database.model.superQuery.SuperJsonModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import java.text.SimpleDateFormat;
+import jnpf.util.*;
+import java.util.*;
+import jnpf.base.UserInfo;
+import jnpf.permission.entity.UserEntity;
+/**
+ *
+ * receiptRelation
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-07-29
+ */
+@Service
+public class ReceiptRelationServiceImpl extends ServiceImpl<ReceiptRelationMapper, ReceiptRelationEntity> implements ReceiptRelationService{
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Override
+    public List<ReceiptRelationEntity> getList(ReceiptRelationPagination receiptRelationPagination){
+        return getTypeList(receiptRelationPagination,receiptRelationPagination.getDataType());
+    }
+    /** 列表查询 */
+    @Override
+    public List<ReceiptRelationEntity> getTypeList(ReceiptRelationPagination receiptRelationPagination,String dataType){
+        String userId=userProvider.get().getUserId();
+        List<String> AllIdList =new ArrayList();
+        List<List<String>> intersectionList =new ArrayList<>();
+        boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+        String columnData = !isPc ? ReceiptRelationConstant.getAppColumnData() : ReceiptRelationConstant.getColumnData();
+        ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
+        String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
+
+        int total=0;
+        int receiptRelationNum =0;
+        QueryWrapper<ReceiptRelationEntity> receiptRelationQueryWrapper=new QueryWrapper<>();
+        List<String> allSuperIDlist = new ArrayList<>();
+        String superOp ="";
+        if (ObjectUtil.isNotEmpty(receiptRelationPagination.getSuperQueryJson())){
+            List<String> allSuperList = new ArrayList<>();
+            List<List<String>> intersectionSuperList  = new ArrayList<>();
+            String queryJson = receiptRelationPagination.getSuperQueryJson();
+            SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
+            int superNum = 0;
+            QueryWrapper<ReceiptRelationEntity> receiptRelationSuperWrapper = new QueryWrapper<>();
+            receiptRelationSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(receiptRelationSuperWrapper,ReceiptRelationEntity.class,queryJson,"0"));
+            int receiptRelationNum1 = receiptRelationSuperWrapper.getExpression().getNormal().size();
+            if (receiptRelationNum1>0){
+                List<String> receiptRelationList =this.list(receiptRelationSuperWrapper).stream().map(ReceiptRelationEntity::getId).collect(Collectors.toList());
+                allSuperList.addAll(receiptRelationList);
+                intersectionSuperList.add(receiptRelationList);
+                superNum++;
+            }
+            superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
+            //and or
+            if(superOp.equalsIgnoreCase("and")){
+                allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
+            }else{
+                allSuperIDlist = allSuperList;
+            }
+        }
+        List<String> allRuleIDlist = new ArrayList<>();
+        String ruleOp ="";
+        if (ObjectUtil.isNotEmpty(ruleJson)){
+            List<String> allRuleList = new ArrayList<>();
+            List<List<String>> intersectionRuleList  = new ArrayList<>();
+            SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
+            int ruleNum = 0;
+            QueryWrapper<ReceiptRelationEntity> receiptRelationSuperWrapper = new QueryWrapper<>();
+            receiptRelationSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(receiptRelationSuperWrapper,ReceiptRelationEntity.class,ruleJson,"0"));
+            int receiptRelationNum1 = receiptRelationSuperWrapper.getExpression().getNormal().size();
+            if (receiptRelationNum1>0){
+                List<String> receiptRelationList =this.list(receiptRelationSuperWrapper).stream().map(ReceiptRelationEntity::getId).collect(Collectors.toList());
+                allRuleList.addAll(receiptRelationList);
+                intersectionRuleList.add(receiptRelationList);
+                ruleNum++;
+            }
+            ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
+            //and or
+            if(ruleOp.equalsIgnoreCase("and")){
+                allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
+            }else{
+                allRuleIDlist = allRuleList;
+            }
+        }
+    boolean pcPermission = false;
+    boolean appPermission = false;
+    if(isPc && pcPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object receiptRelationObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(receiptRelationQueryWrapper,ReceiptRelationEntity.class,receiptRelationPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(receiptRelationObj)){
+        return new ArrayList<>();
+        } else {
+        receiptRelationQueryWrapper = (QueryWrapper<ReceiptRelationEntity>)receiptRelationObj;
+        if( receiptRelationQueryWrapper.getExpression().getNormal().size()>0){
+        receiptRelationNum++;
+        }
+        }
+    }
+    }
+    if(!isPc && appPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object receiptRelationObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(receiptRelationQueryWrapper,ReceiptRelationEntity.class,receiptRelationPagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(receiptRelationObj)){
+        return new ArrayList<>();
+        } else {
+        receiptRelationQueryWrapper = (QueryWrapper<ReceiptRelationEntity>)receiptRelationObj;
+        if( receiptRelationQueryWrapper.getExpression().getNormal().size()>0){
+        receiptRelationNum++;
+        }
+        }
+
+
+    }
+    }
+        List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
+        if (total>0){
+            if (intersection.size()==0){
+                intersection.add("jnpfNullList");
+            }
+            receiptRelationQueryWrapper.lambda().in(ReceiptRelationEntity::getId, intersection);
+        }
+    //是否有高级查询
+        if (StringUtil.isNotEmpty(superOp)){
+            if (allSuperIDlist.size()==0){
+                allSuperIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllSuperIDlist = allSuperIDlist;
+            receiptRelationQueryWrapper.lambda().and(t->t.in(ReceiptRelationEntity::getId, finalAllSuperIDlist));
+        }
+    //是否有数据过滤查询
+        if (StringUtil.isNotEmpty(ruleOp)){
+            if (allRuleIDlist.size()==0){
+                allRuleIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllRuleIDlist = allRuleIDlist;
+            receiptRelationQueryWrapper.lambda().and(t->t.in(ReceiptRelationEntity::getId, finalAllRuleIDlist));
+        }
+
+        //排序
+        if(StringUtil.isEmpty(receiptRelationPagination.getSidx())){
+            receiptRelationQueryWrapper.lambda().orderByDesc(ReceiptRelationEntity::getId);
+        }else{
+            try {
+                String sidx = receiptRelationPagination.getSidx();
+                String[] strs= sidx.split("_name");
+                ReceiptRelationEntity receiptRelationEntity = new ReceiptRelationEntity();
+                Field declaredField = receiptRelationEntity.getClass().getDeclaredField(strs[0]);
+                declaredField.setAccessible(true);
+                String value = declaredField.getAnnotation(TableField.class).value();
+                receiptRelationQueryWrapper="asc".equals(receiptRelationPagination.getSort().toLowerCase())?receiptRelationQueryWrapper.orderByAsc(value):receiptRelationQueryWrapper.orderByDesc(value);
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+
+        if("0".equals(dataType)){
+            if((total>0 && AllIdList.size()>0) || total==0){
+                Page<ReceiptRelationEntity> page=new Page<>(receiptRelationPagination.getCurrentPage(), receiptRelationPagination.getPageSize());
+                IPage<ReceiptRelationEntity> userIPage=this.page(page, receiptRelationQueryWrapper);
+                return receiptRelationPagination.setData(userIPage.getRecords(),userIPage.getTotal());
+            }else{
+                List<ReceiptRelationEntity> list = new ArrayList();
+                return receiptRelationPagination.setData(list, list.size());
+            }
+        }else{
+            return this.list(receiptRelationQueryWrapper);
+        }
+    }
+    @Override
+    public ReceiptRelationEntity getInfo(String id){
+        QueryWrapper<ReceiptRelationEntity> queryWrapper=new QueryWrapper<>();
+        queryWrapper.lambda().eq(ReceiptRelationEntity::getId,id);
+        return this.getOne(queryWrapper);
+    }
+    @Override
+    public void create(ReceiptRelationEntity entity){
+        this.save(entity);
+    }
+    @Override
+    public boolean update(String id, ReceiptRelationEntity entity){
+        return this.updateById(entity);
+    }
+    @Override
+    public void delete(ReceiptRelationEntity entity){
+        if(entity!=null){
+            this.removeById(entity.getId());
+        }
+    }
+    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+    @Override
+    public String checkForm(ReceiptRelationForm form,int i) {
+        boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
+        String id="";
+        String countRecover = "";
+        if (isUp){
+            id = form.getId();
+        }
+        //主表字段验证
+        return countRecover;
+    }
+    /**
+    * 新增修改数据(事务回滚)
+    * @param id
+    * @param receiptRelationForm
+    * @return
+    */
+    @Override
+    @Transactional
+    public void saveOrUpdate(ReceiptRelationForm receiptRelationForm,String id, boolean isSave) throws Exception{
+        UserInfo userInfo=userProvider.get();
+        UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
+        receiptRelationForm = JsonUtil.getJsonToBean(
+        generaterSwapUtil.swapDatetime(ReceiptRelationConstant.getFormData(),receiptRelationForm),ReceiptRelationForm.class);
+        ReceiptRelationEntity entity = JsonUtil.getJsonToBean(receiptRelationForm, ReceiptRelationEntity.class);
+
+        if(isSave){
+            String mainId =  RandomUtil.uuId() ;
+            entity.setId(mainId);
+        }else{
+        }
+        this.saveOrUpdate(entity);
+
+    }
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/SettlementRelationPurchaseServiceImpl.java

@@ -0,0 +1,255 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.SettlementRelationPurchaseMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.settlementrelationpurchase.*;
+import java.math.BigDecimal;
+import cn.hutool.core.util.ObjectUtil;
+import jnpf.permission.model.authorize.AuthorizeConditionModel;
+import jnpf.util.GeneraterSwapUtil;
+import jnpf.database.model.superQuery.SuperQueryJsonModel;
+import jnpf.database.model.superQuery.ConditionJsonModel;
+import jnpf.database.model.superQuery.SuperQueryConditionModel;
+import java.lang.reflect.Field;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.util.regex.Pattern;
+import jnpf.model.QueryModel;
+import java.util.stream.Collectors;
+import jnpf.base.model.ColumnDataModel;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import jnpf.database.model.superQuery.SuperJsonModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import java.text.SimpleDateFormat;
+import jnpf.util.*;
+import java.util.*;
+import jnpf.base.UserInfo;
+import jnpf.permission.entity.UserEntity;
+/**
+ *
+ * settlementRelationPurchase
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-07-29
+ */
+@Service
+public class SettlementRelationPurchaseServiceImpl extends ServiceImpl<SettlementRelationPurchaseMapper, SettlementRelationPurchaseEntity> implements SettlementRelationPurchaseService{
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Override
+    public List<SettlementRelationPurchaseEntity> getList(SettlementRelationPurchasePagination settlementRelationPurchasePagination){
+        return getTypeList(settlementRelationPurchasePagination,settlementRelationPurchasePagination.getDataType());
+    }
+    /** 列表查询 */
+    @Override
+    public List<SettlementRelationPurchaseEntity> getTypeList(SettlementRelationPurchasePagination settlementRelationPurchasePagination,String dataType){
+        String userId=userProvider.get().getUserId();
+        List<String> AllIdList =new ArrayList();
+        List<List<String>> intersectionList =new ArrayList<>();
+        boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+        String columnData = !isPc ? SettlementRelationPurchaseConstant.getAppColumnData() : SettlementRelationPurchaseConstant.getColumnData();
+        ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
+        String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
+
+        int total=0;
+        int settlementRelationPurchaseNum =0;
+        QueryWrapper<SettlementRelationPurchaseEntity> settlementRelationPurchaseQueryWrapper=new QueryWrapper<>();
+        List<String> allSuperIDlist = new ArrayList<>();
+        String superOp ="";
+        if (ObjectUtil.isNotEmpty(settlementRelationPurchasePagination.getSuperQueryJson())){
+            List<String> allSuperList = new ArrayList<>();
+            List<List<String>> intersectionSuperList  = new ArrayList<>();
+            String queryJson = settlementRelationPurchasePagination.getSuperQueryJson();
+            SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
+            int superNum = 0;
+            QueryWrapper<SettlementRelationPurchaseEntity> settlementRelationPurchaseSuperWrapper = new QueryWrapper<>();
+            settlementRelationPurchaseSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(settlementRelationPurchaseSuperWrapper,SettlementRelationPurchaseEntity.class,queryJson,"0"));
+            int settlementRelationPurchaseNum1 = settlementRelationPurchaseSuperWrapper.getExpression().getNormal().size();
+            if (settlementRelationPurchaseNum1>0){
+                List<String> settlementRelationPurchaseList =this.list(settlementRelationPurchaseSuperWrapper).stream().map(SettlementRelationPurchaseEntity::getId).collect(Collectors.toList());
+                allSuperList.addAll(settlementRelationPurchaseList);
+                intersectionSuperList.add(settlementRelationPurchaseList);
+                superNum++;
+            }
+            superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
+            //and or
+            if(superOp.equalsIgnoreCase("and")){
+                allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
+            }else{
+                allSuperIDlist = allSuperList;
+            }
+        }
+        List<String> allRuleIDlist = new ArrayList<>();
+        String ruleOp ="";
+        if (ObjectUtil.isNotEmpty(ruleJson)){
+            List<String> allRuleList = new ArrayList<>();
+            List<List<String>> intersectionRuleList  = new ArrayList<>();
+            SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
+            int ruleNum = 0;
+            QueryWrapper<SettlementRelationPurchaseEntity> settlementRelationPurchaseSuperWrapper = new QueryWrapper<>();
+            settlementRelationPurchaseSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(settlementRelationPurchaseSuperWrapper,SettlementRelationPurchaseEntity.class,ruleJson,"0"));
+            int settlementRelationPurchaseNum1 = settlementRelationPurchaseSuperWrapper.getExpression().getNormal().size();
+            if (settlementRelationPurchaseNum1>0){
+                List<String> settlementRelationPurchaseList =this.list(settlementRelationPurchaseSuperWrapper).stream().map(SettlementRelationPurchaseEntity::getId).collect(Collectors.toList());
+                allRuleList.addAll(settlementRelationPurchaseList);
+                intersectionRuleList.add(settlementRelationPurchaseList);
+                ruleNum++;
+            }
+            ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
+            //and or
+            if(ruleOp.equalsIgnoreCase("and")){
+                allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
+            }else{
+                allRuleIDlist = allRuleList;
+            }
+        }
+    boolean pcPermission = false;
+    boolean appPermission = false;
+    if(isPc && pcPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object settlementRelationPurchaseObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(settlementRelationPurchaseQueryWrapper,SettlementRelationPurchaseEntity.class,settlementRelationPurchasePagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(settlementRelationPurchaseObj)){
+        return new ArrayList<>();
+        } else {
+        settlementRelationPurchaseQueryWrapper = (QueryWrapper<SettlementRelationPurchaseEntity>)settlementRelationPurchaseObj;
+        if( settlementRelationPurchaseQueryWrapper.getExpression().getNormal().size()>0){
+        settlementRelationPurchaseNum++;
+        }
+        }
+    }
+    }
+    if(!isPc && appPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object settlementRelationPurchaseObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(settlementRelationPurchaseQueryWrapper,SettlementRelationPurchaseEntity.class,settlementRelationPurchasePagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(settlementRelationPurchaseObj)){
+        return new ArrayList<>();
+        } else {
+        settlementRelationPurchaseQueryWrapper = (QueryWrapper<SettlementRelationPurchaseEntity>)settlementRelationPurchaseObj;
+        if( settlementRelationPurchaseQueryWrapper.getExpression().getNormal().size()>0){
+        settlementRelationPurchaseNum++;
+        }
+        }
+
+
+    }
+    }
+        List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
+        if (total>0){
+            if (intersection.size()==0){
+                intersection.add("jnpfNullList");
+            }
+            settlementRelationPurchaseQueryWrapper.lambda().in(SettlementRelationPurchaseEntity::getId, intersection);
+        }
+    //是否有高级查询
+        if (StringUtil.isNotEmpty(superOp)){
+            if (allSuperIDlist.size()==0){
+                allSuperIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllSuperIDlist = allSuperIDlist;
+            settlementRelationPurchaseQueryWrapper.lambda().and(t->t.in(SettlementRelationPurchaseEntity::getId, finalAllSuperIDlist));
+        }
+    //是否有数据过滤查询
+        if (StringUtil.isNotEmpty(ruleOp)){
+            if (allRuleIDlist.size()==0){
+                allRuleIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllRuleIDlist = allRuleIDlist;
+            settlementRelationPurchaseQueryWrapper.lambda().and(t->t.in(SettlementRelationPurchaseEntity::getId, finalAllRuleIDlist));
+        }
+
+        //排序
+        if(StringUtil.isEmpty(settlementRelationPurchasePagination.getSidx())){
+            settlementRelationPurchaseQueryWrapper.lambda().orderByDesc(SettlementRelationPurchaseEntity::getId);
+        }else{
+            try {
+                String sidx = settlementRelationPurchasePagination.getSidx();
+                String[] strs= sidx.split("_name");
+                SettlementRelationPurchaseEntity settlementRelationPurchaseEntity = new SettlementRelationPurchaseEntity();
+                Field declaredField = settlementRelationPurchaseEntity.getClass().getDeclaredField(strs[0]);
+                declaredField.setAccessible(true);
+                String value = declaredField.getAnnotation(TableField.class).value();
+                settlementRelationPurchaseQueryWrapper="asc".equals(settlementRelationPurchasePagination.getSort().toLowerCase())?settlementRelationPurchaseQueryWrapper.orderByAsc(value):settlementRelationPurchaseQueryWrapper.orderByDesc(value);
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+
+        if("0".equals(dataType)){
+            if((total>0 && AllIdList.size()>0) || total==0){
+                Page<SettlementRelationPurchaseEntity> page=new Page<>(settlementRelationPurchasePagination.getCurrentPage(), settlementRelationPurchasePagination.getPageSize());
+                IPage<SettlementRelationPurchaseEntity> userIPage=this.page(page, settlementRelationPurchaseQueryWrapper);
+                return settlementRelationPurchasePagination.setData(userIPage.getRecords(),userIPage.getTotal());
+            }else{
+                List<SettlementRelationPurchaseEntity> list = new ArrayList();
+                return settlementRelationPurchasePagination.setData(list, list.size());
+            }
+        }else{
+            return this.list(settlementRelationPurchaseQueryWrapper);
+        }
+    }
+    @Override
+    public SettlementRelationPurchaseEntity getInfo(String id){
+        QueryWrapper<SettlementRelationPurchaseEntity> queryWrapper=new QueryWrapper<>();
+        queryWrapper.lambda().eq(SettlementRelationPurchaseEntity::getId,id);
+        return this.getOne(queryWrapper);
+    }
+    @Override
+    public void create(SettlementRelationPurchaseEntity entity){
+        this.save(entity);
+    }
+    @Override
+    public boolean update(String id, SettlementRelationPurchaseEntity entity){
+        return this.updateById(entity);
+    }
+    @Override
+    public void delete(SettlementRelationPurchaseEntity entity){
+        if(entity!=null){
+            this.removeById(entity.getId());
+        }
+    }
+    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+    @Override
+    public String checkForm(SettlementRelationPurchaseForm form,int i) {
+        boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
+        String id="";
+        String countRecover = "";
+        if (isUp){
+            id = form.getId();
+        }
+        //主表字段验证
+        return countRecover;
+    }
+    /**
+    * 新增修改数据(事务回滚)
+    * @param id
+    * @param settlementRelationPurchaseForm
+    * @return
+    */
+    @Override
+    @Transactional
+    public void saveOrUpdate(SettlementRelationPurchaseForm settlementRelationPurchaseForm,String id, boolean isSave) throws Exception{
+        UserInfo userInfo=userProvider.get();
+        UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
+        settlementRelationPurchaseForm = JsonUtil.getJsonToBean(
+        generaterSwapUtil.swapDatetime(SettlementRelationPurchaseConstant.getFormData(),settlementRelationPurchaseForm),SettlementRelationPurchaseForm.class);
+        SettlementRelationPurchaseEntity entity = JsonUtil.getJsonToBean(settlementRelationPurchaseForm, SettlementRelationPurchaseEntity.class);
+
+        if(isSave){
+            String mainId =  RandomUtil.uuId() ;
+            entity.setId(mainId);
+        }else{
+        }
+        this.saveOrUpdate(entity);
+
+    }
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/SettlementRelationSaleServiceImpl.java

@@ -0,0 +1,255 @@
+package jnpf.service.impl;
+
+import jnpf.entity.*;
+import jnpf.mapper.SettlementRelationSaleMapper;
+import jnpf.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.model.settlementrelationsale.*;
+import java.math.BigDecimal;
+import cn.hutool.core.util.ObjectUtil;
+import jnpf.permission.model.authorize.AuthorizeConditionModel;
+import jnpf.util.GeneraterSwapUtil;
+import jnpf.database.model.superQuery.SuperQueryJsonModel;
+import jnpf.database.model.superQuery.ConditionJsonModel;
+import jnpf.database.model.superQuery.SuperQueryConditionModel;
+import java.lang.reflect.Field;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.util.regex.Pattern;
+import jnpf.model.QueryModel;
+import java.util.stream.Collectors;
+import jnpf.base.model.ColumnDataModel;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import jnpf.database.model.superQuery.SuperJsonModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import java.text.SimpleDateFormat;
+import jnpf.util.*;
+import java.util.*;
+import jnpf.base.UserInfo;
+import jnpf.permission.entity.UserEntity;
+/**
+ *
+ * settlementRelationSale
+ * 版本： V3.5
+ * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * 作者： JNPF开发平台组
+ * 日期： 2024-07-29
+ */
+@Service
+public class SettlementRelationSaleServiceImpl extends ServiceImpl<SettlementRelationSaleMapper, SettlementRelationSaleEntity> implements SettlementRelationSaleService{
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Override
+    public List<SettlementRelationSaleEntity> getList(SettlementRelationSalePagination settlementRelationSalePagination){
+        return getTypeList(settlementRelationSalePagination,settlementRelationSalePagination.getDataType());
+    }
+    /** 列表查询 */
+    @Override
+    public List<SettlementRelationSaleEntity> getTypeList(SettlementRelationSalePagination settlementRelationSalePagination,String dataType){
+        String userId=userProvider.get().getUserId();
+        List<String> AllIdList =new ArrayList();
+        List<List<String>> intersectionList =new ArrayList<>();
+        boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+        String columnData = !isPc ? SettlementRelationSaleConstant.getAppColumnData() : SettlementRelationSaleConstant.getColumnData();
+        ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
+        String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
+
+        int total=0;
+        int settlementRelationSaleNum =0;
+        QueryWrapper<SettlementRelationSaleEntity> settlementRelationSaleQueryWrapper=new QueryWrapper<>();
+        List<String> allSuperIDlist = new ArrayList<>();
+        String superOp ="";
+        if (ObjectUtil.isNotEmpty(settlementRelationSalePagination.getSuperQueryJson())){
+            List<String> allSuperList = new ArrayList<>();
+            List<List<String>> intersectionSuperList  = new ArrayList<>();
+            String queryJson = settlementRelationSalePagination.getSuperQueryJson();
+            SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
+            int superNum = 0;
+            QueryWrapper<SettlementRelationSaleEntity> settlementRelationSaleSuperWrapper = new QueryWrapper<>();
+            settlementRelationSaleSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(settlementRelationSaleSuperWrapper,SettlementRelationSaleEntity.class,queryJson,"0"));
+            int settlementRelationSaleNum1 = settlementRelationSaleSuperWrapper.getExpression().getNormal().size();
+            if (settlementRelationSaleNum1>0){
+                List<String> settlementRelationSaleList =this.list(settlementRelationSaleSuperWrapper).stream().map(SettlementRelationSaleEntity::getId).collect(Collectors.toList());
+                allSuperList.addAll(settlementRelationSaleList);
+                intersectionSuperList.add(settlementRelationSaleList);
+                superNum++;
+            }
+            superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
+            //and or
+            if(superOp.equalsIgnoreCase("and")){
+                allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
+            }else{
+                allSuperIDlist = allSuperList;
+            }
+        }
+        List<String> allRuleIDlist = new ArrayList<>();
+        String ruleOp ="";
+        if (ObjectUtil.isNotEmpty(ruleJson)){
+            List<String> allRuleList = new ArrayList<>();
+            List<List<String>> intersectionRuleList  = new ArrayList<>();
+            SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
+            int ruleNum = 0;
+            QueryWrapper<SettlementRelationSaleEntity> settlementRelationSaleSuperWrapper = new QueryWrapper<>();
+            settlementRelationSaleSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(settlementRelationSaleSuperWrapper,SettlementRelationSaleEntity.class,ruleJson,"0"));
+            int settlementRelationSaleNum1 = settlementRelationSaleSuperWrapper.getExpression().getNormal().size();
+            if (settlementRelationSaleNum1>0){
+                List<String> settlementRelationSaleList =this.list(settlementRelationSaleSuperWrapper).stream().map(SettlementRelationSaleEntity::getId).collect(Collectors.toList());
+                allRuleList.addAll(settlementRelationSaleList);
+                intersectionRuleList.add(settlementRelationSaleList);
+                ruleNum++;
+            }
+            ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
+            //and or
+            if(ruleOp.equalsIgnoreCase("and")){
+                allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
+            }else{
+                allRuleIDlist = allRuleList;
+            }
+        }
+    boolean pcPermission = false;
+    boolean appPermission = false;
+    if(isPc && pcPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object settlementRelationSaleObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(settlementRelationSaleQueryWrapper,SettlementRelationSaleEntity.class,settlementRelationSalePagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(settlementRelationSaleObj)){
+        return new ArrayList<>();
+        } else {
+        settlementRelationSaleQueryWrapper = (QueryWrapper<SettlementRelationSaleEntity>)settlementRelationSaleObj;
+        if( settlementRelationSaleQueryWrapper.getExpression().getNormal().size()>0){
+        settlementRelationSaleNum++;
+        }
+        }
+    }
+    }
+    if(!isPc && appPermission){
+    if (!userProvider.get().getIsAdministrator()){
+        Object settlementRelationSaleObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(settlementRelationSaleQueryWrapper,SettlementRelationSaleEntity.class,settlementRelationSalePagination.getMenuId(),"0"));
+        if (ObjectUtil.isEmpty(settlementRelationSaleObj)){
+        return new ArrayList<>();
+        } else {
+        settlementRelationSaleQueryWrapper = (QueryWrapper<SettlementRelationSaleEntity>)settlementRelationSaleObj;
+        if( settlementRelationSaleQueryWrapper.getExpression().getNormal().size()>0){
+        settlementRelationSaleNum++;
+        }
+        }
+
+
+    }
+    }
+        List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
+        if (total>0){
+            if (intersection.size()==0){
+                intersection.add("jnpfNullList");
+            }
+            settlementRelationSaleQueryWrapper.lambda().in(SettlementRelationSaleEntity::getId, intersection);
+        }
+    //是否有高级查询
+        if (StringUtil.isNotEmpty(superOp)){
+            if (allSuperIDlist.size()==0){
+                allSuperIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllSuperIDlist = allSuperIDlist;
+            settlementRelationSaleQueryWrapper.lambda().and(t->t.in(SettlementRelationSaleEntity::getId, finalAllSuperIDlist));
+        }
+    //是否有数据过滤查询
+        if (StringUtil.isNotEmpty(ruleOp)){
+            if (allRuleIDlist.size()==0){
+                allRuleIDlist.add("jnpfNullList");
+            }
+            List<String> finalAllRuleIDlist = allRuleIDlist;
+            settlementRelationSaleQueryWrapper.lambda().and(t->t.in(SettlementRelationSaleEntity::getId, finalAllRuleIDlist));
+        }
+
+        //排序
+        if(StringUtil.isEmpty(settlementRelationSalePagination.getSidx())){
+            settlementRelationSaleQueryWrapper.lambda().orderByDesc(SettlementRelationSaleEntity::getId);
+        }else{
+            try {
+                String sidx = settlementRelationSalePagination.getSidx();
+                String[] strs= sidx.split("_name");
+                SettlementRelationSaleEntity settlementRelationSaleEntity = new SettlementRelationSaleEntity();
+                Field declaredField = settlementRelationSaleEntity.getClass().getDeclaredField(strs[0]);
+                declaredField.setAccessible(true);
+                String value = declaredField.getAnnotation(TableField.class).value();
+                settlementRelationSaleQueryWrapper="asc".equals(settlementRelationSalePagination.getSort().toLowerCase())?settlementRelationSaleQueryWrapper.orderByAsc(value):settlementRelationSaleQueryWrapper.orderByDesc(value);
+            } catch (NoSuchFieldException e) {
+                e.printStackTrace();
+            }
+        }
+
+        if("0".equals(dataType)){
+            if((total>0 && AllIdList.size()>0) || total==0){
+                Page<SettlementRelationSaleEntity> page=new Page<>(settlementRelationSalePagination.getCurrentPage(), settlementRelationSalePagination.getPageSize());
+                IPage<SettlementRelationSaleEntity> userIPage=this.page(page, settlementRelationSaleQueryWrapper);
+                return settlementRelationSalePagination.setData(userIPage.getRecords(),userIPage.getTotal());
+            }else{
+                List<SettlementRelationSaleEntity> list = new ArrayList();
+                return settlementRelationSalePagination.setData(list, list.size());
+            }
+        }else{
+            return this.list(settlementRelationSaleQueryWrapper);
+        }
+    }
+    @Override
+    public SettlementRelationSaleEntity getInfo(String id){
+        QueryWrapper<SettlementRelationSaleEntity> queryWrapper=new QueryWrapper<>();
+        queryWrapper.lambda().eq(SettlementRelationSaleEntity::getId,id);
+        return this.getOne(queryWrapper);
+    }
+    @Override
+    public void create(SettlementRelationSaleEntity entity){
+        this.save(entity);
+    }
+    @Override
+    public boolean update(String id, SettlementRelationSaleEntity entity){
+        return this.updateById(entity);
+    }
+    @Override
+    public void delete(SettlementRelationSaleEntity entity){
+        if(entity!=null){
+            this.removeById(entity.getId());
+        }
+    }
+    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+    @Override
+    public String checkForm(SettlementRelationSaleForm form,int i) {
+        boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
+        String id="";
+        String countRecover = "";
+        if (isUp){
+            id = form.getId();
+        }
+        //主表字段验证
+        return countRecover;
+    }
+    /**
+    * 新增修改数据(事务回滚)
+    * @param id
+    * @param settlementRelationSaleForm
+    * @return
+    */
+    @Override
+    @Transactional
+    public void saveOrUpdate(SettlementRelationSaleForm settlementRelationSaleForm,String id, boolean isSave) throws Exception{
+        UserInfo userInfo=userProvider.get();
+        UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
+        settlementRelationSaleForm = JsonUtil.getJsonToBean(
+        generaterSwapUtil.swapDatetime(SettlementRelationSaleConstant.getFormData(),settlementRelationSaleForm),SettlementRelationSaleForm.class);
+        SettlementRelationSaleEntity entity = JsonUtil.getJsonToBean(settlementRelationSaleForm, SettlementRelationSaleEntity.class);
+
+        if(isSave){
+            String mainId =  RandomUtil.uuId() ;
+            entity.setId(mainId);
+        }else{
+        }
+        this.saveOrUpdate(entity);
+
+    }
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundProductServiceImpl.java

@@ -66,4 +66,9 @@ public class WarehousingOutboundProductServiceImpl extends ServiceImpl<Warehousi
     public List<WarehousingOutboundProductEntity> queryOutboundProductInfo(String id) {
         return warehousingOutboundProductMapper.queryOutboundProduct(id);
     }
+
+    @Override
+    public List<WarehousingOutboundProductEntity> queryOutboundProductPurchase(String id, String ordLn) {
+        return warehousingOutboundProductMapper.queryOutboundProductPurchase(id,ordLn);
+    }
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java

@@ -83,6 +83,16 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
     private WarehousingNotificationMapper warehousingNotificationMapper;
     @Resource
     private ContractRelationService contractRelationService;
+    @Resource
+    private ContractLService contractLService;
+    @Resource
+    private SubjectbasicService subjectbasicService;
+    @Resource
+    private DeliveryProductRelationService deliveryProductRelationService;
+    @Resource
+    private DeliveryRelationService deliveryRelationService;
+    @Resource
+    private ReceiptOrderService receiptOrderService;
     @Override
     public List<WarehousingOutboundEntity> getList(WarehousingOutboundPagination warehousingOutboundPagination){
         return getTypeList(warehousingOutboundPagination,warehousingOutboundPagination.getDataType());
@@ -748,6 +758,63 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
                 warehousingOutboundProductEntity.setOrderLine(entitys.getOrderLine());//销售发货单订单行号
                 warehousingOutboundProductService.saveOrUpdate(warehousingOutboundProductEntity);
 
+                //销售收货对应关系
+                DeliveryRelationEntity deliveryRelationEntity =new DeliveryRelationEntity();
+                deliveryRelationEntity.setDeliveryCode(deliveryOrder.getDeliveryCode()); //发货单
+
+                BusinessOrderEntity businessOrderEntitySale = businessOrderService.getInfo(deliveryOrderForm.getBusinessId());
+                if (ObjectUtil.isNotEmpty(businessOrderEntitySale)){
+                    deliveryRelationEntity.setSaleCode(businessOrderEntitySale.getCode()); //订单
+                    ContractLEntity contractLEntity = contractLService.getInfo(businessOrderEntitySale.getContractId());
+                    if (ObjectUtil.isNotEmpty(contractLEntity)){
+                        deliveryRelationEntity.setSaleContract(contractLEntity.getContractNumber()); //合同
+                    }
+                    deliveryRelationEntity.setBusinessLine(businessOrderEntitySale.getBusinessLineId());//业务线
+                    SubjectbasicEntity subjectbasicEntity=subjectbasicService.getInfo(businessOrderEntitySale.getFirstSubjectBasicId());
+                    if (ObjectUtil.isNotEmpty(subjectbasicEntity)){
+                        deliveryRelationEntity.setCustomer(subjectbasicEntity.getName()); //客户
+                    }
+                }
+                deliveryRelationEntity.setSaleOrdLn(entitys.getOrdLn()); //订单行号
+                deliveryRelationEntity.setDeliveryNum(entitys.getDeliveryNum()); //数量
+                deliveryRelationEntity.setSalePrice(entitys.getReturnUnit());//采购单价
+                deliveryRelationEntity.setSaleCount(entitys.getTaxCount()); //金额
+//                deliveryRelationEntity.setDeliveryCode(deliveryOrder.getDeliveryCode());
+
+                QueryWrapper<DeliveryProductRelationEntity> queryWrapper=new QueryWrapper<>();
+                queryWrapper.lambda().eq(DeliveryProductRelationEntity::getBusinessType,"1");
+                queryWrapper.lambda().eq(DeliveryProductRelationEntity::getBatchNo,entitys.getBatchNo());
+                List<DeliveryProductRelationEntity> deliveryProductRelationEntities=deliveryProductRelationService.list(queryWrapper);
+                if (deliveryProductRelationEntities!=null && deliveryProductRelationEntities.size()>0){
+
+//                    DeliveryOrderEntity deliveryOrderEntity =deliveryOrderService.getInfo( deliveryProductRelationEntities.get(0).getOrderId());
+                    QueryWrapper<ReceiptOrderEntity> receiptOrderEntityQueryWrapper=new QueryWrapper<>();
+                    receiptOrderEntityQueryWrapper.lambda().eq(ReceiptOrderEntity::getId,deliveryProductRelationEntities.get(0).getOrderId());
+                    List<ReceiptOrderEntity> deliveryOrderEntityList=receiptOrderService.list(receiptOrderEntityQueryWrapper);
+
+
+                    deliveryRelationEntity.setPurchaseOrdLn(deliveryProductRelationEntities.get(0).getOrdLn()); //采购订单行
+                    //销售收货采购对应
+                    BusinessOrderEntity businessOrderEntity1 = businessOrderService.getInfo(deliveryOrderEntityList.get(0).getBusinessId());
+                    if (ObjectUtil.isNotEmpty(businessOrderEntity1)){
+                        deliveryRelationEntity.setPurchaseCode(businessOrderEntity1.getCode()); //订单
+                        ContractLEntity contractLEntity = contractLService.getInfo(businessOrderEntity1.getContractId());
+                        if (ObjectUtil.isNotEmpty(contractLEntity)){
+                            deliveryRelationEntity.setPurchaseContract(contractLEntity.getContractNumber()); //合同
+                        }
+                        deliveryRelationEntity.setBusinessLine(businessOrderEntity1.getBusinessLineId());//业务线
+                        SubjectbasicEntity subjectbasicEntity=subjectbasicService.getInfo(businessOrderEntity1.getFirstSubjectBasicId());
+                        if (ObjectUtil.isNotEmpty(subjectbasicEntity)){
+                            deliveryRelationEntity.setSupplier(subjectbasicEntity.getName()); //供应商
+                        }
+                    }
+                    deliveryRelationService.saveOrUpdate(deliveryRelationEntity);
+
+
+                }
+
+
+
 
                 //查询商品详情
                 ProductWarehouseEntity productWarehouseEntity = new ProductWarehouseEntity();

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java

@@ -10,6 +10,7 @@ import jnpf.mapper.WarehousingNotificationMapper;
 import jnpf.mapper.WarehousingStorageMapper;
 import jnpf.model.receiptorder.DeliveryProductRelationModel;
 import jnpf.model.receiptorder.ReceiptOrderForm;
+import jnpf.model.receiptrelation.ReceiptRelationForm;
 import jnpf.model.yunguan.YunguanPurchaseInBoundModel;
 import jnpf.permission.entity.OrganizeEntity;
 import jnpf.permission.service.OrganizeService;
@@ -73,6 +74,8 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
     private WarehousingStorageMapper warehousingStorageMapper;
     @Resource
     private CwaccountvoucherMapper cwaccountvoucherMapper;
+    @Resource
+    private ContractLService contractLService;
 
 
     @Autowired
@@ -93,6 +96,10 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
     private VoucherMapper voucherMapper;
     @Resource
     private WarehousingNotificationMapper warehousingNotificationMapper;
+    @Resource
+    private SubjectbasicService subjectbasicService;
+    @Resource
+    private ReceiptRelationService receiptRelationService;
     @Override
     public List<WarehousingStorageEntity> getList(WarehousingStoragePagination warehousingStoragePagination){
         return getTypeList(warehousingStoragePagination,warehousingStoragePagination.getDataType());
@@ -619,6 +626,38 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
                 }else{
                 }
                 warehousingStorageProductService.saveOrUpdate(entitys);
+
+
+                //采购收货对应关系(走入库通知)
+                ReceiptRelationEntity receiptRelationEntity =new ReceiptRelationEntity();
+//                receiptRelationEntity.setReceiptCode(receiptOrder.getReceiptCode()); //收货单
+                //为采购收货对应关系添加采购订单编号
+                if (entity.getWarehousingStorageType().equals("1")) {
+                    WarehousingNotificationEntity warehousingNotificationEntity = warehousingNotificationMapper.selectById(entity.getWarehousingId());
+                    if (ObjectUtil.isNotEmpty(warehousingNotificationEntity)){
+                        BusinessOrderEntity businessOrderEntity1 = businessOrderService.getInfo(warehousingNotificationEntity.getBusinessId());
+                        if (ObjectUtil.isNotEmpty(businessOrderEntity1)) {
+                            receiptRelationEntity.setPurchaseCode(businessOrderEntity1.getCode()); //订单
+                            ContractLEntity contractLEntity = contractLService.getInfo(businessOrderEntity1.getContractId());
+                            if (ObjectUtil.isNotEmpty(contractLEntity)){
+                                receiptRelationEntity.setPurchaseContract(contractLEntity.getContractNumber()); //合同
+                            }
+                            receiptRelationEntity.setBusinessLine(businessOrderEntity1.getBusinessLineId());//业务线
+                            SubjectbasicEntity subjectbasicEntity=subjectbasicService.getInfo(businessOrderEntity1.getFirstSubjectBasicId());
+                            if (ObjectUtil.isNotEmpty(subjectbasicEntity)){
+                                receiptRelationEntity.setSupplier(subjectbasicEntity.getName()); //供应商
+                            }
+                        }
+                    }
+                }
+                receiptRelationEntity.setPurchaseOrdLn(entitys.getOrdLn()); //订单行号
+                receiptRelationEntity.setReceivedNum(entitys.getStorageNumber()); //数量
+                receiptRelationEntity.setPurchasePrice(entitys.getBusinessPrice());//采购单价
+                BigDecimal count= entitys.getBusinessPrice();
+                count.multiply(entitys.getStorageNumber());
+                receiptRelationEntity.setPurchaseCount(count); //金额
+                receiptRelationService.saveOrUpdate(receiptRelationEntity);
+
             }
         }
 
@@ -881,6 +920,29 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
                 }
 
                 inventoryLogService.saveOrUpdate(inventoryLogEntity);
+
+                //采购收货对应关系
+                ReceiptRelationEntity receiptRelationEntity =new ReceiptRelationEntity();
+                receiptRelationEntity.setReceiptCode(receiptOrder.getReceiptCode()); //收货单
+                BusinessOrderEntity businessOrderEntity1 = businessOrderService.getInfo(receiptOrderForm.getBusinessId());
+                if (ObjectUtil.isNotEmpty(businessOrderEntity1)){
+                    receiptRelationEntity.setPurchaseCode(businessOrderEntity1.getCode()); //订单
+                    ContractLEntity contractLEntity = contractLService.getInfo(businessOrderEntity1.getContractId());
+                    if (ObjectUtil.isNotEmpty(contractLEntity)){
+                        receiptRelationEntity.setPurchaseContract(contractLEntity.getContractNumber()); //合同
+                    }
+                    receiptRelationEntity.setBusinessLine(businessOrderEntity1.getBusinessLineId());//业务线
+                    SubjectbasicEntity subjectbasicEntity=subjectbasicService.getInfo(businessOrderEntity1.getFirstSubjectBasicId());
+                    if (ObjectUtil.isNotEmpty(subjectbasicEntity)){
+                        receiptRelationEntity.setSupplier(subjectbasicEntity.getName()); //供应商
+                    }
+                }
+                receiptRelationEntity.setPurchaseOrdLn(entitys.getOrdLn()); //订单行号
+                receiptRelationEntity.setReceivedNum(entitys.getDeliveryNum()); //数量
+                receiptRelationEntity.setPurchasePrice(entitys.getReturnUnit());//采购单价
+                receiptRelationEntity.setPurchaseCount(entitys.getTaxCount()); //金额
+                receiptRelationService.saveOrUpdate(receiptRelationEntity);
+
             }
             //更新收货单中的收货数量和收货时间
             ReceiptOrderEntity receiptOrderEntity = receiptOrderService.getInfo(receiptOrderForm.getId());
@@ -889,6 +951,11 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
             receiptOrderEntity.setExecuteDocumentId(entity.getDocumentNo()); //执行单据号
             receiptOrderEntity.setReceiptStatus("3");//收货状态已完成
             receiptOrderService.saveOrUpdate(receiptOrderEntity);
+
+
+
+
+
             if (receiptType.equals("1")) {
                 //查询采购订单，更新采购订单的状态和已收货数量和收货次数
                 if (StringUtils.isNotEmpty(receiptOrderEntity.getBusinessId())) {

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java

@@ -749,14 +749,19 @@ public class BusinessOrderController {
             QueryWrapper<BusinessOrderProductRelationalEntity> productRelationalQueryWrapper = new QueryWrapper<>();
             productRelationalQueryWrapper.lambda().eq(BusinessOrderProductRelationalEntity::getBusinessOrderId, entity.getId());
             List<BusinessOrderProductRelationalEntity> productRelationalList = businessOrderProductRelationalService.list(productRelationalQueryWrapper);
-            businessOrderProductRelationalService.remove(productRelationalQueryWrapper);
+            if (productRelationalList!=null && productRelationalList.size()>0){
+                businessOrderProductRelationalService.remove(productRelationalQueryWrapper);
+
+            }
 
 
             FlowTaskEntity flowTaskEntity = flowTaskService.getById(id);
             //删除主表
             businessOrderService.delete(entity);
 //            flowTaskService.delete(flowTaskEntity);
-            flowTaskService.remove(flowTaskEntity);
+            if (flowTaskEntity!=null){
+                flowTaskService.remove(flowTaskEntity);
+            }
         }
         return ActionResult.success("还原成功");
     }

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/DeliveryRelationController.java

@@ -0,0 +1,190 @@
+package jnpf.controller;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jnpf.base.ActionResult;
+import jnpf.base.UserInfo;
+import jnpf.exception.DataException;
+import jnpf.permission.entity.UserEntity;
+import jnpf.service.*;
+import jnpf.entity.*;
+import jnpf.util.*;
+import jnpf.model.deliveryrelation.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
+import java.util.*;
+import jnpf.annotation.JnpfField;
+import jnpf.base.vo.PageListVO;
+import jnpf.base.vo.PaginationVO;
+import jnpf.base.vo.DownloadVO;
+import jnpf.config.ConfigValueUtil;
+import jnpf.base.entity.ProvinceEntity;
+import java.io.IOException;
+import java.util.stream.Collectors;
+import jnpf.engine.entity.FlowTaskEntity;
+import jnpf.exception.WorkFlowException;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * deliveryRelation
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-29
+ */
+@Slf4j
+@RestController
+@Tag(name = "deliveryRelation" , description = "scm")
+@RequestMapping("/api/scm/DeliveryRelation")
+public class DeliveryRelationController {
+
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private DeliveryRelationService deliveryRelationService;
+
+
+
+    /**
+    * 列表
+    *
+    * @param deliveryRelationPagination
+    * @return
+    */
+    @Operation(summary = "获取列表")
+    @PostMapping("/getList")
+    public ActionResult list(@RequestBody DeliveryRelationPagination deliveryRelationPagination)throws IOException{
+        List<DeliveryRelationEntity> list= deliveryRelationService.getList(deliveryRelationPagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (DeliveryRelationEntity entity : list) {
+        Map<String, Object> deliveryRelationMap=JsonUtil.entityToMap(entity);
+        deliveryRelationMap.put("id", deliveryRelationMap.get("id"));
+        //副表数据
+        //子表数据
+            realList.add(deliveryRelationMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, DeliveryRelationConstant.getFormData(), DeliveryRelationConstant.getColumnData(), deliveryRelationPagination.getModuleId(),false);
+
+        //返回对象
+        PageListVO vo = new PageListVO();
+        vo.setList(realList);
+        PaginationVO page = JsonUtil.getJsonToBean(deliveryRelationPagination, PaginationVO.class);
+        vo.setPagination(page);
+        return ActionResult.success(vo);
+    }
+    /**
+    * 创建
+    *
+    * @param deliveryRelationForm
+    * @return
+    */
+    @PostMapping()
+    @Operation(summary = "创建")
+    public ActionResult create(@RequestBody @Valid DeliveryRelationForm deliveryRelationForm) {
+        String b = deliveryRelationService.checkForm(deliveryRelationForm,0);
+        if (StringUtil.isNotEmpty(b)){
+            return ActionResult.fail(b );
+        }
+        try{
+            deliveryRelationService.saveOrUpdate(deliveryRelationForm, null ,true);
+        }catch(Exception e){
+            return ActionResult.fail("新增数据失败");
+        }
+        return ActionResult.success("创建成功");
+    }
+    /**
+    * 编辑
+    * @param id
+    * @param deliveryRelationForm
+    * @return
+    */
+    @PutMapping("/{id}")
+    @Operation(summary = "更新")
+    public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid DeliveryRelationForm deliveryRelationForm,
+                                @RequestParam(value = "isImport", required = false) boolean isImport){
+        deliveryRelationForm.setId(id);
+        if (!isImport) {
+            String b =  deliveryRelationService.checkForm(deliveryRelationForm,1);
+            if (StringUtil.isNotEmpty(b)){
+                return ActionResult.fail(b );
+            }
+        }
+        DeliveryRelationEntity entity= deliveryRelationService.getInfo(id);
+        if(entity!=null){
+            try{
+                deliveryRelationService.saveOrUpdate(deliveryRelationForm,id,false);
+            }catch(Exception e){
+                return ActionResult.fail("修改数据失败");
+            }
+            return ActionResult.success("更新成功");
+        }else{
+            return ActionResult.fail("更新失败，数据不存在");
+        }
+    }
+    /**
+    * 删除
+    * @param id
+    * @return
+    */
+    @Operation(summary = "删除")
+    @DeleteMapping("/{id}")
+    @Transactional
+    public ActionResult delete(@PathVariable("id") String id){
+        DeliveryRelationEntity entity= deliveryRelationService.getInfo(id);
+        if(entity!=null){
+            //主表数据删除
+            deliveryRelationService.delete(entity);
+        }
+        return ActionResult.success("删除成功");
+    }
+    /**
+    * 表单信息(详情页)
+    * 详情页面使用-转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "表单信息(详情页)")
+    @GetMapping("/detail/{id}")
+    public ActionResult detailInfo(@PathVariable("id") String id){
+        DeliveryRelationEntity entity= deliveryRelationService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> deliveryRelationMap=JsonUtil.entityToMap(entity);
+        deliveryRelationMap.put("id", deliveryRelationMap.get("id"));
+        //副表数据
+        //子表数据
+        deliveryRelationMap = generaterSwapUtil.swapDataDetail(deliveryRelationMap,DeliveryRelationConstant.getFormData(),"587557527328170629",false);
+        return ActionResult.success(deliveryRelationMap);
+    }
+    /**
+    * 获取详情(编辑页)
+    * 编辑页面使用-不转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "信息")
+    @GetMapping("/{id}")
+    public ActionResult info(@PathVariable("id") String id){
+        DeliveryRelationEntity entity= deliveryRelationService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> deliveryRelationMap=JsonUtil.entityToMap(entity);
+        deliveryRelationMap.put("id", deliveryRelationMap.get("id"));
+        //副表数据
+        //子表数据
+        deliveryRelationMap = generaterSwapUtil.swapDataForm(deliveryRelationMap,DeliveryRelationConstant.getFormData(),DeliveryRelationConstant.TABLEFIELDKEY,DeliveryRelationConstant.TABLERENAMES);
+        return ActionResult.success(deliveryRelationMap);
+    }
+
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ReceiptRelationController.java

@@ -0,0 +1,190 @@
+package jnpf.controller;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jnpf.base.ActionResult;
+import jnpf.base.UserInfo;
+import jnpf.exception.DataException;
+import jnpf.permission.entity.UserEntity;
+import jnpf.service.*;
+import jnpf.entity.*;
+import jnpf.util.*;
+import jnpf.model.receiptrelation.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
+import java.util.*;
+import jnpf.annotation.JnpfField;
+import jnpf.base.vo.PageListVO;
+import jnpf.base.vo.PaginationVO;
+import jnpf.base.vo.DownloadVO;
+import jnpf.config.ConfigValueUtil;
+import jnpf.base.entity.ProvinceEntity;
+import java.io.IOException;
+import java.util.stream.Collectors;
+import jnpf.engine.entity.FlowTaskEntity;
+import jnpf.exception.WorkFlowException;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * receiptRelation
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-29
+ */
+@Slf4j
+@RestController
+@Tag(name = "receiptRelation" , description = "scm")
+@RequestMapping("/api/scm/ReceiptRelation")
+public class ReceiptRelationController {
+
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private ReceiptRelationService receiptRelationService;
+
+
+
+    /**
+    * 列表
+    *
+    * @param receiptRelationPagination
+    * @return
+    */
+    @Operation(summary = "获取列表")
+    @PostMapping("/getList")
+    public ActionResult list(@RequestBody ReceiptRelationPagination receiptRelationPagination)throws IOException{
+        List<ReceiptRelationEntity> list= receiptRelationService.getList(receiptRelationPagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (ReceiptRelationEntity entity : list) {
+        Map<String, Object> receiptRelationMap=JsonUtil.entityToMap(entity);
+        receiptRelationMap.put("id", receiptRelationMap.get("id"));
+        //副表数据
+        //子表数据
+            realList.add(receiptRelationMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, ReceiptRelationConstant.getFormData(), ReceiptRelationConstant.getColumnData(), receiptRelationPagination.getModuleId(),false);
+
+        //返回对象
+        PageListVO vo = new PageListVO();
+        vo.setList(realList);
+        PaginationVO page = JsonUtil.getJsonToBean(receiptRelationPagination, PaginationVO.class);
+        vo.setPagination(page);
+        return ActionResult.success(vo);
+    }
+    /**
+    * 创建
+    *
+    * @param receiptRelationForm
+    * @return
+    */
+    @PostMapping()
+    @Operation(summary = "创建")
+    public ActionResult create(@RequestBody @Valid ReceiptRelationForm receiptRelationForm) {
+        String b = receiptRelationService.checkForm(receiptRelationForm,0);
+        if (StringUtil.isNotEmpty(b)){
+            return ActionResult.fail(b );
+        }
+        try{
+            receiptRelationService.saveOrUpdate(receiptRelationForm, null ,true);
+        }catch(Exception e){
+            return ActionResult.fail("新增数据失败");
+        }
+        return ActionResult.success("创建成功");
+    }
+    /**
+    * 编辑
+    * @param id
+    * @param receiptRelationForm
+    * @return
+    */
+    @PutMapping("/{id}")
+    @Operation(summary = "更新")
+    public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid ReceiptRelationForm receiptRelationForm,
+                                @RequestParam(value = "isImport", required = false) boolean isImport){
+        receiptRelationForm.setId(id);
+        if (!isImport) {
+            String b =  receiptRelationService.checkForm(receiptRelationForm,1);
+            if (StringUtil.isNotEmpty(b)){
+                return ActionResult.fail(b );
+            }
+        }
+        ReceiptRelationEntity entity= receiptRelationService.getInfo(id);
+        if(entity!=null){
+            try{
+                receiptRelationService.saveOrUpdate(receiptRelationForm,id,false);
+            }catch(Exception e){
+                return ActionResult.fail("修改数据失败");
+            }
+            return ActionResult.success("更新成功");
+        }else{
+            return ActionResult.fail("更新失败，数据不存在");
+        }
+    }
+    /**
+    * 删除
+    * @param id
+    * @return
+    */
+    @Operation(summary = "删除")
+    @DeleteMapping("/{id}")
+    @Transactional
+    public ActionResult delete(@PathVariable("id") String id){
+        ReceiptRelationEntity entity= receiptRelationService.getInfo(id);
+        if(entity!=null){
+            //主表数据删除
+            receiptRelationService.delete(entity);
+        }
+        return ActionResult.success("删除成功");
+    }
+    /**
+    * 表单信息(详情页)
+    * 详情页面使用-转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "表单信息(详情页)")
+    @GetMapping("/detail/{id}")
+    public ActionResult detailInfo(@PathVariable("id") String id){
+        ReceiptRelationEntity entity= receiptRelationService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> receiptRelationMap=JsonUtil.entityToMap(entity);
+        receiptRelationMap.put("id", receiptRelationMap.get("id"));
+        //副表数据
+        //子表数据
+        receiptRelationMap = generaterSwapUtil.swapDataDetail(receiptRelationMap,ReceiptRelationConstant.getFormData(),"587545710493213317",false);
+        return ActionResult.success(receiptRelationMap);
+    }
+    /**
+    * 获取详情(编辑页)
+    * 编辑页面使用-不转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "信息")
+    @GetMapping("/{id}")
+    public ActionResult info(@PathVariable("id") String id){
+        ReceiptRelationEntity entity= receiptRelationService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> receiptRelationMap=JsonUtil.entityToMap(entity);
+        receiptRelationMap.put("id", receiptRelationMap.get("id"));
+        //副表数据
+        //子表数据
+        receiptRelationMap = generaterSwapUtil.swapDataForm(receiptRelationMap,ReceiptRelationConstant.getFormData(),ReceiptRelationConstant.TABLEFIELDKEY,ReceiptRelationConstant.TABLERENAMES);
+        return ActionResult.success(receiptRelationMap);
+    }
+
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/SettlementRelationPurchaseController.java

@@ -0,0 +1,190 @@
+package jnpf.controller;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jnpf.base.ActionResult;
+import jnpf.base.UserInfo;
+import jnpf.exception.DataException;
+import jnpf.permission.entity.UserEntity;
+import jnpf.service.*;
+import jnpf.entity.*;
+import jnpf.util.*;
+import jnpf.model.settlementrelationpurchase.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
+import java.util.*;
+import jnpf.annotation.JnpfField;
+import jnpf.base.vo.PageListVO;
+import jnpf.base.vo.PaginationVO;
+import jnpf.base.vo.DownloadVO;
+import jnpf.config.ConfigValueUtil;
+import jnpf.base.entity.ProvinceEntity;
+import java.io.IOException;
+import java.util.stream.Collectors;
+import jnpf.engine.entity.FlowTaskEntity;
+import jnpf.exception.WorkFlowException;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * settlementRelationPurchase
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-29
+ */
+@Slf4j
+@RestController
+@Tag(name = "settlementRelationPurchase" , description = "scm")
+@RequestMapping("/api/scm/SettlementRelationPurchase")
+public class SettlementRelationPurchaseController {
+
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private SettlementRelationPurchaseService settlementRelationPurchaseService;
+
+
+
+    /**
+    * 列表
+    *
+    * @param settlementRelationPurchasePagination
+    * @return
+    */
+    @Operation(summary = "获取列表")
+    @PostMapping("/getList")
+    public ActionResult list(@RequestBody SettlementRelationPurchasePagination settlementRelationPurchasePagination)throws IOException{
+        List<SettlementRelationPurchaseEntity> list= settlementRelationPurchaseService.getList(settlementRelationPurchasePagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (SettlementRelationPurchaseEntity entity : list) {
+        Map<String, Object> settlementRelationPurchaseMap=JsonUtil.entityToMap(entity);
+        settlementRelationPurchaseMap.put("id", settlementRelationPurchaseMap.get("id"));
+        //副表数据
+        //子表数据
+            realList.add(settlementRelationPurchaseMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, SettlementRelationPurchaseConstant.getFormData(), SettlementRelationPurchaseConstant.getColumnData(), settlementRelationPurchasePagination.getModuleId(),false);
+
+        //返回对象
+        PageListVO vo = new PageListVO();
+        vo.setList(realList);
+        PaginationVO page = JsonUtil.getJsonToBean(settlementRelationPurchasePagination, PaginationVO.class);
+        vo.setPagination(page);
+        return ActionResult.success(vo);
+    }
+    /**
+    * 创建
+    *
+    * @param settlementRelationPurchaseForm
+    * @return
+    */
+    @PostMapping()
+    @Operation(summary = "创建")
+    public ActionResult create(@RequestBody @Valid SettlementRelationPurchaseForm settlementRelationPurchaseForm) {
+        String b = settlementRelationPurchaseService.checkForm(settlementRelationPurchaseForm,0);
+        if (StringUtil.isNotEmpty(b)){
+            return ActionResult.fail(b );
+        }
+        try{
+            settlementRelationPurchaseService.saveOrUpdate(settlementRelationPurchaseForm, null ,true);
+        }catch(Exception e){
+            return ActionResult.fail("新增数据失败");
+        }
+        return ActionResult.success("创建成功");
+    }
+    /**
+    * 编辑
+    * @param id
+    * @param settlementRelationPurchaseForm
+    * @return
+    */
+    @PutMapping("/{id}")
+    @Operation(summary = "更新")
+    public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid SettlementRelationPurchaseForm settlementRelationPurchaseForm,
+                                @RequestParam(value = "isImport", required = false) boolean isImport){
+        settlementRelationPurchaseForm.setId(id);
+        if (!isImport) {
+            String b =  settlementRelationPurchaseService.checkForm(settlementRelationPurchaseForm,1);
+            if (StringUtil.isNotEmpty(b)){
+                return ActionResult.fail(b );
+            }
+        }
+        SettlementRelationPurchaseEntity entity= settlementRelationPurchaseService.getInfo(id);
+        if(entity!=null){
+            try{
+                settlementRelationPurchaseService.saveOrUpdate(settlementRelationPurchaseForm,id,false);
+            }catch(Exception e){
+                return ActionResult.fail("修改数据失败");
+            }
+            return ActionResult.success("更新成功");
+        }else{
+            return ActionResult.fail("更新失败，数据不存在");
+        }
+    }
+    /**
+    * 删除
+    * @param id
+    * @return
+    */
+    @Operation(summary = "删除")
+    @DeleteMapping("/{id}")
+    @Transactional
+    public ActionResult delete(@PathVariable("id") String id){
+        SettlementRelationPurchaseEntity entity= settlementRelationPurchaseService.getInfo(id);
+        if(entity!=null){
+            //主表数据删除
+            settlementRelationPurchaseService.delete(entity);
+        }
+        return ActionResult.success("删除成功");
+    }
+    /**
+    * 表单信息(详情页)
+    * 详情页面使用-转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "表单信息(详情页)")
+    @GetMapping("/detail/{id}")
+    public ActionResult detailInfo(@PathVariable("id") String id){
+        SettlementRelationPurchaseEntity entity= settlementRelationPurchaseService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> settlementRelationPurchaseMap=JsonUtil.entityToMap(entity);
+        settlementRelationPurchaseMap.put("id", settlementRelationPurchaseMap.get("id"));
+        //副表数据
+        //子表数据
+        settlementRelationPurchaseMap = generaterSwapUtil.swapDataDetail(settlementRelationPurchaseMap,SettlementRelationPurchaseConstant.getFormData(),"587602706143683205",false);
+        return ActionResult.success(settlementRelationPurchaseMap);
+    }
+    /**
+    * 获取详情(编辑页)
+    * 编辑页面使用-不转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "信息")
+    @GetMapping("/{id}")
+    public ActionResult info(@PathVariable("id") String id){
+        SettlementRelationPurchaseEntity entity= settlementRelationPurchaseService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> settlementRelationPurchaseMap=JsonUtil.entityToMap(entity);
+        settlementRelationPurchaseMap.put("id", settlementRelationPurchaseMap.get("id"));
+        //副表数据
+        //子表数据
+        settlementRelationPurchaseMap = generaterSwapUtil.swapDataForm(settlementRelationPurchaseMap,SettlementRelationPurchaseConstant.getFormData(),SettlementRelationPurchaseConstant.TABLEFIELDKEY,SettlementRelationPurchaseConstant.TABLERENAMES);
+        return ActionResult.success(settlementRelationPurchaseMap);
+    }
+
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/SettlementRelationSaleController.java

@@ -0,0 +1,190 @@
+package jnpf.controller;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jnpf.base.ActionResult;
+import jnpf.base.UserInfo;
+import jnpf.exception.DataException;
+import jnpf.permission.entity.UserEntity;
+import jnpf.service.*;
+import jnpf.entity.*;
+import jnpf.util.*;
+import jnpf.model.settlementrelationsale.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
+import java.util.*;
+import jnpf.annotation.JnpfField;
+import jnpf.base.vo.PageListVO;
+import jnpf.base.vo.PaginationVO;
+import jnpf.base.vo.DownloadVO;
+import jnpf.config.ConfigValueUtil;
+import jnpf.base.entity.ProvinceEntity;
+import java.io.IOException;
+import java.util.stream.Collectors;
+import jnpf.engine.entity.FlowTaskEntity;
+import jnpf.exception.WorkFlowException;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * settlementRelationSale
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-29
+ */
+@Slf4j
+@RestController
+@Tag(name = "settlementRelationSale" , description = "scm")
+@RequestMapping("/api/scm/SettlementRelationSale")
+public class SettlementRelationSaleController {
+
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Autowired
+    private SettlementRelationSaleService settlementRelationSaleService;
+
+
+
+    /**
+    * 列表
+    *
+    * @param settlementRelationSalePagination
+    * @return
+    */
+    @Operation(summary = "获取列表")
+    @PostMapping("/getList")
+    public ActionResult list(@RequestBody SettlementRelationSalePagination settlementRelationSalePagination)throws IOException{
+        List<SettlementRelationSaleEntity> list= settlementRelationSaleService.getList(settlementRelationSalePagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (SettlementRelationSaleEntity entity : list) {
+        Map<String, Object> settlementRelationSaleMap=JsonUtil.entityToMap(entity);
+        settlementRelationSaleMap.put("id", settlementRelationSaleMap.get("id"));
+        //副表数据
+        //子表数据
+            realList.add(settlementRelationSaleMap);
+        }
+        //数据转换
+        realList = generaterSwapUtil.swapDataList(realList, SettlementRelationSaleConstant.getFormData(), SettlementRelationSaleConstant.getColumnData(), settlementRelationSalePagination.getModuleId(),false);
+
+        //返回对象
+        PageListVO vo = new PageListVO();
+        vo.setList(realList);
+        PaginationVO page = JsonUtil.getJsonToBean(settlementRelationSalePagination, PaginationVO.class);
+        vo.setPagination(page);
+        return ActionResult.success(vo);
+    }
+    /**
+    * 创建
+    *
+    * @param settlementRelationSaleForm
+    * @return
+    */
+    @PostMapping()
+    @Operation(summary = "创建")
+    public ActionResult create(@RequestBody @Valid SettlementRelationSaleForm settlementRelationSaleForm) {
+        String b = settlementRelationSaleService.checkForm(settlementRelationSaleForm,0);
+        if (StringUtil.isNotEmpty(b)){
+            return ActionResult.fail(b );
+        }
+        try{
+            settlementRelationSaleService.saveOrUpdate(settlementRelationSaleForm, null ,true);
+        }catch(Exception e){
+            return ActionResult.fail("新增数据失败");
+        }
+        return ActionResult.success("创建成功");
+    }
+    /**
+    * 编辑
+    * @param id
+    * @param settlementRelationSaleForm
+    * @return
+    */
+    @PutMapping("/{id}")
+    @Operation(summary = "更新")
+    public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid SettlementRelationSaleForm settlementRelationSaleForm,
+                                @RequestParam(value = "isImport", required = false) boolean isImport){
+        settlementRelationSaleForm.setId(id);
+        if (!isImport) {
+            String b =  settlementRelationSaleService.checkForm(settlementRelationSaleForm,1);
+            if (StringUtil.isNotEmpty(b)){
+                return ActionResult.fail(b );
+            }
+        }
+        SettlementRelationSaleEntity entity= settlementRelationSaleService.getInfo(id);
+        if(entity!=null){
+            try{
+                settlementRelationSaleService.saveOrUpdate(settlementRelationSaleForm,id,false);
+            }catch(Exception e){
+                return ActionResult.fail("修改数据失败");
+            }
+            return ActionResult.success("更新成功");
+        }else{
+            return ActionResult.fail("更新失败，数据不存在");
+        }
+    }
+    /**
+    * 删除
+    * @param id
+    * @return
+    */
+    @Operation(summary = "删除")
+    @DeleteMapping("/{id}")
+    @Transactional
+    public ActionResult delete(@PathVariable("id") String id){
+        SettlementRelationSaleEntity entity= settlementRelationSaleService.getInfo(id);
+        if(entity!=null){
+            //主表数据删除
+            settlementRelationSaleService.delete(entity);
+        }
+        return ActionResult.success("删除成功");
+    }
+    /**
+    * 表单信息(详情页)
+    * 详情页面使用-转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "表单信息(详情页)")
+    @GetMapping("/detail/{id}")
+    public ActionResult detailInfo(@PathVariable("id") String id){
+        SettlementRelationSaleEntity entity= settlementRelationSaleService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> settlementRelationSaleMap=JsonUtil.entityToMap(entity);
+        settlementRelationSaleMap.put("id", settlementRelationSaleMap.get("id"));
+        //副表数据
+        //子表数据
+        settlementRelationSaleMap = generaterSwapUtil.swapDataDetail(settlementRelationSaleMap,SettlementRelationSaleConstant.getFormData(),"587602971907367557",false);
+        return ActionResult.success(settlementRelationSaleMap);
+    }
+    /**
+    * 获取详情(编辑页)
+    * 编辑页面使用-不转换数据
+    * @param id
+    * @return
+    */
+    @Operation(summary = "信息")
+    @GetMapping("/{id}")
+    public ActionResult info(@PathVariable("id") String id){
+        SettlementRelationSaleEntity entity= settlementRelationSaleService.getInfo(id);
+        if(entity==null){
+            return ActionResult.fail("表单数据不存在！");
+        }
+        Map<String, Object> settlementRelationSaleMap=JsonUtil.entityToMap(entity);
+        settlementRelationSaleMap.put("id", settlementRelationSaleMap.get("id"));
+        //副表数据
+        //子表数据
+        settlementRelationSaleMap = generaterSwapUtil.swapDataForm(settlementRelationSaleMap,SettlementRelationSaleConstant.getFormData(),SettlementRelationSaleConstant.TABLEFIELDKEY,SettlementRelationSaleConstant.TABLERENAMES);
+        return ActionResult.success(settlementRelationSaleMap);
+    }
+
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderProductRelationalEntity.java

@@ -107,4 +107,7 @@ public class BusinessOrderProductRelationalEntity  {
     private String orderNo;
     @TableField(exist = false)
     private List<String> voucherProductId;
+
+    @TableField("SALE_PRICE")
+    private BigDecimal salePrice;
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryRelationEntity.java

@@ -0,0 +1,74 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+/**
+ * 销售发货对应关系表
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-29
+ */
+@Data
+@TableName("jg_delivery_relation")
+public class DeliveryRelationEntity  {
+    @TableId(value ="ID"  )
+    private String id;
+    @TableField(value = "DELIVERY_CODE" , updateStrategy = FieldStrategy.IGNORED)
+    private String deliveryCode;
+    @TableField("SALE_CONTRACT")
+    private String saleContract;
+    @TableField("SALE_CODE")
+    private String saleCode;
+    @TableField("SALE_ORD_LN")
+    private String saleOrdLn;
+    @TableField("DELIVERY_NUM")
+    private BigDecimal deliveryNum;
+    @TableField("RECEIPT_CODE")
+    private String receiptCode;
+    @TableField("PURCHASE_CONTRACT")
+    private String purchaseContract;
+    @TableField("PURCHASE_CODE")
+    private String purchaseCode;
+    @TableField("PURCHASE_ORD_LN")
+    private String purchaseOrdLn;
+    @TableField("SALE_PRICE")
+    private BigDecimal salePrice;
+    @TableField("SALE_COUNT")
+    private BigDecimal saleCount;
+    @TableField("CUSTOMER")
+    private String customer;
+    @TableField("SUPPLIER")
+    private String supplier;
+    @TableField("BUSINESS_LINE")
+    private String businessLine;
+    @TableField(value = "f_creator_time" , fill = FieldFill.INSERT)
+    private Date creatorTime;
+    @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT)
+    private String creatorUserId;
+    @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE)
+    private Date lastModifyTime;
+    @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE)
+    private String lastModifyUserId;
+    @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE)
+    private Date deleteTime;
+    @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE)
+    private String deleteUserId;
+    @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED)
+    private Integer deleteMark;
+    @TableField(value = "company_id" , fill = FieldFill.INSERT)
+    private String companyId;
+    @TableField(value = "department_id" , fill = FieldFill.INSERT)
+    private String departmentId;
+    @TableField(value = "organize_json_id" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
+    @TableField("F_FLOW_ID")
+    private String flowId;
+    @TableField("F_VERSION")
+    private Integer version;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ReceiptRelationEntity.java

@@ -0,0 +1,64 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+/**
+ * 采购收货对应关系表
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-29
+ */
+@Data
+@TableName("jg_receipt_relation")
+public class ReceiptRelationEntity  {
+    @TableId(value ="ID"  )
+    private String id;
+    @TableField(value = "RECEIPT_CODE" , updateStrategy = FieldStrategy.IGNORED)
+    private String receiptCode;
+    @TableField("PURCHASE_CONTRACT")
+    private String purchaseContract;
+    @TableField("PURCHASE_CODE")
+    private String purchaseCode;
+    @TableField("PURCHASE_ORD_LN")
+    private String purchaseOrdLn;
+    @TableField("RECEIVED_NUM")
+    private BigDecimal receivedNum;
+    @TableField("PURCHASE_PRICE")
+    private BigDecimal purchasePrice;
+    @TableField("PURCHASE_COUNT")
+    private BigDecimal purchaseCount;
+    @TableField("SUPPLIER")
+    private String supplier;
+    @TableField("BUSINESS_LINE")
+    private String businessLine;
+    @TableField(value = "f_creator_time" , fill = FieldFill.INSERT)
+    private Date creatorTime;
+    @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT)
+    private String creatorUserId;
+    @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE)
+    private Date lastModifyTime;
+    @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE)
+    private String lastModifyUserId;
+    @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE)
+    private Date deleteTime;
+    @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE)
+    private String deleteUserId;
+    @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED)
+    private Integer deleteMark;
+    @TableField(value = "company_id" , fill = FieldFill.INSERT)
+    private String companyId;
+    @TableField(value = "department_id" , fill = FieldFill.INSERT)
+    private String departmentId;
+    @TableField(value = "organize_json_id" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
+    @TableField("F_FLOW_ID")
+    private String flowId;
+    @TableField("F_VERSION")
+    private Integer version;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SettlementRelationPurchaseEntity.java

@@ -0,0 +1,69 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+/**
+ * 采购结算对应关系表
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-29
+ */
+@Data
+@TableName("jg_settlement_relation_purchase")
+public class SettlementRelationPurchaseEntity  {
+    @TableId(value ="ID"  )
+    private String id;
+    @TableField(value = "PURCHASE_SETTLEMENT_CODE" , updateStrategy = FieldStrategy.IGNORED)
+    private String purchaseSettlementCode;
+    @TableField("RECEIPT_CODE")
+    private String receiptCode;
+    @TableField("CONTRACT")
+    private String contract;
+    @TableField("PURCHASE_CODE")
+    private String purchaseCode;
+    @TableField("ORD_LN")
+    private String ordLn;
+    @TableField("SETTLEMENT_SUM")
+    private BigDecimal settlementSum;
+    @TableField("SETTLEMENT_PRICE")
+    private BigDecimal settlementPrice;
+    @TableField("SETTLEMENT_COUNT")
+    private BigDecimal settlementCount;
+    @TableField("SUPPLIER")
+    private String supplier;
+    @TableField("PURCHASE_BUSINESS_LINE")
+    private String purchaseBusinessLine;
+    @TableField("PAYMENT_AMOUNT")
+    private BigDecimal paymentAmount;
+    @TableField(value = "f_creator_time" , fill = FieldFill.INSERT)
+    private Date creatorTime;
+    @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT)
+    private String creatorUserId;
+    @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE)
+    private Date lastModifyTime;
+    @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE)
+    private String lastModifyUserId;
+    @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE)
+    private Date deleteTime;
+    @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE)
+    private String deleteUserId;
+    @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED)
+    private Integer deleteMark;
+    @TableField(value = "company_id" , fill = FieldFill.INSERT)
+    private String companyId;
+    @TableField(value = "department_id" , fill = FieldFill.INSERT)
+    private String departmentId;
+    @TableField(value = "organize_json_id" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
+    @TableField("F_FLOW_ID")
+    private String flowId;
+    @TableField("F_VERSION")
+    private Integer version;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SettlementRelationSaleEntity.java

@@ -0,0 +1,80 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+import java.math.BigDecimal;
+/**
+ * 销售结算对应关系表
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-29
+ */
+@Data
+@TableName("jg_settlement_relation_sale")
+public class SettlementRelationSaleEntity  {
+    @TableId(value ="ID"  )
+    private String id;
+    @TableField(value = "SETTLEMENT_CODE" , updateStrategy = FieldStrategy.IGNORED)
+    private String settlementCode;
+    @TableField("DELIVERY_CODE")
+    private String deliveryCode;
+    @TableField("SALE_CONTRACT")
+    private String saleContract;
+    @TableField("SALE_CODE")
+    private String saleCode;
+    @TableField("SALE_ORD_LN")
+    private String saleOrdLn;
+    @TableField("SALE_SETTLEMENT_SUM")
+    private BigDecimal saleSettlementSum;
+    @TableField("CUSTOMER")
+    private String customer;
+    @TableField("CONTRACT")
+    private String contract;
+    @TableField("PURCHASE_CODE")
+    private String purchaseCode;
+    @TableField("ORD_LN")
+    private String ordLn;
+    @TableField("SETTLEMENT_SUM")
+    private BigDecimal settlementSum;
+    @TableField("SETTLEMENT_PRICE")
+    private BigDecimal settlementPrice;
+    @TableField("SETTLEMENT_COUNT")
+    private BigDecimal settlementCount;
+    @TableField("SUPPLIER")
+    private String supplier;
+    @TableField("PURCHASE_BUSINESS_LINE")
+    private String purchaseBusinessLine;
+    @TableField("PAYMENT_AMOUNT")
+    private BigDecimal paymentAmount;
+    @TableField(value = "f_creator_time" , fill = FieldFill.INSERT)
+    private Date creatorTime;
+    @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT)
+    private String creatorUserId;
+    @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE)
+    private Date lastModifyTime;
+    @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE)
+    private String lastModifyUserId;
+    @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE)
+    private Date deleteTime;
+    @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE)
+    private String deleteUserId;
+    @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED)
+    private Integer deleteMark;
+    @TableField(value = "company_id" , fill = FieldFill.INSERT)
+    private String companyId;
+    @TableField(value = "department_id" , fill = FieldFill.INSERT)
+    private String departmentId;
+    @TableField(value = "organize_json_id" , fill = FieldFill.INSERT)
+    private String organizeJsonId;
+    @TableField("F_FLOW_ID")
+    private String flowId;
+    @TableField("F_VERSION")
+    private Integer version;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingOutboundProductEntity.java

@@ -101,4 +101,16 @@ public class WarehousingOutboundProductEntity  {
     private BigDecimal netWeight;
     @TableField(exist = false)
     private String productName;
+
+    @TableField(exist = false)
+    private String deliveryCode;
+    @TableField(exist = false)
+    private String code;
+    @TableField(exist = false)
+    private String name;
+    @TableField(exist = false)
+    private String contractName;
+
+
+
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessorder/BusinessOrderProductRelationalModel.java

@@ -1,5 +1,6 @@
 package jnpf.model.businessorder;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import java.util.List;
 import java.util.Date;
@@ -71,4 +72,7 @@ public class BusinessOrderProductRelationalModel  {
     private String orderNo;
     @JSONField(name = "voucherProductId")
     private List<String> voucherProductId;
+
+    @JSONField(name = "salePrice")
+    private String salePrice;
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/deliveryrelation/DeliveryRelationForm.java

@@ -0,0 +1,23 @@
+package jnpf.model.deliveryrelation;
+
+import lombok.Data;
+import java.util.List;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * deliveryRelation
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-29
+ */
+@Data
+public class DeliveryRelationForm  {
+    /** 主键 */
+    private String id;
+
+    /** 发货订单编号 **/
+    @JsonProperty("deliveryCode")
+    private String deliveryCode;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/deliveryrelation/DeliveryRelationPagination.java

@@ -0,0 +1,30 @@
+package jnpf.model.deliveryrelation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import jnpf.base.Pagination;
+import java.util.List;
+
+/**
+ *
+ * deliveryRelation
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-29
+ */
+@Data
+public class DeliveryRelationPagination extends Pagination {
+    /** 查询key */
+	private String[] selectKey;
+    /** json */
+	private String json;
+    /** 数据类型 0-当前页，1-全部数据 */
+	private String dataType;
+    /** 高级查询 */
+	private String superQueryJson;
+    /** 功能id */
+    private String moduleId;
+    /** 菜单id */
+    private String menuId;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/receiptrelation/ReceiptRelationConstant.java

@@ -0,0 +1,41 @@
+package jnpf.model.receiptrelation;
+
+import jnpf.util.JsonUtil;
+import java.util.Map;
+
+/**
+ * receiptRelation配置json
+ *
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-29
+ */
+public class ReceiptRelationConstant{
+    /** 数据库链接 */
+    public static final String  DBLINKID = "0";
+    /** 表别名 map */
+    public static final Map<String,String>  TABLERENAMES = JsonUtil.getJsonToBean("{\"jg_receipt_relation\":\"receiptRelation\"}",Map.class);
+    /** 子表model map */
+    public static final Map<String,String>  TABLEFIELDKEY = JsonUtil.getJsonToBean("{}",Map.class);
+    /** 整个表单配置json */
+    public static final String  getFormData(){
+        StringBuilder sb = new StringBuilder();
+sb.append("{\"popupType\":\"general\",\"idGlobal\":101,\"formBtns\":false,\"labelWidth\":100,\"classNames\":[],\"className\":[],\"fullScreenWidth\":\"100%\",\"hasConfirmAndAddBtn\":true,\"labelPosition\":\"right\",\"printId\":\"\",\"disabled\":false,\"formModel\":\"dataForm\",\"cancelButtonText\":\"取 消\",\"confirmButtonText\":\"确 定\",\"hasCancelBtn\":true,\"primaryKeyPolicy\":1,\"confirmAndAddText\":\"确定并继续操作\",\"hasPrintBtn\":false,\"concurrencyLock\":false,\"classJson\":\"\",\"drawerWidth\":\"600px\",\"printButtonText\":\"打 印\",\"formRef\":\"formRef\",\"gutter\":15,\"logicalDelete\":false,\"size\":\"small\",\"formRules\":\"rules\",\"generalWidth\":\"600px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"fields\":[{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"收货订单编号\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_receipt_relation\",\"renderKey\":1722218209617,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"receiptCode\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"}],\"span\":24}");        return sb.toString();
+    }
+    /** 列表字段配置json */
+    public static final String  getColumnData(){
+        StringBuilder sb = new StringBuilder();
+sb.append("{\"showSummary\":false,\"hasPage\":true,\"searchList\":[],\"treeInterfaceId\":\"\",\"treePropsValue\":\"id\",\"ruleList\":{\"conditionList\":[],\"matchLogic\":\"and\"},\"childTableStyle\":1,\"columnOptions\":[{\"clearable\":true,\"suffixIcon\":\"\",\"fullName\":\"收货订单编号\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"收货订单编号\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_receipt_relation\",\"renderKey\":1722218209617,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"receiptCode\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"id\":\"receiptCode\",\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"}],\"pageSize\":20,\"treePropsChildren\":\"children\",\"type\":1,\"columnBtnsList\":[{\"icon\":\"icon-ym icon-ym-btn-edit\",\"label\":\"编辑\",\"value\":\"edit\"},{\"icon\":\"icon-ym icon-ym-btn-clearn\",\"label\":\"删除\",\"value\":\"remove\"},{\"icon\":\"icon-ym icon-ym-generator-menu\",\"label\":\"详情\",\"value\":\"detail\"}],\"thousandsField\":[],\"treeTitle\":\"左侧标题\",\"defaultColumnList\":[{\"suffixIcon\":\"\",\"align\":\"left\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"收货订单编号\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_receipt_relation\",\"renderKey\":1722218209617,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"prop\":\"receiptCode\",\"showWordLimit\":false,\"__vModel__\":\"receiptCode\",\"checked\":true,\"disabled\":false,\"id\":\"receiptCode\",\"placeholder\":\"请输入\",\"addonBefore\":\"\",\"clearable\":true,\"jnpfKey\":\"input\",\"fullName\":\"收货订单编号\",\"label\":\"收货订单编号\",\"sortable\":false,\"addonAfter\":\"\",\"showPassword\":false,\"fixed\":\"none\",\"style\":{\"width\":\"100%\"},\"prefixIcon\":\"\"}],\"treeTemplateJson\":[],\"treePropsName\":\"\",\"useColumnPermission\":false,\"treePropsUrl\":\"\",\"treeRelation\":\"\",\"treeSynType\":0,\"btnsList\":[{\"icon\":\"icon-ym icon-ym-btn-add\",\"label\":\"新增\",\"value\":\"add\"}],\"useDataPermission\":false,\"columnList\":[{\"clearable\":true,\"jnpfKey\":\"input\",\"suffixIcon\":\"\",\"fullName\":\"收货订单编号\",\"label\":\"收货订单编号\",\"sortable\":false,\"align\":\"left\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"收货订单编号\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_receipt_relation\",\"renderKey\":1722218209617,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"prop\":\"receiptCode\",\"showWordLimit\":false,\"width\":0,\"__vModel__\":\"receiptCode\",\"showPassword\":false,\"fixed\":\"none\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"id\":\"receiptCode\",\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"}],\"sort\":\"desc\",\"thousands\":false,\"hasSuperQuery\":true,\"summaryField\":[],\"parentField\":\"\",\"treePropsLabel\":\"fullName\",\"treeDataSource\":\"dictionary\",\"groupField\":\"\",\"printIds\":[],\"uploaderTemplateJson\":{},\"treeDictionary\":\"\",\"hasTreeQuery\":false,\"useFormPermission\":false,\"customBtnsList\":[],\"complexHeaderList\":[],\"useBtnPermission\":false,\"treeInterfaceName\":\"\",\"defaultSidx\":\"\"}");        return sb.toString();
+    }
+    /** app列表字段配置json */
+    public static final String  getAppColumnData(){
+        StringBuilder sb = new StringBuilder();
+sb.append("{\"hasPage\":true,\"useColumnPermission\":false,\"searchList\":[],\"btnsList\":[{\"icon\":\"icon-ym icon-ym-btn-add\",\"label\":\"新增\",\"value\":\"add\"}],\"useDataPermission\":false,\"ruleListApp\":{\"conditionList\":[],\"matchLogic\":\"and\"},\"columnList\":[{\"clearable\":true,\"jnpfKey\":\"input\",\"suffixIcon\":\"\",\"fullName\":\"收货订单编号\",\"label\":\"收货订单编号\",\"sortable\":false,\"align\":\"left\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"收货订单编号\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_receipt_relation\",\"renderKey\":1722218209617,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"prop\":\"receiptCode\",\"showWordLimit\":false,\"width\":0,\"__vModel__\":\"receiptCode\",\"showPassword\":false,\"fixed\":\"none\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"id\":\"receiptCode\",\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"}],\"columnOptions\":[{\"clearable\":true,\"suffixIcon\":\"\",\"fullName\":\"收货订单编号\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"收货订单编号\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_receipt_relation\",\"renderKey\":1722218209617,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"receiptCode\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"id\":\"receiptCode\",\"prefixIcon\":\"\",\"addonBefore\":\"\"}],\"pageSize\":20,\"sort\":\"desc\",\"thousands\":false,\"columnBtnsList\":[{\"icon\":\"icon-ym icon-ym-btn-edit\",\"label\":\"编辑\",\"value\":\"edit\"},{\"icon\":\"icon-ym icon-ym-btn-clearn\",\"label\":\"删除\",\"value\":\"remove\"},{\"icon\":\"icon-ym icon-ym-generator-menu\",\"label\":\"详情\",\"value\":\"detail\"}],\"loading\":false,\"hasSuperQuery\":false,\"thousandsField\":[],\"defaultColumnList\":[{\"clearable\":true,\"jnpfKey\":\"input\",\"suffixIcon\":\"\",\"fullName\":\"收货订单编号\",\"label\":\"收货订单编号\",\"sortable\":false,\"align\":\"left\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"收货订单编号\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_receipt_relation\",\"renderKey\":1722218209617,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"prop\":\"receiptCode\",\"showWordLimit\":false,\"__vModel__\":\"receiptCode\",\"showPassword\":false,\"checked\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"id\":\"receiptCode\",\"prefixIcon\":\"\",\"addonBefore\":\"\"}],\"sortList\":[],\"useFormPermission\":false,\"customBtnsList\":[],\"useBtnPermission\":false,\"defaultSidx\":\"\"}");        return sb.toString();
+    }
+    /** 表列表 */
+    public static final String  getTableList(){
+        StringBuilder sb = new StringBuilder();
+sb.append("[{\"relationField\":\"\",\"relationTable\":\"\",\"table\":\"jg_receipt_relation\",\"tableName\":\"采购收货对应关系表\",\"tableField\":\"\",\"typeId\":\"1\",\"fields\":[{\"columnName\":\"id\",\"field\":\"id\",\"fieldName\":\"ID\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":1,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"receipt_code\",\"field\":\"receiptCode\",\"fieldName\":\"收货订单编号\",\"dataType\":\"varchar\",\"dataLength\":\"64\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"purchase_contract\",\"field\":\"purchaseContract\",\"fieldName\":\"采购合同号\",\"dataType\":\"varchar\",\"dataLength\":\"64\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"purchase_code\",\"field\":\"purchaseCode\",\"fieldName\":\"采购订单号\",\"dataType\":\"varchar\",\"dataLength\":\"64\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"purchase_ord_ln\",\"field\":\"purchaseOrdLn\",\"fieldName\":\"采购订单行\",\"dataType\":\"varchar\",\"dataLength\":\"20\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"received_num\",\"field\":\"receivedNum\",\"fieldName\":\"订单量\",\"dataType\":\"decimal\",\"dataLength\":\"32,4\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"purchase_price\",\"field\":\"purchasePrice\",\"fieldName\":\"采购单价（含税）\",\"dataType\":\"decimal\",\"dataLength\":\"32,6\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"purchase_count\",\"field\":\"purchaseCount\",\"fieldName\":\"订单金额（含税）\",\"dataType\":\"decimal\",\"dataLength\":\"32,6\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"supplier\",\"field\":\"supplier\",\"fieldName\":\"供应商\",\"dataType\":\"varchar\",\"dataLength\":\"64\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"business_line\",\"field\":\"businessLine\",\"fieldName\":\"业务线\",\"dataType\":\"varchar\",\"dataLength\":\"64\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_creator_time\",\"field\":\"creatorTime\",\"fieldName\":\"创建时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_creator_user_id\",\"field\":\"creatorUserId\",\"fieldName\":\"创建用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_time\",\"field\":\"lastModifyTime\",\"fieldName\":\"修改时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_user_id\",\"field\":\"lastModifyUserId\",\"fieldName\":\"修改用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_time\",\"field\":\"deleteTime\",\"fieldName\":\"删除时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_user_id\",\"field\":\"deleteUserId\",\"fieldName\":\"删除用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_mark\",\"field\":\"deleteMark\",\"fieldName\":\"删除标志\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_tenant_id\",\"field\":\"tenantId\",\"fieldName\":\"租户id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"company_id\",\"field\":\"companyId\",\"fieldName\":\"公司id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"department_id\",\"field\":\"departmentId\",\"fieldName\":\"部门id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"organize_json_id\",\"field\":\"organizeJsonId\",\"fieldName\":\"组织id\",\"dataType\":\"varchar\",\"dataLength\":\"1000\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_flow_id\",\"field\":\"flowId\",\"fieldName\":\"流程id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_version\",\"field\":\"version\",\"fieldName\":\"乐观锁\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0}]}]");        return sb.toString();
+    }
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/receiptrelation/ReceiptRelationForm.java

@@ -0,0 +1,23 @@
+package jnpf.model.receiptrelation;
+
+import lombok.Data;
+import java.util.List;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * receiptRelation
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-29
+ */
+@Data
+public class ReceiptRelationForm  {
+    /** 主键 */
+    private String id;
+
+    /** 收货订单编号 **/
+    @JsonProperty("receiptCode")
+    private String receiptCode;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/receiptrelation/ReceiptRelationPagination.java

@@ -0,0 +1,30 @@
+package jnpf.model.receiptrelation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import jnpf.base.Pagination;
+import java.util.List;
+
+/**
+ *
+ * receiptRelation
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-29
+ */
+@Data
+public class ReceiptRelationPagination extends Pagination {
+    /** 查询key */
+	private String[] selectKey;
+    /** json */
+	private String json;
+    /** 数据类型 0-当前页，1-全部数据 */
+	private String dataType;
+    /** 高级查询 */
+	private String superQueryJson;
+    /** 功能id */
+    private String moduleId;
+    /** 菜单id */
+    private String menuId;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/settlementrelationpurchase/SettlementRelationPurchaseForm.java

@@ -0,0 +1,23 @@
+package jnpf.model.settlementrelationpurchase;
+
+import lombok.Data;
+import java.util.List;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * settlementRelationPurchase
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-29
+ */
+@Data
+public class SettlementRelationPurchaseForm  {
+    /** 主键 */
+    private String id;
+
+    /** 采购结算单号 **/
+    @JsonProperty("purchaseSettlementCode")
+    private String purchaseSettlementCode;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/settlementrelationpurchase/SettlementRelationPurchasePagination.java

@@ -0,0 +1,30 @@
+package jnpf.model.settlementrelationpurchase;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import jnpf.base.Pagination;
+import java.util.List;
+
+/**
+ *
+ * settlementRelationPurchase
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-29
+ */
+@Data
+public class SettlementRelationPurchasePagination extends Pagination {
+    /** 查询key */
+	private String[] selectKey;
+    /** json */
+	private String json;
+    /** 数据类型 0-当前页，1-全部数据 */
+	private String dataType;
+    /** 高级查询 */
+	private String superQueryJson;
+    /** 功能id */
+    private String moduleId;
+    /** 菜单id */
+    private String menuId;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/settlementrelationsale/SettlementRelationSaleForm.java

@@ -0,0 +1,23 @@
+package jnpf.model.settlementrelationsale;
+
+import lombok.Data;
+import java.util.List;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * settlementRelationSale
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-29
+ */
+@Data
+public class SettlementRelationSaleForm  {
+    /** 主键 */
+    private String id;
+
+    /** 结算单号 **/
+    @JsonProperty("settlementCode")
+    private String settlementCode;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/settlementrelationsale/SettlementRelationSalePagination.java

@@ -0,0 +1,30 @@
+package jnpf.model.settlementrelationsale;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import jnpf.base.Pagination;
+import java.util.List;
+
+/**
+ *
+ * settlementRelationSale
+ * @版本： V3.5
+ * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
+ * @作者： JNPF开发平台组
+ * @日期： 2024-07-29
+ */
+@Data
+public class SettlementRelationSalePagination extends Pagination {
+    /** 查询key */
+	private String[] selectKey;
+    /** json */
+	private String json;
+    /** 数据类型 0-当前页，1-全部数据 */
+	private String dataType;
+    /** 高级查询 */
+	private String superQueryJson;
+    /** 功能id */
+    private String moduleId;
+    /** 菜单id */
+    private String menuId;
+}

jnpf-java-boot/jnpf-web/src/utils/apiUrl.js

@@ -1,10 +1,10 @@
 module.exports = {
   // 开发环境接口配置
-  //APIURl: 'http://127.0.0.1:40000'
+  APIURl: 'http://127.0.0.1:50000'
   // 测试环境接口配置
   // APIURl: 'http://222.71.165.188:30000'
   // 生产环境接口配置
-  //APIURl: 'http://221.214.32.166:40000'
+  // APIURl: 'http://221.214.32.166:40000'
   // 演示环境接口配置
-  APIURl: 'http://222.71.165.188:50000'
+  // APIURl: 'http://222.71.165.188:50000'
 }

jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/form.vue

@@ -1037,6 +1037,23 @@
                     </JnpfInput>
                   </template>
                 </el-table-column>
+
+                <!-- <el-table-column label="销售单价"
+                  v-if="judgeShow('businessorderproductrelational-businessPrice')"
+                  prop="businessPrice" width="150" align="center">
+                  <template slot="header">
+                    <span class="required-sign"
+                      v-if="judgeRequired('businessorderproductrelationalList-businessPrice')">*</span>销售单价
+                  </template>
+                  <template slot-scope="scope">
+                    <JnpfInput v-model="scope.row.salePrice" @input="priceCount(scope.row)"
+                      placeholder="请输入"
+                      :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-businessPrice')"
+                      clearable :style='{ "width": "100%" }'>
+                    </JnpfInput>
+                  </template>
+                </el-table-column> -->
+
                 <el-table-column label="税率" v-if="judgeShow('businessorderproductrelational-tax')"
                   prop="tax" width="120" align="center">
                   <template slot="header">
@@ -1839,6 +1856,7 @@ export default {
           purchaseOrderMultiple: e.purchaseOrderMultiple,
           businessNum: e.businessNum,
           businessPrice: e.businessPrice,
+          // salePrice:e.salePrice,
           tax: e.inputTaxRate,
           taxCount: e.taxCount,
         }
@@ -2051,6 +2069,7 @@ export default {
             item.voucherProductId = item.voucherProductId
             if (item.purchaseAmount !== 0) {
               item.businessPrice = this.jnpf.floatDiv(item.purchaseAmount, item.netWeight).toFixed(6)
+              item.salePrice = this.jnpf.floatDiv(item.saleAmount, item.netWeight).toFixed(6)
               item.taxCount = this.jnpf.floatMul(item.businessNum, item.businessPrice).toFixed(2) //采购含税总价
               item.notTaxPrice = this.jnpf.floatDiv(item.businessPrice, this.jnpf.floatAdd(1, this.jnpf.floatDiv(item.tax, 100))).toFixed(6)  //采购不含税单价
               item.notTaxCount = this.jnpf.floatMul(item.businessNum, item.notTaxPrice).toFixed(2) //采购不含税总价
@@ -2285,6 +2304,7 @@ export default {
         salesMainUnitId: '',
         businessNum: undefined,
         businessPrice: undefined,
+        salePrice: undefined,
         tax: undefined,
         taxCount: undefined,
         notTaxPrice: undefined,

jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue

@@ -100,8 +100,13 @@
               v-has="'btn_batchRemove'">批量删除
             </el-button> -->
             <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
-              @click="addSaleHandle()">生成销售订单
+              @click="addSaleHandle()">合并生成销售订单
             </el-button>
+
+            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
+              @click="addSaleHandle1()">不合并生成销售订单
+            </el-button>
+
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
@@ -592,6 +597,47 @@ export default {
         this.flowListVisible = true
       }
     },
+
+
+    addSaleHandle1() {
+      if (!this.multipleSelectionItem.length) {
+        this.$message({
+          type: 'error',
+          message: '请选择一条数据',
+          duration: 1500,
+        })
+        return
+      }
+      const data = this.multipleSelectionItem
+      let selectData = []
+      selectData = JSON.parse(JSON.stringify(data))
+      const firstData = selectData[0]
+      selectData.forEach((item, index) => {
+        if (item.saleContractNo !== firstData.saleContractNo) {
+          this.$message({
+            type: 'error',
+            message: '订单' + item.code + '与订单' + firstData.code + '的销售合同号不一致',
+            duration: 1500,
+          })
+        }
+        if (item.isTransfer == '2') {
+          this.$message({
+            type: 'error',
+            message: '订单' + item.code + '已经生成过销售订单',
+            duration: 1500,
+          })
+        }
+      })
+      selectData.flag = '采购转销售1'
+      if (!this.saleFlowList.length) {
+        this.$message({ type: 'error', message: '流程不存在' });
+      } else if (this.saleFlowList.length === 1) {
+        this.selectSaleFlow(this.saleFlowList[0], selectData)
+      } else {
+        this.flowListVisible = true
+      }
+    },
+
     selectSaleFlow(item, selectData) {
       let data = {
         id: '',

jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue

@@ -1996,14 +1996,31 @@ export default {
                 notTaxCount: 0,
                 lastSalePrice: item.lastSalePrice,
                 ordLn: item.ordLn,
+                businessPrice: item.salePrice,
               }
               this.dataForm.businessOrderProductRelationalList.push(item1)
 
 
             } else {
               const product = this.dataForm.businessOrderProductRelationalList.find(net => net.productId == item.productId)
+              // console.log(item, product, '--------------');
               if (product) {
+                // product.businessPrice = this.jnpf.floatAdd(product.businessPrice, item.salePrice)
+                // product.businessPrice = this.jnpf.floatDiv(product.businessPrice, product.businessNum)
+                // product.businessPrice = this.jnpf.floatDiv(item.businessPrice, item.businessNum)
+                // product.businessPrice = this.jnpf.floatDiv(this.jnpf.floatAdd(product.businessPrice, item.businessPrice), this.jnpf.floatAdd(product.businessNum, item.businessNum))
+
+                var price1 = this.jnpf.floatMul(product.businessPrice, product.businessNum)
+                var price2 = this.jnpf.floatMul(item.salePrice, item.businessNum)
+                var prices = this.jnpf.floatAdd(price1, price2)
+                // console.log(price1, 'price1', price2, 'price2', prices, 'prices');
+                var pricesNum = this.jnpf.floatAdd(product.businessNum, item.businessNum)
+                product.businessPrice = this.jnpf.floatDiv(prices, pricesNum)
+                // product.businessPrice = this.jnpf.floatDiv(this.jnpf.floatAdd(this.jnpf.floatMul(product.businessPrice, item.businessPrice), this.jnpf.floatMul(product.businessNum, item.businessNum)), product.businessNum)
+
                 product.businessNum = this.jnpf.floatAdd(product.businessNum, item.businessNum)
+
+                // floatMul
               } else {
                 // this.dataForm.businessOrderProductRelationalList.push(item)
                 let item1 = {
@@ -2024,6 +2041,8 @@ export default {
                   notTaxCount: 0,
                   lastSalePrice: item.lastSalePrice,
                   ordLn: item.ordLn,
+                  businessPrice: item.salePrice,
+
                 }
                 this.dataForm.businessOrderProductRelationalList.push(item1)
 
@@ -2031,6 +2050,79 @@ export default {
             }
           })
         })
+      } else if (data.flag == '采购转销售1') {
+
+        this.productCreate = true
+        this.dataForm.orderType = '3'
+        this.dataForm.businessLineId = data[0].businessLineId
+        this.dataForm.counterpartOrderCode = data[0].counterpartOrderCode
+        this.dataForm.urgentOrder = data[0].urgentOrder
+        this.dataForm.deliveryType = data[0].deliveryType
+        this.dataForm.saleContractNo = data[0].saleContractNo
+        data.forEach((val, index) => {
+          this.dataForm.isTransferSource.push(val.id)
+          val.businessOrderProductRelationalList.forEach((item, index) => {
+
+            if (this.dataForm.businessOrderProductRelationalList.length == 0) {
+              // this.dataForm.businessOrderProductRelationalList.push(item);
+              let item1 = {
+                productId: item.productId,
+                businessNum: item.businessNum,
+                businessPrice: undefined,
+                name: item.name,
+                spec: item.spec,
+                code: item.code,
+                inventoryUnitId: item.inventoryUnitId,
+                realBound: item.realBound,
+                useBound: item.useBound,
+                saleNumDay: item.saleNumDay,
+                salesMainUnitId: item.salesMainUnitId,
+                tax: item.tax,
+                taxCount: 0,
+                notTaxPrice: 0,
+                notTaxCount: 0,
+                lastSalePrice: item.lastSalePrice,
+                ordLn: item.ordLn,
+                businessPrice: item.salePrice,
+
+              }
+              this.dataForm.businessOrderProductRelationalList.push(item1)
+
+
+            } else {
+              // const product = this.dataForm.businessOrderProductRelationalList.find(net => net.productId == item.productId)
+              // if (product) {
+              //   product.businessNum = this.jnpf.floatAdd(product.businessNum, item.businessNum)
+              // } else {
+              // this.dataForm.businessOrderProductRelationalList.push(item)
+              let item1 = {
+                productId: item.productId,
+                businessNum: item.businessNum,
+                businessPrice: undefined,
+                name: item.name,
+                spec: item.spec,
+                code: item.code,
+                inventoryUnitId: item.inventoryUnitId,
+                realBound: item.realBound,
+                useBound: item.useBound,
+                saleNumDay: item.saleNumDay,
+                salesMainUnitId: item.salesMainUnitId,
+                tax: item.tax,
+                taxCount: 0,
+                notTaxPrice: 0,
+                notTaxCount: 0,
+                lastSalePrice: item.lastSalePrice,
+                ordLn: item.ordLn,
+                businessPrice: item.salePrice,
+
+              }
+              this.dataForm.businessOrderProductRelationalList.push(item1)
+
+              // }
+            }
+          })
+        })
+
       }
       if (data.flag == '发货凭证生成销售订单') {
         this.productCreate = true