拣货任务完善，出库单与系统绑定 完成后反馈

src/main/java/com/mushiny/heli/xnr/comm/CommonUtils.java

@@ -229,7 +229,7 @@ public class CommonUtils {
     public static void genUselessInfo(Map record) {
         //record.put("ID",genUUID());
         Date date = DateUtils.asDate(LocalDateTime.now());
-        record.putIfAbsent("CREATED_DATE",new Timestamp(date.getTime()));
+        record.putIfAbsent("CREATED_DATE",new Timestamp(System.currentTimeMillis()));
         record.putIfAbsent("CREATED_BY","SYSTEM");
         /*record.put("CLIENT_ID","SYSTEM");*/
         //record.putIfAbsent("WAREHOUSE_ID", "DEFAULT");

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

@@ -73,7 +73,7 @@ public class ICQAController {
         logger.debug("收到创建盘点任务指令:" + json);
         MessageDTO dto = MessageDTO.success();
         try {
-            this.wmsService.createICQAOrder(data);
+            dto = this.wmsService.createICQAOrder(data);
         } catch (Exception e) {
             logger.error("盘点任务创建失败!",e);
             dto.setMESSAGE(e.getMessage());

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

@@ -314,7 +314,7 @@ public class ICQAService {
         baseBpo.addKV("POD_ID", storageLocation.getPodId());
         baseBpo.addKV("SKUID", skuId);
         baseBpo.addKV("POD_FACE", storageLocation.getPodFace());
-        baseBpo.addKV("STORAGENAME", storageLocation.getLocate());
+        baseBpo.addKV("STORAGENAME", storageLocation.getStorageName());
         baseBpo.addKV("POD_LOCATE", storageLocation.getLocate());
         baseBpo.addKV("WORKSTATION_ID", stationName);
         baseBpo.addKV("PODINDEX", storageLocation.getPodIndex());
@@ -346,7 +346,7 @@ public class ICQAService {
     public Map searchIcqaInfo(Map data) {
         String taskId = CommonUtils.parseString("taskId", data);
         Map ret = new HashMap();
-        List<Map> taskInfo = this.jdbcRepository.queryBySql(Sql_Table.SQL_QUERY_ICQAPOSITIONS, taskId);
+        List<Map> taskInfo = this.jdbcRepository.queryBySql(Sql_Table.SQL_QUERY_ALLICQAPOSITIONS, taskId);
         ret.put("taskId", taskId);
         ret.put("content", taskInfo);
         return ret;
@@ -382,7 +382,7 @@ public class ICQAService {
         Map data = invs.get(0);
         String uid = CommonUtils.parseString("ID",data);
 
-        //查询入库单的入库数量
+        //查询盘点的入库数量
         Map icqaOrderPosition = this.getIcqaOrderPosition(taskId,skuId);
 
         String pId = CommonUtils.parseString("ID", icqaOrderPosition);
@@ -401,9 +401,9 @@ public class ICQAService {
 
         Map con = new HashMap();
         con.put("SKUID",skuId);
-        con.put("ENTRYID",taskId);
+        con.put("TASKID",taskId);
         //
-        int count = this.jdbcRepository.updateRecords(Sql_Table.WMS_INBOUND_ORDERPOSITION, newValue, con);
+        int count = this.jdbcRepository.updateRecords(Sql_Table.WMS_ICQA_ORDERPOSITION, newValue, con);
         if(count == 0){
             messageDTO.setMESSAGE("更新失败,entryId:"+taskId+" skuId:"+skuId);
             messageDTO.setCODE(1);
@@ -412,7 +412,7 @@ public class ICQAService {
 
     private Map getIcqaOrderPosition(String taskId, String skuId) {
         List<Map> data = this.jdbcRepository
-                .queryBySql(Sql_Table.SQL_QUERY_INBOUNDORDERPOSITION, taskId, skuId);
+                .queryBySql(Sql_Table.SQL_QUERY_ICQAORDERPOSITION, taskId, skuId);
         if(data.isEmpty()){
             return null;
         }

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

@@ -46,7 +46,7 @@ public interface Sql_Table {
 
     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<>?";
+    String SQL_QUERY_ICQA_BY_TYPE = "SELECT * FROM WMS_ICQA_ORDER WHERE TYPE='all' AND STATE<>?";
     String SQL_ALL_TASKING_SKU = "SELECT SKUID FROM WMS_ICQA_ORDERPOSITION " +
             "WHERE STATE<>?" ;
     String FINISH = "Finish";
@@ -179,4 +179,6 @@ public interface Sql_Table {
             "AND MD_ITEMDATA.ITEM_NO LIKE ?\n" +
             "GROUP BY MD_ITEMDATA.`ITEM_NO`,MD_ITEMDATA.`NAME`";
     String WMS_ICQA_PODORDER = "WMS_ICQA_PODORDER";
+    String SQL_QUERY_ALLICQAPOSITIONS = "SELECT * FROM WMS_ICQA_ORDERPOSItION WHERE TASKID=?";
+    String SQL_QUERY_ICQAORDERPOSITION = "SELECT * FROM WMS_ICQA_ORDERPOSITION WHERE TASKID=? AND SKUID=?";
 }

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

@@ -208,12 +208,13 @@ public class WMSService {
         order.setTable(Sql_Table.WMS_ICQA_ORDER);
         String orderId = CommonUtils.genUUID();
         order.addKV("TASKID", orderId);
-        order.addKV("CREATED_DATE",new Date(System.currentTimeMillis()));
+        //order.addKV("CREATED_DATE",new Date(System.currentTimeMillis()));
         //order.addKV("FACTORY",CommonUtils.parseString("FACTORY",data));
         order.addKV("WAREHOUSE_ID",CommonUtils.parseString("FACTORY",data));
         order.addKV("SECTION_ID",CommonUtils.parseString("SECTION",data));
         order.addKV("STATE",Sql_Table.AVAILABLE);
         order.addKV("NEED_RESP", 0);
+        CommonUtils.genUselessInfo(order.getKv());
         //"type":"all"
         if(Objects.equals(CommonUtils.parseString("type", data), Sql_Table.ALL_TYPE)){
             order.addKV("TYPE",Sql_Table.ALL_TYPE);
@@ -236,7 +237,7 @@ public class WMSService {
                 baseBpo.addKV("TASKID",orderId).addKV("ID",CommonUtils.genUUID())
                         .addKV("SKUID",CommonUtils.parseString("ITEM_NO",map));
                 //增加几条字段
-                baseBpo.addKV("STATE",Sql_Table.NEW);
+                //baseBpo.addKV("STATE",Sql_Table.NEW);
                 baseBpo.addKV("AMOUNT",0);//TODO当前库存
                 baseBpo.addKV("WAREHOUSE_ID",CommonUtils.parseString("FACTORY",data));
                 baseBpo.addKV("SECTION_ID",CommonUtils.parseString("SECTION",data));
@@ -276,8 +277,10 @@ public class WMSService {
                 baseBpo.addKV("TASKID",orderId).addKV("ID",CommonUtils.genUUID())
                         .addKV("SKUID",skuId);
                 //增加几条字段
-                baseBpo.addKV("STATE",Sql_Table.NEW);
+                baseBpo.addKV("STATE",Sql_Table.AVAILABLE);
                 baseBpo.addKV("AMOUNT",0);//TODO当前库存
+                baseBpo.addKV("WAREHOUSE_ID",CommonUtils.parseString("FACTORY",data));
+                baseBpo.addKV("SECTION_ID",CommonUtils.parseString("SECTION",data));
                 this.jdbcRepository.insertBusinessObject(baseBpo);
             }