1.修复部分接口查询参数缺失或无效问题

2.领用单据实体类补充缺失字段

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;
+
 }

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;
 }

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

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>
+            <if test="cplb != null and cplb != ''">
-            AND bp.cplb = #{cplb}
+                AND bp.cplb = #{cplb}
+            </if>
         </where>
         group by ip.id
     </select>

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},