From 81306eb072f11bc90d0af58e200571e2d153e3ae Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 21 Dec 2022 14:13:35 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0=E7=BC=BA=E5=A4=B1?=
 =?UTF-8?q?=E6=88=96=E6=97=A0=E6=95=88=E9=97=AE=E9=A2=98=202.=E9=A2=86?=
 =?UTF-8?q?=E7=94=A8=E5=8D=95=E6=8D=AE=E5=AE=9E=E4=BD=93=E7=B1=BB=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85=E7=BC=BA=E5=A4=B1=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/admin/req/basic/BasicEntrustRecRequest.java | 5 +++++
 .../glxp/api/admin/req/business/StockOrderPostRequest.java   | 2 ++
 .../main/resources/mybatis/mapper/basic/EntrustReceDao.xml   | 3 +++
 .../resources/mybatis/mapper/inventory/InvProductDao.xml     | 5 +++--
 .../src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml | 2 +-
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicEntrustRecRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicEntrustRecRequest.java
index 1656166a..4118cb76 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicEntrustRecRequest.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicEntrustRecRequest.java
@@ -19,4 +19,9 @@ public class BasicEntrustRecRequest extends ListPageRequest {
     private String entrustSubInv;
     private String invWarehouseCode;
 
+    /**
+     * 单据类型名称
+     */
+    private String name;
+
 }
diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderPostRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderPostRequest.java
index 8bfd3e6b..9fa33663 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderPostRequest.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderPostRequest.java
@@ -30,4 +30,6 @@ public class StockOrderPostRequest {
     private String deptCode;
     private BigDecimal price;
     private String unitIdFk;
+
+    private Integer editStatus;
 }
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml
index 61072eef..de114485 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml
@@ -100,6 +100,9 @@
             <if test="curInv!=null">
                 and curInv = #{curInv}
             </if>
+            <if test="name != null and name != ''">
+                and a.name like concat('%', #{name}, '%')
+            </if>
         </where>
         group by basic_entrust_accept.id
         order by updateTime desc
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
index e69f87cc..45221d5b 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
@@ -445,8 +445,9 @@
             <if test="invSpaceCode != null and invSpaceCode != ''">
                 AND ipd.invSpaceCode = #{invSpaceCode}
             </if>
-            <if test="cplb != null and cplb != ''"></if>
-            AND bp.cplb = #{cplb}
+            <if test="cplb != null and cplb != ''">
+                AND bp.cplb = #{cplb}
+            </if>
         </where>
         group by ip.id
     </select>
diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml
index c8b0e1c7..3d939001 100644
--- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml
@@ -116,7 +116,7 @@
         INTO thr_order
                 (id,billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, updateTime, originType, unitIdFk,
                  startDate, endDate, createUser, reviewUser, address, linkMan, linkTel, remark, remark1, remark2,
-                 remark3,locStorageCode,editStatus,invWarehouseCode,thirdPartyDate,fromSubInvCode,`type`,allocateStatus)
+                 remark3, locStorageCode,editStatus,invWarehouseCode,thirdPartyDate,fromSubInvCode,`type`,allocateStatus)
         values (
         #{id},
         #{billNo},