From d4f6578ffc53b7dd066ea3dfef16a78151cb01d9 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Tue, 12 Nov 2024 15:19:05 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20=E7=94=9F=E7=AE=94=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=94=B9=E4=B8=BA=E4=B8=80=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pda/mps/service/impl/RawFoilServiceImpl.java    | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

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 3d8661810..42ef7257c 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
@@ -228,12 +228,8 @@ public class RawFoilServiceImpl implements RawFoilService {
             if (ObjectUtil.isEmpty(point_code2_jo)) {
                 throw new BadRequestException("未查询到可用的点位类型为入箱的烘箱对接位！");
             }
-            String bigType = whereJson.getString("big_type");
             // 起点和终点确定 生成任务
             JSONObject param = new JSONObject();
-            if (ObjectUtil.isNotEmpty(bigType) && "1".equals(bigType)) {
-                param.put("car_no", "99");
-            }
             param.put("point_code1", jsonIvt.getString("empty_point_code"));
             param.put("point_code2", jsonSb.getString("point_code") + "_K");
             param.put("point_code3", jsonSb.getString("point_code") + "_M");
@@ -250,17 +246,14 @@ public class RawFoilServiceImpl implements RawFoilService {
             map.put("flag", "1");
             map.put("product_area", jsonSb.getString("product_area"));
             map.put("point_location", jsonSb.getString("point_location"));
+            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");
-                } else {
-                    map.put("point_type", "1");
                 }
-            } else {
-                map.put("point_type", "1");
             }
             JSONObject jsonIvt = WQL.getWO("PDA_RAWFOIL_01").addParamMap(map).process().uniqueResult(0);
             // 3.如果没找到则继续找下一节点
@@ -277,6 +270,10 @@ public class RawFoilServiceImpl implements RawFoilService {
 
             // 起点和终点确定 生成任务
             JSONObject param = new JSONObject();
+            String bigType = whereJson.getString("big_type");
+            if (ObjectUtil.isNotEmpty(bigType) && "1".equals(bigType)) {
+                param.put("car_no", "99");
+            }
             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");