From f2c7576cbd050824ec78233483e06fc375382bfb Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 02 四月 2026 17:04:03 +0800
Subject: [PATCH] yys 1.客户档案导入-维护人，维护时间默认当前 2.销售报价审核非必填，产品选择方式也要改 3.销售产品增加物料号字段 4.产品维护增加录入时间，修改时间 6.发货审核不需要了 7.BI的生产核算分析不要了，增加生产订单当前工序 3.库存导入模板规格改成图纸编号，产品名称可以为空，加个库位 4.库存管理外购改为标准件 5.bom产品唯一 6.产品根据bom计算子项数量（只统计二级）
---
src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml b/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml
index 58479b1..87dfa32 100644
--- a/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml
+++ b/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml
@@ -3,23 +3,37 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.warehouse.mapper.WarehouseGoodsShelvesRowcolMapper">
-
-
- <select id="listPage" resultType="com.ruoyi.warehouse.pojo.WarehouseGoodsShelvesRowcol">
- select * from warehouse_goods_shelves_rowcol
+ <select id="findList" resultType="com.ruoyi.warehouse.dto.WarehouseGoodsShelvesRowcolDto">
+-- SELECT
+-- wgsr.*,
+-- w.warehouse_name,
+-- wgs.name,
+-- dc.category
+-- FROM warehouse_goods_shelves_rowcol wgsr
+-- LEFT JOIN documentation doc ON doc.warehouse_goods_shelves_rowcol_id = wgsr.id
+-- LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
+-- LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
+-- LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
+ SELECT
+ wgsr.*,
+ w.warehouse_name,
+ wgs.name
+ FROM warehouse_goods_shelves_rowcol wgsr
+ LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
+ LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
<where>
1=1
- <if test="warehouseGoodsShelvesRowcol.storey != null">
- and storey = #{warehouseGoodsShelvesRowcol.storey}
+ <if test="warehouseGoodsShelvesRowcol.row != null">
+ and wgsr.row = #{warehouseGoodsShelvesRowcol.row}
</if>
- <if test="warehouseGoodsShelvesRowcol.arrange != null">
- and arrange = #{warehouseGoodsShelvesRowcol.arrange}
+ <if test="warehouseGoodsShelvesRowcol.col != null">
+ and wgsr.col = #{warehouseGoodsShelvesRowcol.col}
</if>
<if test="warehouseGoodsShelvesRowcol.warehouseGoodsShelvesId != null">
- and warehouse_goods_shelves_id = #{warehouseGoodsShelvesRowcol.warehouseGoodsShelvesId}
+ and wgsr.warehouse_goods_shelves_id = #{warehouseGoodsShelvesRowcol.warehouseGoodsShelvesId}
</if>
- <if test="warehouseGoodsShelvesRowcol.warehouseId != null">
- and warehouse_id = #{warehouseGoodsShelvesRowcol.warehouseId}
+ <if test="warehouseGoodsShelvesRowcol.id != null">
+ and wgsr.id = #{warehouseGoodsShelvesRowcol.id}
</if>
</where>
</select>
--
Gitblit v1.9.3