diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index c8ecec110..cdd3c78ab 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -1112,7 +1112,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } //更新任务 - if ("010602".equals(task_jo.getString("task_type"))) { + if ("010602".equals(task_jo.getString("task_type")) || "010606".equals(task_jo.getString("task_type"))) { task_jo.put("point_code1", struct_jo.getString("point_code")); } if ("010604".equals(task_jo.getString("task_type"))) { @@ -1136,6 +1136,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { if ("010603".equals(task_jo.getString("task_type")) || "010604".equals(task_jo.getString("task_type"))) { task_jo.put("point_code2", struct_jo.getString("point_code")); } + if ("010606".equals(task_jo.getString("task_type"))) { + task_jo.put("point_code1", struct_jo.getString("point_code")); + } result.put("version", have_generation); result.put("size", have_size); @@ -1178,7 +1181,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { String point_type = task_jo.getString("task_type"); //取货完成 if ("1".equals(type)) { - if ("010602".equals(point_type)) { + if ("010602".equals(point_type) || "010606".equals(point_type)) { JSONObject point1_jo = ivt_shaftivt.query("point_code = '" + task_jo.getString("point_code1") + "'").uniqueResult(0); point1_jo.put("have_qzz", "0"); ivt_shaftivt.update(point1_jo); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCallEmptyVehicle.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCallEmptyVehicle.java index afdfaa463..5021b9a95 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCallEmptyVehicle.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCallEmptyVehicle.java @@ -369,6 +369,7 @@ public class AutoCallEmptyVehicle { JSONObject jo = new JSONObject(); jo.put("task_type", "010606"); + jo.put("truss_type", "8"); jo.put("task_status", TaskStatusEnum.SURE_START.getCode()); JSONObject qhd_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("point_type = '6' AND product_area = '" + product_area + "'").uniqueResult(0); jo.put("point_code1", qhd_jo.getString("point_code")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTrussTask.java index 6416afeb2..91b165fd1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTrussTask.java @@ -244,8 +244,15 @@ public class PaperTrussTask extends AbstractAcsTask { json.put("task_code", IdUtil.getSnowflake(1, 1).nextId()); json.put("task_type", form.getString("task_type")); json.put("vehicle_code", form.getString("vehicle_code")); + json.put("material_code", form.getString("material_code")); json.put("product_area", form.getString("product_area")); - json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); + String task_status = form.getString("task_status"); + if (StrUtil.isEmpty(task_status)){ + json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); + }else { + json.put("task_status", task_status); + } + json.put("point_code1", point_code1); json.put("point_code2", point_code2); json.put("point_code3", point_code3);