From cbc673daf3f30c6281bee5b59011a2b9eec6765b Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Tue, 3 Dec 2024 14:05:48 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E4=B8=87=E6=9D=90=E8=B0=83=E6=95=B4:=20?= =?UTF-8?q?=E9=87=8D=E5=86=99=E5=AF=BC=E5=87=BA=E5=87=BA=E8=B4=A7=E5=8F=91?= =?UTF-8?q?=E7=A5=A81=E6=A8=A1=E6=9D=BF=E7=9A=84=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E4=BF=AE=E6=94=B9=20=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E8=B4=A7=E5=8F=91=E7=A5=A8=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E6=95=B0=E6=8D=AE=E5=AE=9E=E4=BD=93=E7=B1=BB=20?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E6=96=B0=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=87=BA=E8=B4=A7=E5=8F=91=E7=A5=A81.xlsx=E6=96=87=E4=BB=B6=20?= =?UTF-8?q?=E9=87=8D=E5=86=99=E5=AF=BC=E5=87=BA=E5=87=BA=E8=B4=A7=E5=8F=91?= =?UTF-8?q?=E7=A5=A82=E6=A8=A1=E6=9D=BF=E7=9A=84=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E6=8C=89=E7=85=A7=E6=96=B0=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E4=BF=AE=E6=94=B9=E5=87=BA=E8=B4=A7=E5=8F=91=E7=A5=A8?= =?UTF-8?q?2.xlsx=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/dto/ExportShippingInvoiceDto.java | 7 +- .../SysSalesShippingInformServiceImpl.java | 153 ++++++++++++------ .../attachments/销售出货发票1.xlsx | Bin 89413 -> 89424 bytes .../attachments/销售出货发票2.xlsx | Bin 29190 -> 29138 bytes .../salesShippingInform.html | 4 +- 5 files changed, 114 insertions(+), 50 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/dto/ExportShippingInvoiceDto.java b/ruoyi-admin/src/main/java/com/ruoyi/system/dto/ExportShippingInvoiceDto.java index eed8c878..b075df5e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/dto/ExportShippingInvoiceDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/dto/ExportShippingInvoiceDto.java @@ -15,12 +15,15 @@ public class ExportShippingInvoiceDto { private String materialName; + private String materialModel; + private String makeNo; private Integer materialNum; - private BigDecimal materialUsd; + private String materialAmount; - private BigDecimal materialUsdSum; + private String materialAmountSum; + private String total; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java index 902d0aab..b45f411b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java @@ -1075,51 +1075,83 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor insertShippingInformation(outOrderCode,shippingInformationType,shippingTemplateType,sysSalesShippingInform); String salesOrderCode = sysSalesShippingInform.getSalesOrderCode(); - SysMakeOrder sysMakeOrder = sysMakeOrderMapper.selectMakeOrderBySaleNo(salesOrderCode); - List sysSalesOrderChildren = salesOrderChildMapper.selectOrderChildListBySalesOrderCode(salesOrderCode); + List salesOrderCodes = new ArrayList<>(); - String makeNo = sysMakeOrder.getMakeNo(); - if (!StringUtils.isEmpty(makeNo)){ - List afterSalesShippingDevices = salesShippingDeviceMapper.selectShippingDeviceByMakeNo(makeNo); + if (StringUtils.isNotEmpty(salesOrderCode)){ + String[] splitSalesOrderCode = salesOrderCode.split(","); + salesOrderCodes = Arrays.asList(splitSalesOrderCode); } - Map map = new HashMap<>(); - map.put("customerContact",sysSalesShippingInform.getCustomerContact()); - map.put("customerContactAddress",sysSalesShippingInform.getCustomerContactAddress()); - map.put("customerContactBillto",sysSalesShippingInform.getCustomerContactBillto()); - map.put("contactAddressBillto",sysSalesShippingInform.getContactAddressBillto()); + //生产订主表的数据 + List sysMakeOrders = sysMakeOrderMapper.selectMakeOrderListBySalesOrderCodes(salesOrderCodes); + + + //销售订单主表的数据 + List sysSalesOrders = sysSalesOrderMapper.selectSysSalesOrderListByCodeList(salesOrderCodes); + + //获取销售订单的明细 + List sysSalesOrderChildren = salesOrderChildMapper.selectBatchOrderChildListBySalesOrderCode(salesOrderCodes); + + + + Map makeOrderMap = new HashMap<>(); + + for (SysMakeOrder sysMakeOrder : sysMakeOrders) { + makeOrderMap.put(sysMakeOrder.getSaleNo(),sysMakeOrder); + } + + Map salesOrderMap = new HashMap<>(); + + for (SysSalesOrder sysSalesOrder : sysSalesOrders) { + salesOrderMap.put(sysSalesOrder.getSalesOrderCode(),sysSalesOrder); + } ArrayList exportShippingInvoiceDtos = new ArrayList<>(); + AtomicInteger index = new AtomicInteger(1); for (SysSalesOrderChild sysSalesOrderChild : sysSalesOrderChildren) { ExportShippingInvoiceDto exportShippingInvoiceDto = new ExportShippingInvoiceDto(); + SysMakeOrder sysMakeOrder = makeOrderMap.get(sysSalesOrderChild.getQuoteId()); + SysSalesOrder sysSalesOrder = salesOrderMap.get(sysSalesOrderChild.getQuoteId()); + exportShippingInvoiceDto.setIndex(index.getAndIncrement()); + exportShippingInvoiceDto.setMaterialModel(sysSalesOrderChild.getMaterialModel()); exportShippingInvoiceDto.setMaterialName(sysSalesOrderChild.getMaterialName()); - exportShippingInvoiceDto.setMaterialNum(1); + exportShippingInvoiceDto.setMaterialNum(sysSalesOrderChild.getMaterialNum()); + exportShippingInvoiceDto.setMakeNo(sysMakeOrder.getMakeNo()); - if (sysSalesOrderChild.getMaterialUsd() != null) { - exportShippingInvoiceDto.setMaterialUsd(new BigDecimal(sysSalesOrderChild.getMaterialUsd())); - } else { - // 如果 materialUsd 为 null，可以设置为默认值或者保持不变 - exportShippingInvoiceDto.setMaterialUsd(BigDecimal.ZERO); // 示例: 设置为0 - } + if ("1".equals(sysSalesOrder.getCommonCurrency())){ + + String materialNoRmb = sysSalesOrderChild.getMaterialNoRmb().toString(); + String materialNoRmbSum = sysSalesOrderChild.getMaterialNoRmbSum().toString(); + exportShippingInvoiceDto.setMaterialAmount(materialNoRmb + "RMB"); + exportShippingInvoiceDto.setMaterialAmountSum(materialNoRmbSum + "RMB"); - if (sysSalesOrderChild.getMaterialUsdSum() != null) { - exportShippingInvoiceDto.setMaterialUsdSum(new BigDecimal(sysSalesOrderChild.getMaterialUsdSum())); } else { - // 如果 materialUsdSum 为 null，可以设置为默认值或者保持不变 - exportShippingInvoiceDto.setMaterialUsdSum(BigDecimal.ZERO); // 示例: 设置为0 + + String materialNoUsd = sysSalesOrderChild.getMaterialNoUsd().toString(); + String materialNoUsdSum = sysSalesOrderChild.getMaterialNoUsdSum().toString(); + exportShippingInvoiceDto.setMaterialAmount(materialNoUsd + "USD"); + exportShippingInvoiceDto.setMaterialAmountSum(materialNoUsdSum + "USD"); } - exportShippingInvoiceDto.setMakeNo(makeNo); - // to do 缺少物料型号 + exportShippingInvoiceDtos.add(exportShippingInvoiceDto); } + + + Map map = new HashMap<>(); + map.put("customerContact",sysSalesShippingInform.getCustomerContact()); + map.put("customerContactAddress",sysSalesShippingInform.getCustomerContactAddress()); + map.put("customerContactBillto",sysSalesShippingInform.getCustomerContactBillto()); + map.put("contactAddressBillto",sysSalesShippingInform.getContactAddressBillto()); + + ExcelWriter workBook = EasyExcel.write(response.getOutputStream()).withTemplate(fileAbsolutePath).build(); WriteSheet sheet = EasyExcel.writerSheet().build(); FillConfig fillConfig = FillConfig.builder().forceNewRow(true).build(); @@ -1163,50 +1195,79 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor insertShippingInformation(outOrderCode,shippingInformationType,shippingTemplateType,sysSalesShippingInform); String salesOrderCode = sysSalesShippingInform.getSalesOrderCode(); - SysMakeOrder sysMakeOrder = sysMakeOrderMapper.selectMakeOrderBySaleNo(salesOrderCode); - List sysSalesOrderChildren = salesOrderChildMapper.selectOrderChildListBySalesOrderCode(salesOrderCode); + List salesOrderCodes = new ArrayList<>(); - String makeNo = sysMakeOrder.getMakeNo(); - if (!StringUtils.isEmpty(makeNo)){ - List afterSalesShippingDevices = salesShippingDeviceMapper.selectShippingDeviceByMakeNo(makeNo); + if (StringUtils.isNotEmpty(salesOrderCode)){ + String[] splitSalesOrderCode = salesOrderCode.split(","); + salesOrderCodes = Arrays.asList(splitSalesOrderCode); } - Map map = new HashMap<>(); - map.put("customerContact",sysSalesShippingInform.getCustomerContact()); - map.put("customerContactAddress",sysSalesShippingInform.getCustomerContactAddress()); - map.put("customerContactBillto",sysSalesShippingInform.getCustomerContactBillto()); - map.put("contactAddressBillto",sysSalesShippingInform.getContactAddressBillto()); + //生产订主表的数据 + List sysMakeOrders = sysMakeOrderMapper.selectMakeOrderListBySalesOrderCodes(salesOrderCodes); + + + //销售订单主表的数据 + List sysSalesOrders = sysSalesOrderMapper.selectSysSalesOrderListByCodeList(salesOrderCodes); + + //获取销售订单的明细 + List sysSalesOrderChildren = salesOrderChildMapper.selectBatchOrderChildListBySalesOrderCode(salesOrderCodes); + + + + Map makeOrderMap = new HashMap<>(); + + for (SysMakeOrder sysMakeOrder : sysMakeOrders) { + makeOrderMap.put(sysMakeOrder.getSaleNo(),sysMakeOrder); + } + + Map salesOrderMap = new HashMap<>(); + + for (SysSalesOrder sysSalesOrder : sysSalesOrders) { + salesOrderMap.put(sysSalesOrder.getSalesOrderCode(),sysSalesOrder); + } ArrayList exportShippingInvoiceDtos = new ArrayList<>(); + AtomicInteger index = new AtomicInteger(1); for (SysSalesOrderChild sysSalesOrderChild : sysSalesOrderChildren) { ExportShippingInvoiceDto exportShippingInvoiceDto = new ExportShippingInvoiceDto(); + SysMakeOrder sysMakeOrder = makeOrderMap.get(sysSalesOrderChild.getQuoteId()); + SysSalesOrder sysSalesOrder = salesOrderMap.get(sysSalesOrderChild.getQuoteId()); + exportShippingInvoiceDto.setIndex(index.getAndIncrement()); + exportShippingInvoiceDto.setMaterialModel(sysSalesOrderChild.getMaterialModel()); exportShippingInvoiceDto.setMaterialName(sysSalesOrderChild.getMaterialName()); - exportShippingInvoiceDto.setMaterialNum(1); + exportShippingInvoiceDto.setMaterialNum(sysSalesOrderChild.getMaterialNum()); + exportShippingInvoiceDto.setMakeNo(sysMakeOrder.getMakeNo()); - if (sysSalesOrderChild.getMaterialUsd() != null) { - exportShippingInvoiceDto.setMaterialUsd(new BigDecimal(sysSalesOrderChild.getMaterialUsd())); - } else { - // 如果 materialUsd 为 null，可以设置为默认值或者保持不变 - exportShippingInvoiceDto.setMaterialUsd(BigDecimal.ZERO); // 示例: 设置为0 - } + if ("1".equals(sysSalesOrder.getCommonCurrency())){ + + String materialNoRmb = sysSalesOrderChild.getMaterialNoRmb().toString(); + String materialNoRmbSum = sysSalesOrderChild.getMaterialNoRmbSum().toString(); + exportShippingInvoiceDto.setMaterialAmount(materialNoRmb + "RMB"); + exportShippingInvoiceDto.setMaterialAmountSum(materialNoRmbSum + "RMB"); - if (sysSalesOrderChild.getMaterialUsdSum() != null) { - exportShippingInvoiceDto.setMaterialUsdSum(new BigDecimal(sysSalesOrderChild.getMaterialUsdSum())); } else { - // 如果 materialUsdSum 为 null，可以设置为默认值或者保持不变 - exportShippingInvoiceDto.setMaterialUsdSum(BigDecimal.ZERO); // 示例: 设置为0 + + String materialNoUsd = sysSalesOrderChild.getMaterialNoUsd().toString(); + String materialNoUsdSum = sysSalesOrderChild.getMaterialNoUsdSum().toString(); + exportShippingInvoiceDto.setMaterialAmount(materialNoUsd + "USD"); + exportShippingInvoiceDto.setMaterialAmountSum(materialNoUsdSum + "USD"); } - exportShippingInvoiceDto.setMakeNo(makeNo); - // to do 缺少物料型号 + exportShippingInvoiceDtos.add(exportShippingInvoiceDto); } + Map map = new HashMap<>(); + map.put("customerContact",sysSalesShippingInform.getCustomerContact()); + map.put("customerContactAddress",sysSalesShippingInform.getCustomerContactAddress()); + map.put("customerContactBillto",sysSalesShippingInform.getCustomerContactBillto()); + map.put("contactAddressBillto",sysSalesShippingInform.getContactAddressBillto()); + ExcelWriter workBook = EasyExcel.write(response.getOutputStream()).withTemplate(fileAbsolutePath).build(); WriteSheet sheet = EasyExcel.writerSheet().build(); diff --git a/ruoyi-admin/src/main/resources/static/attachments/销售出货发票1.xlsx b/ruoyi-admin/src/main/resources/static/attachments/销售出货发票1.xlsx index 5153f88d1b5f38afb1341bf4c256198a4f0c25c9..d712f516b79ff9b2332461f02635b0f209d2c82c 100644 GIT binary patch delta 4514 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 diff --git a/ruoyi-admin/src/main/resources/static/attachments/销售出货发票2.xlsx b/ruoyi-admin/src/main/resources/static/attachments/销售出货发票2.xlsx index 7cda613a96bb1ddfc602b011cfd9ca20d769c644..4f0494a831a82cad9298b0bd434b39f3049ff662 100644 GIT binary patch delta 6032 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 delta 6062 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 diff --git a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html index 6e6bf075..5c25a2fc 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html @@ -524,7 +524,7 @@ const row = selectedRows[0]; // 使用 $.modal.confirm 显示确认对话框 - $.modal.confirm("确定导出这条数据的出货单吗？", function() { + $.modal.confirm("确定导出这条数据的出货发票1吗？", function() { // 如果用户点击确定，继续导出 var outOrderCode = row.outOrderCode; window.location.href = prefix + "/exportShippingInvoiceOne/" + outOrderCode; @@ -546,7 +546,7 @@ const row = selectedRows[0]; // 使用 $.modal.confirm 显示确认对话框 - $.modal.confirm("确定导出这条数据的出货单吗？", function() { + $.modal.confirm("确定导出这条数据的出货发票吗？", function() { // 如果用户点击确定，继续导出 var outOrderCode = row.outOrderCode; window.location.href = prefix + "/exportShippingInvoiceTwo/" + outOrderCode;