From f46b04ca90de75f130cf63b0dfe34fce56b4c596 Mon Sep 17 00:00:00 2001
From: wwb <782276617@qq.com>
Date: Fri, 10 Jan 2025 11:29:01 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E5=90=88=E7=BA=A6=E7=BC=96=E7=A0=81=E6=9B=BF=E6=8D=A2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/oms/service/saleorder/SaleOrderServiceImpl.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 44f9de9..4c203cf 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
@@ -1012,7 +1012,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
         String billno = getNewOrderCode2();
         String contractType = saleOrder.getContractType();
         if (StringUtils.isNotBlank(contractType)) {
-            billno = billno.replace("XXXX-", contractType + "-");
+            billno = billno.replace("XXXX", contractType);
         }
        /* // 优先使用销售订单合同号
         String billno = saleOrder.getContractCode();

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 02/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E5=88=B6=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) {

From 0aa527f44f37fae0f0663b939be14213442f464d Mon Sep 17 00:00:00 2001
From: wwb <782276617@qq.com>
Date: Sun, 12 Jan 2025 12:22:13 +0800
Subject: [PATCH 03/11] Merge branch 'dev' of https://git.yfgame.vip/r/hangtag
 into dev

---
 .../module/oms/service/saleorder/SaleOrderServiceImpl.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 7bc1e0a..f6578dc 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,7 +473,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
                 saveReqVO.setProduceDate(LocalDateTime.now());
                 saveReqVO.setInspectionDate(LocalDateTime.now());
                 saveReqVO.setDeliverydate(LocalDateTime.now());
-                if(saleOrderSkuDO!=null&&saleOrderSkuDO.size()>0 && "尺码唛".equals(productInfo.getProductTypeName())){
+                if(saleOrderSkuDO!=null&&saleOrderSkuDO.size()>0 && 7l == productInfo.getProductTypeId()){
                     SaleOrderSkuDO skuDo = saleOrderSkuDO.get(0);
                     String remarks = skuDo.getOrderQty() + " " + skuDo.getLabelSize();
                     saveReqVO.setRemarks(remarks);

From dd36e9f7cc5381d220a66020a55a82f3ddda123e Mon Sep 17 00:00:00 2001
From: wwb <782276617@qq.com>
Date: Sun, 12 Jan 2025 12:31:17 +0800
Subject: [PATCH 04/11] Merge branch 'dev' of https://git.yfgame.vip/r/hangtag
 into dev

---
 .../module/oms/service/saleorder/SaleOrderServiceImpl.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 f6578dc..3d94570 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
@@ -475,7 +475,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
                 saveReqVO.setDeliverydate(LocalDateTime.now());
                 if(saleOrderSkuDO!=null&&saleOrderSkuDO.size()>0 && 7l == productInfo.getProductTypeId()){
                     SaleOrderSkuDO skuDo = saleOrderSkuDO.get(0);
-                    String remarks = skuDo.getOrderQty() + " " + skuDo.getLabelSize();
+                    String remarks = skuDo.getLabelSize() + " " + skuDo.getOrderQty();
                     saveReqVO.setRemarks(remarks);
                 }
                 Double specSizeWidth = productInfo.getSpecSizeWidth();

From 36940cbd2ba907698d549146f74cb84af0933d67 Mon Sep 17 00:00:00 2001
From: Mrking <782276617@qq.com>
Date: Sun, 12 Jan 2025 22:07:34 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../produceorder/ProduceOrderServiceImpl.java |  8 ++---
 .../saleorder/SaleOrderServiceImpl.java       | 10 +++---
 .../oms/produceorder/ProduceOrderForm.vue     | 31 ++++++++++++++++---
 .../src/views/oms/produceorder/template1.js   |  2 +-
 4 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/produceorder/ProduceOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/produceorder/ProduceOrderServiceImpl.java
index 3ad5100..0d42b12 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/produceorder/ProduceOrderServiceImpl.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/produceorder/ProduceOrderServiceImpl.java
@@ -82,12 +82,12 @@ public class ProduceOrderServiceImpl implements ProduceOrderService {
         Double specSizeHeight = productInfo.getSpecSizeHeight();
         String specMaterial = productInfo.getSpecMaterial();
         String productionInfo = productInfo.getProductionInfo();
-        StringBuffer str = new StringBuffer();
-/*        str.append(String.format("货名：%s\r\n",productInfo.getName()));
+/*        StringBuffer str = new StringBuffer();
+        str.append(String.format("货名：%s\r\n",productInfo.getName()));
         str.append(String.format("规格：%s × %s \r\n",specSizeWidth,specSizeHeight));
         str.append(String.format("纸质：%s \r\n",specMaterial));*/;
-        str.append(String.format("%s ",productionInfo));
-        updateObj.setDetails(str.toString());
+        //str.append(String.format("%s ",productionInfo));
+        //updateObj.setDetails(str.toString());
 
         produceOrderMapper.updateById(updateObj);
     }
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 3d94570..dd142e3 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
@@ -474,18 +474,20 @@ public class SaleOrderServiceImpl implements SaleOrderService {
                 saveReqVO.setInspectionDate(LocalDateTime.now());
                 saveReqVO.setDeliverydate(LocalDateTime.now());
                 if(saleOrderSkuDO!=null&&saleOrderSkuDO.size()>0 && 7l == productInfo.getProductTypeId()){
-                    SaleOrderSkuDO skuDo = saleOrderSkuDO.get(0);
-                    String remarks = skuDo.getLabelSize() + " " + skuDo.getOrderQty();
+                    String remarks = "";
+                    for (SaleOrderSkuDO orderSkuDO : saleOrderSkuDO) {
+                        remarks = remarks += orderSkuDO.getLabelSize() + " " + orderSkuDO.getOrderQty()+"; ";
+                    }
                     saveReqVO.setRemarks(remarks);
                 }
-                Double specSizeWidth = productInfo.getSpecSizeWidth();
+          /*      Double specSizeWidth = productInfo.getSpecSizeWidth();
                 Double specSizeHeight = productInfo.getSpecSizeHeight();
                 String specMaterial = productInfo.getSpecMaterial();
                 StringBuffer str = new StringBuffer();
                 str.append(String.format("货名：%s\r\n", productInfo.getName()));
                 str.append(String.format("规格：%s × %s \r\n", specSizeWidth, specSizeHeight));
                 str.append(String.format("纸质：%s \r\n", specMaterial));
-                saveReqVO.setDetails(str.toString());
+                saveReqVO.setDetails(str.toString());*/
                 Long produceOrderId = produceOrderService.createProduceOrder(saveReqVO);
             }
 
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 92c1419..4aba286 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
@@ -156,6 +156,13 @@
       </el-form-item>
         </el-col>
       </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="备注" prop="details">
+            <el-input v-model="formData.details" placeholder="请输入备注" />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <el-button @click="downpdf" type="primary" v-if="formData.id" :disabled="formLoading">下 载</el-button>
@@ -216,6 +223,7 @@ const formData = ref({
   deliveryQty: undefined,
   details: undefined,
   remarks: undefined,
+  remarksText: undefined,
 })
 
 const formRules = reactive({
@@ -298,6 +306,9 @@ const resetForm = () => {
     inspectionDate: undefined,
     deliverydate: undefined,
     deliveryQty: undefined,
+    details: undefined,
+    remarks: undefined,
+    remarksText: undefined,
   }
   formRef.value?.resetFields()
 }
@@ -316,17 +327,23 @@ const downpdf = async () => {
   formData.value.produceDateStr = formatDate(formData.value.produceDate,'YYYY-MM-DD')
   formData.value.inspectionDateStr = formatDate(formData.value.inspectionDate,'YYYY-MM-DD')
   formData.value.deliverydateStr = formatDate(formData.value.deliverydate,'YYYY-MM-DD')
+  const remarks = formData.value.remarks
+  if(remarks){
+    formData.value.remarksText =  formData.value.remarks + '\n' +formData.value.details
+  }else {
+    formData.value.remarksText =  formData.value.details
+  }
   //formData.value.saleContractNo = formData.value.orderNo
 
   if(formData.value.productId){
     const material = await ProductInfoApi.getProductInfo(formData.value.productId)
     formData.value.productCode = material.code
     formData.value.productName = material.name
-    formData.value.details = material.productionInfo
+    //formData.value.details = material.productionInfo
   }else {
     formData.value.productCode = ''
     formData.value.productName = ''
-    formData.value.details = ''
+    //formData.value.details = ''
   }
 
   let printData = JSON.stringify(formData.value)
@@ -358,17 +375,23 @@ const preview = async () => {
   formData.value.produceDateStr = formatDate(formData.value.produceDate,'YYYY-MM-DD')
   formData.value.inspectionDateStr = formatDate(formData.value.inspectionDate,'YYYY-MM-DD')
   formData.value.deliverydateStr = formatDate(formData.value.deliverydate,'YYYY-MM-DD')
+  const remarks = formData.value.remarks
+  if(remarks){
+    formData.value.remarksText =  formData.value.remarks + '\n' +formData.value.details
+  }else {
+    formData.value.remarksText =  formData.value.details
+  }
   //formData.value.saleContractNo = formData.value.orderNo
 
   if(formData.value.productId){
     const material = await ProductInfoApi.getProductInfo(formData.value.productId)
     formData.value.productCode = material.code
     formData.value.productName = material.name
-    formData.value.details = material.productionInfo
+    //formData.value.details = material.productionInfo
   }else {
     formData.value.productCode = ''
     formData.value.productName = ''
-    formData.value.details = ''
+    //formData.value.details = ''
   }
 
 
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/template1.js b/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/template1.js
index f4c19fb..4456323 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/template1.js
+++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/template1.js
@@ -2237,7 +2237,7 @@ export default {
             "bottom": 502.4933338165283,
             "vCenter": 317.2477569580078,
             "hCenter": 471.7433338165283,
-            "field": "remarks",
+            "field": "remarksText",
             "coordinateSync": false,
             "widthHeightSync": false,
             "fixed": true,

From 376899392985ab9a33032c134bac10f10d469a7c Mon Sep 17 00:00:00 2001
From: Mrking <782276617@qq.com>
Date: Sun, 12 Jan 2025 22:16:38 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/oms/produceorder/ProduceOrderForm.vue    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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 4aba286..252e778 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
@@ -328,10 +328,13 @@ const downpdf = async () => {
   formData.value.inspectionDateStr = formatDate(formData.value.inspectionDate,'YYYY-MM-DD')
   formData.value.deliverydateStr = formatDate(formData.value.deliverydate,'YYYY-MM-DD')
   const remarks = formData.value.remarks
+  const details = formData.value.details
   if(remarks){
     formData.value.remarksText =  formData.value.remarks + '\n' +formData.value.details
   }else {
-    formData.value.remarksText =  formData.value.details
+    if(details){
+      formData.value.remarksText = details
+    }
   }
   //formData.value.saleContractNo = formData.value.orderNo
 
@@ -376,10 +379,13 @@ const preview = async () => {
   formData.value.inspectionDateStr = formatDate(formData.value.inspectionDate,'YYYY-MM-DD')
   formData.value.deliverydateStr = formatDate(formData.value.deliverydate,'YYYY-MM-DD')
   const remarks = formData.value.remarks
+  const details = formData.value.remarks
   if(remarks){
     formData.value.remarksText =  formData.value.remarks + '\n' +formData.value.details
   }else {
-    formData.value.remarksText =  formData.value.details
+    if(details){
+      formData.value.remarksText = details
+    }
   }
   //formData.value.saleContractNo = formData.value.orderNo
 

From e40b1764545e49cb84f086284601b6adf0c9cb56 Mon Sep 17 00:00:00 2001
From: Mrking <782276617@qq.com>
Date: Sun, 12 Jan 2025 22:24:48 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/oms/produceorder/ProduceOrderForm.vue   | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

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 252e778..eb7621e 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
@@ -328,13 +328,12 @@ const downpdf = async () => {
   formData.value.inspectionDateStr = formatDate(formData.value.inspectionDate,'YYYY-MM-DD')
   formData.value.deliverydateStr = formatDate(formData.value.deliverydate,'YYYY-MM-DD')
   const remarks = formData.value.remarks
-  const details = formData.value.details
+  const details = formData.value.details || ''
+  debugger
   if(remarks){
-    formData.value.remarksText =  formData.value.remarks + '\n' +formData.value.details
+    formData.value.remarksText =  remarks + '\n' +details
   }else {
-    if(details){
       formData.value.remarksText = details
-    }
   }
   //formData.value.saleContractNo = formData.value.orderNo
 
@@ -381,11 +380,9 @@ const preview = async () => {
   const remarks = formData.value.remarks
   const details = formData.value.remarks
   if(remarks){
-    formData.value.remarksText =  formData.value.remarks + '\n' +formData.value.details
+    formData.value.remarksText =  remarks + '\n' +details
   }else {
-    if(details){
       formData.value.remarksText = details
-    }
   }
   //formData.value.saleContractNo = formData.value.orderNo
 

From 252cf1a34f2d733a0c690e34bce8e253951e480d Mon Sep 17 00:00:00 2001
From: Mrking <782276617@qq.com>
Date: Sun, 12 Jan 2025 22:29:04 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/oms/produceorder/ProduceOrderForm.vue            | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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 eb7621e..047dea0 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
@@ -329,7 +329,6 @@ const downpdf = async () => {
   formData.value.deliverydateStr = formatDate(formData.value.deliverydate,'YYYY-MM-DD')
   const remarks = formData.value.remarks
   const details = formData.value.details || ''
-  debugger
   if(remarks){
     formData.value.remarksText =  remarks + '\n' +details
   }else {
@@ -378,7 +377,7 @@ const preview = async () => {
   formData.value.inspectionDateStr = formatDate(formData.value.inspectionDate,'YYYY-MM-DD')
   formData.value.deliverydateStr = formatDate(formData.value.deliverydate,'YYYY-MM-DD')
   const remarks = formData.value.remarks
-  const details = formData.value.remarks
+  const details = formData.value.details || ''
   if(remarks){
     formData.value.remarksText =  remarks + '\n' +details
   }else {

From 994be7914f108333bb2b04955884074add078b33 Mon Sep 17 00:00:00 2001
From: wwb <782276617@qq.com>
Date: Mon, 13 Jan 2025 08:11:04 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/oms/produceorder/ProduceOrderForm.vue           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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..75532f9 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
@@ -330,7 +330,7 @@ const downpdf = async () => {
   const remarks = formData.value.remarks
   const details = formData.value.details || ''
   if(remarks){
-    formData.value.remarksText =  remarks + '\n' +details
+    formData.value.remarksText =  remarks + '\n \n' +details
   }else {
       formData.value.remarksText = details
   }
@@ -379,7 +379,7 @@ const preview = async () => {
   const remarks = formData.value.remarks
   const details = formData.value.details || ''
   if(remarks){
-    formData.value.remarksText =  remarks + '\n' +details
+    formData.value.remarksText =  remarks + '\n \n' +details
   }else {
       formData.value.remarksText = details
   }

From 2e876da193028568e80d90d46a3d8262f35f1300 Mon Sep 17 00:00:00 2001
From: wwb <782276617@qq.com>
Date: Mon, 13 Jan 2025 08:36:58 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/ProduceOrderImportExcelVO.java         |  4 +++
 .../produceorder/vo/ProduceOrderRespVO.java   |  3 ++
 .../vo/ProduceOrderSaveReqVO.java             |  3 ++
 .../produceorder/ProduceOrderDO.java          |  5 ++++
 .../produceorder/ProduceOrderServiceImpl.java |  8 +++---
 .../saleorder/SaleOrderServiceImpl.java       |  4 +--
 .../oms/produceorder/ProduceOrderForm.vue     | 28 ++++++++++---------
 7 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderImportExcelVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderImportExcelVO.java
index 057fa29..54eb4a4 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderImportExcelVO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderImportExcelVO.java
@@ -82,4 +82,8 @@ public class ProduceOrderImportExcelVO {
     @ExcelProperty("交货数量")
     private Long deliveryQty;
 
+    @Schema(description = "备注")
+    @ExcelProperty("备注")
+    private Long remarks2;
+
 }
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderRespVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderRespVO.java
index 739d60e..c7be0e8 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderRespVO.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/produceorder/vo/ProduceOrderRespVO.java
@@ -109,4 +109,7 @@ public class ProduceOrderRespVO {
 
     @Schema(description = "备注")
     private String remarks;
+
+    @Schema(description = "备注")
+    private String remarks2;
 }
\ No newline at end of file
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 0f8dc24..cdbe85d 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
@@ -86,4 +86,7 @@ public class ProduceOrderSaveReqVO {
     @Schema(description = "备注")
     private String remarks;
 
+    @Schema(description = "备注2")
+    private String remarks2;
+
 }
\ 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 c421786..48f1fe1 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
@@ -126,4 +126,9 @@ public class ProduceOrderDO extends BaseDO {
      */
     private String remarks;
 
+    /**
+     * 备注2
+     */
+    private String remarks2;
+
 }
\ No newline at end of file
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/produceorder/ProduceOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/produceorder/ProduceOrderServiceImpl.java
index 0d42b12..8b8a440 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/produceorder/ProduceOrderServiceImpl.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/produceorder/ProduceOrderServiceImpl.java
@@ -82,12 +82,12 @@ public class ProduceOrderServiceImpl implements ProduceOrderService {
         Double specSizeHeight = productInfo.getSpecSizeHeight();
         String specMaterial = productInfo.getSpecMaterial();
         String productionInfo = productInfo.getProductionInfo();
-/*        StringBuffer str = new StringBuffer();
+        StringBuffer str = new StringBuffer();
         str.append(String.format("货名：%s\r\n",productInfo.getName()));
         str.append(String.format("规格：%s × %s \r\n",specSizeWidth,specSizeHeight));
-        str.append(String.format("纸质：%s \r\n",specMaterial));*/;
-        //str.append(String.format("%s ",productionInfo));
-        //updateObj.setDetails(str.toString());
+        str.append(String.format("纸质：%s \r\n",specMaterial));;
+        str.append(String.format("%s ",productionInfo));
+        updateObj.setDetails(str.toString());
 
         produceOrderMapper.updateById(updateObj);
     }
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..086b0f4 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
@@ -480,14 +480,14 @@ public class SaleOrderServiceImpl implements SaleOrderService {
                     }
                     saveReqVO.setRemarks(remarks);
                 }
-          /*      Double specSizeWidth = productInfo.getSpecSizeWidth();
+                Double specSizeWidth = productInfo.getSpecSizeWidth();
                 Double specSizeHeight = productInfo.getSpecSizeHeight();
                 String specMaterial = productInfo.getSpecMaterial();
                 StringBuffer str = new StringBuffer();
                 str.append(String.format("货名：%s\r\n", productInfo.getName()));
                 str.append(String.format("规格：%s × %s \r\n", specSizeWidth, specSizeHeight));
                 str.append(String.format("纸质：%s \r\n", specMaterial));
-                saveReqVO.setDetails(str.toString());*/
+                saveReqVO.setDetails(str.toString());
                 Long produceOrderId = produceOrderService.createProduceOrder(saveReqVO);
             }
 
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 75532f9..f0c6b67 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
@@ -158,8 +158,8 @@
       </el-row>
       <el-row>
         <el-col :span="24">
-          <el-form-item label="备注" prop="details">
-            <el-input v-model="formData.details" placeholder="请输入备注" />
+          <el-form-item label="备注" prop="remarks2">
+            <el-input v-model="formData.remarks2" placeholder="请输入备注" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -223,6 +223,7 @@ const formData = ref({
   deliveryQty: undefined,
   details: undefined,
   remarks: undefined,
+  remarks2: undefined,
   remarksText: undefined,
 })
 
@@ -308,6 +309,7 @@ const resetForm = () => {
     deliveryQty: undefined,
     details: undefined,
     remarks: undefined,
+    remarks2: undefined,
     remarksText: undefined,
   }
   formRef.value?.resetFields()
@@ -328,23 +330,23 @@ const downpdf = async () => {
   formData.value.inspectionDateStr = formatDate(formData.value.inspectionDate,'YYYY-MM-DD')
   formData.value.deliverydateStr = formatDate(formData.value.deliverydate,'YYYY-MM-DD')
   const remarks = formData.value.remarks
-  const details = formData.value.details || ''
+  const remarks2 = formData.value.remarks2 || ''
   if(remarks){
-    formData.value.remarksText =  remarks + '\n \n' +details
+    formData.value.remarksText =  remarks + '\n \n' +remarks2
   }else {
-      formData.value.remarksText = details
+      formData.value.remarksText = remarks2
   }
   //formData.value.saleContractNo = formData.value.orderNo
-
+  debugger
   if(formData.value.productId){
     const material = await ProductInfoApi.getProductInfo(formData.value.productId)
     formData.value.productCode = material.code
     formData.value.productName = material.name
-    //formData.value.details = material.productionInfo
+    formData.value.details = material.productionInfo
   }else {
     formData.value.productCode = ''
     formData.value.productName = ''
-    //formData.value.details = ''
+    formData.value.details = ''
   }
 
   let printData = JSON.stringify(formData.value)
@@ -377,11 +379,11 @@ const preview = async () => {
   formData.value.inspectionDateStr = formatDate(formData.value.inspectionDate,'YYYY-MM-DD')
   formData.value.deliverydateStr = formatDate(formData.value.deliverydate,'YYYY-MM-DD')
   const remarks = formData.value.remarks
-  const details = formData.value.details || ''
+  const remarks2 = formData.value.remarks2 || ''
   if(remarks){
-    formData.value.remarksText =  remarks + '\n \n' +details
+    formData.value.remarksText =  remarks + '\n \n' +remarks2
   }else {
-      formData.value.remarksText = details
+      formData.value.remarksText = remarks2
   }
   //formData.value.saleContractNo = formData.value.orderNo
 
@@ -389,11 +391,11 @@ const preview = async () => {
     const material = await ProductInfoApi.getProductInfo(formData.value.productId)
     formData.value.productCode = material.code
     formData.value.productName = material.name
-    //formData.value.details = material.productionInfo
+    formData.value.details = material.productionInfo
   }else {
     formData.value.productCode = ''
     formData.value.productName = ''
-    //formData.value.details = ''
+    formData.value.details = ''
   }
 
 

From a14f49f94dd4d55031e9211b81bfea5ec15adcef Mon Sep 17 00:00:00 2001
From: wwb <782276617@qq.com>
Date: Mon, 13 Jan 2025 08:37:51 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/oms/produceorder/ProduceOrderForm.vue              | 1 -
 1 file changed, 1 deletion(-)

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 f0c6b67..f45b09a 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
@@ -337,7 +337,6 @@ const downpdf = async () => {
       formData.value.remarksText = remarks2
   }
   //formData.value.saleContractNo = formData.value.orderNo
-  debugger
   if(formData.value.productId){
     const material = await ProductInfoApi.getProductInfo(formData.value.productId)
     formData.value.productCode = material.code