From c3ad3cdbd191cb5fc4e0bffb9daa6c7f5f23e11a Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 3 Mar 2023 17:19:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/InvPreProductDetailServiceImpl.java  | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java
index 7283562da..5329d5f7e 100644
--- a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.constant.ConstantType;
 import com.glxp.api.dao.basic.BasicBussinessTypeDao;
+import com.glxp.api.dao.basic.UdiProductDao;
 import com.glxp.api.dao.inout.IoOrderDao;
 import com.glxp.api.dao.inv.InvPreProductDetailDao;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
@@ -37,6 +38,8 @@ public class InvPreProductDetailServiceImpl implements InvPreProductDetailServic
     private BasicBussinessTypeDao bussinessTypeDao;
     @Resource
     private IoOrderDao orderDao;
+    @Resource
+    private UdiProductDao udiProductDao;
 
     @Override
     public int insert(InvPreProductDetailEntity invPreProductDetailEntity) {
@@ -94,13 +97,27 @@ public class InvPreProductDetailServiceImpl implements InvPreProductDetailServic
 
     @Override
     public void setOrderInfo(InvPreProductDetailResponse response) {
+        //查询DI层级，根据DI层级设置数量取值
+        Integer packLevel = udiProductDao.selectPackLevel(response.getNameCode());
         //设置出入库中文及出入库数量
-        if (response.getMainAction().equals(ConstantType.TYPE_OUT)) {
-            response.setMainActionStr("出库");
-            response.setOutCount(response.getCount());
+        if (null != packLevel && packLevel != 1) {
+            //多级包装
+            if (response.getMainAction().equals(ConstantType.TYPE_OUT)) {
+                response.setMainActionStr("出库");
+                response.setOutCount(response.getReCount());
+            } else {
+                response.setMainActionStr("入库");
+                response.setInCount(response.getReCount());
+            }
         } else {
-            response.setMainActionStr("入库");
-            response.setInCount(response.getCount());
+            //单层包装
+            if (response.getMainAction().equals(ConstantType.TYPE_OUT)) {
+                response.setMainActionStr("出库");
+                response.setOutCount(response.getCount());
+            } else {
+                response.setMainActionStr("入库");
+                response.setInCount(response.getCount());
+            }
         }
         //设置单据类型名称
         BasicBussinessTypeEntity busType = bussinessTypeDao.selectOne(new QueryWrapper<BasicBussinessTypeEntity>().select("name").eq("action", response.getAction()));