Commit 9309eafc authored by tank.li@mushiny.com's avatar tank.li@mushiny.com

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

parent 50933994
...@@ -240,7 +240,7 @@ public class CommonUtils { ...@@ -240,7 +240,7 @@ public class CommonUtils {
public static void modifyUselessInfo(Map record) { public static void modifyUselessInfo(Map record) {
record.put("MODIFIED_BY","SYSTEM"); record.put("MODIFIED_BY","SYSTEM");
Date date = DateUtils.asDate(LocalDateTime.now()); Date date = DateUtils.asDate(LocalDateTime.now());
record.put("MODIFIED_DATE",new Timestamp(date.getTime())); record.put("MODIFIED_DATE",new Timestamp(System.currentTimeMillis()));
} }
public static Long parseLong(String key, Map data) { public static Long parseLong(String key, Map data) {
......
...@@ -183,7 +183,7 @@ public class InboundService { ...@@ -183,7 +183,7 @@ public class InboundService {
Map newValue = new HashMap(); Map newValue = new HashMap();
newValue.put("STATE",state); newValue.put("STATE",state);
newValue.put("MSG",msg); newValue.put("MSG",msg);
newValue.put("STORED",stored); newValue.put("ITEM_STORED",stored);
CommonUtils.modifyUselessInfo(newValue); CommonUtils.modifyUselessInfo(newValue);
Map con = new HashMap(); Map con = new HashMap();
......
...@@ -124,7 +124,7 @@ public interface Sql_Table { ...@@ -124,7 +124,7 @@ public interface Sql_Table {
String SQL_SEARCHINBOUND_FACTORY = " AND WAREHOUSE_ID=? "; String SQL_SEARCHINBOUND_FACTORY = " AND WAREHOUSE_ID=? ";
String SQL_SEARCHINBOUND_SECTION = " AND SECTION_ID=? "; String SQL_SEARCHINBOUND_SECTION = " AND SECTION_ID=? ";
String SQL_SEARCHINBOUNDINFO = String SQL_SEARCHINBOUNDINFO =
"SELECT SKUID,AMOUNT,IFNULL(STORED,0) AS STORED,STATE FROM WMS_INBOUND_ORDERPOSITION WHERE ENTRYID = ?"; "SELECT SKUID,AMOUNT,IFNULL(ITEM_STORED,0) AS STORED,STATE FROM WMS_INBOUND_ORDERPOSITION WHERE ENTRYID = ?";
String SQL_SEARCHINBOUND_ENTRYID = " AND ENTRYID like ? "; String SQL_SEARCHINBOUND_ENTRYID = " AND ENTRYID like ? ";
String SQL_SEARCHINBOUND = String SQL_SEARCHINBOUND =
"SELECT ENTRYID,STATE,DATE_FORMAT(CREATED_DATE,'%Y-%m-%d %H:%i:%s') as CREATED_DATE" + "SELECT ENTRYID,STATE,DATE_FORMAT(CREATED_DATE,'%Y-%m-%d %H:%i:%s') as CREATED_DATE" +
......
...@@ -240,7 +240,7 @@ public class WMSRespService { ...@@ -240,7 +240,7 @@ public class WMSRespService {
inboundOrderPosition.setAMOUNT(CommonUtils.parseInteger("AMOUNT",map)); inboundOrderPosition.setAMOUNT(CommonUtils.parseInteger("AMOUNT",map));
inboundOrderPosition.setMSG(CommonUtils.parseString("MSG",map)); inboundOrderPosition.setMSG(CommonUtils.parseString("MSG",map));
inboundOrderPosition.setSTATE(CommonUtils.parseString("STATE",map)); inboundOrderPosition.setSTATE(CommonUtils.parseString("STATE",map));
inboundOrderPosition.setSTORED(CommonUtils.parseInteger("STORED",map)); inboundOrderPosition.setSTORED(CommonUtils.parseInteger("ITEM_STORED",map));
inboundOrderDTO.getDATA().add(inboundOrderPosition); inboundOrderDTO.getDATA().add(inboundOrderPosition);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment