From 86212bb3b635b5087529c2c0957d721cf4a0c6ff Mon Sep 17 00:00:00 2001
From: wwb <782276617@qq.com>
Date: Sun, 12 Jan 2025 12:08:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7=E5=88=B6?=
 =?UTF-8?q?=E5=8D=95=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/oms/service/saleorder/SaleOrderServiceImpl.java  | 6 ++++--
 .../src/views/oms/produceorder/ProduceOrderForm.vue         | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

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 d9e9943..7bc1e0a 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
@@ -473,8 +473,10 @@ 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());
+                if(saleOrderSkuDO!=null&&saleOrderSkuDO.size()>0 && "尺码唛".equals(productInfo.getProductTypeName())){
+                    SaleOrderSkuDO skuDo = saleOrderSkuDO.get(0);
+                    String remarks = skuDo.getOrderQty() + " " + skuDo.getLabelSize();
+                    saveReqVO.setRemarks(remarks);
                 }
                 Double specSizeWidth = productInfo.getSpecSizeWidth();
                 Double specSizeHeight = productInfo.getSpecSizeHeight();
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 37ab719..92c1419 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
@@ -302,7 +302,7 @@ const resetForm = () => {
   formRef.value?.resetFields()
 }
 
-
+// 下载
 const downpdf = async () => {
   const id = formData.value.id;
   if (id) {
@@ -345,6 +345,7 @@ const downpdf = async () => {
 
 }
 
+// 预览
 const preview = async () => {
   const id = formData.value.id;
   if (id) {