From 85ce8d05b6d259b52d6d2da7e641695c887eadac Mon Sep 17 00:00:00 2001 From: zj Date: Wed, 28 Jan 2026 14:05:19 +0800 Subject: [PATCH] 0128 --- .../api/service/impl/ToWmsServiceImpl.java | 3 +- .../mapper/search/StockSummaryMapper.xml | 391 ++++++++++-------- .../src/views/search/StockSummary/index.vue | 259 ++++++------ 3 files changed, 351 insertions(+), 302 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java index 08e0f43..df59257 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java @@ -137,10 +137,11 @@ public class ToWmsServiceImpl implements IToWmsService { BasProduct basProductParam = new BasProduct(); basProductParam.setProductId(productId); List basProducts = basProductService.selectBasProductList(basProductParam); - BasProduct basProduct = basProducts.get(0); + if (CollUtil.isEmpty(basProducts)) { return new AjaxResult(3, "物料不存在！"); } + BasProduct basProduct = basProducts.get(0); List inList = mydoJobService.getInJobBySerial(serial); List stockList = stockService.getStockBySerial(serial); diff --git a/ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml index 4a8d152..7a7197f 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml @@ -1,7 +1,7 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> @@ -65,183 +65,212 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT - - - p.product_id, - p.product_name, - s.order_id, - p.spec, - p.unit, - p.price, - p.parent_id, - p.cargo_no, - p.spare1, - p.spare2, - p.spare3, - p.spare4, - p.spare5, - p.spare6, - p.spare7, - p.spare8, - p.spare9, - p.spare10, - s.lot_no, - s.warehouse_id, - bw.warehouse_name, - s.cargo_space_id, - bcs.cargo_space_name, - bcs.roadway_id, - SUM(CAST(s.quantity AS DECIMAL(18,2))) as quantity - FROM bas_stock s - LEFT JOIN bas_product p ON s.product_id = p.product_id - LEFT JOIN bas_warehouse bw ON bw.warehouse_id = s.warehouse_id - LEFT JOIN bas_cargo_space bcs ON bcs.cargo_space_id = s.cargo_space_id - - AND p.product_id IS NOT NULL AND p.product_id != '' - AND p.product_id like concat('%', #{productId}, '%') - AND p.product_name like concat('%', #{productName}, '%') - AND s.order_id like concat('%', #{orderId}, '%') - AND p.spec like concat('%', #{spec}, '%') - AND p.unit like concat('%', #{unit}, '%') - AND p.price like concat('%', #{price}, '%') - AND p.spare1 like concat('%', #{spare1}, '%') - AND p.spare2 like concat('%', #{spare2}, '%') - AND p.spare5 like concat('%', #{spare5}, '%') - AND p.spare6 like concat('%', #{spare6}, '%') - AND p.spare8 like concat('%', #{spare8}, '%') - AND p.spare7 like concat('%', #{spare7}, '%') - AND p.spare7 like concat('%', #{remark}, '%')} - AND s.lot_no like concat('%', #{lotNo}, '%') - AND s.warehouse_id like concat('%', #{warehouseId}, '%') - AND s.cargo_space_id like concat('%', #{cargoSpaceId}, '%') - AND bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%') - AND p.spare9 like concat('%', #{spare9}, '%') - - ${params.warehouseDataScope} - - - GROUP BY - - ,p.product_id - ,p.product_name - ,s.order_id - ,p.spec - ,p.unit - ,p.price - ,p.parent_id - ,p.cargo_no - ,p.spare1 - ,p.spare2 - ,p.spare3 - ,p.spare4 - ,p.spare5 - ,p.spare6 - ,p.spare7 - ,p.spare8 - ,p.spare9 - ,p.spare10 - ,p.spare11 - ,p.spare12 - ,p.spare13 - ,p.spare14 - ,p.spare15 - ,p.spare16 - ,p.spare17 - ,p.spare18 - ,p.spare19 - ,p.spare20 - ,p.spare21 - ,p.spare22 - ,p.spare23 - ,p.spare24 - ,p.spare25 - ,p.spare26 - ,p.spare27 - ,p.spare28 - ,p.spare29 - ,p.spare30 - ,p.spare31 - ,p.spare32 - ,p.spare33 - ,p.spare34 - ,p.spare35 - ,p.spare36 - ,p.spare37 - ,p.spare38 - ,p.spare39 - ,s.lot_no - ,s.warehouse_id - ,bw.warehouse_name - ,s.cargo_space_id - ,bcs.cargo_space_name - ,bcs.roadway_id - - - - 1 as group_all, - SUM(CAST(s.quantity AS DECIMAL(18,2))) as quantity - FROM bas_stock s - LEFT JOIN bas_product p ON s.product_id = p.product_id - - AND p.product_id IS NOT NULL AND p.product_id != '' - AND p.product_id like concat('%', #{productId}, '%') - AND p.product_name like concat('%', #{productName}, '%') - AND s.order_id like concat('%', #{orderId}, '%') - AND p.spec like concat('%', #{spec}, '%') - AND p.unit like concat('%', #{unit}, '%') - AND p.price like concat('%', #{price}, '%') - AND p.parent_id like concat('%', #{parentId}, '%') - AND p.cargo_no like concat('%', #{cargoNo}, '%') - AND p.spare1 like concat('%', #{spare1}, '%') - AND p.spare2 like concat('%', #{spare2}, '%') - AND p.spare3 like concat('%', #{spare3}, '%') - AND p.spare4 like concat('%', #{spare4}, '%') - AND p.spare5 like concat('%', #{spare5}, '%') - AND p.spare6 like concat('%', #{spare6}, '%') - AND p.spare7 like concat('%', #{spare7}, '%') - AND p.spare8 like concat('%', #{spare8}, '%') - AND p.spare9 like concat('%', #{spare9}, '%') - AND p.spare10 like concat('%', #{spare10}, '%') - AND p.spare11 like concat('%', #{spare11}, '%') - AND p.spare12 like concat('%', #{spare12}, '%') - AND p.spare13 like concat('%', #{spare13}, '%') - AND p.spare14 like concat('%', #{spare14}, '%') - AND p.spare15 like concat('%', #{spare15}, '%') - AND p.spare16 like concat('%', #{spare16}, '%') - AND p.spare17 like concat('%', #{spare17}, '%') - AND p.spare18 like concat('%', #{spare18}, '%') - AND p.spare19 like concat('%', #{spare19}, '%') - AND p.spare20 like concat('%', #{spare20}, '%') - AND p.spare21 like concat('%', #{spare21}, '%') - AND p.spare22 like concat('%', #{spare22}, '%') - AND p.spare23 like concat('%', #{spare23}, '%') - AND p.spare24 like concat('%', #{spare24}, '%') - AND p.spare25 like concat('%', #{spare25}, '%') - AND p.spare26 like concat('%', #{spare26}, '%') - AND p.spare27 like concat('%', #{spare27}, '%') - AND p.spare28 like concat('%', #{spare28}, '%') - AND p.spare29 like concat('%', #{spare29}, '%') - AND p.spare30 like concat('%', #{spare30}, '%') - AND p.spare31 like concat('%', #{spare31}, '%') - AND p.spare32 like concat('%', #{spare32}, '%') - AND p.spare33 like concat('%', #{spare33}, '%') - AND p.spare34 like concat('%', #{spare34}, '%') - AND p.spare35 like concat('%', #{spare35}, '%') - AND p.spare36 like concat('%', #{spare36}, '%') - AND p.spare37 like concat('%', #{spare37}, '%') - AND p.spare38 like concat('%', #{spare38}, '%') - AND p.spare39 like concat('%', #{spare39}, '%') - AND p.remark like concat('%', #{remark}, '%') - AND s.lot_no like concat('%', #{lotNo}, '%') - AND s.warehouse_id like concat('%', #{warehouseId}, '%') - AND s.cargo_space_id like concat('%', #{cargoSpaceId}, '%') - AND bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%') - - ${params.warehouseDataScope} - - - - + + + p.product_id, + p.product_name, + s.order_id, + p.spec, + p.unit, + p.price, + p.parent_id, + p.cargo_no, + p.spare1, + p.spare2, + p.spare3, + p.spare4, + p.spare5, + p.spare6, + p.spare7, + p.spare8, + p.spare9, + p.spare10, + p.spare11, + p.spare12, + p.spare13, + p.spare14, + p.spare15, + p.spare16, + p.spare17, + p.spare18, + p.spare19, + p.spare20, + p.spare21, + p.spare22, + p.spare23, + p.spare24, + p.spare25, + p.spare26, + p.spare27, + p.spare28, + p.spare29, + p.spare30, + p.spare31, + p.spare32, + p.spare33, + p.spare34, + p.spare35, + p.spare36, + p.spare37, + p.spare38, + p.spare39, + s.lot_no, + s.warehouse_id, + bw.warehouse_name, + s.cargo_space_id, + bcs.cargo_space_name, + bcs.roadway_id, + SUM(CAST(s.quantity AS DECIMAL(18,2))) as quantity + FROM bas_stock s + LEFT JOIN bas_product p ON s.product_id = p.product_id + LEFT JOIN bas_warehouse bw ON bw.warehouse_id = s.warehouse_id + LEFT JOIN bas_cargo_space bcs ON bcs.cargo_space_id = s.cargo_space_id + + AND p.product_id IS NOT NULL AND p.product_id != '' + AND p.product_id like concat('%', #{productId}, '%') + AND p.product_name like concat('%', #{productName}, '%') + AND s.order_id like concat('%', #{orderId}, '%') + AND p.spec like concat('%', #{spec}, '%') + AND p.unit like concat('%', #{unit}, '%') + AND p.price like concat('%', #{price}, '%') + AND p.spare1 like concat('%', #{spare1}, '%') + AND p.spare2 like concat('%', #{spare2}, '%') + AND p.spare5 like concat('%', #{spare5}, '%') + AND p.spare6 like concat('%', #{spare6}, '%') + AND p.spare8 like concat('%', #{spare8}, '%') + AND p.spare7 like concat('%', #{spare7}, '%') + AND p.spare7 like concat('%', #{remark}, '%')} + AND s.lot_no like concat('%', #{lotNo}, '%') + AND s.warehouse_id like concat('%', #{warehouseId}, '%') + AND s.cargo_space_id like concat('%', #{cargoSpaceId}, '%') + AND bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%') + AND p.spare9 like concat('%', #{spare9}, '%') + + ${params.warehouseDataScope} + + + GROUP BY + + ,p.product_id + ,p.product_name + ,s.order_id + ,p.spec + ,p.unit + ,p.price + ,p.parent_id + ,p.cargo_no + ,p.spare1 + ,p.spare2 + ,p.spare3 + ,p.spare4 + ,p.spare5 + ,p.spare6 + ,p.spare7 + ,p.spare8 + ,p.spare9 + ,p.spare10 + ,p.spare11 + ,p.spare12 + ,p.spare13 + ,p.spare14 + ,p.spare15 + ,p.spare16 + ,p.spare17 + ,p.spare18 + ,p.spare19 + ,p.spare20 + ,p.spare21 + ,p.spare22 + ,p.spare23 + ,p.spare24 + ,p.spare25 + ,p.spare26 + ,p.spare27 + ,p.spare28 + ,p.spare29 + ,p.spare30 + ,p.spare31 + ,p.spare32 + ,p.spare33 + ,p.spare34 + ,p.spare35 + ,p.spare36 + ,p.spare37 + ,p.spare38 + ,p.spare39 + ,s.lot_no + ,s.warehouse_id + ,bw.warehouse_name + ,s.cargo_space_id + ,bcs.cargo_space_name + ,bcs.roadway_id + + + + 1 as group_all, + SUM(CAST(s.quantity AS DECIMAL(18,2))) as quantity + FROM bas_stock s + LEFT JOIN bas_product p ON s.product_id = p.product_id + + AND p.product_id IS NOT NULL AND p.product_id != '' + AND p.product_id like concat('%', #{productId}, '%') + AND p.product_name like concat('%', #{productName}, '%') + AND s.order_id like concat('%', #{orderId}, '%') + AND p.spec like concat('%', #{spec}, '%') + AND p.unit like concat('%', #{unit}, '%') + AND p.price like concat('%', #{price}, '%') + AND p.parent_id like concat('%', #{parentId}, '%') + AND p.cargo_no like concat('%', #{cargoNo}, '%') + AND p.spare1 like concat('%', #{spare1}, '%') + AND p.spare2 like concat('%', #{spare2}, '%') + AND p.spare3 like concat('%', #{spare3}, '%') + AND p.spare4 like concat('%', #{spare4}, '%') + AND p.spare5 like concat('%', #{spare5}, '%') + AND p.spare6 like concat('%', #{spare6}, '%') + AND p.spare7 like concat('%', #{spare7}, '%') + AND p.spare8 like concat('%', #{spare8}, '%') + AND p.spare9 like concat('%', #{spare9}, '%') + AND p.spare10 like concat('%', #{spare10}, '%') + AND p.spare11 like concat('%', #{spare11}, '%') + AND p.spare12 like concat('%', #{spare12}, '%') + AND p.spare13 like concat('%', #{spare13}, '%') + AND p.spare14 like concat('%', #{spare14}, '%') + AND p.spare15 like concat('%', #{spare15}, '%') + AND p.spare16 like concat('%', #{spare16}, '%') + AND p.spare17 like concat('%', #{spare17}, '%') + AND p.spare18 like concat('%', #{spare18}, '%') + AND p.spare19 like concat('%', #{spare19}, '%') + AND p.spare20 like concat('%', #{spare20}, '%') + AND p.spare21 like concat('%', #{spare21}, '%') + AND p.spare22 like concat('%', #{spare22}, '%') + AND p.spare23 like concat('%', #{spare23}, '%') + AND p.spare24 like concat('%', #{spare24}, '%') + AND p.spare25 like concat('%', #{spare25}, '%') + AND p.spare26 like concat('%', #{spare26}, '%') + AND p.spare27 like concat('%', #{spare27}, '%') + AND p.spare28 like concat('%', #{spare28}, '%') + AND p.spare29 like concat('%', #{spare29}, '%') + AND p.spare30 like concat('%', #{spare30}, '%') + AND p.spare31 like concat('%', #{spare31}, '%') + AND p.spare32 like concat('%', #{spare32}, '%') + AND p.spare33 like concat('%', #{spare33}, '%') + AND p.spare34 like concat('%', #{spare34}, '%') + AND p.spare35 like concat('%', #{spare35}, '%') + AND p.spare36 like concat('%', #{spare36}, '%') + AND p.spare37 like concat('%', #{spare37}, '%') + AND p.spare38 like concat('%', #{spare38}, '%') + AND p.spare39 like concat('%', #{spare39}, '%') + AND p.remark like concat('%', #{remark}, '%') + AND s.lot_no like concat('%', #{lotNo}, '%') + AND s.warehouse_id like concat('%', #{warehouseId}, '%') + AND s.cargo_space_id like concat('%', #{cargoSpaceId}, '%') + AND bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%') + + ${params.warehouseDataScope} + + + +