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 1/2] =?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) {

From 4d6cffe094f99b9ba7a65c473ff66bbaf49653f5 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Fri, 10 Jan 2025 14:07:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF=E7=9B=B4=E5=8F=91?=
 =?UTF-8?q?=E5=95=86=E5=AE=B6=E7=AD=BE=E6=94=B6=E5=8D=95=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/logpm/trunkline/vo/SignPackageVO.java  | 3 +++
 .../logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml   | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/SignPackageVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/SignPackageVO.java
index eb27db6f5..a106bf01a 100644
--- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/SignPackageVO.java
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/SignPackageVO.java
@@ -16,6 +16,9 @@ public class SignPackageVO implements Serializable {
 	private String scanStatus;
 	private String orderCode;
 	private String waybillNo;
+	private String firstName;
+	private String secondName;
+	private String thirdName;
 
 	private List<TrunklineScanZeroDetailVO> scanZeroDetailList = new ArrayList<>();
 
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
index 765ae7926..a1431f19a 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
@@ -1114,7 +1114,10 @@
                unload_num unloadNum,
                scan_status scanStatus,
                order_code orderCode,
-               waybill_no waybillNo
+               waybill_no waybillNo,
+               firsts firstName,
+               senconds secondName,
+               thirds thirdName
         from logpm_trunkline_cars_load_scan
         where  sign_order_id = #{signOrderId}
     </select>