Browse Source

[fix]

仓库管理 出库单
修改出库单mapper合计出库数方法返回类型为Integer;
售后管理 客诉通知
修改查询物料方法,出库数赋值语句添加空值判断后赋值;
dev
王晓迪 3 months ago
parent
commit
fde79056b0
  1. 2
      ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AftersalesComplaintNoticeServiceImpl.java
  2. 2
      ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseOutOrderMapper.java
  3. 2
      ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderMapper.xml

2
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()); log.warn("未查找到与销售订单关联的物料相关数据, 销售订单号: {}", sysMakeOrder.getSaleNo());
} }
int totalQuantity = warehouseOutOrderMapper.sumOutOrderQuantityByMakeNo(makeNo); int totalQuantity = (warehouseOutOrderMapper.sumOutOrderQuantityByMakeNo(makeNo)==null?0:warehouseOutOrderMapper.sumOutOrderQuantityByMakeNo(makeNo));
for (SysSalesOrderChild salesOrderChild : sysSalesOrderChildList) { for (SysSalesOrderChild salesOrderChild : sysSalesOrderChildList) {
AftersalesMaterialVO aftersalesMaterialVO = new AftersalesMaterialVO(); AftersalesMaterialVO aftersalesMaterialVO = new AftersalesMaterialVO();
aftersalesMaterialVO.setMaterialNo(salesOrderChild.getMaterialCode()); aftersalesMaterialVO.setMaterialNo(salesOrderChild.getMaterialCode());

2
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);
} }

2
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} where shipping_device_id = #{shippingDeviceId}
</select> </select>
<select id="sumOutOrderQuantityByMakeNo" parameterType="String" resultType="int"> <select id="sumOutOrderQuantityByMakeNo" parameterType="String" resultType="Integer">
select sum(out_order_sum) as totalQuantity select sum(out_order_sum) as totalQuantity
from warehouse_out_order from warehouse_out_order
where make_no = #{makeNo} and warehouse_out_status = '7' where make_no = #{makeNo} and warehouse_out_status = '7'

Loading…
Cancel
Save