diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderRespVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderRespVO.java
index c8a8db7..a031913 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderRespVO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderRespVO.java
@@ -25,6 +25,10 @@ public class SaleOrderRespVO {
     @ExcelProperty("单据编号")
     private String billno;
 
+    @Schema(description = "销售合约号", example = "2")
+    @ExcelProperty("销售合约号")
+    private String saleContractCode;
+
     @Schema(description = "客户id", example = "10257")
     @ExcelProperty("客户id")
     private Long customerId;
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderSaveReqVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderSaveReqVO.java
index e87d3e0..28b0703 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderSaveReqVO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/vo/SaleOrderSaveReqVO.java
@@ -71,6 +71,9 @@ public class SaleOrderSaveReqVO {
     @Schema(description = "驳回原因", example = "2")
     private String rejectReason;
 
+    @Schema(description = "销售合约号", example = "2")
+    private String saleContractCode;
+
     @Schema(description = "销售订单明细列表")
     private List<SaleOrderEntryDO> entrys;
 
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/convert/saleorder/SaleOrderConvert.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/convert/saleorder/SaleOrderConvert.java
index e159f86..695772b 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/convert/saleorder/SaleOrderConvert.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/convert/saleorder/SaleOrderConvert.java
@@ -25,7 +25,8 @@ public interface SaleOrderConvert {
             @Mapping(source = "address", target = "address"),
             @Mapping(source = "emails", target = "emails"),
             @Mapping(source = "contractType", target = "contractType"),
-            @Mapping(source = "currencyType", target = "currencyType")
+            @Mapping(source = "currencyType", target = "currencyType"),
+            @Mapping(source = "saleContractCode", target = "saleContractCode")
     })
     SaleOrderRespVO convert(SaleOrderDO bean);
 
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleorder/SaleOrderDO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleorder/SaleOrderDO.java
index 6e9d383..3181329 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleorder/SaleOrderDO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleorder/SaleOrderDO.java
@@ -34,6 +34,10 @@ public class SaleOrderDO extends BaseDO {
      * 单据编号
      */
     private String billno;
+    /**
+     * 销售合约编码
+     */
+    private String saleContractCode;
     /**
      * 客户id
      */
@@ -138,12 +142,6 @@ public class SaleOrderDO extends BaseDO {
      * 合同编码
      */
     private String contractCode;
-
-    /**
-     * 销售合约编码
-     */
-    private String saleContractCode;
-
     /**
      * 零售商单号
      */
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 dd142e3..9567c54 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
@@ -329,10 +329,10 @@ public class SaleOrderServiceImpl implements SaleOrderService {
                 for (SaleOrderDO saleOrder : saleOrders) {
                     if (BillStatusEnum.SUBMIT.getValue().equals(saleOrder.getBillStatus())) {
                         List<SaleOrderEntryDO> entrys = getSaleOrderEntryListByParentId(saleOrder.getId());
-                        String contractType = saleOrder.getContractType();
+                        String saleContractCode = saleOrder.getSaleContractCode();
                         String currencyType = saleOrder.getCurrencyType();
-                        if (StringUtils.isBlank(contractType)) {
-                            throw new ServiceException(001, "合约类型不允许为空！");
+                        if (StringUtils.isBlank(saleContractCode)) {
+                            throw new ServiceException(001, "销售合约号不允许为空！");
                         }
                         if (StringUtils.isBlank(currencyType)) {
                             throw new ServiceException(001, "结算币种不允许为空！");
@@ -365,7 +365,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
                         //生成销售合约
                         SaleContractSaveReqVO saleContractVO = generateSaleContract(saleOrder, entrys);
                         Long saleContractId = saleContractVO.getId();
-                        saleOrder.setSaleContractCode(saleContractVO.getBillno());
+                        //saleOrder.setSaleContractCode(saleContractVO.getBillno());
                         saleOrderMapper.updateById(saleOrder);
 
                         String htmlContent = generateHtmlContent(saleContractId);
@@ -1014,18 +1014,17 @@ public class SaleOrderServiceImpl implements SaleOrderService {
     private SaleContractSaveReqVO toSaleContractVO(SaleOrderDO saleOrder, List<SaleOrderEntryDO> entrys) {
         CustomerDO customer = customerService.getCustomer(saleOrder.getCustomerId());
         SaleContractSaveReqVO saveReqVO = new SaleContractSaveReqVO();
-        String billno = getNewOrderCode2();
+     /*   String billno = getNewOrderCode2();
         String contractType = saleOrder.getContractType();
         if (StringUtils.isNotBlank(contractType)) {
             billno = billno.replace("XXXX", contractType);
-        }
+        }*/
        /* // 优先使用销售订单合同号
         String billno = saleOrder.getContractCode();
         if (FuncUtil.isEmpty(billno)) {
             billno = getNewContractCode2();
         }*/
-
-        saveReqVO.setBillno(billno);
+        saveReqVO.setBillno(saleOrder.getSaleContractCode());
         saveReqVO.setCustomerId(saleOrder.getCustomerId());
         saveReqVO.setCustomerName(customer.getName());
         saveReqVO.setCustomerBuyNo(saleOrder.getContractCode());
diff --git a/hangtag-ui/hangtag-ui-admin/src/api/oms/saleorder/index.ts b/hangtag-ui/hangtag-ui-admin/src/api/oms/saleorder/index.ts
index b4ac220..3826675 100644
--- a/hangtag-ui/hangtag-ui-admin/src/api/oms/saleorder/index.ts
+++ b/hangtag-ui/hangtag-ui-admin/src/api/oms/saleorder/index.ts
@@ -18,6 +18,7 @@ export interface SaleOrderVO {
   invoiceRemarks: string // 发票备注
   contractType: string // 合约类型
   currencyType: string // 结算币种
+  saleContractCode: string // 销售合约号
 }
 
 // 销售订单 API
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/ProduceOrderForm.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/ProduceOrderForm.vue
index 047dea0..f721ec2 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/ProduceOrderForm.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/ProduceOrderForm.vue
@@ -381,7 +381,7 @@ const preview = async () => {
   if(remarks){
     formData.value.remarksText =  remarks + '\n' +details
   }else {
-      formData.value.remarksText = details
+    formData.value.remarksText = details
   }
   //formData.value.saleContractNo = formData.value.orderNo