diff --git a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/MESServiceImpl.java b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/MESServiceImpl.java index b3c0ba8..bae8a0c 100644 --- a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/MESServiceImpl.java +++ b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/MESServiceImpl.java @@ -118,7 +118,7 @@ public class MESServiceImpl implements MESService{ //根据单据获取要发送MES的信息 String sql="SELECT * from(\r\n" + " SELECT m.CHARGE,m.MATERIALPACKINGNAME,m.MATERIALSPECNAME,to_char(m.EXPIRINGDATE,'YYYY-MM-DD HH24:MI')EXPIRINGDATE,m.PHASE, \r\n" + - " m.TRUEGG ,m.SDK_ID,m.FQTY ,m.FUNIT ,m.GXID,m.LASTEVENTUSER ,m.REMARK , m3.SHIPREQUESTTYPE, \r\n" + + " m.TRUEGG ,m.SDK_ID,m.FQTY ,m.FUNIT ,m.GXID,m.LASTEVENTUSER ,m.REMARK ,TO_CHAR (m.MATURATIONINTIME + m2.MATURATIONTIME, 'YYYY-MM-DD HH24:MI:SS') MATURATIONOUTTIME, m3.SHIPREQUESTTYPE, \r\n" + " m3.SHIPREQUESTDETAILTYPE ,m2.MATERIALUNIT ,bm.DENOMINATOR/bm.MODULECULE CONVERSIONSCALE, \r\n" + " m4.DESCRIPTION ,m2.MATERIALTYPE ,(SELECT RECEIVEPRODUCTIONORDERNUMBER FROM MATERIALSHIPREQUESTDETAIL m5 \r\n" + " WHERE m5.SHIPREQUESTNAME=:SHIPREQUESTNAME AND m5.MATERIALSPECNAME=m.MATERIALSPECNAME \r\n" + @@ -243,7 +243,7 @@ public class MESServiceImpl implements MESService{ //根据单据获取要发送MES的信息 String sql="SELECT * from(\r\n" + " SELECT m.CHARGE,m.MATERIALPACKINGNAME,m.MATERIALSPECNAME,to_char(m.EXPIRINGDATE,'YYYY-MM-DD HH24:MI')EXPIRINGDATE,m.PHASE, \r\n" + - " m.TRUEGG ,m.FQTY ,m.FUNIT ,m.GXID,m.LASTEVENTUSER ,m.REMARK , m3.SHIPREQUESTTYPE, \r\n" + + " m.TRUEGG ,m.FQTY ,m.FUNIT ,m.GXID,m.LASTEVENTUSER ,m.REMARK ,TO_CHAR (m.MATURATIONINTIME + m2.MATURATIONTIME, 'YYYY-MM-DD HH24:MI:SS') MATURATIONOUTTIME, m3.SHIPREQUESTTYPE, \r\n" + " m3.SHIPREQUESTDETAILTYPE ,m2.MATERIALUNIT ,bm.DENOMINATOR/bm.MODULECULE CONVERSIONSCALE, \r\n" + " m4.DESCRIPTION ,m2.MATERIALTYPE ,(SELECT RECEIVEPRODUCTIONORDERNUMBER FROM MATERIALSHIPREQUESTDETAIL m5 \r\n" + " WHERE m5.SHIPREQUESTNAME=:SHIPREQUESTNAME AND m5.MATERIALSPECNAME=m.MATERIALSPECNAME \r\n" + @@ -603,8 +603,9 @@ public class MESServiceImpl implements MESService{ jsonObject.put("shipRequestType", list.get(i).get("SHIPREQUESTTYPE")); jsonObject.put("shipRequestName", shipRequestName); jsonObject.put("gxId", list.get(i).get("GXID")); - jsonObject.put("receiveFlag", "N"); - + jsonObject.put("receiveFlag", "N"); + jsonObject.put("maturationOutTime", list.get(i).get("MATURATIONOUTTIME") == null ? "" : list.get(i).get("MATURATIONOUTTIME")); + jsonArray.add(jsonObject); } @@ -727,7 +728,7 @@ public class MESServiceImpl implements MESService{ //根据单据获取要发送MES的信息 String sql="SELECT * from(\r\n" + " SELECT m.CHARGE,m.MATERIALPACKINGNAME,m.MATERIALSPECNAME,to_char(m.EXPIRINGDATE,'YYYY-MM-DD HH24:MI')EXPIRINGDATE,m.PHASE, \r\n" + - " m.TRUEGG ,m.FQTY ,m.FUNIT ,m.GXID,m.LASTEVENTUSER ,m.REMARK , m3.SHIPREQUESTTYPE, \r\n" + + " m.TRUEGG ,m.FQTY ,m.FUNIT ,m.GXID,m.LASTEVENTUSER ,m.REMARK ,TO_CHAR (m.MATURATIONINTIME + m2.MATURATIONTIME, 'YYYY-MM-DD HH24:MI:SS') MATURATIONOUTTIME, m3.SHIPREQUESTTYPE, \r\n" + " m3.SHIPREQUESTDETAILTYPE ,m2.MATERIALUNIT ,bm.DENOMINATOR/bm.MODULECULE CONVERSIONSCALE, \r\n" + " m4.DESCRIPTION ,m2.MATERIALTYPE ,(SELECT RECEIVEPRODUCTIONORDERNUMBER FROM MATERIALSHIPREQUESTDETAIL m5 \r\n" + " WHERE m5.SHIPREQUESTNAME=:SHIPREQUESTNAME AND m5.MATERIALSPECNAME=m.MATERIALSPECNAME \r\n" +