From 86a118a7857f260a6bd5b23280dd63ef330102cb Mon Sep 17 00:00:00 2001
From: wwb <782276617@qq.com>
Date: Sat, 4 Jan 2025 16:23:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E7=94=9F=E4=BA=A7=E5=88=B6=E5=8D=95?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/produceorder/vo/ProduceOrderSaveReqVO.java         | 3 +++
 .../oms/dal/dataobject/produceorder/ProduceOrderDO.java      | 5 +++++
 .../module/oms/service/saleorder/SaleOrderServiceImpl.java   | 4 +++-
 hangtag-ui/hangtag-ui-front/src/locales/en.ts                | 1 +
 hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts             | 1 +
 5 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/produceorder/vo/ProduceOrderSaveReqVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderSaveReqVO.java
index a12d153..0f8dc24 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderSaveReqVO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderSaveReqVO.java
@@ -83,4 +83,7 @@ public class ProduceOrderSaveReqVO {
     @Schema(description = "详情")
     private String details;
 
+    @Schema(description = "备注")
+    private String remarks;
+
 }
\ No newline at end of file
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/produceorder/ProduceOrderDO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/produceorder/ProduceOrderDO.java
index db8ae84..c421786 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/produceorder/ProduceOrderDO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/produceorder/ProduceOrderDO.java
@@ -121,4 +121,9 @@ public class ProduceOrderDO extends BaseDO {
      */
     private String details;
 
+    /**
+     * 备注
+     */
+    private String remarks;
+
 }
\ No newline at end of file
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 d14cdcd..4799338 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
@@ -470,7 +470,9 @@ public class SaleOrderServiceImpl implements SaleOrderService {
                 saveReqVO.setProduceDate(LocalDateTime.now());
                 saveReqVO.setInspectionDate(LocalDateTime.now());
                 saveReqVO.setDeliverydate(LocalDateTime.now());
-
+                if(saleOrderSkuDO!=null&&saleOrderSkuDO.size()>0){
+                    saveReqVO.setRemarks(saleOrderSkuDO.get(0).getRemark());
+                }
                 Double specSizeWidth = productInfo.getSpecSizeWidth();
                 Double specSizeHeight = productInfo.getSpecSizeHeight();
                 String specMaterial = productInfo.getSpecMaterial();
diff --git a/hangtag-ui/hangtag-ui-front/src/locales/en.ts b/hangtag-ui/hangtag-ui-front/src/locales/en.ts
index 41e2843..a942e99 100644
--- a/hangtag-ui/hangtag-ui-front/src/locales/en.ts
+++ b/hangtag-ui/hangtag-ui-front/src/locales/en.ts
@@ -515,6 +515,7 @@ export default {
     orderstatus:'orderstatus',
     phone:'phone',
     remark:'remark',
+    remarks:'remarks',
     contractType:'contractType',
     emails:'emails',
     fax:'fax',
diff --git a/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts b/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts
index 8a43b62..6a8db57 100644
--- a/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts
+++ b/hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts
@@ -510,6 +510,7 @@ export default {
     orderstatus:'订单状态',
     phone:'手机',
     remark:'备注',
+    remarks:'备注',
     contractType:'合约类型',
     emails:'邮箱',
     fax:'传真',