diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpInvClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpInvClient.java index f79dbee4..b9226815 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpInvClient.java +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpInvClient.java @@ -57,6 +57,14 @@ public class ErpInvClient { paramMap.put("warehouseCode", onhandRequest.getWarehouseCode()); if (onhandRequest.getInventoryCode() != null && !onhandRequest.getInventoryCode().equals("")) paramMap.put("inventoryCode", onhandRequest.getInventoryCode()); + if (onhandRequest.getInventoryName() != null && !onhandRequest.getInventoryName().equals("")) + paramMap.put("inventoryName", onhandRequest.getInventoryName()); + if (onhandRequest.getSpec() != null && !onhandRequest.getSpec().equals("")) + paramMap.put("spec", onhandRequest.getSpec()); + if (onhandRequest.getRegisterCertNo() != null && !onhandRequest.getRegisterCertNo().equals("")) + paramMap.put("registerCertNo", onhandRequest.getRegisterCertNo()); + if (onhandRequest.getManufactory() != null && !onhandRequest.getManufactory().equals("")) + paramMap.put("manufactory", onhandRequest.getManufactory()); if (onhandRequest.getPage() != null) paramMap.put("page", onhandRequest.getPage()); if (onhandRequest.getLimit() != null) diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml index 1185c9da..8db1b26b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml @@ -8,22 +8,22 @@ SELECT * FROM thr_inv_products - AND inventoryCode LIKE concat(#{inventoryCode},'%') + AND inventoryCode LIKE concat('%',#{inventoryCode},'%') - AND inventoryName LIKE concat(#{inventoryName},'%') + AND inventoryName LIKE concat('%',#{inventoryName},'%') - AND inventoryName LIKE concat(#{inventoryName},'%') + AND inventoryName LIKE concat('%',#{inventoryName},'%') - AND spec LIKE concat(#{spec},'%') + AND spec LIKE concat('%',#{spec},'%') - AND registerCertNo LIKE concat(#{registerCertNo},'%') + AND registerCertNo LIKE concat('%',#{registerCertNo},'%') - AND manufactory = #{manufactory} + AND manufactory LIKE concat('%',#{manufactory},'%') ORDER BY updateTime DESC