盘点差异,入库联查字段修改,历史单据作业查询

This commit is contained in:
liuhanqing
2025-05-29 08:41:12 +08:00
parent 91d042e4e5
commit 4e4c64439c
50 changed files with 2477 additions and 336 deletions

View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.receive.stockindetailfinish.mapper.ReceiveStockinDetailFinishMapper">
<resultMap type="ReceiveStockinDetailFinish" id="ReceiveStockinDetailFinishResult">
<result property="stockinDetailId" column="stockin_detail_id" />
<result property="stockinGuid" column="stockin_guid" />
@@ -33,6 +33,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
</resultMap>
<resultMap type="ReceiveStockinDetail" id="ReceiveStockinDetailResult">
<result property="stockinDetailId" column="stockin_detail_id" />
<result property="stockinGuid" column="stockin_guid" />
<result property="stockinId" column="stockin_id" />
<result property="lotNo" column="lot_no" />
<result property="productGuid" column="product_guid" />
<result property="productId" column="product_id" />
<result property="quantity" column="quantity" />
<result property="quantityX" column="quantity_x" />
<result property="quantityJ" column="quantity_j" />
<result property="price" column="price" />
<result property="cargoNo" column="cargo_no" />
<result property="remark" column="remark" />
<result property="assignNum" column="assign_num" />
<result property="assignNumX" column="assign_num_x" />
<result property="assignNumJ" column="assign_num_j" />
<result property="printDate" column="print_date" />
<result property="stockStatus" column="stock_status" />
<result property="supplierId" column="supplier_id" />
<result property="customerId" column="customer_id" />
<result property="unit" column="unit" />
<result property="spec" column="spec" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
</resultMap>
<sql id="selectReceiveStockinDetailFinishVo">
select stockin_detail_id, stockin_guid, stockin_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, spare1, spare2, spare3, spare4, spare5, spare6 from receive_stockin_detail_finish
@@ -40,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectReceiveStockinDetailFinishList" parameterType="ReceiveStockinDetailFinish" resultMap="ReceiveStockinDetailFinishResult">
<include refid="selectReceiveStockinDetailFinishVo"/>
<where>
<where>
<if test="stockinGuid != null and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
@@ -68,11 +97,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare6 != null and spare6 != ''"> and spare6 = #{spare6}</if>
</where>
</select>
<select id="selectReceiveStockinDetailFinishByStockinDetailId" parameterType="String" resultMap="ReceiveStockinDetailFinishResult">
<include refid="selectReceiveStockinDetailFinishVo"/>
where stockin_detail_id = #{stockinDetailId}
</select>
<select id="selectReceiveStockinDetailList"
resultMap="ReceiveStockinDetailResult">
<include refid="selectReceiveStockinDetailFinishVo"/>
<where>
<if test="stockinGuid != null and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="spec != null and spec != ''"> and spec = #{spec}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and spare6 = #{spare6}</if>
</where>
</select>
<insert id="insertReceiveStockinDetailFinish" parameterType="ReceiveStockinDetailFinish">
insert into receive_stockin_detail_finish
@@ -174,9 +234,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteReceiveStockinDetailFinishByStockinDetailIds" parameterType="String">
delete from receive_stockin_detail_finish where stockin_detail_id in
delete from receive_stockin_detail_finish where stockin_detail_id in
<foreach item="stockinDetailId" collection="array" open="(" separator="," close=")">
#{stockinDetailId}
</foreach>
</delete>
</mapper>
</mapper>

View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.receive.stockinfinish.mapper.ReceiveStockinFinishMapper">
<resultMap type="ReceiveStockinFinish" id="ReceiveStockinFinishResult">
<result property="stockinGuid" column="stockin_guid" />
<result property="stockinId" column="stockin_id" />
@@ -25,39 +25,115 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="classNo" column="class_no" />
<result property="supplierNo" column="supplier_no" />
</resultMap>
<resultMap type="ReceiveStockin" id="ReceiveStockinResult">
<result property="stockinGuid" column="stockin_guid" />
<result property="stockinId" column="stockin_id" />
<result property="inType" column="in_type" />
<result property="createDate" column="create_date" />
<result property="createManId" column="create_man_id" />
<result property="createManName" column="user_name" />
<result property="status" column="status" />
<result property="warehouseId" column="warehouse_id" />
<result property="warehouseName" column="warehouse_name" />
<result property="spare5" column="spare5" />
<result property="spare4" column="spare4" />
<result property="spare3" column="spare3" />
<result property="finishDate" column="finish_date" />
<result property="spare2" column="spare2" />
<result property="spare1" column="spare1" />
<result property="erpBill" column="erp_bill" />
<result property="stockSource" column="stock_source" />
<result property="departmentNo" column="department_no" />
<result property="departmentName" column="dept_name" />
<result property="customerNo" column="customer_no" />
<result property="classNo" column="class_no" />
<result property="supplierNo" column="supplier_no" />
<result property="supplierName" column="supplier_name" />
</resultMap>
<sql id="selectReceiveStockinFinishVo">
select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no from receive_stockin_finish
select
rs.stockin_guid ,
rs.stockin_id ,
rs.in_type ,
rs.create_date ,
rs.create_man_id ,
rs.status ,
rs.warehouse_id ,
bw.warehouse_name ,
rs.spare5 ,
rs.spare4 ,
rs.spare3 ,
rs.finish_date ,
rs.spare2 ,
rs.spare1,
rs.erp_bill ,
rs.stock_source,
rs.department_no,
rs.customer_no,
rs.class_no,
rs.supplier_no,
bs.supplier_name,
sd.dept_name,
su.user_name
from receive_stockin_finish rs
left join bas_warehouse bw on rs.warehouse_id = bw.warehouse_id
left join bas_supplier bs on rs.supplier_no = bs.supplier_no
left join sys_dept sd on rs.department_no = sd.dept_id
left join sys_user su on su.user_id = rs.create_man_id
</sql>
<select id="selectReceiveStockinFinishList" parameterType="ReceiveStockinFinish" resultMap="ReceiveStockinFinishResult">
<include refid="selectReceiveStockinFinishVo"/>
<where>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and in_type = #{inType}</if>
<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="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="finishDate != null and finishDate != ''"> and finish_date = #{finishDate}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
<where>
<if test="stockinId != null and stockinId != ''"> and rs.stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and rs.in_type = #{inType}</if>
<if test="createDate != null and createDate != ''"> and rs.create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and rs.create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and rs.status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and rs.warehouse_id = #{warehouseId}</if>
<if test="spare5 != null and spare5 != ''"> and rs.spare5 = #{spare5}</if>
<if test="spare4 != null and spare4 != ''"> and rs.spare4 = #{spare4}</if>
<if test="spare3 != null and spare3 != ''"> and rs.spare3 = #{spare3}</if>
<if test="finishDate != null and finishDate != ''"> and rs.finish_date = #{finishDate}</if>
<if test="spare2 != null and spare2 != ''"> and rs.spare2 = #{spare2}</if>
<if test="spare1 != null and spare1 != ''"> and rs.spare1 = #{spare1}</if>
<if test="erpBill != null and erpBill != ''"> and rs.erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and rs.stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and rs.department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and rs.customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and rs.class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and rs.supplier_no = #{supplierNo}</if>
</where>
</select>
<select id="selectReceiveStockinFinishByStockinGuid" parameterType="String" resultMap="ReceiveStockinFinishResult">
<include refid="selectReceiveStockinFinishVo"/>
where stockin_guid = #{stockinGuid}
</select>
<select id="selectReceiveStockinList" resultMap="ReceiveStockinResult">
<include refid="selectReceiveStockinFinishVo"/>
<where>
<if test="stockinId != null and stockinId != ''"> and rs.stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and rs.in_type = #{inType}</if>
<if test="createDate != null and createDate != ''"> and rs.create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and rs.create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and rs.status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and rs.warehouse_id = #{warehouseId}</if>
<if test="spare5 != null and spare5 != ''"> and rs.spare5 = #{spare5}</if>
<if test="spare4 != null and spare4 != ''"> and rs.spare4 = #{spare4}</if>
<if test="spare3 != null and spare3 != ''"> and rs.spare3 = #{spare3}</if>
<if test="finishDate != null and finishDate != ''"> and rs.finish_date = #{finishDate}</if>
<if test="spare2 != null and spare2 != ''"> and rs.spare2 = #{spare2}</if>
<if test="spare1 != null and spare1 != ''"> and rs.spare1 = #{spare1}</if>
<if test="erpBill != null and erpBill != ''"> and rs.erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and rs.stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and rs.department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and rs.customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and rs.class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and rs.supplier_no = #{supplierNo}</if>
</where>
</select>
<insert id="insertReceiveStockinFinish" parameterType="ReceiveStockinFinish">
insert into receive_stockin_finish
@@ -135,9 +211,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteReceiveStockinFinishByStockinGuids" parameterType="String">
delete from receive_stockin_finish where stockin_guid in
delete from receive_stockin_finish where stockin_guid in
<foreach item="stockinGuid" collection="array" open="(" separator="," close=")">
#{stockinGuid}
</foreach>
</delete>
</mapper>
</mapper>

View File

@@ -10,8 +10,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="inType" column="in_type" />
<result property="createDate" column="create_date" />
<result property="createManId" column="create_man_id" />
<result property="createManName" column="user_name" />
<result property="status" column="status" />
<result property="warehouseId" column="warehouse_id" />
<result property="warehouseName" column="warehouse_name" />
<result property="spare5" column="spare5" />
<result property="spare4" column="spare4" />
<result property="spare3" column="spare3" />
@@ -21,42 +23,73 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="erpBill" column="erp_bill" />
<result property="stockSource" column="stock_source" />
<result property="departmentNo" column="department_no" />
<result property="departmentName" column="dept_name" />
<result property="customerNo" column="customer_no" />
<result property="classNo" column="class_no" />
<result property="supplierNo" column="supplier_no" />
<result property="supplierName" column="supplier_name" />
</resultMap>
<sql id="selectReceiveStockinVo">
select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no from receive_stockin
select
rs.stockin_guid ,
rs.stockin_id ,
rs.in_type ,
rs.create_date ,
rs.create_man_id ,
rs.status ,
rs.warehouse_id ,
bw.warehouse_name ,
rs.spare5 ,
rs.spare4 ,
rs.spare3 ,
rs.finish_date ,
rs.spare2 ,
rs.spare1,
rs.erp_bill ,
rs.stock_source,
rs.department_no,
rs.customer_no,
rs.class_no,
rs.supplier_no,
bs.supplier_name,
sd.dept_name,
su.user_name
from receive_stockin rs
left join bas_warehouse bw on rs.warehouse_id = bw.warehouse_id
left join bas_supplier bs on rs.supplier_no = bs.supplier_no
left join sys_dept sd on rs.department_no = sd.dept_id
left join sys_user su on su.user_id = rs.create_man_id
</sql>
<select id="selectReceiveStockinList" parameterType="ReceiveStockin" resultMap="ReceiveStockinResult">
<include refid="selectReceiveStockinVo"/>
<where>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and in_type = #{inType}</if>
<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="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="finishDate != null and finishDate != ''"> and finish_date = #{finishDate}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
<if test="stockinId != null and stockinId != ''"> and rs.stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and rs.in_type = #{inType}</if>
<if test="createDate != null and createDate != ''"> and rs.create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and rs.create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and rs.status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and rs.warehouse_id = #{warehouseId}</if>
<if test="spare5 != null and spare5 != ''"> and rs.spare5 = #{spare5}</if>
<if test="spare4 != null and spare4 != ''"> and rs.spare4 = #{spare4}</if>
<if test="spare3 != null and spare3 != ''"> and rs.spare3 = #{spare3}</if>
<if test="finishDate != null and finishDate != ''"> and rs.finish_date = #{finishDate}</if>
<if test="spare2 != null and spare2 != ''"> and rs.spare2 = #{spare2}</if>
<if test="spare1 != null and spare1 != ''"> and rs.spare1 = #{spare1}</if>
<if test="erpBill != null and erpBill != ''"> and rs.erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and rs.stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and rs.department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and rs.customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and rs.class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and rs.supplier_no = #{supplierNo}</if>
</where>
</select>
<select id="selectReceiveStockinByStockinGuid" parameterType="String" resultMap="ReceiveStockinResult">
<include refid="selectReceiveStockinVo"/>
where stockin_guid = #{stockinGuid}
where rs.stockin_guid = #{stockinGuid}
</select>
<insert id="insertReceiveStockin" parameterType="ReceiveStockin">