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-06 15:23:59 +08:00
parent d03ff60280
commit 25343c13cb
11 changed files with 174 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java
View File

@@ -98,6 +98,25 @@ public class InStockin extends BaseEntity
@Excel(name = "备用字段5")
private String spare5;
private String lotNo;
private String materialDesc;
public String getLotNo() {
return lotNo;
}
public void setLotNo(String lotNo) {
this.lotNo = lotNo;
}
public String getMaterialDesc() {
return materialDesc;
}
public void setMaterialDesc(String materialDesc) {
this.materialDesc = materialDesc;
}
public String getCreateManName() {
return createManName;
}

19
ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/domain/ReceiveStockin.java
View File

@@ -102,6 +102,25 @@ public class ReceiveStockin extends BaseEntity
@Excel(name = "供应商名称")
private String supplierName;
private String lotNo;
private String materialDesc;
public String getLotNo() {
return lotNo;
}
public void setLotNo(String lotNo) {
this.lotNo = lotNo;
}
public String getMaterialDesc() {
return materialDesc;
}
public void setMaterialDesc(String materialDesc) {
this.materialDesc = materialDesc;
}
public String getCreateManName() {
return createManName;
}

13
ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml
View File

@@ -131,6 +131,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare3 != null and spare3 != ''"> and is2.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and is2.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and is2.spare5 = #{spare5}</if>
<if test="materialDesc !=null and materialDesc!=''">
and is2.stockin_id in (
select distinct stockin_id from in_stockin_detail_finish isd
left join bas_product bp on isd.product_id = bp.product_id
where bp.product_name like concat('%',#{materialDesc},'%')
)
</if>
<if test="lotNo !=null and lotNo!=''">
and is2.stockin_id in (
select distinct stockin_id from in_stockin_detail_finish
where lot_no like concat('%',#{lotNo},'%')
)
</if>
</where>
</select>

13
ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml
View File

@@ -82,6 +82,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare4 != null and spare4 != ''"> and is2.spare4 = #{spare4}</if>
<if test="spare3 != null and spare3 != ''"> and is2.spare3 = #{spare3}</if>
<if test="spare5 != null and spare5 != ''"> and is2.spare5 = #{spare5}</if>
<if test="materialDesc !=null and materialDesc!=''">
and is2.stockin_id in (
select distinct stockin_id from in_stockin_detail isd
left join bas_product bp on isd.product_id = bp.product_id
where bp.product_name like concat('%',#{materialDesc},'%')
)
</if>
<if test="lotNo !=null and lotNo!=''">
and is2.stockin_id in (
select distinct stockin_id from in_stockin_detail
where lot_no like concat('%',#{lotNo},'%')
)
</if>
</where>
</select>

13
ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinFinishMapper.xml
View File

@@ -132,6 +132,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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>
<if test="materialDesc !=null and materialDesc!=''">
and rs.stockin_id in (
select distinct stockin_id from receive_stockin_detail_finish rsd
left join bas_product bp on rsd.product_id = bp.product_id
where bp.product_name like concat('%',#{materialDesc},'%')
)
</if>
<if test="lotNo !=null and lotNo!=''">
and rs.stockin_id in (
select distinct stockin_id from receive_stockin_detail_finish rsd
where rsd.lot_no like concat('%',#{lotNo},'%')
)
</if>
</where>
</select>

13
ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinMapper.xml
View File

@@ -84,6 +84,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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>
<if test="materialDesc !=null and materialDesc!=''">
and rs.stockin_id in (
select distinct stockin_id from receive_stockin_detail rsd
left join bas_product bp on rsd.product_id = bp.product_id
where bp.product_name like concat('%',#{materialDesc},'%')
)
</if>
<if test="lotNo !=null and lotNo!=''">
and rs.stockin_id in (
select distinct stockin_id from receive_stockin_detail rsd
where rsd.lot_no like concat('%',#{lotNo},'%')
)
</if>
</where>
</select>