From 80bf20b11d64707c3f3d63d4573bfce66f53e175 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Wed, 13 Nov 2024 17:20:23 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20B2=E7=94=9F=E7=AE=94=E4=B8=8B=E6=96=99?= =?UTF-8?q?=E4=B8=8E=E7=83=98=E7=AE=B1=E5=87=BA=E6=9D=A5=E5=86=B7=E5=8D=B4?= =?UTF-8?q?=E5=8C=BA=E5=8C=BA=E5=9F=9F=E5=88=92=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java | 4 ++-- .../org/nl/wms/pda/mps/service/impl/RawFoilServiceImpl.java | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java index 961bd0aeb..f935d32e1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java @@ -618,12 +618,12 @@ public class BakingServiceImpl implements BakingService { map.put("point_location", jsonPoint.getString("point_location")); } map.put("point_type", "1"); - // B2出来要根据锂电或者标箔去不同地方 + // B2出来要根据锂电或者标箔去不同地方（状态5） if (jsonPoint.getString("product_area").equals("B2")) { String orderType = raw_jo.getString("order_type"); // order_type 1-标箔；2-锂电 if ("2".equals(orderType)) { - map.put("point_type", "4"); + map.put("point_type", "5"); } } JSONObject jsonCooIvt = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(map).process().uniqueResult(0); 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 719d5f277..d4a0f9ee0 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 @@ -271,9 +271,13 @@ public class RawFoilServiceImpl implements RawFoilService { // 起点和终点确定 生成任务 JSONObject param = new JSONObject(); String bigType = whereJson.getString("big_type"); - if (ObjectUtil.isNotEmpty(bigType) && "1".equals(bigType)) { + // 只有一期才需要指定车号 + if (jsonSb.getString("product_area").startsWith("A") + && ObjectUtil.isNotEmpty(bigType) + && "1".equals(bigType)) { param.put("car_no", "8"); } + param.put("point_code1", start_pint_code); param.put("point_code2", jsonSb.getString("point_code") + "_K"); param.put("point_code3", jsonSb.getString("point_code") + "_M");