设备位号功能

platform-dao/src/main/java/com/platform/dao/dto/store/SpareStoreDTO.java

@@ -116,11 +116,22 @@ public class SpareStoreDTO extends BaseDTO implements Serializable {
      * 备件名称
      */
     private String spareName;
+    /**
+     * 备件名称
+     */
+    private String spareNo;
     /**
      * 仓库id
      */
     private String storeId;
-
+    /**
+     * 仓库编码
+     */
+    private String storeNo;
+    /**
+     * 仓库名称
+     */
+    private String storeName;
     /**
      * 使用公司
      */

platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -131,7 +131,28 @@ public class YongyouServiceImpl implements YongyouService {
         req.setCAcc_ID(getCAccId());
         req.setPageNum(pageNum);
         req.setPageSize(pageSize);
-        req.setStrWhere("1=1");
+        StringBuffer whereStr = new StringBuffer(" 1=1 ");
+        // 仓库编码搜索
+        if(StringUtils.isNotBlank(record.getStoreNo())){
+            whereStr.append(" and cWhCode like '%" + record.getStoreNo() + "%' ");
+        }
+        // 仓库名称搜索
+        if(StringUtils.isNotBlank(record.getStoreName())){
+            whereStr.append(" and cWhName like '%" + record.getStoreName() + "%' ");
+        }
+        // 存货编码搜索
+        if(StringUtils.isNotBlank(record.getSpareNo())){
+            whereStr.append(" and cInvCode like '%" + record.getSpareNo() + "%' ");
+        }
+        // 存货名称搜索
+        if(StringUtils.isNotBlank(record.getSpareName())){
+            whereStr.append(" and cInvName like '%" + record.getSpareName() + "%' ");
+        }
+        // 规格型号搜索
+        if(StringUtils.isNotBlank(record.getGgxh())){
+            whereStr.append(" and cInvStd like '%" + record.getGgxh() + "%' ");
+        }
+        req.setStrWhere(whereStr.toString());
         handler.setRequest(req);
         String responseStr = handler.handler();
         GetCurrentStockResponse response = JSONObject.parseObject(responseStr, GetCurrentStockResponse.class);
@@ -186,7 +207,20 @@ public class YongyouServiceImpl implements YongyouService {
         req.setCAcc_ID(getCAccId());
         req.setPageNum(pageNum);
         req.setPageSize(pageSize);
-        req.setCcode("1=1");
+        StringBuffer ccode = new StringBuffer(" 1=1 ");
+        // 存货编码搜索
+        if(StringUtils.isNotBlank(record.getNo())){
+            ccode.append(" and cInvCode like '%" + record.getNo() + "%' ");
+        }
+        // 存货名称搜索
+        if(StringUtils.isNotBlank(record.getName())){
+            ccode.append(" and cInvName like '%" + record.getName() + "%' ");
+        }
+        // 规格型号搜索
+        if(StringUtils.isNotBlank(record.getGgxh())){
+            ccode.append(" and cInvStd like '%" + record.getGgxh() + "%' ");
+        }
+        req.setCcode(ccode.toString());
         handler.setRequest(req);
         String responseStr = handler.handler();
         GetInventoryListResponse response = JSONObject.parseObject(responseStr, GetInventoryListResponse.class);