查询物料信息

src/main/java/com/mushiny/heli/xnr/controller/ICQAController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -89,7 +90,11 @@ public class ICQAController {
 
     @PostMapping(value = "/searchSkus", produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<String> searchSkus(@RequestBody String json){
-        Map data = JsonUtils.json2Map(json);
+        Map data = new HashMap();
+        if(!CommonUtils.isEmpty(json)){
+            data = JsonUtils.json2Map(json);
+        }
+
         Map resData = this.icqaService.searchSkus(data);
         return ResponseEntity.ok(JsonUtils.map2Json(resData));
     }

src/main/java/com/mushiny/heli/xnr/service/ICQAService.java

@@ -194,7 +194,7 @@ public class ICQAService {
         List params = new ArrayList();
         if (!CommonUtils.isEmpty(taskId)) {
             stringBuilder.append(" AND TASKID like ? ");
-            params.add(taskId);
+            params.add("%"+taskId+"%");
         }
 
         stringBuilder.append(" ORDER BY CREATED_DATE DESC");
@@ -420,10 +420,22 @@ public class ICQAService {
     }
 
     public Map searchSkus(Map data) {
-        //所有的SKU
-        List<Map> items= this.jdbcRepository.queryBySql(Sql_Table.SQL_FINDALLITEM
-                ,CommonUtils.parseString("FACTORY",data)
-                ,CommonUtils.parseString("FACTORY",data));
+        String skuId = CommonUtils.parseString("skuId",data);//等同于ItemNo
+        List<Map> items;
+        if (CommonUtils.isEmpty(skuId)) {
+            //所有的SKU
+            items = this.jdbcRepository.queryBySql(Sql_Table.SQL_FINDALLITEM
+                    , CommonUtils.parseString("FACTORY",data)
+                    ,CommonUtils.parseString("FACTORY",data));
+        } else {
+            //所有的SKU
+            //模糊查询
+            skuId = "%"+skuId+"%";
+            items = this.jdbcRepository.queryBySql(Sql_Table.SQL_FINDALLITEM_BYSKUID
+                    , CommonUtils.parseString("FACTORY",data)
+                    ,CommonUtils.parseString("FACTORY",data),
+                    skuId);
+        }
         data.put("content",items);
         return data;
     }

src/main/java/com/mushiny/heli/xnr/service/InboundService.java

@@ -37,7 +37,7 @@ public class InboundService {
         sql.append(Sql_Table.SQL_SEARCHINBOUND);
         if(!CommonUtils.isEmpty(warehouseId)){
             sql.append(Sql_Table.SQL_SEARCHINBOUND_ENTRYID);
-            params.add(entryId);
+            params.add("%"+entryId+"%");
         }
 
         if(!CommonUtils.isEmpty(warehouseId)){

src/main/java/com/mushiny/heli/xnr/service/Sql_Table.java

@@ -29,7 +29,21 @@ public interface Sql_Table {
             "AND WMS_INBOUND_ORDERPOSITION.ENTRYID = WMS_INBOUND_ORDER.ENTRYID)";
     String SQL_QUERYITEM_BYID = "SELECT * FROM MD_ITEMDATA WHERE ID=?";
     String TABLE_MD_ITEMDATA = "MD_ITEMDATA";
-    String SQL_FINDALLITEM = "SELECT * FROM MD_ITEMDATA WHERE CLIENT_ID=? AND WAREHOUSE_ID=?";
+
+    String SQL_FINDALLITEM = "SELECT SUM(AMOUNT) AS SUMALL,MD_ITEMDATA.`ITEM_NO`,\n" +
+            "MD_ITEMDATA.`NAME` , \n" +
+            "MD_STORAGELOCATION.`NAME`,\n" +
+            "MD_ITEMDATA.`CLIENT_ID`,\n" +
+            "MD_ITEMDATA.`WAREHOUSE_ID`\n" +
+            "FROM INV_STOCKUNIT, MD_ITEMDATA,INV_UNITLOAD, MD_STORAGELOCATION \n" +
+            "WHERE MD_ITEMDATA.ID = INV_STOCKUNIT.`ITEMDATA_ID`\n" +
+            "AND INV_UNITLOAD.ID = INV_STOCKUNIT.UNITLOAD_ID\n" +
+            "AND INV_UNITLOAD.STORAGELOCATION_ID = MD_STORAGELOCATION.ID\n" +
+            "AND MD_ITEMDATA.CLIENT_ID = ? \n" +
+            "AND MD_ITEMDATA.WAREHOUSE_ID = ?\n" +
+            "GROUP BY MD_ITEMDATA.ITEM_NO,MD_ITEMDATA.NAME";
+
+
     String WMS_ICQA_ORDERPOSITION = "WMS_ICQA_ORDERPOSITION";
     String WMS_ICQA_ORDER = "WMS_ICQA_ORDER";
     String SQL_QUERY_ICQA_BY_TYPE = "SELECT * FROM WMS_ICQA_ORDER WHERE TYPE='ALL' AND STATE<>?";
@@ -150,4 +164,18 @@ public interface Sql_Table {
             "FROM INV_STOCKUNIT group by UNITLOAD_ID )UNITLOAD WHERE UNITLOAD.SUMALL>0) limit 1";
     String SQL_QUERY_INBOUND_AVAILABLEPOSITION = "SELECT ID FROM WMS_INBOUND_ORDERPOSITION " +
             "WHERE ENTRYID=? AND STATE<>'Finish'" ;
+    String SQL_FINDALLITEM_BYSKUID = "SELECT SUM(AMOUNT) AS SUMALL,\n" +
+            "MD_ITEMDATA.`ITEM_NO`,\n" +
+            "MD_ITEMDATA.`NAME` , \n" +
+            "MD_STORAGELOCATION.`NAME`,\n" +
+            "MD_ITEMDATA.`CLIENT_ID`,\n" +
+            "MD_ITEMDATA.`WAREHOUSE_ID`\n" +
+            "FROM INV_STOCKUNIT, MD_ITEMDATA,INV_UNITLOAD, MD_STORAGELOCATION \n" +
+            "WHERE MD_ITEMDATA.`ID` = INV_STOCKUNIT.`ITEMDATA_ID`\n" +
+            "AND INV_UNITLOAD.`ID` = INV_STOCKUNIT.`UNITLOAD_ID`\n" +
+            "AND INV_UNITLOAD.`STORAGELOCATION_ID` = MD_STORAGELOCATION.`ID`\n" +
+            "AND MD_ITEMDATA.CLIENT_ID=? \n" +
+            "AND MD_ITEMDATA.WAREHOUSE_ID=?\n" +
+            "AND MD_ITEMDATA.ITEM_NO LIKE ?\n" +
+            "GROUP BY MD_ITEMDATA.`ITEM_NO`,MD_ITEMDATA.`NAME`";
 }