From 01bf0d484b7de54c0b449ce3826aa5bbf2d1ed75 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Mon, 27 May 2024 16:11:32 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9C=A8=E7=AE=B1=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/StIvtIostorinvServiceImpl.java       | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
index 1c8e4a6ef..ee37f1706 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService;
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.mapper.PdmBiSlittingproductionplanMapper;
 import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
@@ -406,15 +407,27 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
     }
 
     private BstIvtBoxinfo getBstIvtBoxinfo(Map whereJson) {
-        //查询木箱码
+        //查询木箱信息
+        String containerName;
+        if (whereJson.get("tableMater") != null) {
+            JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(whereJson.get("tableMater")));
+            containerName = jsonArray.getJSONObject(0).getString("pcsn");
+        } else {
+            containerName = whereJson.get("material_barcode").toString().split(",")[0];
+        }
+        if (StringUtils.isBlank(containerName)) {
+            throw new BadRequestException("子卷号不能为空");
+        }
         PdmBiSubpackagerelation pdmBiSubpackagerelation = ipdmBiSubpackagerelationService.getOne(new LambdaQueryWrapper<PdmBiSubpackagerelation>()
-                .eq(PdmBiSubpackagerelation::getContainer_name, whereJson.get("material_barcode").toString().split(",")[0]));
+                .eq(PdmBiSubpackagerelation::getContainer_name, containerName));
+        if (pdmBiSubpackagerelation == null) {
+            throw new BadRequestException("子卷包装关系不存在");
+        }
         // 查询木箱信息
-        BstIvtBoxinfo boxDao = iBstIvtBoxinfoService.getOne(
+        return iBstIvtBoxinfoService.getOne(
                 new QueryWrapper<BstIvtBoxinfo>().lambda()
                         .eq(BstIvtBoxinfo::getBox_no, pdmBiSubpackagerelation.getPackage_box_sn())
         );
-        return boxDao;
     }
 
     @Override
@@ -512,7 +525,8 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
         jsonTaskParam.put("task_type", "010703");
         jsonTaskParam.put("start_device_code", pointDto.getPoint_code());
         jsonTaskParam.put("next_device_code", jsonDis.getString("struct_code"));
-        jsonTaskParam.put("vehicle_code", whereJson.get("vehicle_code"));
+        //jsonTaskParam.put("vehicle_code", whereJson.get("vehicle_code"));
+        jsonTaskParam.put("vehicle_code", "A00010");
         jsonTaskParam.put("vehicle_code2", whereJson.get("vehicle_code2"));
         jsonTaskParam.put("inv_type", mstDao.getBill_type());
         jsonTaskParam.put("inv_id", mstDao.getIostorinv_id());