From fffe0df1032883462b45f9ce0468f1058f340a23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= <vayne0702@163.com>
Date: Thu, 20 Apr 2023 15:32:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../paymentdoc/controller/PaymentdocController.java | 13 +++++++++++--
 .../controller/SaleorderitemController.java         |  2 +-
 .../resources/mapper/receiptin/ReceiptinMapper.xml  |  7 +++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java
index 43b4eb96..ae88bc9f 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java
@@ -23,6 +23,9 @@ import jnpf.poundlist.service.PoundlistService;
 import jnpf.purchaseback.entity.PurchaseorderEntity;
 import jnpf.purchaseback.service.PurchaseorderService;
 import jnpf.purchaseorder.entity.Purchaseorder_item0Entity;
+import jnpf.supplier.entity.SupplierEntity;
+import jnpf.supplier.service.SupplierService;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import jnpf.base.entity.ProvinceEntity;
@@ -112,6 +115,8 @@ public class PaymentdocController {
     private PaymentService paymentService;
     @Autowired
     private PoundlistService poundlistService;
+    @Autowired
+    private SupplierService supplierService;
 
     /**
      * 列表
@@ -124,9 +129,13 @@ public class PaymentdocController {
         List<PaymentdocEntity> list= paymentdocService.getList(paymentdocPagination);
         //处理id字段转名称，若无需转或者为空可删除
         for(PaymentdocEntity entity:list){
-            Map<String,Object> supplierIdMap = new HashMap<>();
-            entity.setSupplierName(generaterSwapUtil.getPopupSelectValue("389674191453990661","id","supplier_name",entity.getSupplierId(),supplierIdMap));
+//            Map<String,Object> supplierIdMap = new HashMap<>();
+//            entity.setSupplierName(generaterSwapUtil.getPopupSelectValue("389674191453990661","id","supplier_name",entity.getSupplierId(),supplierIdMap));
 
+            SupplierEntity supplierEntity = supplierService.getById(entity.getSupplierId());
+            if (ObjectUtils.isNotEmpty(supplierEntity)){
+                entity.setSupplierName(supplierEntity.getSupplierName());
+            }
 
             QueryWrapper<PaymentdocItem1Entity> PaymentdocItem1EntityqueryWrapper = new QueryWrapper<>();
             PaymentdocItem1EntityqueryWrapper.lambda().eq(PaymentdocItem1Entity::getPaymentdocId, entity.getId());
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java
index 9f530fb1..c34fae53 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java
@@ -497,7 +497,7 @@ public class SaleorderitemController {
 //            entity.setContractId(generaterSwapUtil.getPopupSelectValue("391146878474963333","id","contract_name",entity.getContractId(),contractCodeMap));
 //						Map<String,Object> costomerCodeMap = new HashMap<>();
 //            entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("398016916830126469","id","supplier_nm",entity.getCustomerId(),costomerCodeMap));
-            entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
+//            entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
 //            entity.setCreatorTime(generaterSwapUtil.userSelectValue(entity.getCreatorTime()));
     }
 	List<SaleorderitemListVO> listVO=JsonUtil.getJsonToList(list,SaleorderitemListVO.class);
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/ReceiptinMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/ReceiptinMapper.xml
index 3462b2d8..4b2c982a 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/ReceiptinMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/ReceiptinMapper.xml
@@ -10,8 +10,8 @@
         <if test="receiptinPagination.startDate != null and receiptinPagination.endDate != null">
             AND a.creator_time &gt; #{receiptinPagination.startDate} AND a.creator_time &lt;= #{receiptinPagination.endDate}
         </if>
-        <if test="receiptinPagination.documentNo != null and receiptinPagination.documentNo != ''">
-            AND a.document_no LIKE CONCAT('%',#{receiptinPagination.documentNo},'%')
+        <if test="receiptinPagination.documentno != null and receiptinPagination.documentno != ''">
+            AND a.documentno LIKE CONCAT('%',#{receiptinPagination.documentno},'%')
         </if>
         <if test="receiptinPagination.souceno != null and receiptinPagination.souceno != ''">
             AND b.document_no LIKE CONCAT('%',#{receiptinPagination.souceno},'%')
@@ -19,6 +19,9 @@
         <if test="receiptinPagination.supplierName != null and receiptinPagination.supplierName != ''">
             AND d.supplier_name LIKE CONCAT('%',#{receiptinPagination.supplierName},'%')
         </if>
+        <if test="receiptinPagination.status != null and receiptinPagination.status != ''">
+            AND a.status LIKE CONCAT('%',#{receiptinPagination.status},'%')
+        </if>
         <if test="receiptinPagination.sidx != null and receiptinPagination.sidx != ''">
             ORDER BY ${receiptinPagination.sidx} ${receiptinPagination.sort}
         </if>