From 514a42102b236c9b151893e4b7aed1fa9a487712 Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Mon, 22 Jun 2026 16:35:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=BD=BD=E5=85=B7=E6=89=98=E7=9B=98?=
 =?UTF-8?q?=E8=A7=A3=E7=BB=91=E3=80=81=E9=80=80=E8=B4=A7=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=9B=9E=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StoragevehicleinfoServiceImpl.java    | 10 ++++------
 .../service/impl/InAndOutRetrunServiceImpl.java        |  7 ++++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java
index 215fe6d0e..9d89a4e33 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java
@@ -129,10 +129,10 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService
                 code = "VEHICLE_CODE_GXTP";
                 break;
             case "0003":
-                if (class_jo.getString("class_code").equals("000301")){
+                if (class_jo.getString("class_code").equals("000301")) {
                     code = "VEHICLE_CODE_LK";
                 }
-                if (class_jo.getString("class_code").equals("000302")){
+                if (class_jo.getString("class_code").equals("000302")) {
                     code = "VEHICLE_CODE_LKB";
                 }
                 break;
@@ -179,7 +179,7 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService
         String qty = dto.getString("qty");
         String pcsn = dto.getString("pcsn");
         if (StrUtil.isNotEmpty(qty) || StrUtil.isNotEmpty(pcsn)) {
-            JSONObject ext_jo = veExtTab.query("storagevehicle_code = '"+dto.getString("storagevehicle_code")+"'").uniqueResult(0);
+            JSONObject ext_jo = veExtTab.query("storagevehicle_code = '" + dto.getString("storagevehicle_code") + "'").uniqueResult(0);
             if (ObjectUtil.isEmpty(ext_jo)) {
                 //新增一条记录
                 JSONObject jsonVeExt = new JSONObject();
@@ -197,9 +197,7 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService
                 jsonVeExt.put("update_time", DateUtil.now());
                 veExtTab.insert(jsonVeExt);
             } else {
-                if (StrUtil.isNotEmpty(pcsn)) {
-                    ext_jo.put("pcsn", pcsn);
-                }
+                ext_jo.put("pcsn", pcsn);
                 if (StrUtil.isNotEmpty(qty)) {
                     ext_jo.put("qty", qty);
                 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
index 4d883373d..645586c51 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
@@ -1131,7 +1131,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
             }
 
             //退货入库
-            if (StrUtil.equals(bill_type, "0002")) {
+            if (StrUtil.equals(bill_type, "0002") || StrUtil.equals(bill_type, "0013") || StrUtil.equals(bill_type, "0014")) {
                 // 1.回传sap
                 JSONArray paramSapMstArr = new JSONArray();
 
@@ -1162,10 +1162,11 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                         JSONObject jsonSect = sectTab.query("sect_id = '" + json2.getString("sect_id") + "'").uniqueResult(0);
                         if (ObjectUtil.isNotEmpty(jsonSect)) {
                             // jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 明細储存地点
-                            jsonDtl.put("LGORT", jo_mst.getString("remark")); // 明細储存地点
+                            //jsonDtl.put("LGORT", jo_mst.getString("remark")); // 明細储存地点
+                            jsonDtl.put("LGORT", lgort);
                         }
 
-                        JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "' AND package_box_sn = '" + json2.getString("box_no") + "' AND bill_id = '" + json2.getString("iostorinv_id") + "'").uniqueResult(0);
+                        JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "' AND package_bo x_sn = '" + json2.getString("box_no") + "' AND bill_id = '" + json2.getString("iostorinv_id") + "'").uniqueResult(0);
                         if (ObjectUtil.isNotEmpty(jsonSect)) {
                             jsonDis.put("CHARG", jsonSub.getString("sap_pcsn")); // sap批次
                         }