diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java index 18a5eacfa..cbdb6b6b3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java @@ -165,6 +165,7 @@ public class RawFoilServiceImpl implements RawFoilService { String start_pint_code = ""; String point_code4 = ""; + String orderType = jsonRaw.getString("order_type"); //二期B1、B3的生箔烘箱任务和其他不一致 if (jsonSb.getString("product_area").equals("B1")) { @@ -250,7 +251,6 @@ public class RawFoilServiceImpl implements RawFoilService { map.put("point_type", "1"); // 如果是B2, 需要根据标箔或者锂电来判断是哪个位置 if (jsonSb.getString("product_area").equals("B2")) { - String orderType = jsonRaw.getString("order_type"); // order_type 1-标箔;2-锂电 if ("2".equals(orderType)) { map.put("point_type", "4"); @@ -293,7 +293,7 @@ public class RawFoilServiceImpl implements RawFoilService { param.put("task_type", "010105"); param.put("material_code", jsonRaw.getString("container_name")); param.put("product_area", jsonSb.getString("product_area")); - } else if (jsonSb.getString("product_area").startsWith("B2")) { + } else if (jsonSb.getString("product_area").equals("B2") && "2".equals(orderType)) { // 如果是B2直接送到对接位。 JSONObject map2 = new JSONObject(); map2.put("flag", "3"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java index 15d62ecd9..546cab4df 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CallEmpReelTask.java @@ -380,7 +380,7 @@ public class CallEmpReelTask extends AbstractAcsTask { } else { json.put("priority", priority_jo.getString("value")); } - if ("010101".equals(form.getString("task_type")) || "010104".equals(form.getString("task_type"))) { + if ("010101".equals(form.getString("task_type")) || "010106".equals(form.getString("task_type")) || "010104".equals(form.getString("task_type"))) { json.put("acs_task_type", "1"); } else { json.put("acs_task_type", "3");