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 ee821b4..3ad5100 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
@@ -81,10 +81,12 @@ public class ProduceOrderServiceImpl implements ProduceOrderService {
         Double specSizeWidth = productInfo.getSpecSizeWidth();
         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()));
+/*        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 \r\n",specMaterial));*/;
+        str.append(String.format("%s ",productionInfo));
         updateObj.setDetails(str.toString());
 
         produceOrderMapper.updateById(updateObj);
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 2f139f0..5ff9999 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
@@ -175,6 +175,7 @@ import startPreview from "./components/preview.vue"
 import {dateUtil} from "@/utils/dateUtil";
 import {dateFormatter, formatDate} from '@/utils/formatTime'
 import ProductInfoListDialog from "@/components/Dialog/src/ProductInfoListDialog/index.vue";
+import {ProductInfoApi} from "@/api/oms/productinfo";
 
 
 /** 生产制单 表单 */
@@ -306,6 +307,7 @@ const downpdf = async () => {
   if (id) {
     formData.value = await ProduceOrderApi.getProduceOrder(id)
   }
+
   //日期转换
   formData.value.contractDateStr = formatDate(formData.value.contractDate,'YYYY-MM-DD')
   formData.value.reportDateStr = formatDate(formData.value.reportDate,'YYYY-MM-DD')
@@ -315,6 +317,17 @@ const downpdf = async () => {
   formData.value.deliverydateStr = formatDate(formData.value.deliverydate,'YYYY-MM-DD')
   //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
+  }else {
+    formData.value.productCode = ''
+    formData.value.productName = ''
+    formData.value.details = ''
+  }
+
   let printData = JSON.stringify(formData.value)
   printData = JSON.parse(printData)
   let hiprintTemplate = new hiprint.PrintTemplate({template: template1});
@@ -345,6 +358,19 @@ const preview = async () => {
   formData.value.deliverydateStr = formatDate(formData.value.deliverydate,'YYYY-MM-DD')
   //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
+  }else {
+    formData.value.productCode = ''
+    formData.value.productName = ''
+    formData.value.details = ''
+  }
+
+
+
   let printData = JSON.stringify(formData.value)
   printData = JSON.parse(printData)
   let hiprintTemplate = new hiprint.PrintTemplate({template: template1});
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 a356b1d..752dbb3 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
@@ -408,14 +408,14 @@ export default {
         {
           "options": {
             "left": 474,
-            "top": 177,
+            "top": 187.5,
             "height": 9.75,
             "width": 120,
             "title": "数量",
-            "right": 574.5,
-            "bottom": 131.25,
-            "vCenter": 514.5,
-            "hCenter": 126.375,
+            "right": 593.9926071166992,
+            "bottom": 186.7401351928711,
+            "vCenter": 533.9926071166992,
+            "hCenter": 181.8651351928711,
             "field": "deliveryQty",
             "coordinateSync": false,
             "widthHeightSync": false,