lhq/FT517-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0128

Browse Source
This commit is contained in:
zj
2026-01-28 14:05:19 +08:00
parent 3a8cd0141b
commit 85ce8d05b6
3 changed files with 351 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
View File

@@ -137,10 +137,11 @@ public class ToWmsServiceImpl implements IToWmsService {
BasProduct basProductParam = new BasProduct();
basProductParam.setProductId(productId);
List<BasProduct> basProducts = basProductService.selectBasProductList(basProductParam);
BasProduct basProduct = basProducts.get(0);
if (CollUtil.isEmpty(basProducts)) {
return new AjaxResult(3, "物料不存在！");
}
BasProduct basProduct = basProducts.get(0);
List<MydoJob> inList = mydoJobService.getInJobBySerial(serial);
List<BasStock> stockList = stockService.getStockBySerial(serial);

391
ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.search.StockSummary.mapper.StockSummaryMapper">
<resultMap type="StockSummary" id="StockSummaryResult">
@@ -65,183 +65,212 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectStockSummaryVo">
SELECT
<choose>
<when test="groupByProductId != null and groupByProductId or groupByProductName != null and groupByProductName or groupBySpec != null and groupBySpec or groupByUnit != null and groupByUnit or groupByLotNo != null and groupByLotNo or groupByWarehouseId != null and groupByWarehouseId or groupByCargoSpaceId != null and groupByCargoSpaceId or groupByPrice != null and groupByPrice or groupByParentId != null and groupByParentId or groupByCargoNo != null and groupByCargoNo or groupBySpare1 != null and groupBySpare1 or groupBySpare2 != null and groupBySpare2 or groupBySpare3 != null and groupBySpare3 or groupBySpare4 != null and groupBySpare4 or groupBySpare5 != null and groupBySpare5 or groupBySpare6 != null and groupBySpare6 or groupBySpare7 != null and groupBySpare7 or groupBySpare8 != null and groupBySpare8 or groupBySpare9 != null and groupBySpare9 or groupBySpare10 != null and groupBySpare10">
<if test="groupByProductId != null and groupByProductId">p.product_id,</if>
<if test="groupByProductName != null and groupByProductName">p.product_name,</if>
<if test="groupByOrderId != null and groupByOrderId">s.order_id,</if>
<if test="groupBySpec != null and groupBySpec">p.spec,</if>
<if test="groupByUnit != null and groupByUnit">p.unit,</if>
<if test="groupByPrice != null and groupByPrice">p.price,</if>
<if test="groupByParentId != null and groupByParentId">p.parent_id,</if>
<if test="groupByCargoNo != null and groupByCargoNo">p.cargo_no,</if>
<if test="groupBySpare1 != null and groupBySpare1">p.spare1,</if>
<if test="groupBySpare2 != null and groupBySpare2">p.spare2,</if>
<if test="groupBySpare3 != null and groupBySpare3">p.spare3,</if>
<if test="groupBySpare4 != null and groupBySpare4">p.spare4,</if>
<if test="groupBySpare5 != null and groupBySpare5">p.spare5,</if>
<if test="groupBySpare6 != null and groupBySpare6">p.spare6,</if>
<if test="groupBySpare7 != null and groupBySpare7">p.spare7,</if>
<if test="groupBySpare8 != null and groupBySpare8">p.spare8,</if>
<if test="groupBySpare9 != null and groupBySpare9">p.spare9,</if>
<if test="groupBySpare10 != null and groupBySpare10">p.spare10,</if>
<if test="groupByLotNo != null and groupByLotNo">s.lot_no,</if>
<if test="groupByWarehouseId != null and groupByWarehouseId">s.warehouse_id,</if>
<if test="groupByWarehouseId != null and groupByWarehouseId">bw.warehouse_name,</if>
<if test="groupByCargoSpaceId != null and groupByCargoSpaceId">s.cargo_space_id,</if>
<if test="groupByCargoSpaceId != null and groupByCargoSpaceId">bcs.cargo_space_name,</if>
<if test="groupByRoadwayId != null and groupByRoadwayId">bcs.roadway_id,</if>
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
<where>
AND p.product_id IS NOT NULL AND p.product_id != ''
<if test="productId != null and productId != ''"> AND p.product_id like concat('%', #{productId}, '%')</if>
<if test="productName != null and productName != ''"> AND p.product_name like concat('%', #{productName}, '%')</if>
<if test="orderId != null and orderId != ''"> AND s.order_id like concat('%', #{orderId}, '%')</if>
<if test="spec != null and spec != ''"> AND p.spec like concat('%', #{spec}, '%')</if>
<if test="unit != null and unit != ''"> AND p.unit like concat('%', #{unit}, '%')</if>
<if test="price != null and price != ''"> AND p.price like concat('%', #{price}, '%')</if>
<if test="spare1 != null and spare1 != ''"> AND p.spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> AND p.spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare5 != null and spare5 != ''"> AND p.spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> AND p.spare6 like concat('%', #{spare6}, '%')</if>
<if test="spare8 != null and spare8 != ''"> AND p.spare8 like concat('%', #{spare8}, '%')</if>
<if test="spare7 != null and spare7 != ''"> AND p.spare7 like concat('%', #{spare7}, '%')</if>
<if test="remark != null and remark != ''"> AND p.spare7 like concat('%', #{remark}, '%')}</if>
<if test="lotNo != null and lotNo != ''"> AND s.lot_no like concat('%', #{lotNo}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> AND s.warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> AND s.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
<if test="cargoSpaceName != null and cargoSpaceName != ''"> AND bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
<if test="spare9 != null and spare9 != ''"> AND p.spare9 like concat('%', #{spare9}, '%')</if>
<if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
${params.warehouseDataScope}
</if>
</where>
GROUP BY
<trim prefixOverrides=",">
<if test="groupByProductId != null and groupByProductId">,p.product_id</if>
<if test="groupByProductName != null and groupByProductName">,p.product_name</if>
<if test="groupByOrderId != null and groupByOrderId">,s.order_id</if>
<if test="groupBySpec != null and groupBySpec">,p.spec</if>
<if test="groupByUnit != null and groupByUnit">,p.unit</if>
<if test="groupByPrice != null and groupByPrice">,p.price</if>
<if test="groupByParentId != null and groupByParentId">,p.parent_id</if>
<if test="groupByCargoNo != null and groupByCargoNo">,p.cargo_no</if>
<if test="groupBySpare1 != null and groupBySpare1">,p.spare1</if>
<if test="groupBySpare2 != null and groupBySpare2">,p.spare2</if>
<if test="groupBySpare3 != null and groupBySpare3">,p.spare3</if>
<if test="groupBySpare4 != null and groupBySpare4">,p.spare4</if>
<if test="groupBySpare5 != null and groupBySpare5">,p.spare5</if>
<if test="groupBySpare6 != null and groupBySpare6">,p.spare6</if>
<if test="groupBySpare7 != null and groupBySpare7">,p.spare7</if>
<if test="groupBySpare8 != null and groupBySpare8">,p.spare8</if>
<if test="groupBySpare9 != null and groupBySpare9">,p.spare9</if>
<if test="groupBySpare10 != null and groupBySpare10">,p.spare10</if>
<if test="groupBySpare11 != null and groupBySpare11">,p.spare11</if>
<if test="groupBySpare12 != null and groupBySpare12">,p.spare12</if>
<if test="groupBySpare13 != null and groupBySpare13">,p.spare13</if>
<if test="groupBySpare14 != null and groupBySpare14">,p.spare14</if>
<if test="groupBySpare15 != null and groupBySpare15">,p.spare15</if>
<if test="groupBySpare16 != null and groupBySpare16">,p.spare16</if>
<if test="groupBySpare17 != null and groupBySpare17">,p.spare17</if>
<if test="groupBySpare18 != null and groupBySpare18">,p.spare18</if>
<if test="groupBySpare19 != null and groupBySpare19">,p.spare19</if>
<if test="groupBySpare20 != null and groupBySpare20">,p.spare20</if>
<if test="groupBySpare21 != null and groupBySpare21">,p.spare21</if>
<if test="groupBySpare22 != null and groupBySpare22">,p.spare22</if>
<if test="groupBySpare23 != null and groupBySpare23">,p.spare23</if>
<if test="groupBySpare24 != null and groupBySpare24">,p.spare24</if>
<if test="groupBySpare25 != null and groupBySpare25">,p.spare25</if>
<if test="groupBySpare26 != null and groupBySpare26">,p.spare26</if>
<if test="groupBySpare27 != null and groupBySpare27">,p.spare27</if>
<if test="groupBySpare28 != null and groupBySpare28">,p.spare28</if>
<if test="groupBySpare29 != null and groupBySpare29">,p.spare29</if>
<if test="groupBySpare30 != null and groupBySpare30">,p.spare30</if>
<if test="groupBySpare31 != null and groupBySpare31">,p.spare31</if>
<if test="groupBySpare32 != null and groupBySpare32">,p.spare32</if>
<if test="groupBySpare33 != null and groupBySpare33">,p.spare33</if>
<if test="groupBySpare34 != null and groupBySpare34">,p.spare34</if>
<if test="groupBySpare35 != null and groupBySpare35">,p.spare35</if>
<if test="groupBySpare36 != null and groupBySpare36">,p.spare36</if>
<if test="groupBySpare37 != null and groupBySpare37">,p.spare37</if>
<if test="groupBySpare38 != null and groupBySpare38">,p.spare38</if>
<if test="groupBySpare39 != null and groupBySpare39">,p.spare39</if>
<if test="groupByLotNo != null and groupByLotNo">,s.lot_no</if>
<if test="groupByWarehouseId != null and groupByWarehouseId">,s.warehouse_id</if>
<if test="groupByWarehouseId != null and groupByWarehouseId">,bw.warehouse_name</if>
<if test="groupByCargoSpaceId != null and groupByCargoSpaceId">,s.cargo_space_id</if>
<if test="groupByCargoSpaceId != null and groupByCargoSpaceId">,bcs.cargo_space_name</if>
<if test="groupByRoadwayId != null and groupByRoadwayId">,bcs.roadway_id</if>
</trim>
</when>
<otherwise>
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
<where>
AND p.product_id IS NOT NULL AND p.product_id != ''
<if test="productId != null and productId != ''"> AND p.product_id like concat('%', #{productId}, '%')</if>
<if test="productName != null and productName != ''"> AND p.product_name like concat('%', #{productName}, '%')</if>
<if test="orderId != null and orderId != ''"> AND s.order_id like concat('%', #{orderId}, '%')</if>
<if test="spec != null and spec != ''"> AND p.spec like concat('%', #{spec}, '%')</if>
<if test="unit != null and unit != ''"> AND p.unit like concat('%', #{unit}, '%')</if>
<if test="price != null and price != ''"> AND p.price like concat('%', #{price}, '%')</if>
<if test="parentId != null and parentId != ''"> AND p.parent_id like concat('%', #{parentId}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> AND p.cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="spare1 != null and spare1 != ''"> AND p.spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> AND p.spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> AND p.spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> AND p.spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> AND p.spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> AND p.spare6 like concat('%', #{spare6}, '%')</if>
<if test="spare7 != null and spare7 != ''"> AND p.spare7 like concat('%', #{spare7}, '%')</if>
<if test="spare8 != null and spare8 != ''"> AND p.spare8 like concat('%', #{spare8}, '%')</if>
<if test="spare9 != null and spare9 != ''"> AND p.spare9 like concat('%', #{spare9}, '%')</if>
<if test="spare10 != null and spare10 != ''"> AND p.spare10 like concat('%', #{spare10}, '%')</if>
<if test="spare11 != null and spare11 != ''"> AND p.spare11 like concat('%', #{spare11}, '%')</if>
<if test="spare12 != null and spare12 != ''"> AND p.spare12 like concat('%', #{spare12}, '%')</if>
<if test="spare13 != null and spare13 != ''"> AND p.spare13 like concat('%', #{spare13}, '%')</if>
<if test="spare14 != null and spare14 != ''"> AND p.spare14 like concat('%', #{spare14}, '%')</if>
<if test="spare15 != null and spare15 != ''"> AND p.spare15 like concat('%', #{spare15}, '%')</if>
<if test="spare16 != null and spare16 != ''"> AND p.spare16 like concat('%', #{spare16}, '%')</if>
<if test="spare17 != null and spare17 != ''"> AND p.spare17 like concat('%', #{spare17}, '%')</if>
<if test="spare18 != null and spare18 != ''"> AND p.spare18 like concat('%', #{spare18}, '%')</if>
<if test="spare19 != null and spare19 != ''"> AND p.spare19 like concat('%', #{spare19}, '%')</if>
<if test="spare20 != null and spare20 != ''"> AND p.spare20 like concat('%', #{spare20}, '%')</if>
<if test="spare21 != null and spare21 != ''"> AND p.spare21 like concat('%', #{spare21}, '%')</if>
<if test="spare22 != null and spare22 != ''"> AND p.spare22 like concat('%', #{spare22}, '%')</if>
<if test="spare23 != null and spare23 != ''"> AND p.spare23 like concat('%', #{spare23}, '%')</if>
<if test="spare24 != null and spare24 != ''"> AND p.spare24 like concat('%', #{spare24}, '%')</if>
<if test="spare25 != null and spare25 != ''"> AND p.spare25 like concat('%', #{spare25}, '%')</if>
<if test="spare26 != null and spare26 != ''"> AND p.spare26 like concat('%', #{spare26}, '%')</if>
<if test="spare27 != null and spare27 != ''"> AND p.spare27 like concat('%', #{spare27}, '%')</if>
<if test="spare28 != null and spare28 != ''"> AND p.spare28 like concat('%', #{spare28}, '%')</if>
<if test="spare29 != null and spare29 != ''"> AND p.spare29 like concat('%', #{spare29}, '%')</if>
<if test="spare30 != null and spare30 != ''"> AND p.spare30 like concat('%', #{spare30}, '%')</if>
<if test="spare31 != null and spare31 != ''"> AND p.spare31 like concat('%', #{spare31}, '%')</if>
<if test="spare32 != null and spare32 != ''"> AND p.spare32 like concat('%', #{spare32}, '%')</if>
<if test="spare33 != null and spare33 != ''"> AND p.spare33 like concat('%', #{spare33}, '%')</if>
<if test="spare34 != null and spare34 != ''"> AND p.spare34 like concat('%', #{spare34}, '%')</if>
<if test="spare35 != null and spare35 != ''"> AND p.spare35 like concat('%', #{spare35}, '%')</if>
<if test="spare36 != null and spare36 != ''"> AND p.spare36 like concat('%', #{spare36}, '%')</if>
<if test="spare37 != null and spare37 != ''"> AND p.spare37 like concat('%', #{spare37}, '%')</if>
<if test="spare38 != null and spare38 != ''"> AND p.spare38 like concat('%', #{spare38}, '%')</if>
<if test="spare39 != null and spare39 != ''"> AND p.spare39 like concat('%', #{spare39}, '%')</if>
<if test="remark != null and remark != ''"> AND p.remark like concat('%', #{remark}, '%')</if>
<if test="lotNo != null and lotNo != ''"> AND s.lot_no like concat('%', #{lotNo}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> AND s.warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> AND s.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
<if test="cargoSpaceName != null and cargoSpaceName != ''"> AND bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
<if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
${params.warehouseDataScope}
</if>
</where>
</otherwise>
</choose>
<choose>
<when test="groupByProductId != null and groupByProductId or groupByProductName != null and groupByProductName or groupBySpec != null and groupBySpec or groupByUnit != null and groupByUnit or groupByLotNo != null and groupByLotNo or groupByWarehouseId != null and groupByWarehouseId or groupByCargoSpaceId != null and groupByCargoSpaceId or groupByPrice != null and groupByPrice or groupByParentId != null and groupByParentId or groupByCargoNo != null and groupByCargoNo or groupByOrderId != null and groupByOrderId or groupByRoadwayId != null and groupByRoadwayId or groupBySpare1 != null and groupBySpare1 or groupBySpare2 != null and groupBySpare2 or groupBySpare3 != null and groupBySpare3 or groupBySpare4 != null and groupBySpare4 or groupBySpare5 != null and groupBySpare5 or groupBySpare6 != null and groupBySpare6 or groupBySpare7 != null and groupBySpare7 or groupBySpare8 != null and groupBySpare8 or groupBySpare9 != null and groupBySpare9 or groupBySpare10 != null and groupBySpare10 or groupBySpare11 != null and groupBySpare11 or groupBySpare12 != null and groupBySpare12 or groupBySpare13 != null and groupBySpare13 or groupBySpare14 != null and groupBySpare14 or groupBySpare15 != null and groupBySpare15 or groupBySpare16 != null and groupBySpare16 or groupBySpare17 != null and groupBySpare17 or groupBySpare18 != null and groupBySpare18 or groupBySpare19 != null and groupBySpare19 or groupBySpare20 != null and groupBySpare20 or groupBySpare21 != null and groupBySpare21 or groupBySpare22 != null and groupBySpare22 or groupBySpare23 != null and groupBySpare23 or groupBySpare24 != null and groupBySpare24 or groupBySpare25 != null and groupBySpare25 or groupBySpare26 != null and groupBySpare26 or groupBySpare27 != null and groupBySpare27 or groupBySpare28 != null and groupBySpare28 or groupBySpare29 != null and groupBySpare29 or groupBySpare30 != null and groupBySpare30 or groupBySpare31 != null and groupBySpare31 or groupBySpare32 != null and groupBySpare32 or groupBySpare33 != null and groupBySpare33 or groupBySpare34 != null and groupBySpare34 or groupBySpare35 != null and groupBySpare35 or groupBySpare36 != null and groupBySpare36 or groupBySpare37 != null and groupBySpare37 or groupBySpare38 != null and groupBySpare38 or groupBySpare39 != null and groupBySpare39">
<if test="groupByProductId != null and groupByProductId">p.product_id,</if>
<if test="groupByProductName != null and groupByProductName">p.product_name,</if>
<if test="groupByOrderId != null and groupByOrderId">s.order_id,</if>
<if test="groupBySpec != null and groupBySpec">p.spec,</if>
<if test="groupByUnit != null and groupByUnit">p.unit,</if>
<if test="groupByPrice != null and groupByPrice">p.price,</if>
<if test="groupByParentId != null and groupByParentId">p.parent_id,</if>
<if test="groupByCargoNo != null and groupByCargoNo">p.cargo_no,</if>
<if test="groupBySpare1 != null and groupBySpare1">p.spare1,</if>
<if test="groupBySpare2 != null and groupBySpare2">p.spare2,</if>
<if test="groupBySpare3 != null and groupBySpare3">p.spare3,</if>
<if test="groupBySpare4 != null and groupBySpare4">p.spare4,</if>
<if test="groupBySpare5 != null and groupBySpare5">p.spare5,</if>
<if test="groupBySpare6 != null and groupBySpare6">p.spare6,</if>
<if test="groupBySpare7 != null and groupBySpare7">p.spare7,</if>
<if test="groupBySpare8 != null and groupBySpare8">p.spare8,</if>
<if test="groupBySpare9 != null and groupBySpare9">p.spare9,</if>
<if test="groupBySpare10 != null and groupBySpare10">p.spare10,</if>
<if test="groupBySpare11 != null and groupBySpare11">p.spare11,</if>
<if test="groupBySpare12 != null and groupBySpare12">p.spare12,</if>
<if test="groupBySpare13 != null and groupBySpare13">p.spare13,</if>
<if test="groupBySpare14 != null and groupBySpare14">p.spare14,</if>
<if test="groupBySpare15 != null and groupBySpare15">p.spare15,</if>
<if test="groupBySpare16 != null and groupBySpare16">p.spare16,</if>
<if test="groupBySpare17 != null and groupBySpare17">p.spare17,</if>
<if test="groupBySpare18 != null and groupBySpare18">p.spare18,</if>
<if test="groupBySpare19 != null and groupBySpare19">p.spare19,</if>
<if test="groupBySpare20 != null and groupBySpare20">p.spare20,</if>
<if test="groupBySpare21 != null and groupBySpare21">p.spare21,</if>
<if test="groupBySpare22 != null and groupBySpare22">p.spare22,</if>
<if test="groupBySpare23 != null and groupBySpare23">p.spare23,</if>
<if test="groupBySpare24 != null and groupBySpare24">p.spare24,</if>
<if test="groupBySpare25 != null and groupBySpare25">p.spare25,</if>
<if test="groupBySpare26 != null and groupBySpare26">p.spare26,</if>
<if test="groupBySpare27 != null and groupBySpare27">p.spare27,</if>
<if test="groupBySpare28 != null and groupBySpare28">p.spare28,</if>
<if test="groupBySpare29 != null and groupBySpare29">p.spare29,</if>
<if test="groupBySpare30 != null and groupBySpare30">p.spare30,</if>
<if test="groupBySpare31 != null and groupBySpare31">p.spare31,</if>
<if test="groupBySpare32 != null and groupBySpare32">p.spare32,</if>
<if test="groupBySpare33 != null and groupBySpare33">p.spare33,</if>
<if test="groupBySpare34 != null and groupBySpare34">p.spare34,</if>
<if test="groupBySpare35 != null and groupBySpare35">p.spare35,</if>
<if test="groupBySpare36 != null and groupBySpare36">p.spare36,</if>
<if test="groupBySpare37 != null and groupBySpare37">p.spare37,</if>
<if test="groupBySpare38 != null and groupBySpare38">p.spare38,</if>
<if test="groupBySpare39 != null and groupBySpare39">p.spare39,</if>
<if test="groupByLotNo != null and groupByLotNo">s.lot_no,</if>
<if test="groupByWarehouseId != null and groupByWarehouseId">s.warehouse_id,</if>
<if test="groupByWarehouseId != null and groupByWarehouseId">bw.warehouse_name,</if>
<if test="groupByCargoSpaceId != null and groupByCargoSpaceId">s.cargo_space_id,</if>
<if test="groupByCargoSpaceId != null and groupByCargoSpaceId">bcs.cargo_space_name,</if>
<if test="groupByRoadwayId != null and groupByRoadwayId">bcs.roadway_id,</if>
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
<where>
AND p.product_id IS NOT NULL AND p.product_id != ''
<if test="productId != null and productId != ''"> AND p.product_id like concat('%', #{productId}, '%')</if>
<if test="productName != null and productName != ''"> AND p.product_name like concat('%', #{productName}, '%')</if>
<if test="orderId != null and orderId != ''"> AND s.order_id like concat('%', #{orderId}, '%')</if>
<if test="spec != null and spec != ''"> AND p.spec like concat('%', #{spec}, '%')</if>
<if test="unit != null and unit != ''"> AND p.unit like concat('%', #{unit}, '%')</if>
<if test="price != null and price != ''"> AND p.price like concat('%', #{price}, '%')</if>
<if test="spare1 != null and spare1 != ''"> AND p.spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> AND p.spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare5 != null and spare5 != ''"> AND p.spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> AND p.spare6 like concat('%', #{spare6}, '%')</if>
<if test="spare8 != null and spare8 != ''"> AND p.spare8 like concat('%', #{spare8}, '%')</if>
<if test="spare7 != null and spare7 != ''"> AND p.spare7 like concat('%', #{spare7}, '%')</if>
<if test="remark != null and remark != ''"> AND p.spare7 like concat('%', #{remark}, '%')}</if>
<if test="lotNo != null and lotNo != ''"> AND s.lot_no like concat('%', #{lotNo}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> AND s.warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> AND s.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
<if test="cargoSpaceName != null and cargoSpaceName != ''"> AND bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
<if test="spare9 != null and spare9 != ''"> AND p.spare9 like concat('%', #{spare9}, '%')</if>
<if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
${params.warehouseDataScope}
</if>
</where>
GROUP BY
<trim prefixOverrides=",">
<if test="groupByProductId != null and groupByProductId">,p.product_id</if>
<if test="groupByProductName != null and groupByProductName">,p.product_name</if>
<if test="groupByOrderId != null and groupByOrderId">,s.order_id</if>
<if test="groupBySpec != null and groupBySpec">,p.spec</if>
<if test="groupByUnit != null and groupByUnit">,p.unit</if>
<if test="groupByPrice != null and groupByPrice">,p.price</if>
<if test="groupByParentId != null and groupByParentId">,p.parent_id</if>
<if test="groupByCargoNo != null and groupByCargoNo">,p.cargo_no</if>
<if test="groupBySpare1 != null and groupBySpare1">,p.spare1</if>
<if test="groupBySpare2 != null and groupBySpare2">,p.spare2</if>
<if test="groupBySpare3 != null and groupBySpare3">,p.spare3</if>
<if test="groupBySpare4 != null and groupBySpare4">,p.spare4</if>
<if test="groupBySpare5 != null and groupBySpare5">,p.spare5</if>
<if test="groupBySpare6 != null and groupBySpare6">,p.spare6</if>
<if test="groupBySpare7 != null and groupBySpare7">,p.spare7</if>
<if test="groupBySpare8 != null and groupBySpare8">,p.spare8</if>
<if test="groupBySpare9 != null and groupBySpare9">,p.spare9</if>
<if test="groupBySpare10 != null and groupBySpare10">,p.spare10</if>
<if test="groupBySpare11 != null and groupBySpare11">,p.spare11</if>
<if test="groupBySpare12 != null and groupBySpare12">,p.spare12</if>
<if test="groupBySpare13 != null and groupBySpare13">,p.spare13</if>
<if test="groupBySpare14 != null and groupBySpare14">,p.spare14</if>
<if test="groupBySpare15 != null and groupBySpare15">,p.spare15</if>
<if test="groupBySpare16 != null and groupBySpare16">,p.spare16</if>
<if test="groupBySpare17 != null and groupBySpare17">,p.spare17</if>
<if test="groupBySpare18 != null and groupBySpare18">,p.spare18</if>
<if test="groupBySpare19 != null and groupBySpare19">,p.spare19</if>
<if test="groupBySpare20 != null and groupBySpare20">,p.spare20</if>
<if test="groupBySpare21 != null and groupBySpare21">,p.spare21</if>
<if test="groupBySpare22 != null and groupBySpare22">,p.spare22</if>
<if test="groupBySpare23 != null and groupBySpare23">,p.spare23</if>
<if test="groupBySpare24 != null and groupBySpare24">,p.spare24</if>
<if test="groupBySpare25 != null and groupBySpare25">,p.spare25</if>
<if test="groupBySpare26 != null and groupBySpare26">,p.spare26</if>
<if test="groupBySpare27 != null and groupBySpare27">,p.spare27</if>
<if test="groupBySpare28 != null and groupBySpare28">,p.spare28</if>
<if test="groupBySpare29 != null and groupBySpare29">,p.spare29</if>
<if test="groupBySpare30 != null and groupBySpare30">,p.spare30</if>
<if test="groupBySpare31 != null and groupBySpare31">,p.spare31</if>
<if test="groupBySpare32 != null and groupBySpare32">,p.spare32</if>
<if test="groupBySpare33 != null and groupBySpare33">,p.spare33</if>
<if test="groupBySpare34 != null and groupBySpare34">,p.spare34</if>
<if test="groupBySpare35 != null and groupBySpare35">,p.spare35</if>
<if test="groupBySpare36 != null and groupBySpare36">,p.spare36</if>
<if test="groupBySpare37 != null and groupBySpare37">,p.spare37</if>
<if test="groupBySpare38 != null and groupBySpare38">,p.spare38</if>
<if test="groupBySpare39 != null and groupBySpare39">,p.spare39</if>
<if test="groupByLotNo != null and groupByLotNo">,s.lot_no</if>
<if test="groupByWarehouseId != null and groupByWarehouseId">,s.warehouse_id</if>
<if test="groupByWarehouseId != null and groupByWarehouseId">,bw.warehouse_name</if>
<if test="groupByCargoSpaceId != null and groupByCargoSpaceId">,s.cargo_space_id</if>
<if test="groupByCargoSpaceId != null and groupByCargoSpaceId">,bcs.cargo_space_name</if>
<if test="groupByRoadwayId != null and groupByRoadwayId">,bcs.roadway_id</if>
</trim>
</when>
<otherwise>
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
<where>
AND p.product_id IS NOT NULL AND p.product_id != ''
<if test="productId != null and productId != ''"> AND p.product_id like concat('%', #{productId}, '%')</if>
<if test="productName != null and productName != ''"> AND p.product_name like concat('%', #{productName}, '%')</if>
<if test="orderId != null and orderId != ''"> AND s.order_id like concat('%', #{orderId}, '%')</if>
<if test="spec != null and spec != ''"> AND p.spec like concat('%', #{spec}, '%')</if>
<if test="unit != null and unit != ''"> AND p.unit like concat('%', #{unit}, '%')</if>
<if test="price != null and price != ''"> AND p.price like concat('%', #{price}, '%')</if>
<if test="parentId != null and parentId != ''"> AND p.parent_id like concat('%', #{parentId}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> AND p.cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="spare1 != null and spare1 != ''"> AND p.spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> AND p.spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> AND p.spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> AND p.spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> AND p.spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> AND p.spare6 like concat('%', #{spare6}, '%')</if>
<if test="spare7 != null and spare7 != ''"> AND p.spare7 like concat('%', #{spare7}, '%')</if>
<if test="spare8 != null and spare8 != ''"> AND p.spare8 like concat('%', #{spare8}, '%')</if>
<if test="spare9 != null and spare9 != ''"> AND p.spare9 like concat('%', #{spare9}, '%')</if>
<if test="spare10 != null and spare10 != ''"> AND p.spare10 like concat('%', #{spare10}, '%')</if>
<if test="spare11 != null and spare11 != ''"> AND p.spare11 like concat('%', #{spare11}, '%')</if>
<if test="spare12 != null and spare12 != ''"> AND p.spare12 like concat('%', #{spare12}, '%')</if>
<if test="spare13 != null and spare13 != ''"> AND p.spare13 like concat('%', #{spare13}, '%')</if>
<if test="spare14 != null and spare14 != ''"> AND p.spare14 like concat('%', #{spare14}, '%')</if>
<if test="spare15 != null and spare15 != ''"> AND p.spare15 like concat('%', #{spare15}, '%')</if>
<if test="spare16 != null and spare16 != ''"> AND p.spare16 like concat('%', #{spare16}, '%')</if>
<if test="spare17 != null and spare17 != ''"> AND p.spare17 like concat('%', #{spare17}, '%')</if>
<if test="spare18 != null and spare18 != ''"> AND p.spare18 like concat('%', #{spare18}, '%')</if>
<if test="spare19 != null and spare19 != ''"> AND p.spare19 like concat('%', #{spare19}, '%')</if>
<if test="spare20 != null and spare20 != ''"> AND p.spare20 like concat('%', #{spare20}, '%')</if>
<if test="spare21 != null and spare21 != ''"> AND p.spare21 like concat('%', #{spare21}, '%')</if>
<if test="spare22 != null and spare22 != ''"> AND p.spare22 like concat('%', #{spare22}, '%')</if>
<if test="spare23 != null and spare23 != ''"> AND p.spare23 like concat('%', #{spare23}, '%')</if>
<if test="spare24 != null and spare24 != ''"> AND p.spare24 like concat('%', #{spare24}, '%')</if>
<if test="spare25 != null and spare25 != ''"> AND p.spare25 like concat('%', #{spare25}, '%')</if>
<if test="spare26 != null and spare26 != ''"> AND p.spare26 like concat('%', #{spare26}, '%')</if>
<if test="spare27 != null and spare27 != ''"> AND p.spare27 like concat('%', #{spare27}, '%')</if>
<if test="spare28 != null and spare28 != ''"> AND p.spare28 like concat('%', #{spare28}, '%')</if>
<if test="spare29 != null and spare29 != ''"> AND p.spare29 like concat('%', #{spare29}, '%')</if>
<if test="spare30 != null and spare30 != ''"> AND p.spare30 like concat('%', #{spare30}, '%')</if>
<if test="spare31 != null and spare31 != ''"> AND p.spare31 like concat('%', #{spare31}, '%')</if>
<if test="spare32 != null and spare32 != ''"> AND p.spare32 like concat('%', #{spare32}, '%')</if>
<if test="spare33 != null and spare33 != ''"> AND p.spare33 like concat('%', #{spare33}, '%')</if>
<if test="spare34 != null and spare34 != ''"> AND p.spare34 like concat('%', #{spare34}, '%')</if>
<if test="spare35 != null and spare35 != ''"> AND p.spare35 like concat('%', #{spare35}, '%')</if>
<if test="spare36 != null and spare36 != ''"> AND p.spare36 like concat('%', #{spare36}, '%')</if>
<if test="spare37 != null and spare37 != ''"> AND p.spare37 like concat('%', #{spare37}, '%')</if>
<if test="spare38 != null and spare38 != ''"> AND p.spare38 like concat('%', #{spare38}, '%')</if>
<if test="spare39 != null and spare39 != ''"> AND p.spare39 like concat('%', #{spare39}, '%')</if>
<if test="remark != null and remark != ''"> AND p.remark like concat('%', #{remark}, '%')</if>
<if test="lotNo != null and lotNo != ''"> AND s.lot_no like concat('%', #{lotNo}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> AND s.warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> AND s.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
<if test="cargoSpaceName != null and cargoSpaceName != ''"> AND bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
<if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
${params.warehouseDataScope}
</if>
</where>
</otherwise>
</choose>
</sql>
<select id="selectStockSummaryList" parameterType="StockSummary" resultMap="StockSummaryResult">
@@ -308,7 +337,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="warehouseId != null">warehouse_id,</if>
<if test="cargoSpaceId != null">cargo_space_id,</if>
<if test="quantity != null">quantity,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="onlyIdentity != null">#{onlyIdentity},</if>
<if test="productId != null and productId != ''">#{productId},</if>
@@ -362,7 +391,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="warehouseId != null">#{warehouseId},</if>
<if test="cargoSpaceId != null">#{cargoSpaceId},</if>
<if test="quantity != null">#{quantity},</if>
</trim>
</trim>
</insert>
<update id="updateStockSummary" parameterType="StockSummary">

259
ruoyi-ui/src/views/search/StockSummary/index.vue
View File

@@ -18,7 +18,7 @@
<!-- <el-checkbox label="spare1">型号</el-checkbox> -->
<!-- <el-checkbox label="spare2">单件净重</el-checkbox>-->
<!-- <el-checkbox label="spare3">颜色</el-checkbox> -->
<!-- <el-checkbox label="spare4">序列号</el-checkbox> -->
<!-- <el-checkbox label="spare4">序列号</el-checkbox>-->
<!-- <el-checkbox label="spare5">电压</el-checkbox> -->
<!-- <el-checkbox label="spare6">功率</el-checkbox> -->
<!-- <el-checkbox label="spare7">相位</el-checkbox> -->
@@ -82,14 +82,30 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="NC号" prop="spare9">
<!-- <el-form-item label="序列号" prop="spare4">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare4"-->
<!-- placeholder="请输入序列号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="规格" prop="spec">
<el-input
v-model="queryParams.spare9"
placeholder="请输入NC号"
v-model="queryParams.spec"
placeholder="请输入规格"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="NC号" prop="spare9">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare9"-->
<!-- placeholder="请输入NC号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="货位" prop="cargoSpaceId">-->
<!-- <el-input-->
<!-- v-model="queryParams.cargoSpaceId"-->
@@ -128,54 +144,55 @@
<el-table-column label="订单号" align="center" prop="orderId" width="160" v-if="queryParams.groupFields.includes('orderId')" />
<el-table-column label="品号" align="left" prop="productId" width="160" v-if="queryParams.groupFields.includes('productId')" />
<el-table-column label="品名" align="center" prop="productName" width="160" v-if="queryParams.groupFields.includes('productName')" />
<el-table-column label="批号" align="center" prop="lotNo" width="160" v-if="queryParams.groupFields.includes('lotNo')" />
<!-- <el-table-column label="批号" align="center" prop="lotNo" width="160" v-if="queryParams.groupFields.includes('lotNo')" />-->
<!-- <el-table-column label="单位" align="center" prop="unit" width="120" v-if="queryParams.groupFields.includes('unit')" /> -->
<!-- <el-table-column label="仓库" align="left" prop="warehouseName" width="120" v-if="queryParams.groupFields.includes('warehouseId')" />-->
<el-table-column label="巷道" align="left" prop="roadwayId" width="160" />
<el-table-column label="货位" align="left" prop="cargoSpaceName" width="160" v-if="queryParams.groupFields.includes('cargoSpaceId')" />
<!-- <el-table-column label="巷道" align="left" prop="roadwayId" width="160" />-->
<!-- <el-table-column label="货位" align="left" prop="cargoSpaceName" width="160" v-if="queryParams.groupFields.includes('cargoSpaceId')" />-->
<el-table-column label="库存数量" align="right" prop="quantity" width="120" />
<!-- <el-table-column label="型号" align="center" prop="spare1" width="120" v-if="queryParams.groupFields.includes('spare1')" /> -->
<!-- <el-table-column label="单件净重" align="center" prop="spare2" width="120" v-if="queryParams.groupFields.includes('spare2')" /> -->
<!-- <el-table-column label="电压" align="center" prop="spare5" width="120" v-if="queryParams.groupFields.includes('spare5')" /> -->
<!-- <el-table-column label="功率" align="center" prop="spare6" width="120" v-if="queryParams.groupFields.includes('spare6')" /> -->
<!-- <el-table-column label="相位" align="center" prop="spare7" width="120" v-if="queryParams.groupFields.includes('spare7')" /> -->
<el-table-column label="单件净重" align="center" prop="spare2" width="120" v-if="queryParams.groupFields.includes('spare2')" />
<!-- <el-table-column label="序列号" align="center" prop="spare4" width="120" v-if="queryParams.groupFields.includes('spare4')" />-->
<el-table-column label="电压" align="center" prop="spare5" width="120" v-if="queryParams.groupFields.includes('spare5')" />
<el-table-column label="功率" align="center" prop="spare6" width="120" v-if="queryParams.groupFields.includes('spare6')" />
<el-table-column label="相位" align="center" prop="spare7" width="120" v-if="queryParams.groupFields.includes('spare7')" />
<!-- <el-table-column label="毛重" align="center" prop="spare8" width="120" v-if="queryParams.groupFields.includes('spare8')" /> -->
<el-table-column label="规格" align="left" prop="spec" width="160" v-if="queryParams.groupFields.includes('spec')" />
<el-table-column label="品号描述" align="left" prop="price" width="160" v-if="queryParams.groupFields.includes('price')" />
<el-table-column label="产品分类" align="left" prop="parentId" width="160" v-if="queryParams.groupFields.includes('parentId')" />
<el-table-column label="英文描述" align="left" prop="cargoNo" width="160" v-if="queryParams.groupFields.includes('cargoNo')" />
<!-- <el-table-column label="品号描述" align="left" prop="price" width="160" v-if="queryParams.groupFields.includes('price')" />-->
<!-- <el-table-column label="产品分类" align="left" prop="parentId" width="160" v-if="queryParams.groupFields.includes('parentId')" />-->
<!-- <el-table-column label="英文描述" align="left" prop="cargoNo" width="160" v-if="queryParams.groupFields.includes('cargoNo')" />-->
<el-table-column label="NC号" align="left" prop="spare9" width="160" v-if="queryParams.groupFields.includes('spare9')" />
<el-table-column label="电源线" align="left" prop="spare10" width="160" v-if="queryParams.groupFields.includes('spare10')" />
<el-table-column label="插头" align="left" prop="spare11" width="160" v-if="queryParams.groupFields.includes('spare11')" />
<el-table-column label="接嘴" align="left" prop="spare12" width="160" v-if="queryParams.groupFields.includes('spare12')" />
<el-table-column label="快捷码" align="left" prop="spare13" width="160" v-if="queryParams.groupFields.includes('spare13')" />
<el-table-column label="库存单位编号" align="left" prop="spare14" width="160" v-if="queryParams.groupFields.includes('spare14')" />
<el-table-column label="库存单位名称" align="left" prop="spare15" width="160" v-if="queryParams.groupFields.includes('spare15')" />
<el-table-column label="品号群组" align="left" prop="spare16" width="160" v-if="queryParams.groupFields.includes('spare16')" />
<el-table-column label="归类品" align="left" prop="spare17" width="160" v-if="queryParams.groupFields.includes('spare17')" />
<el-table-column label="计量体系" align="left" prop="spare18" width="160" v-if="queryParams.groupFields.includes('spare18')" />
<el-table-column label="群组名称" align="left" prop="spare19" width="160" v-if="queryParams.groupFields.includes('spare19')" />
<el-table-column label="批号管理" align="left" prop="spare20" width="160" v-if="queryParams.groupFields.includes('spare20')" />
<el-table-column label="状态" align="left" prop="spare21" width="160" v-if="queryParams.groupFields.includes('spare21')" />
<el-table-column label="产品大类" align="left" prop="spare22" width="160" v-if="queryParams.groupFields.includes('spare22')" />
<el-table-column label="产品二类" align="left" prop="spare23" width="160" v-if="queryParams.groupFields.includes('spare23')" />
<el-table-column label="产品线/产品系列" align="left" prop="spare24" width="160" v-if="queryParams.groupFields.includes('spare24')" />
<el-table-column label="BOM状态" align="left" prop="spare25" width="160" v-if="queryParams.groupFields.includes('spare25')" />
<el-table-column label="产品定位" align="left" prop="spare26" width="160" v-if="queryParams.groupFields.includes('spare26')" />
<el-table-column label="电脑板型号" align="left" prop="spare27" width="160" v-if="queryParams.groupFields.includes('spare27')" />
<el-table-column label="非标要求" align="left" prop="spare28" width="160" v-if="queryParams.groupFields.includes('spare28')" />
<el-table-column label="品牌" align="left" prop="spare29" width="160" v-if="queryParams.groupFields.includes('spare29')" />
<!-- <el-table-column label="电源线" align="left" prop="spare10" width="160" v-if="queryParams.groupFields.includes('spare10')" />-->
<!-- <el-table-column label="插头" align="left" prop="spare11" width="160" v-if="queryParams.groupFields.includes('spare11')" />-->
<!-- <el-table-column label="接嘴" align="left" prop="spare12" width="160" v-if="queryParams.groupFields.includes('spare12')" />-->
<!-- <el-table-column label="快捷码" align="left" prop="spare13" width="160" v-if="queryParams.groupFields.includes('spare13')" />-->
<!-- <el-table-column label="库存单位编号" align="left" prop="spare14" width="160" v-if="queryParams.groupFields.includes('spare14')" />-->
<!-- <el-table-column label="库存单位名称" align="left" prop="spare15" width="160" v-if="queryParams.groupFields.includes('spare15')" />-->
<!-- <el-table-column label="品号群组" align="left" prop="spare16" width="160" v-if="queryParams.groupFields.includes('spare16')" />-->
<!-- <el-table-column label="归类品" align="left" prop="spare17" width="160" v-if="queryParams.groupFields.includes('spare17')" />-->
<!-- <el-table-column label="计量体系" align="left" prop="spare18" width="160" v-if="queryParams.groupFields.includes('spare18')" />-->
<!-- <el-table-column label="群组名称" align="left" prop="spare19" width="160" v-if="queryParams.groupFields.includes('spare19')" />-->
<!-- <el-table-column label="批号管理" align="left" prop="spare20" width="160" v-if="queryParams.groupFields.includes('spare20')" />-->
<!-- <el-table-column label="状态" align="left" prop="spare21" width="160" v-if="queryParams.groupFields.includes('spare21')" />-->
<!-- <el-table-column label="产品大类" align="left" prop="spare22" width="160" v-if="queryParams.groupFields.includes('spare22')" />-->
<!-- <el-table-column label="产品二类" align="left" prop="spare23" width="160" v-if="queryParams.groupFields.includes('spare23')" />-->
<!-- <el-table-column label="产品线/产品系列" align="left" prop="spare24" width="160" v-if="queryParams.groupFields.includes('spare24')" />-->
<!-- <el-table-column label="BOM状态" align="left" prop="spare25" width="160" v-if="queryParams.groupFields.includes('spare25')" />-->
<!-- <el-table-column label="产品定位" align="left" prop="spare26" width="160" v-if="queryParams.groupFields.includes('spare26')" />-->
<!-- <el-table-column label="电脑板型号" align="left" prop="spare27" width="160" v-if="queryParams.groupFields.includes('spare27')" />-->
<!-- <el-table-column label="非标要求" align="left" prop="spare28" width="160" v-if="queryParams.groupFields.includes('spare28')" />-->
<!-- <el-table-column label="品牌" align="left" prop="spare29" width="160" v-if="queryParams.groupFields.includes('spare29')" />-->
<el-table-column label="非标颜色" align="left" prop="spare30" width="160" v-if="queryParams.groupFields.includes('spare30')" />
<el-table-column label="主颜色" align="left" prop="spare31" width="160" v-if="queryParams.groupFields.includes('spare31')" />
<el-table-column label="辅助颜色" align="left" prop="spare32" width="160" v-if="queryParams.groupFields.includes('spare32')" />
<el-table-column label="是否标准款" align="left" prop="spare33" width="160" v-if="queryParams.groupFields.includes('spare33')" />
<el-table-column label="包装方式" align="left" prop="spare34" width="160" v-if="queryParams.groupFields.includes('spare34')" />
<el-table-column label="主要包装方式" align="left" prop="spare35" width="160" v-if="queryParams.groupFields.includes('spare35')" />
<el-table-column label="长" align="right" prop="spare36" width="160" v-if="queryParams.groupFields.includes('spare36')" />
<el-table-column label="宽" align="right" prop="spare37" width="160" v-if="queryParams.groupFields.includes('spare37')" />
<el-table-column label="高" align="right" prop="spare38" width="160" v-if="queryParams.groupFields.includes('spare38')" />
<el-table-column label="包装材积" align="center" prop="spare39" width="160" v-if="queryParams.groupFields.includes('spare39')" />
<el-table-column label="备注" align="left" prop="remark" width="160" />
<!-- <el-table-column label="是否标准款" align="left" prop="spare33" width="160" v-if="queryParams.groupFields.includes('spare33')" />-->
<!-- <el-table-column label="包装方式" align="left" prop="spare34" width="160" v-if="queryParams.groupFields.includes('spare34')" />-->
<!-- <el-table-column label="主要包装方式" align="left" prop="spare35" width="160" v-if="queryParams.groupFields.includes('spare35')" />-->
<!-- <el-table-column label="长" align="right" prop="spare36" width="160" v-if="queryParams.groupFields.includes('spare36')" />-->
<!-- <el-table-column label="宽" align="right" prop="spare37" width="160" v-if="queryParams.groupFields.includes('spare37')" />-->
<!-- <el-table-column label="高" align="right" prop="spare38" width="160" v-if="queryParams.groupFields.includes('spare38')" />-->
<!-- <el-table-column label="包装材积" align="center" prop="spare39" width="160" v-if="queryParams.groupFields.includes('spare39')" />-->
<!-- <el-table-column label="备注" align="left" prop="remark" width="160" />-->
</el-table>
<pagination
@@ -272,49 +289,50 @@ export default {
created() {
// 初始化时全选分组选项
this.queryParams.groupFields = [
'parentId',
'cargoNo',
'roadwayId',
// 'parentId',
// 'cargoNo',
// 'roadwayId',
'orderId',
'spare3',
'spare4',
'spare5',
'spare6',
'spare7',
'spare8',
'spare9',
'spare10',
'spare11',
'spare12',
'spare13',
'spare14',
'spare15',
'spare16',
'spare17',
'spare18',
'spare19',
'spare20',
'spare21',
'spare22',
'spare23',
'spare24',
'spare25',
'spare26',
'spare27',
'spare28',
'spare29',
// 'spare3',
// 'spare4',
// 'spare5',
// 'spare6',
// 'spare7',
// 'spare8',
// 'spare9',
// 'spare10',
// 'spare11',
// 'spare12',
// 'spare13',
// 'spare14',
// 'spare15',
// 'spare16',
// 'spare17',
// 'spare18',
// 'spare19',
// 'spare20',
// 'spare21',
// 'spare22',
// 'spare23',
// 'spare24',
// 'spare25',
// 'spare26',
// 'spare27',
// 'spare28',
// 'spare29',
'spare30',
'spare31',
'spare32',
'spare33',
'spare34',
'spare35',
'spare36',
'spare37',
'spare38',
'spare39',
'productId', 'productName', 'spec', 'unit', 'lotNo', 'warehouseId', 'cargoSpaceId',
'price', 'spare1', 'spare2', 'spare5', 'spare6', 'spare7', 'spare8'
// 'spare33',
// 'spare34',
// 'spare35',
// 'spare36',
// 'spare37',
// 'spare38',
// 'spare39',
'productId', 'productName', 'spec'
// 'unit', 'lotNo', 'warehouseId', 'cargoSpaceId',
// 'price', 'spare1', 'spare2', 'spare5', 'spare6', 'spare7', 'spare8'
];
this.getList();
this.getWarehouseList()
@@ -362,49 +380,50 @@ export default {
this.resetForm("queryForm");
// 重置时恢复全选状态
this.queryParams.groupFields = [
'parentId',
'cargoNo',
// 'parentId',
// 'cargoNo',
'orderId',
'roadwayId',
'spare3',
'spare4',
'spare5',
'spare6',
'spare7',
'spare8',
'spare9',
'spare10',
'spare11',
'spare12',
'spare13',
'spare14',
'spare15',
'spare16',
'spare17',
'spare18',
'spare19',
'spare20',
'spare21',
'spare22',
'spare23',
'spare24',
'spare25',
'spare26',
'spare27',
'spare28',
'spare29',
// 'roadwayId',
// 'spare3',
// 'spare4',
// 'spare5',
// 'spare6',
// 'spare7',
// 'spare8',
// 'spare9',
// 'spare10',
// 'spare11',
// 'spare12',
// 'spare13',
// 'spare14',
// 'spare15',
// 'spare16',
// 'spare17',
// 'spare18',
// 'spare19',
// 'spare20',
// 'spare21',
// 'spare22',
// 'spare23',
// 'spare24',
// 'spare25',
// 'spare26',
// 'spare27',
// 'spare28',
// 'spare29',
'spare30',
'spare31',
'spare32',
'spare33',
'spare34',
'spare35',
'spare36',
'spare37',
'spare38',
'spare39',
'productId', 'productName', 'spec', 'unit', 'lotNo', 'warehouseId', 'cargoSpaceId',
'price', 'spare1', 'spare2', 'spare5', 'spare6', 'spare7', 'spare8'
// 'spare33',
// 'spare34',
// 'spare35',
// 'spare36',
// 'spare37',
// 'spare38',
// 'spare39',
'productId', 'productName', 'spec'
// , 'unit', 'lotNo', 'warehouseId', 'cargoSpaceId',
// 'price', 'spare1', 'spare2', 'spare5', 'spare6', 'spare7', 'spare8'
];
this.handleQuery();
},