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 9567c54..63f23b5 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/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 +}) -