From d75f17c7ad7f63c3645f63476e970b3f178df32b Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Tue, 23 Jul 2024 14:25:05 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=AD=90=E5=8D=B7=E8=A3=85?=
 =?UTF-8?q?=E7=AE=B1=EF=BC=9A=E6=A0=B9=E6=8D=AE=E5=AD=90=E5=8D=B7=E5=8F=B7?=
 =?UTF-8?q?=E5=B8=A6=E5=87=BA=E6=9C=A8=E7=AE=B1=E6=96=99=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PdmBiSubpackagerelationServiceImpl.java    | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
index 54b45a1c0..7efa2b8be 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
@@ -3,6 +3,7 @@ package org.nl.b_lms.pdm.subpackagerelation.service.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.StopWatch;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -20,6 +21,8 @@ import org.apache.commons.collections4.CollectionUtils;
 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.PdmBiSlittingproductionplan;
+import org.nl.b_lms.pdm.info.dao.PdmBiOrderbominfo;
+import org.nl.b_lms.pdm.info.service.IPdmBiOrderbominfoService;
 import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
 import org.nl.b_lms.pdm.subpackagerelation.dao.mapper.PdmBiSubpackagerelationMapper;
 import org.nl.b_lms.pdm.subpackagerelation.service.IpdmBiSubpackagerelationService;
@@ -87,6 +90,9 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
     @Resource
     private IPdmBiSlittingproductionplanService iPdmBiSlittingproductionplanService;
 
+    @Resource
+    private IPdmBiOrderbominfoService iPdmBiOrderbominfoService;
+
 
     @Resource
     private DjqTask djqTask;
@@ -206,8 +212,11 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
                 r.setBox_group("0");
             }
 
-            // TODO 调用方法获取木箱料号：输入：子卷号、输出：木箱信息
-            // r.setBox_type("441510009000470");
+            // 调用方法获取木箱料号：输入：子卷号、输出：木箱信息
+            PdmBiOrderbominfo bomInfoDao = iPdmBiOrderbominfoService.getBiOrderbominfoByContainer(r.getContainer_name());
+            if (ObjectUtil.isNotEmpty(bomInfoDao)) {
+                r.setBox_type(bomInfoDao.getProductName());
+            }
 
         });
         return pdmBiSubpackagerelationList;