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 fe45f1f11..2e53dd311 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 @@ -529,7 +529,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { /** * 分切包装段:分切计划(单表,包含母卷/改制子卷-包装箱号、空包装箱物料、纸筒/FRP管)MES下发智能物流 * - * @param param + * @param ja * @return */ @Override @@ -539,7 +539,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { WQLObject tab = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan"); JSONObject result = new JSONObject(); - + String now = DateUtil.now(); try { for (int i = 0; i < ja.size(); i++) { JSONObject param = ja.getJSONObject(i); @@ -716,7 +716,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { } json.put("sale_order_name", Attribute2); json.put("material_type", Attribute6); - json.put("start_time", DateUtil.now()); + json.put("start_time", now); json.put("status", "01"); json.put("qzz_generation", qzz_generation); json.put("is_parent_ok", "0"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index 7fd2e2e89..c7a51c16b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -3276,6 +3276,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { for (int i = 0; i < structs.size(); i++) { JSONObject item = structs.get(i); item.put("task_group_id",taskGroup); + item.put("iostorinv_id",whereJson.getString("iostorinv_id")); item.put("sort_seq",i); item.put("point_code",point_code); item.put("point_id",jsonPoint2.getString("point_id")); @@ -3377,7 +3378,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { } } //option确认了左边出库还是右边出库03右边,02左边 - String orderBy = "order by out_order_seq "+(option.equals("02")?"asc":"desc"); + String orderBy = "order by out_order_seq "+(option.equals("03")?"asc":"desc"); HashMap structParam = MapOf.of("flag", "53", "order_by",orderBy,"sect_id",left.getSect_id(),"block_num", left.getBlock_num(), "row_num", left.getRow_num()); return WQL.getWO("ST_OUTIVT04").addParamMap(structParam).process().getResultJSONArray(0).toJavaList(JSONObject.class); } @@ -3467,6 +3468,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { public void createOut(JSONObject struct){ List list = iStIvtIostorinvdisService .list(new QueryWrapper() + .eq("iostorinv_id",struct.getString("iostorinv_id")) .eq("box_no", struct.getString("storagevehicle_code"))); StIvtIostorinvdis oneDis = list.get(0); // 创建任务