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

现场调试更改

Browse Source
This commit is contained in:
lsymicc
2026-09-08 22:20:47 +08:00
parent 5353351520
commit 7c3ee78d41
140 changed files with 4488 additions and 4311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ruoyi-admin/src/main/resources/mapper/bas/BasStockMapper.xml
View File

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="BasStock" id="BasStockResult">
<result property="stockId" column="stock_id" />
<result property="stockDetailId" column="stock_detail_id" />
<result property="cargoSpaceId" column="cargo_space_id" />
<result property="stockStatus" column="stock_status" />
<result property="productStatus" column="product_status" />
@@ -31,23 +32,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="deptName" column="dept_name" />
<result property="supplierId" column="supplier_id" />
<result property="supplierName" column="supplier_name" />
<result property="trayType" column="tray_type" />
<result property="availablePlace" column="available_place" />
</resultMap>
<sql id="selectBasStockVo">
select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_id, product_name, roller_number,
select stock_id, stock_detail_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_id, product_name, roller_number,
quantity, job_id, job_detail_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, warehouse_id, warehouse_name,
user_id, user_name, dept_id, dept_name, supplier_id, supplier_name, tray_type, availablePlace
from bas_stock
user_id, user_name, dept_id, dept_name, supplier_id, supplier_name
from bas_stock_detail
</sql>
<select id="selectBasStockList" parameterType="BasStock" resultMap="BasStockResult">
select bs.stock_id, bs.cargo_space_id, bs.stock_status, bs.product_status,
select bs.stock_id, bs.stock_detail_id, bs.cargo_space_id, bs.stock_status, bs.product_status,
bs.lot_no, bs.in_date, bs.back_date, bs.product_id, bs.product_name,bs.roller_number,
bs.quantity, bs.job_id, bs.job_detail_id, bs.tray_code, bs.out_quantity,
bs.stockin_detail_id, bs.stockin_id, bs.in_type, bs.warehouse_id, bs.warehouse_name,
bs.user_id, bs.user_name, bs.dept_id, bs.dept_name, bs.supplier_id, bs.supplier_name,bs.tray_type,bs.available_place
bs.user_id, bs.user_name, bs.dept_id, bs.dept_name, bs.supplier_id, bs.supplier_name
from bas_stock_detail bs
left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id
where
@@ -73,8 +72,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="userName != null and userName != ''"> and bs.user_name like concat('%', #{userName}, '%')</if>
<if test="deptName != null and deptName != ''"> and bs.dept_name like concat('%', #{deptName}, '%')</if>
<if test="supplierName != null and supplierName != ''"> and bs.supplier_name like concat('%', #{supplierName}, '%')</if>
<if test="trayType != null and trayType != ''"> and bs.tray_type = #{trayType}</if>
<if test="availablePlace != null and availablePlace != ''"> and bs.available_place = #{availablePlace}</if>
${params.warehouseScope}
</select>
@@ -102,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into bas_stock_detail
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="stockId != null">stock_id,</if>
<if test="stockDetailId != null">stock_detail_id,</if>
<if test="cargoSpaceId != null">cargo_space_id,</if>
<if test="stockStatus != null">stock_status,</if>
<if test="productStatus != null">product_status,</if>
@@ -127,11 +125,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deptName != null">dept_name,</if>
<if test="supplierId != null">supplier_id,</if>
<if test="supplierName != null">supplier_name,</if>
<if test="trayType != null">tray_type,</if>
<if test="availablePlace != null">available_place,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="stockId != null">#{stockId},</if>
<if test="stockDetailId != null">#{stockDetailId},</if>
<if test="cargoSpaceId != null">#{cargoSpaceId},</if>
<if test="stockStatus != null">#{stockStatus},</if>
<if test="productStatus != null">#{productStatus},</if>
@@ -157,8 +154,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deptName != null">#{deptName},</if>
<if test="supplierId != null">#{supplierId},</if>
<if test="supplierName != null">#{supplierName},</if>
<if test="trayType != null">#{tray_type},</if>
<if test="availablePlace != null">#{available_place},</if>
</trim>
</insert>
@@ -190,10 +185,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deptName != null">dept_name = #{deptName},</if>
<if test="supplierId != null">supplier_id = #{supplierId},</if>
<if test="supplierName != null">supplier_name = #{supplierName},</if>
<if test="trayType != null">tray_type = #{trayType},</if>
<if test="availablePlace != null">available_place = #{availablePlace},</if>
</trim>
where stock_id = #{stockId}
where stock_detail_id = #{stockDetailId}
</update>
<delete id="deleteBasStockByStockId" parameterType="String">
@@ -204,6 +197,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
delete from bas_stock_detail where roller_number = #{rollerNumber}
</delete>
<delete id="deleteBasStockByTrayCode" parameterType="String">
delete from bas_stock_detail where tray_code = #{trayCode}
</delete>
<delete id="deleteBasStockByStockIds" parameterType="String">
delete from bas_stock_detail where stock_id in
<foreach item="stockId" collection="array" open="(" separator="," close=")">