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 1/4] =?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 2/4] =?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 @@ - - + + @@ -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 3/4] =?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 From 2ec371bd9a62211e0a224d4314164e57e248ba4a Mon Sep 17 00:00:00 2001 From: yf <770153798@qq.com> Date: Sun, 19 Jan 2025 17:32:23 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hangtag-ui-admin/src/components/Search/src/Search.vue | 8 ++++++-- .../hangtag-ui-front/src/components/Search/src/Search.vue | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hangtag-ui/hangtag-ui-admin/src/components/Search/src/Search.vue b/hangtag-ui/hangtag-ui-admin/src/components/Search/src/Search.vue index 3218a63..c1d0737 100644 --- a/hangtag-ui/hangtag-ui-admin/src/components/Search/src/Search.vue +++ b/hangtag-ui/hangtag-ui-admin/src/components/Search/src/Search.vue @@ -97,6 +97,10 @@ const setVisible = () => { unref(elFormRef)?.resetFields() visible.value = !unref(visible) } +defineExpose({ + reset, + search +}) -