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] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=9F=E4=BA=A7=E5=88=B6?= =?UTF-8?q?=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 @@ + + + + + + +