From 7b868f213c444e42c803bc9719152414bf180fb7 Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Sat, 18 May 2024 11:33:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=96=B0=E5=A2=9E=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E4=B8=9A=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ext/acs/service/impl/AcsToWmsServiceImpl.java  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

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 1a130a09e..541b62244 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
@@ -1868,6 +1868,20 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                     // 6-退货入库
                     whereJson.put("bill_type", IOSEnum.IN_TYPE.code("退货入库"));
                     whereJson.put("box_no", whereJson.getString("material_barcode"));
+                    JSONArray resultJSONArray = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + whereJson.getString("material_barcode") + "' AND status = '0'").getResultJSONArray(0);
+                    if (ObjectUtil.isEmpty(resultJSONArray)) {
+                        throw new BadRequestException("未查询到子卷包装信息!");
+                    }
+                    String material_barcode = "";
+                    for (int i = 0; i < resultJSONArray.size(); i++) {
+                        JSONObject resultObj = resultJSONArray.getJSONObject(i);
+                        if (i==0){
+                            material_barcode = resultObj.getString("container_name");
+                        }else {
+                            material_barcode += "," + resultObj.getString("container_name");
+                        }
+                    }
+                    whereJson.put("material_barcode", material_barcode);
                     inBussManageService.inTask(whereJson);
                 }
                 result.put("status", HttpStatus.OK.value());