From 054780da331a48802c847418d610b360f19c86c9 Mon Sep 17 00:00:00 2001
From: yf <770153798@qq.com>
Date: Mon, 20 Jan 2025 12:42:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/oms/service/saleorder/SaleOrderServiceImpl.java  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
index 0ec3cfe..8e7ed0f 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
@@ -1201,7 +1201,13 @@ public class SaleOrderServiceImpl implements SaleOrderService {
                 if("1".equals(templateType)){
                     // 有模板物料
                     entryIds.add(entryDO.getId());
+                    // 获取销售订单
+                    SaleOrderDO saleOrderDO = saleOrderMapper.selectById(entryDO.getParentId());
                     String code = infoDO.getCode();
+                    if(FuncUtil.isNotEmpty(saleOrderDO)){
+                        String billno = saleOrderDO.getBillno();
+                        code = billno + "-" + code;
+                    }
                     codeMap.put(entryDO.getId().toString(), code);
                 }
             }