From a2ea5282a20267c1b9fc2db33089fe5343f8b2f1 Mon Sep 17 00:00:00 2001 From: wwb <782276617@qq.com> Date: Sat, 4 Jan 2025 17:10:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E7=94=9F=E4=BA=A7=E5=88=B6=E5=8D=95?= =?UTF-8?q?=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../produceorder/vo/ProduceOrderRespVO.java | 2 + .../productinfo/vo/ProductInfoRespVO.java | 2 +- .../dal/dataobject/saleorder/SaleOrderDO.java | 6 ++ .../saleorder/SaleOrderServiceImpl.java | 17 ++-- .../oms/produceorder/ProduceOrderForm.vue | 1 + .../src/views/oms/produceorder/template1.js | 78 ++++++++++++------- 6 files changed, 70 insertions(+), 36 deletions(-) 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 f49229e..739d60e 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 @@ -107,4 +107,6 @@ public class ProduceOrderRespVO { @Schema(description = "详情") private String details; + @Schema(description = "备注") + private String remarks; } \ 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/productinfo/vo/ProductInfoRespVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productinfo/vo/ProductInfoRespVO.java index 9cf441f..9a2ba5d 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productinfo/vo/ProductInfoRespVO.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productinfo/vo/ProductInfoRespVO.java @@ -53,7 +53,7 @@ public class ProductInfoRespVO { @Schema(description = "备注") @ExcelProperty("备注") - private String remark; + private String remarks; @Schema(description = "品牌名称") @ExcelProperty("品牌名称") diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleorder/SaleOrderDO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleorder/SaleOrderDO.java index 3935385..6e9d383 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleorder/SaleOrderDO.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/saleorder/SaleOrderDO.java @@ -138,6 +138,12 @@ public class SaleOrderDO extends BaseDO { * 合同编码 */ private String contractCode; + + /** + * 销售合约编码 + */ + private String saleContractCode; + /** * 零售商单号 */ 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 4799338..44f9de9 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 @@ -352,7 +352,7 @@ public class SaleOrderServiceImpl implements SaleOrderService { Long userId = SecurityFrameworkUtils.getLoginUserId(); saleOrder.setAuditor(userId.toString()); saleOrder.setAuditorTime(LocalDateTime.now()); - saleOrderMapper.updateById(saleOrder); + //生成产品单价记录 @@ -363,7 +363,10 @@ public class SaleOrderServiceImpl implements SaleOrderService { } //生成销售合约 - Long saleContractId = generateSaleContract(saleOrder, entrys); + SaleContractSaveReqVO saleContractVO = generateSaleContract(saleOrder, entrys); + Long saleContractId = saleContractVO.getId(); + saleOrder.setSaleContractCode(saleContractVO.getBillno()); + saleOrderMapper.updateById(saleOrder); String htmlContent = generateHtmlContent(saleContractId); @@ -452,7 +455,7 @@ public class SaleOrderServiceImpl implements SaleOrderService { ProductInfoDO productInfo = productInfoService.getProductInfo(entry.getMaterialId()); ProduceOrderSaveReqVO saveReqVO = new ProduceOrderSaveReqVO(); saveReqVO.setOrderNo(saleOrder.getBillno()); - saveReqVO.setSaleContractNo(saleOrder.getContractCode()); + saveReqVO.setSaleContractNo(saleOrder.getSaleContractCode()); saveReqVO.setCustomerId(customer.getId()); saveReqVO.setCustomerCode(customer.getNumber()); saveReqVO.setProductId(entry.getMaterialId()); @@ -995,9 +998,11 @@ public class SaleOrderServiceImpl implements SaleOrderService { } - private Long generateSaleContract(SaleOrderDO saleOrder, List entrys) { + private SaleContractSaveReqVO generateSaleContract(SaleOrderDO saleOrder, List entrys) { SaleContractSaveReqVO saveReqVO = toSaleContractVO(saleOrder, entrys); - return saleContractService.createSaleContract(saveReqVO); + Long id = saleContractService.createSaleContract(saveReqVO); + saveReqVO.setId(id); + return saveReqVO; } @@ -1018,7 +1023,7 @@ public class SaleOrderServiceImpl implements SaleOrderService { saveReqVO.setBillno(billno); saveReqVO.setCustomerId(saleOrder.getCustomerId()); saveReqVO.setCustomerName(customer.getName()); - saveReqVO.setCustomerBuyNo(saleOrder.getBillno()); + saveReqVO.setCustomerBuyNo(saleOrder.getContractCode()); saveReqVO.setBizdate(saleOrder.getBizdate()); saveReqVO.setPartyA(customer.getCompany()); saveReqVO.setHead(customer.getGdperson()); 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 5ff9999..37ab719 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 @@ -215,6 +215,7 @@ const formData = ref({ deliverydateStr: undefined, deliveryQty: undefined, details: undefined, + remarks: undefined, }) const formRules = reactive({ 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 752dbb3..f4c19fb 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 @@ -594,14 +594,14 @@ export default { }, { "options": { - "left": 60, - "top": 262.5, + "left": 61.5, + "top": 259.5, "height": 178.5, "width": 532, - "right": 587.5, - "bottom": 453.7449760437012, - "vCenter": 321.5, - "hCenter": 358.4949760437012, + "right": 593.4955368041992, + "bottom": 440.98885345458984, + "vCenter": 327.4955368041992, + "hCenter": 351.73885345458984, "field": "details", "coordinateSync": false, "widthHeightSync": false, @@ -612,29 +612,6 @@ export default { "type": "longText" } }, - { - "options": { - "left": 15, - "top": 444, - "height": 50, - "width": 575, - "title": "备注", - "right": 583.5, - "bottom": 487.4950575828552, - "vCenter": 300.75, - "hCenter": 464.9950575828552, - "coordinateSync": false, - "widthHeightSync": false, - "qrCodeLevel": 0, - "field": "remarks", - "fontSize": 9, - "fontWeight": "700" - }, - "printElementType": { - "title": "文本", - "type": "text" - } - }, { "options": { "left": 15, @@ -2227,6 +2204,49 @@ export default { "title": "横线", "type": "hline" } + }, + { + "options": { + "left": 15, + "top": 441, + "height": 9.75, + "width": 39, + "title": "备注：", + "right": 136.49553680419922, + "bottom": 444.7500228881836, + "vCenter": 76.49553680419922, + "hCenter": 439.8750228881836, + "coordinateSync": false, + "widthHeightSync": false, + "fontSize": 9, + "fontWeight": "700", + "qrCodeLevel": 0 + }, + "printElementType": { + "title": "文本", + "type": "text" + } + }, + { + "options": { + "left": 42, + "top": 441, + "height": 61.5, + "width": 550.5, + "right": 592.4977569580078, + "bottom": 502.4933338165283, + "vCenter": 317.2477569580078, + "hCenter": 471.7433338165283, + "field": "remarks", + "coordinateSync": false, + "widthHeightSync": false, + "fixed": true, + "qid": "details_1" + }, + "printElementType": { + "title": "", + "type": "longText" + } } ], "paperNumberLeft": 565,