From fde79056b06f7481965b9d3c158e9553784573d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Mon, 19 Aug 2024 10:15:33 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=20=E4=BF=AE=E6=94=B9=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=8D=95mapper=E5=90=88=E8=AE=A1=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E6=95=B0=E6=96=B9=E6=B3=95=E8=BF=94=E5=9B=9E=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=B8=BAInteger=EF=BC=9B=20=E5=94=AE=E5=90=8E=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E5=AE=A2=E8=AF=89=E9=80=9A=E7=9F=A5=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=9F=A5=E8=AF=A2=E7=89=A9=E6=96=99=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=8C=E5=87=BA=E5=BA=93=E6=95=B0=E8=B5=8B=E5=80=BC=E8=AF=AD?= =?UTF-8?q?=E5=8F=A5=E6=B7=BB=E5=8A=A0=E7=A9=BA=E5=80=BC=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E5=90=8E=E8=B5=8B=E5=80=BC=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AftersalesComplaintNoticeServiceImpl.java | 2 +- .../com/ruoyi/warehouse/mapper/WarehouseOutOrderMapper.java | 2 +- .../main/resources/mapper/warehouse/WarehouseOutOrderMapper.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesComplaintNoticeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesComplaintNoticeServiceImpl.java index 8d446930..c2addd49 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesComplaintNoticeServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesComplaintNoticeServiceImpl.java @@ -212,7 +212,7 @@ public class AftersalesComplaintNoticeServiceImpl implements IAftersalesComplain // 记录日志 log.warn("未查找到与销售订单关联的物料相关数据, 销售订单号: {}", sysMakeOrder.getSaleNo()); } - int totalQuantity = warehouseOutOrderMapper.sumOutOrderQuantityByMakeNo(makeNo); + int totalQuantity = (warehouseOutOrderMapper.sumOutOrderQuantityByMakeNo(makeNo)==null?0:warehouseOutOrderMapper.sumOutOrderQuantityByMakeNo(makeNo)); for (SysSalesOrderChild salesOrderChild : sysSalesOrderChildList) { AftersalesMaterialVO aftersalesMaterialVO = new AftersalesMaterialVO(); aftersalesMaterialVO.setMaterialNo(salesOrderChild.getMaterialCode()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseOutOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseOutOrderMapper.java index 2aac61f5..22ad88ae 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseOutOrderMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseOutOrderMapper.java @@ -107,6 +107,6 @@ public interface WarehouseOutOrderMapper /* * 根据生产单号查询出库单数据 * */ - public int sumOutOrderQuantityByMakeNo(String makeNo); + public Integer sumOutOrderQuantityByMakeNo(String makeNo); } diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderMapper.xml index c0b4b63f..5204a59b 100644 --- a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderMapper.xml @@ -102,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where shipping_device_id = #{shippingDeviceId} - select sum(out_order_sum) as totalQuantity from warehouse_out_order where make_no = #{makeNo} and warehouse_out_status = '7'