From c1c31b9bf7112143eb9a0ec4a52c89241798a185 Mon Sep 17 00:00:00 2001
From: wwb <782276617@qq.com>
Date: Sun, 9 Aug 2026 12:16:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/saleorder/SaleOrderController.java         | 12 ++++++++++++
 .../src/views/oms/deliveryorder/index.vue            |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/SaleOrderController.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/SaleOrderController.java
index 1981094..604ae60 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/SaleOrderController.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/SaleOrderController.java
@@ -236,6 +236,18 @@ public class SaleOrderController {
     @Operation(summary = "更新销售订单")
     @PreAuthorize("@ss.hasPermission('oms:sale-order:update')")
     public CommonResult<Boolean> updateSaleOrderEntry(@Valid @RequestBody SaleOrderSaveReqVO updateReqVO) {
+        //拼接销售合约编码
+        String saleContractCodePrefix = updateReqVO.getSaleContractCodePrefix();
+        String saleContractCode = updateReqVO.getSaleContractCode();
+        if(StringUtils.isBlank(saleContractCodePrefix)){
+            saleContractCodePrefix = "";
+        }
+        if(StringUtils.isNotBlank(saleContractCode)){
+            saleContractCode = saleContractCode.replaceAll("[^0-9]", "");
+        }else {
+            saleContractCode = "";
+        }
+        updateReqVO.setSaleContractCode(saleContractCodePrefix+saleContractCode);
         saleOrderService.updateSaleOrder(updateReqVO);
         return success(true);
     }
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/deliveryorder/index.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/deliveryorder/index.vue
index ef4da47..ea92e8b 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/oms/deliveryorder/index.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/deliveryorder/index.vue
@@ -172,7 +172,7 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="操作" align="center">
+      <el-table-column label="操作" align="center"  fixed="right">
         <template #default="scope">
           <el-button
             link