From 89dd34d9a0432dbdf9a695e1f4211307822e6d6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Thu, 21 Mar 2024 08:22:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=8C=85=E8=A3=85=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=20=E6=89=A9=E5=B1=95=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/packageMassage/vo/PackageCreateReqVO.java  | 8 +++++++-
 .../wms/service/packageMassage/PackageServiceImpl.java    | 6 +++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageCreateReqVO.java
index b645cf4bc6..128569226c 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageCreateReqVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageCreateReqVO.java
@@ -1,12 +1,18 @@
 package com.win.module.wms.controller.packageMassage.vo;
 
+import com.win.framework.excel.core.annotations.SubObject;
+import com.win.module.wms.controller.packageoverRequest.vo.PackageoverRequestDetailCreateReqVO;
 import lombok.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 
+import java.util.List;
+
 @Schema(description = "管理后台 - 包装创建 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class PackageCreateReqVO extends PackageBaseVO {
-
+    @SubObject
+    @Schema(description = "出入")
+    private String inOfOut;
 }
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java
index f7e9f56906..aefe7728bd 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java
@@ -431,7 +431,11 @@ public class PackageServiceImpl implements PackageService {
             itemPackagingDO.setPackUnit(createReqVO.getPackUnit());
             itemPackagingDO.setPackQty(createReqVO.getPackQty());
         } else {
-            itemPackagingDO = jobUtils.getItempackageDOByItemCodeAndLocationCodeAndInOrOut(createReqVO.getItemCode(),createReqVO.getToLocationCode(),"out");
+            String inOrOut = createReqVO.getInOfOut();
+            if (inOrOut == null || inOrOut.isEmpty()) {
+                inOrOut = "out";
+            }
+            itemPackagingDO = jobUtils.getItempackageDOByItemCodeAndLocationCodeAndInOrOut(createReqVO.getItemCode(),createReqVO.getToLocationCode(),inOrOut);
         }
         // 判断 数量 大于 标包数 进行拆分
         if (createReqVO.getQty().compareTo(itemPackagingDO.getPackQty()) == 1) {