From 863553e76a37ff0a83ed3a9fa0e53b881d5e144a Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Fri, 10 Jan 2025 11:52:57 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E9=87=91=E7=89=8C=E5=B7=A5?=
 =?UTF-8?q?=E5=8E=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1 优化金牌暂存单逻辑
---
 .../jinpai/service/impl/DeliveryNoteServiceImpl.java      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java
index 6e04e5095..0e43375f4 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/service/impl/DeliveryNoteServiceImpl.java
@@ -194,7 +194,7 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 			advanceEntity.setTenantId(tenantId);
 			advanceEntity.setStatus(0);
 			advanceEntity.setIsDeleted(0);
-			advanceEntity.setHasPackage(CollUtil.isNotEmpty(boxCodes) ? 1 : 0);
+			advanceEntity.setHasPackage(1);
 			advanceEntity.setOrderType("");
 			advanceEntity.setBrand(BrandEnums.JP.getValue());
 			advanceEntity.setSiteName(vo.getOrgName());
@@ -252,6 +252,12 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 			if (StrUtil.isNotEmpty(goodsVolume)) {
 				volume = new BigDecimal(goodsVolume);
 			}
+			// 如果有数量没有包条码，则生成系统包条
+			if(CollUtil.isEmpty(boxCodes)){
+				for (int i = 0; i < Convert.toInt(orderInfoVO.getGoodsNumber()); i++) {
+					boxCodes.add(orderInfoVO.getCustomItemNo() + "-" + (i+1));
+				}
+			}
 			int size = boxCodes.size();
 			int index = 0;
 			for (String packageCode : boxCodes) {