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

优化页面显示

Browse Source
This commit is contained in:
liuhanqing
2026-03-24 10:39:17 +08:00
parent 62a823f984
commit f4e3d2c898
13 changed files with 138 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java
View File

@@ -44,6 +44,8 @@ public class OutStockout extends BaseEntity
/** 建单人 */
@Excel(name = "建单人")
private String createManId;
@Excel(name = "建单人")
private String createManName;
/** 单据状态 */
@Excel(name = "单据状态")
@@ -96,6 +98,13 @@ public class OutStockout extends BaseEntity
private List<String> typeData;
public String getCreateManName() {
return createManName;
}
public void setCreateManName(String createManName) {
this.createManName = createManName;
}
public String getSupplierName() {
return supplierName;

6
ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
View File

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="departmentNo" column="department_no" />
<result property="customerNo" column="customer_no" />
<result property="createManId" column="create_man_id" />
<result property="createManName" column="user_name" />
<result property="status" column="status" />
<result property="stockoutSource" column="stockout_source" />
<result property="warehouseId" column="warehouse_id" />
@@ -34,13 +35,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectOutStockoutList" parameterType="OutStockout" resultMap="OutStockoutResult">
select distinct o.stockout_guid, o.stockout_id, o.out_type, o.create_date, o.department_no, o.customer_no, o.create_man_id, o.status, o.stockout_source,
o.class_now_id, o.exit_id, o.car_number, o.FID, o.erp_stockout_id,o.start_date,o.finish_date,o.remark from out_stockout o
o.class_now_id, o.exit_id, o.car_number, o.FID, o.erp_stockout_id,o.start_date,o.finish_date,o.remark ,su.user_name
from out_stockout o
left join out_stockout_detail d on d.stockout_id = o.stockout_id
left join bas_customer bc on bc.customer_no = d.out_id
left join bas_warehouse bw on bw.warehouse_id = d.warehouse_id
left join bas_supplier bs on bs.supplier_no = d.supplier_id
left join bas_product bp on bp.product_id = d.product_id
left join sys_user su on su.user_id = o.create_man_id
<where>
<if test="stockoutGuid != null and stockoutGuid != ''"> and o.stockout_guid = #{stockoutGuid}</if>
<if test="stockoutId != null and stockoutId != ''"> and o.stockout_id = #{stockoutId}</if>

3
ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
View File

@@ -405,6 +405,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="productName != null and productName != ''">
and bp.product_name like concat('%',#{productName},'%')
</if>
<if test="distribution != null and distribution != ''">
and bs.distribution like concat('%',#{distribution},'%')
</if>
<if test="warehouseIdList != null and warehouseIdList.size() > 0">
and bs.warehouse_id in
<foreach collection="warehouseIdList" open="(" close=")" item="it" separator=",">