From 521b35e8b7bfc5b3d970a284aa61e33fa4a7a2e0 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 13 Dec 2024 16:08:51 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E8=B4=A7=E9=80=9A=E7=9F=A5=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=EF=BC=9A=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=9A=90=E8=97=8F=E4=BB=8E=E3=80=90=E4=B8=8D=E5=90=AB?= =?UTF-8?q?=E7=A8=8E=E6=80=BB=E4=BB=B7(RMB)=E3=80=91=E8=87=B3=E3=80=90?= =?UTF-8?q?=E5=90=AB=E7=A8=8E=E6=80=BB=E4=BB=B7=E3=80=91=E7=9A=84=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=20=E6=96=B0=E5=A2=9E=20=E5=AF=BC=E5=87=BA=E9=94=80?= =?UTF-8?q?=E5=94=AE=E5=87=BA=E8=B4=A7=E5=8D=95=E4=B8=BB=E8=A1=A8=E5=92=8C?= =?UTF-8?q?=E5=AD=90=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE=E5=87=BA=E8=B4=A7?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=AF=BC=E5=87=BA=E5=85=A8=E9=83=A8=E5=92=8C?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=80=89=E6=8B=A9=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3=EF=BC=9A=E7=BB=9F=E4=B8=80=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E5=AF=BC=E5=87=BA=E9=94=80=E5=94=AE=E5=87=BA=E8=B4=A7?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=8D=95=E6=98=8E=E7=BB=86=E6=96=B9=E6=B3=95?= =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=20=E5=AF=BC=E5=87=BA=E9=94=80=E5=94=AE?= =?UTF-8?q?=E5=87=BA=E8=B4=A7=E9=80=9A=E7=9F=A5=E5=8D=95=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=96=B9=E6=B3=95=EF=BC=8C=E7=94=A8=E4=BA=8E?= =?UTF-8?q?=E7=BB=99=E5=AF=BC=E5=87=BA=E9=94=80=E5=94=AE=E5=87=BA=E8=B4=A7?= =?UTF-8?q?=E5=8D=95=E4=B8=BB=E8=A1=A8=E5=92=8C=E5=AD=90=E8=A1=A8=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=AE=9E=E4=BD=93=E7=B1=BB=E8=BF=9B=E8=A1=8C=E8=B5=8B?= =?UTF-8?q?=E5=80=BC=E6=93=8D=E4=BD=9C=EF=BC=8C=E5=AE=9E=E7=8E=B0=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E9=94=80=E5=94=AE=E5=87=BA=E8=B4=A7=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E5=AF=B9=E5=BA=94=E4=B8=80=E6=9D=A1=E5=AD=90?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E5=BD=A2=E5=BC=8F=20=E4=BF=AE=E6=94=B9=20?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=87=BA=E5=BA=93=E5=8D=95=E5=8F=B7=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E6=9F=A5=E8=AF=A2=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=96=B9=E6=B3=95=EF=BC=8C=E4=BC=A0=E5=85=A5?= =?UTF-8?q?=E7=9A=84=E9=9B=86=E5=90=88=E5=8A=A0=E4=B8=8A=E9=9D=9E=E7=A9=BA?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysSalesShippingInformController.java | 57 +++--- .../Vo/ExportSalesShippingInformDetailVo.java | 190 ++++++++++++++++++ .../ISysSalesShippingInformService.java | 6 + .../SysSalesShippingInformServiceImpl.java | 65 +++++- .../SysSalesShippingInformDetailMapper.xml | 6 +- .../salesShippingInform.html | 72 +++---- 6 files changed, 331 insertions(+), 65 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/domain/Vo/ExportSalesShippingInformDetailVo.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesShippingInformController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesShippingInformController.java index 4809f805..4009a80e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesShippingInformController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesShippingInformController.java @@ -12,6 +12,7 @@ import com.ruoyi.system.domain.SysSalesOrder; import com.ruoyi.system.domain.SysSalesOrderVo; import com.ruoyi.system.domain.SysSalesShippingInformDetail; import com.ruoyi.system.domain.Vo.ConfirmReceivingDetailVo; +import com.ruoyi.system.domain.Vo.ExportSalesShippingInformDetailVo; import com.ruoyi.system.service.ISysSalesOrderService; import com.ruoyi.system.service.ISysSalesShippingInformDetailService; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -82,20 +83,21 @@ public class SysSalesShippingInformController extends BaseController public AjaxResult export(SysSalesShippingInform sysSalesShippingInform) { List list = sysSalesShippingInformService.selectSysSalesShippingInformList(sysSalesShippingInform); - if (!CollectionUtils.isEmpty(list)){ - //批量遍历 - List collectOutOrderCodes = list.stream().map(SysSalesShippingInform::getOutOrderCode).collect(Collectors.toList()); - Map> detailMap = shippingInformDetailService.selectShippingInformDetailListByCodes(collectOutOrderCodes); - - list.forEach(salesShippingInform -> { - salesShippingInform.setShippingInformDetailList( - detailMap.getOrDefault(salesShippingInform.getOutOrderCode(), Collections.emptyList()) - ); - }); - } - - ExcelUtil util = new ExcelUtil(SysSalesShippingInform.class); - return util.exportExcel(list, "销售出货通知数据","销售出货通知数据"); +// if (!CollectionUtils.isEmpty(list)){ +// //批量遍历 +// List collectOutOrderCodes = list.stream().map(SysSalesShippingInform::getOutOrderCode).collect(Collectors.toList()); +// Map> detailMap = shippingInformDetailService.selectShippingInformDetailListByCodes(collectOutOrderCodes); +// +// list.forEach(salesShippingInform -> { +// salesShippingInform.setShippingInformDetailList( +// detailMap.getOrDefault(salesShippingInform.getOutOrderCode(), Collections.emptyList()) +// ); +// }); +// } + + List exportSalesShippingInformDetailVos = sysSalesShippingInformService.exportShippingInformOrderDetailList(list); + ExcelUtil util = new ExcelUtil(ExportSalesShippingInformDetailVo.class); + return util.exportExcel(exportSalesShippingInformDetailVos, "销售出货通知数据"); } /** * 导出销售出货通知列表 @@ -107,19 +109,20 @@ public class SysSalesShippingInformController extends BaseController public AjaxResult export(@RequestBody String[] outOrderCodes) { List list = sysSalesShippingInformService.getExportListByNos(outOrderCodes); - if (!CollectionUtils.isEmpty(list)){ - //批量遍历 - List collectOutOrderCodes = list.stream().map(SysSalesShippingInform::getOutOrderCode).collect(Collectors.toList()); - Map> detailMap = shippingInformDetailService.selectShippingInformDetailListByCodes(collectOutOrderCodes); - - list.forEach(salesShippingInform -> { - salesShippingInform.setShippingInformDetailList( - detailMap.getOrDefault(salesShippingInform.getOutOrderCode(), Collections.emptyList()) - ); - }); - } - ExcelUtil util = new ExcelUtil(SysSalesShippingInform.class); - return util.exportExcel(list, "销售出货通知数据","销售出货通知数据"); +// if (!CollectionUtils.isEmpty(list)){ +// //批量遍历 +// List collectOutOrderCodes = list.stream().map(SysSalesShippingInform::getOutOrderCode).collect(Collectors.toList()); +// Map> detailMap = shippingInformDetailService.selectShippingInformDetailListByCodes(collectOutOrderCodes); +// +// list.forEach(salesShippingInform -> { +// salesShippingInform.setShippingInformDetailList( +// detailMap.getOrDefault(salesShippingInform.getOutOrderCode(), Collections.emptyList()) +// ); +// }); +// } + List exportSalesShippingInformDetailVos = sysSalesShippingInformService.exportShippingInformOrderDetailList(list); + ExcelUtil util = new ExcelUtil(ExportSalesShippingInformDetailVo.class); + return util.exportExcel(exportSalesShippingInformDetailVos, "销售出货通知数据"); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/Vo/ExportSalesShippingInformDetailVo.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/Vo/ExportSalesShippingInformDetailVo.java new file mode 100644 index 00000000..ef595bdf --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/Vo/ExportSalesShippingInformDetailVo.java @@ -0,0 +1,190 @@ +package com.ruoyi.system.domain.Vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** +* 导出销售出货单主表和子表数据 +* */ +@Data +public class ExportSalesShippingInformDetailVo { + + /** 出库单号 */ + @Excel(name = "出库单号") + private String outOrderCode; + + @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** 出库状态（0待仓库准备物料、1待售后维护设备1、2待业务确认发货、3待售后维护设备2、4待出库、5部分出库、6全部出库、7已出库、8已取消） */ +// @Excel(name = "出库状态", readConverterExp = "0=待仓库准备物料、1待售后维护设备1、2待业务确认发货、3待售后维护设备2、4待出库、5部分出库、6全部出库、7已出库、8已取消") + @Excel(name = "出库状态", dictType = "warehouse_out_status") + private String warehouseOutStatus; + + /** 关联销售订单号 */ + @Excel(name = "关联销售订单号") + private String salesOrderCode; + + /** 出库类型（0销售出库、1生产领料、2员工领料、3委外领料、4公司退货出库、5开发领料） */ + @Excel(name = "出库类型", dictType = "warehouse_out_type") + private String warehouseOutType; + + + /** 客户代码/id */ + @Excel(name = "客户ID") + private String customerId; + + /** 客户名称 */ + @Excel(name = "客户名称") + private String customerName; + + /** 业务员 */ + @Excel(name = "业务员") + private String businessMembers; + + /** 物料合计 */ + @Excel(name = "物料合计") + private Integer materialSum; + + /** 数量合计 */ + @Excel(name = "数量合计") + private Integer enterpriseSum; + + /** 收货联系人 */ + @Excel(name = "收货联系人(Ship To)") + private String customerContact; + + /** 联系电话 */ + @Excel(name = "收货联系人电话(Ship To)") + private String contactNumber; + + /** 收货地址 */ + @Excel(name = "收货地址(Ship To)") + private String customerContactAddress; + + + + + /** 收货联系人 */ + @Excel(name = "收货联系人(Bill To)") + private String customerContactBillto; + + /** 联系电话 */ + @Excel(name = "联系电话(Bill To)") + private String contactNumberBillto; + + /** 收货地址 */ + @Excel(name = "收货地址(Bill To)") + private String contactAddressBillto; + + + + /** 不含税总价（RMB） */ + @Excel(name = "不含税总价") + private BigDecimal allPriceExcludingTaxRmb; + + /** 不含税总价（美元） */ + @Excel(name = "不含税总价") + private BigDecimal allPriceExcludingTaxDollar; + + /** 含税总价（RMB） */ + @Excel(name = "含税总价") + private BigDecimal allPriceIncludesTax; + + /** 计划交付时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "计划交付时间", dateFormat = "yyyy-MM-dd") + private Date plannedDeliveryTime; + + /** 客户验收时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "客户验收时间", dateFormat = "yyyy-MM-dd") + private Date acceptanceTime; + + /** 付款条件 */ + @Excel(name = "付款条件") + private String paymentCondition; + + /** 交付条件 */ + @Excel(name = "交付条件") + private String deliveryCondition; + + /** 送货日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "送货日期", dateFormat = "yyyy-MM-dd") + private Date deliverTime; + + /** 料号 */ + @Excel(name = "料号") + private String materialNo; + + /** 物料名称 */ + @Excel(name = "物料名称") + private String materialName; + + /** 物料图片地址 */ + @Excel(name = "物料图片地址") + private String materialPhotourl; + + /** 物料品牌 */ + @Excel(name = "物料品牌") + private String materialBrand; + + /** 物料单位 */ + @Excel(name = "物料单位") + private String materialUnit; + + /** 物料描述 */ + @Excel(name = "物料描述") + private String materialDescribe; + + /** 物料加工方式 */ + @Excel(name = "物料加工方式",dictType = "processMethod") + private String materialProcessMethod; + + /** 物料型号 */ + @Excel(name = "物料型号") + private String materialModel; + + /** 订单数 */ + @Excel(name = "订单数") + private Integer makeNum; + + /** 本次出货数 */ + @Excel(name = "本次出货数") + private Integer thisShippingNum; + + /** 已出库数 */ + @Excel(name = "已出库数") + private Integer hasOutOrderNum; + + /** 本次验收数 */ + @Excel(name = "本次验收数") + private Integer thisCheckNum; + + /** 已验收数 */ + @Excel(name = "已验收数") + private Integer hasCheckNum; + + /** 已申请出货数 */ + @Excel(name = "已申请出货数") + private Integer hasShippingNum; + + /** 已完成数 */ + @Excel(name = "已完成数") + private Integer hasCompleteNum; + + /** 本次收货数 */ + @Excel(name = "本次收货数") + private Integer thisReceivingNum; + + /** 已收货数 */ + @Excel(name = "已收货数") + private Integer hasReceivingNum; + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesShippingInformService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesShippingInformService.java index 6dd84148..a5eb32b7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesShippingInformService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSalesShippingInformService.java @@ -7,6 +7,7 @@ import com.ruoyi.system.domain.SysSalesOrderChild; import com.ruoyi.system.domain.SysSalesShippingInform; import com.ruoyi.system.domain.SysSalesShippingInformDetail; import com.ruoyi.system.domain.Vo.ConfirmReceivingDetailVo; +import com.ruoyi.system.domain.Vo.ExportSalesShippingInformDetailVo; import javax.servlet.http.HttpServletResponse; @@ -162,4 +163,9 @@ public interface ISysSalesShippingInformService * 根据出库单号查询销售出货通知单 * */ SysSalesShippingInform selectSysSalesShippingInformByCode(String outOrderCode); + + /** + * 导出销售出货通知单明细 + * */ + List exportShippingInformOrderDetailList(List list); } 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 692f52e0..edd1f044 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 @@ -6,6 +6,7 @@ import java.net.URLEncoder; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Function; import java.util.stream.Collectors; import com.alibaba.excel.EasyExcel; @@ -27,6 +28,7 @@ import com.ruoyi.sales.domain.SalesShippingInformation; import com.ruoyi.sales.mapper.SalesShippingInformationMapper; import com.ruoyi.system.domain.*; import com.ruoyi.system.domain.Vo.ConfirmReceivingDetailVo; +import com.ruoyi.system.domain.Vo.ExportSalesShippingInformDetailVo; import com.ruoyi.system.dto.ExportShippingInformOrderDto; import com.ruoyi.system.dto.ExportShippingInvoiceDto; import com.ruoyi.system.dto.ExportShippingOrderDto; @@ -125,6 +127,7 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor return sysSalesShippingInformMapper.selectSysSalesShippingInformByCode(outOrderCode); } + /** * 新增销售出货通知 * @@ -222,7 +225,6 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor List sysSalesOrders = sysSalesOrderMapper.selectBatchSalesOrderById(salesOrderIdList); - String salesOrderCodes = getSalesOrderCodes(sysSalesOrders); sysSalesShippingInform.setOutOrderCode(outOrderCode); @@ -1558,4 +1560,65 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor throw new BusinessException("插入销售出货资料单失败"); } } + + /** + * 导出销售出货通知单明细 + * */ + @Override + public List exportShippingInformOrderDetailList(List list) { + + List collectOutOrderCodes = list.stream().map(SysSalesShippingInform::getOutOrderCode).collect(Collectors.toList()); + List sysSalesShippingInformDetails = shippingInformDetailMapper.selectSalesShippingInformDetailListByCodes(collectOutOrderCodes); + + Map salesShippingInformMap = list.stream().collect(Collectors.toMap(SysSalesShippingInform::getOutOrderCode, Function.identity())); + + List exportSalesShippingInformDetailVos = new ArrayList<>(); + for (SysSalesShippingInformDetail sysSalesShippingInformDetail : sysSalesShippingInformDetails) { + ExportSalesShippingInformDetailVo exportSalesShippingInformDetailVo = new ExportSalesShippingInformDetailVo(); + SysSalesShippingInform tempSalesShippingInform = salesShippingInformMap.get(sysSalesShippingInformDetail.getOutOrderCode()); + exportSalesShippingInformDetailVo.setOutOrderCode(tempSalesShippingInform.getOutOrderCode()); + exportSalesShippingInformDetailVo.setSalesOrderCode(tempSalesShippingInform.getSalesOrderCode()); + exportSalesShippingInformDetailVo.setCustomerId(tempSalesShippingInform.getCustomerId()); + exportSalesShippingInformDetailVo.setCustomerName(tempSalesShippingInform.getCustomerName()); + exportSalesShippingInformDetailVo.setCustomerContact(tempSalesShippingInform.getCustomerContact()); + exportSalesShippingInformDetailVo.setCustomerContactAddress(tempSalesShippingInform.getCustomerContactAddress()); + exportSalesShippingInformDetailVo.setCustomerContactBillto(tempSalesShippingInform.getCustomerContactBillto()); + exportSalesShippingInformDetailVo.setContactNumber(tempSalesShippingInform.getContactNumber()); + exportSalesShippingInformDetailVo.setContactNumberBillto(tempSalesShippingInform.getContactNumberBillto()); + exportSalesShippingInformDetailVo.setContactAddressBillto(tempSalesShippingInform.getContactAddressBillto()); + exportSalesShippingInformDetailVo.setDeliveryCondition(tempSalesShippingInform.getDeliveryCondition()); + exportSalesShippingInformDetailVo.setDeliverTime(tempSalesShippingInform.getDeliverTime()); + exportSalesShippingInformDetailVo.setPaymentCondition(tempSalesShippingInform.getPaymentCondition()); + exportSalesShippingInformDetailVo.setPlannedDeliveryTime(tempSalesShippingInform.getPlannedDeliveryTime()); + exportSalesShippingInformDetailVo.setAllPriceIncludesTax(tempSalesShippingInform.getAllPriceIncludesTax()); + exportSalesShippingInformDetailVo.setAllPriceExcludingTaxDollar(tempSalesShippingInform.getAllPriceExcludingTaxDollar()); + exportSalesShippingInformDetailVo.setAllPriceExcludingTaxRmb(tempSalesShippingInform.getAllPriceExcludingTaxRmb()); + exportSalesShippingInformDetailVo.setBusinessMembers(tempSalesShippingInform.getBusinessMembers()); + exportSalesShippingInformDetailVo.setWarehouseOutType(tempSalesShippingInform.getWarehouseOutType()); + exportSalesShippingInformDetailVo.setWarehouseOutStatus(tempSalesShippingInform.getWarehouseOutStatus()); + exportSalesShippingInformDetailVo.setEnterpriseSum(tempSalesShippingInform.getEnterpriseSum()); + exportSalesShippingInformDetailVo.setMaterialSum(tempSalesShippingInform.getMaterialSum()); + exportSalesShippingInformDetailVo.setCreateTime(tempSalesShippingInform.getCreateTime()); + + + exportSalesShippingInformDetailVo.setMaterialNo(sysSalesShippingInformDetail.getMaterialNo()); + exportSalesShippingInformDetailVo.setMaterialName(sysSalesShippingInformDetail.getMaterialName()); + exportSalesShippingInformDetailVo.setMaterialUnit(sysSalesShippingInformDetail.getMaterialUnit()); + exportSalesShippingInformDetailVo.setMaterialDescribe(sysSalesShippingInformDetail.getMaterialDescribe()); + exportSalesShippingInformDetailVo.setMaterialBrand(sysSalesShippingInformDetail.getMaterialBrand()); + exportSalesShippingInformDetailVo.setMaterialProcessMethod(sysSalesShippingInformDetail.getMaterialProcessMethod()); + exportSalesShippingInformDetailVo.setMaterialModel(sysSalesShippingInformDetail.getMaterialModel()); + exportSalesShippingInformDetailVo.setMakeNum(sysSalesShippingInformDetail.getMakeNum()); + exportSalesShippingInformDetailVo.setThisCheckNum(sysSalesShippingInformDetail.getThisCheckNum()); + exportSalesShippingInformDetailVo.setHasCheckNum(sysSalesShippingInformDetail.getHasCheckNum()); + exportSalesShippingInformDetailVo.setThisShippingNum(sysSalesShippingInformDetail.getThisShippingNum()); + exportSalesShippingInformDetailVo.setHasShippingNum(sysSalesShippingInformDetail.getHasShippingNum()); + exportSalesShippingInformDetailVo.setThisReceivingNum(sysSalesShippingInformDetail.getThisReceivingNum()); + exportSalesShippingInformDetailVo.setHasReceivingNum(sysSalesShippingInformDetail.getHasReceivingNum()); + + exportSalesShippingInformDetailVos.add(exportSalesShippingInformDetailVo); + } + + return exportSalesShippingInformDetailVos; + } } diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformDetailMapper.xml index a04bab25..1aef07ac 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysSalesShippingInformDetailMapper.xml @@ -61,10 +61,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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 c79e8f14..16f92bda 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html @@ -213,42 +213,42 @@ } }, - { - title: '不含税总价(RMB)', - field: 'allPriceExcludingTaxRmb', - align: 'center', - footerFormatter: function (value) { - var sum = 0; - for (var i in value) { - sum += parseFloat(value[i].allPriceExcludingTaxRmb)|| 0;; - } - return "总不含税总价: " + sum.toFixed(2); - } - }, - { - title: '不含税总价(美元)', - field: 'allPriceExcludingTaxDollar', - align: 'center', - footerFormatter: function (value) { - var sum = 0; - for (var i in value) { - sum += parseFloat(value[i].allPriceExcludingTaxDollar)|| 0;; - } - return "总不含税总价: " + sum.toFixed(2); - } - }, - { - title: '含税总价', - field: 'allPriceIncludesTax', - align: 'center', - footerFormatter: function (value) { - var sum = 0; - for (var i in value) { - sum += parseFloat(value[i].allPriceIncludesTax)|| 0;; - } - return "总含税总价: " + sum.toFixed(2); - } - }, + // { + // title: '不含税总价(RMB)', + // field: 'allPriceExcludingTaxRmb', + // align: 'center', + // footerFormatter: function (value) { + // var sum = 0; + // for (var i in value) { + // sum += parseFloat(value[i].allPriceExcludingTaxRmb)|| 0;; + // } + // return "总不含税总价: " + sum.toFixed(2); + // } + // }, + // { + // title: '不含税总价(美元)', + // field: 'allPriceExcludingTaxDollar', + // align: 'center', + // footerFormatter: function (value) { + // var sum = 0; + // for (var i in value) { + // sum += parseFloat(value[i].allPriceExcludingTaxDollar)|| 0;; + // } + // return "总不含税总价: " + sum.toFixed(2); + // } + // }, + // { + // title: '含税总价', + // field: 'allPriceIncludesTax', + // align: 'center', + // footerFormatter: function (value) { + // var sum = 0; + // for (var i in value) { + // sum += parseFloat(value[i].allPriceIncludesTax)|| 0;; + // } + // return "总含税总价: " + sum.toFixed(2); + // } + // }, // { // title: '计划交付时间', // field: 'plannedDeliveryTime',