From 6f9507a8146977c6be9bf4b624d420b391b4c5ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Wed, 6 Dec 2023 09:30:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=9F=A5=E8=AF=A2=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E5=8F=8A=E5=8C=85=E8=A3=85=E5=88=9B=E5=BB=BA=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/controller/packageMassage/vo/PackageBaseVO.java   | 6 ++++++
 .../wms/service/packageMassage/PackageServiceImpl.java    | 8 +++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java
index 88851001..05d91d32 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java
@@ -151,4 +151,10 @@ public class PackageBaseVO {
     @Schema(description = "创建者用户名")
     private String creator;
 
+    /**
+     * 额外扩展的 区分出 是制造件的生产线
+     */
+    @Schema(description = "生产线")
+    private String productionLineCodePackage;
+
 }
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 7f55125d..e4f4e291 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
@@ -140,6 +140,8 @@ public class PackageServiceImpl implements PackageService {
     public PackageDO createPackageLabel(PackageCreateReqVO createReqVO) {
         // 插入
         PackageDO packageDo = PackageConvert.INSTANCE.convert(createReqVO);
+        // 包装中的生产线 对应的是 实际生产线 而非来源生产线
+        packageDo.setProductionLineCode(createReqVO.getProductionLineCodePackage());
         // 获取标包数量
         ItempackagingDO itemPackagingDO = itempackagingService.selectItemPackagingExist(packageDo.getItemCode());
         // 赋值 自动生成 包装号
@@ -197,9 +199,13 @@ public class PackageServiceImpl implements PackageService {
             barbasicDO.setType("PurchaseLabel");
         }
         // 制造件标签
-        if (packageDO.getProductionLineCode() != null && !packageDO.getProductionLineCode().isEmpty()) {
+        else if (packageDO.getProductionLineCode() != null && !packageDO.getProductionLineCode().isEmpty()) {
             barbasicDO.setType("MakeLabel");
         }
+        // 判断不出标签 默认走采购标签
+        else {
+            barbasicDO.setType("PurchaseLabel");
+        }
         // 查询 标签定义
         LabeltypeDO labeltypeDO =  labeltypeService.getLabeltypeDOByLabelType(barbasicDO.getType());
         // 查询 条码片段