From 8957b6eb467af123a660932fec26b03e262b736c Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Mon, 11 Nov 2024 17:12:24 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E6=88=91=E4=B9=90=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 修改我乐工厂标准台面包件重复数据丢失问题
---
 .../factorydata/olo/service/impl/DeliveryNoteServiceImpl.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/service/impl/DeliveryNoteServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/service/impl/DeliveryNoteServiceImpl.java
index bffdfc225..081d75f18 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/service/impl/DeliveryNoteServiceImpl.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/service/impl/DeliveryNoteServiceImpl.java
@@ -209,7 +209,8 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 					// advanceDetailEntity.setQuantity((StrUtil.isNotBlank(orderPackageDTO.getQty()) && NumberUtil.isNumber(orderPackageDTO.getQty())) ? Convert.toInt(orderPackageDTO.getQty()) : 0);
 					advanceDetailEntity.setQuantity(1);
 					// 按老系统生成新的逻辑的包件号 OLO2312064418-20231226010129-1-001
-					if (anInt > 1) {
+					// 标准台面全部使用新码，其他的数量大于 1 的使用新码
+					if (StrUtil.equals(orderPackageDTO.getType(),"标准台面") || anInt > 1) {
 						advanceDetailEntity.setOrderPackageCode("OLO" + orderPackageDTO.getSn() + "-" + DateUtil.format(new Date(), "yyyyMMddHHmmss") + "-" + num + "-" + StrUtil.padPre(String.valueOf(i + 1), 3, "0"));
 					} else {
 						advanceDetailEntity.setOrderPackageCode(orderPackageDTO.getSn());