From c9bda7998102415ee9a0c18159c0227419f8bf88 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Sat, 27 Jul 2024 14:42:00 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=85=A5=E5=BA=93=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/b_lms/pdm_manage/enums/SUBEnum.java     |  3 +++
 .../util/impl/InBussManageServiceImpl.java         | 14 +++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm_manage/enums/SUBEnum.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm_manage/enums/SUBEnum.java
index 2b652e4b0..e0b4c0781 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm_manage/enums/SUBEnum.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm_manage/enums/SUBEnum.java
@@ -19,6 +19,9 @@ import java.util.Map;
 public enum SUBEnum {
     // 子卷包装状态
     STATUS(MapOf.of("生成", "0", "包装", "1", "入库", "2", "出库", "3")),
+
+    // 子卷包装类型
+    SUB_TYPE(MapOf.of("返检入库", "1", "改切入库", "2")),
     ;
 
     private Map<String, String> code;
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java
index e36120d02..66b949ede 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import lombok.extern.log4j.Log4j;
 import org.apache.commons.lang3.StringUtils;
+import org.nl.b_lms.pdm_manage.enums.SUBEnum;
 import org.nl.b_lms.sch.task.dao.SchBaseTask;
 import org.nl.b_lms.sch.task.service.IschBaseTaskService;
 import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
@@ -245,7 +246,18 @@ public class InBussManageServiceImpl implements InBussManageService {
         mst.put("bill_status", IOSEnum.BILL_STATUS.code("生成"));
         mst.put("total_qty", subList.stream().map(row -> row.getDoubleValue("net_weight")).reduce(Double::sum).orElse(0.00));
         mst.put("detail_count", subList.size());
-        mst.put("bill_type", jsonObject.getString("bill_type"));
+        // 根据子卷类型判断是返检入库还是反切入库
+        if (ObjectUtil.isEmpty(subList.get(0).getString("sub_type"))) {
+            mst.put("bill_type", jsonObject.getString("bill_type"));
+        } else {
+            if (subList.get(0).getString("sub_type").equals(SUBEnum.SUB_TYPE.code("返检入库"))) {
+                mst.put("bill_type", IOSEnum.IN_TYPE.code("返检入库"));
+            } else if (subList.get(0).getString("sub_type").equals(SUBEnum.SUB_TYPE.code("改切入库"))) {
+                mst.put("bill_type", IOSEnum.IN_TYPE.code("改切入库"));
+            } else {
+                mst.put("bill_type", jsonObject.getString("bill_type"));
+            }
+        }
         mst.put("biz_date", DateUtil.today());
         mst.put("remark", "");
         // 明细