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 @@
and curInv = #{curInv}
+
+ and a.name like concat('%', #{name}, '%')
+
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 @@
AND ipd.invSpaceCode = #{invSpaceCode}
-
- AND bp.cplb = #{cplb}
+
+ AND bp.cplb = #{cplb}
+
group by ip.id
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},