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

修改入库管理 盘点管理联查

Browse Source
This commit is contained in:
liuhanqing
2025-06-10 10:50:24 +08:00
parent be72a0ac13
commit a87bc77cf3
30 changed files with 561 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml
View File

@@ -24,10 +24,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="warehouseName" column="warehouse_name" />
</resultMap>
<sql id="selectCheckStockinVo">
select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 from check_stockin
select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, cs.warehouse_id, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 ,
bw.warehouse_name
from check_stockin cs
left join bas_warehouse bw on cs.warehouse_id = bw.warehouse_id
</sql>
<select id="selectCheckStockinList" parameterType="CheckStockin" resultMap="CheckStockinResult">
@@ -38,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createDate != null and createDate != ''"> and create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
<if test="warehouseId != null and warehouseId != ''"> and cs.warehouse_id = #{warehouseId}</if>
<if test="finishDate != null and finishDate != ''"> and finish_date = #{finishDate}</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and stock_source = #{stockSource}</if>