优化生产制单

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);
     }

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);
             }
 

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 = ''
   }
 
 

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,