diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls index 95c69edcd..e58758cb9 100644 Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls differ diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java index be560eb81..cb8c8ebbf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java @@ -518,8 +518,8 @@ public class MesToLmsServiceImpl implements MesToLmsService { jsonCool.put("start_point_code", cool_ivt.getString("full_point_code")); jsonCool.put("end_point_code", cut_jo.getString("full_point_code")); jsonCool.put("create_mode", "03"); - jsonCool.put("create_id", currentUserId); - jsonCool.put("create_name", currentUsername); + jsonCool.put("create_id", "2"); + jsonCool.put("create_name", "MES用户"); jsonCool.put("create_time", DateUtil.now()); jsonCool.put("update_optid", currentUserId); jsonCool.put("update_optname", currentUsername); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java index 3387a7705..03f498ad2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java @@ -117,7 +117,7 @@ public class CoolCutTask extends AbstractAcsTask { ivtTab.update(coolMst); //更新冷却区母卷库存 - JSONObject jsonCoolIvt = ivtTab.query("full_point_code = '" + point_code1 + "'").uniqueResult(0); + JSONObject jsonCoolIvt = WQLObject.getWQLObject("st_ivt_coolpointivt").query("full_point_code = '" + point_code1 + "'").uniqueResult(0); String container_name = jsonCoolIvt.getString("container_name"); // 母卷号 jsonCoolIvt.put("full_point_status", "01"); @@ -129,7 +129,7 @@ public class CoolCutTask extends AbstractAcsTask { jsonCoolIvt.put("update_optid", currentUserId); jsonCoolIvt.put("update_optname", currentUsername); jsonCoolIvt.put("update_time", DateUtil.now()); - ivtTab.update(jsonCoolIvt); + WQLObject.getWQLObject("st_ivt_coolpointivt").update(jsonCoolIvt); //更新分切区母卷库存 JSONObject cut_jo = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("full_point_code = '" + point_code2 + "'").uniqueResult(0); @@ -150,7 +150,7 @@ public class CoolCutTask extends AbstractAcsTask { WQLObject.getWQLObject("ST_IVT_CutPointIvt").update(cut_jo2); //更新冷却区空轴库存 - JSONObject jsonCoolIvt2 = ivtTab.query("full_point_code = '" + point_code4 + "'").uniqueResult(0); + JSONObject jsonCoolIvt2 = WQLObject.getWQLObject("st_ivt_coolpointivt").query("full_point_code = '" + point_code4 + "'").uniqueResult(0); jsonCoolIvt2.put("empty_point_status", "02"); jsonCoolIvt2.put("empty_vehicle_code", jsonTask.getString("vehicle_code2")); jsonCoolIvt2.put("cool_ivt_status", "01"); @@ -158,7 +158,7 @@ public class CoolCutTask extends AbstractAcsTask { jsonCoolIvt2.put("update_optid", currentUserId); jsonCoolIvt2.put("update_optname", currentUsername); jsonCoolIvt2.put("update_time", DateUtil.now()); - ivtTab.update(jsonCoolIvt2); + WQLObject.getWQLObject("st_ivt_coolpointivt").update(jsonCoolIvt2); } if (jsonTask.getString("task_type").equals("010302")) { @@ -168,7 +168,7 @@ public class CoolCutTask extends AbstractAcsTask { ivtTab.update(coolMst); //更新冷却区母卷库存 - JSONObject jsonCoolIvt = ivtTab.query("full_point_code = '" + point_code1 + "'").uniqueResult(0); + JSONObject jsonCoolIvt = WQLObject.getWQLObject("st_ivt_coolpointivt").query("full_point_code = '" + point_code1 + "'").uniqueResult(0); String container_name = jsonCoolIvt.getString("container_name"); // 母卷号 jsonCoolIvt.put("full_point_status", "01"); @@ -180,7 +180,7 @@ public class CoolCutTask extends AbstractAcsTask { jsonCoolIvt.put("update_optid", currentUserId); jsonCoolIvt.put("update_optname", currentUsername); jsonCoolIvt.put("update_time", DateUtil.now()); - ivtTab.update(jsonCoolIvt); + WQLObject.getWQLObject("st_ivt_coolpointivt").update(jsonCoolIvt); //更新分切区母卷库存 JSONObject cut_jo = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("full_point_code = '" + point_code2 + "'").uniqueResult(0); @@ -203,7 +203,7 @@ public class CoolCutTask extends AbstractAcsTask { WQLObject.getWQLObject("ST_IVT_CutPointIvt").update(cut_jo2); //更新冷却区空轴库存 - JSONObject jsonCoolIvt2 = ivtTab.query("full_point_code = '" + point_code2 + "'").uniqueResult(0); + JSONObject jsonCoolIvt2 = WQLObject.getWQLObject("st_ivt_coolpointivt").query("full_point_code = '" + point_code2 + "'").uniqueResult(0); jsonCoolIvt2.put("empty_point_status", "02"); jsonCoolIvt2.put("empty_vehicle_code", jsonTask.getString("vehicle_code")); jsonCoolIvt2.put("cool_ivt_status", "01"); @@ -211,7 +211,7 @@ public class CoolCutTask extends AbstractAcsTask { jsonCoolIvt2.put("update_optid", currentUserId); jsonCoolIvt2.put("update_optname", currentUsername); jsonCoolIvt2.put("update_time", DateUtil.now()); - ivtTab.update(jsonCoolIvt2); + WQLObject.getWQLObject("st_ivt_coolpointivt").update(jsonCoolIvt2); } }