DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2026-04-18 10:23:27 +08:00
parent dd27069b4c b95bd5b93d
commit 843512ab7e
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java
View File

@@ -354,5 +354,11 @@ public class WmsMaterialCoilBo extends BaseEntity {
//根据逗号分割的创建人筛选 //根据逗号分割的创建人筛选
private String createBys; private String createBys;
/**
* 是否查询调拨类型不为空的钢卷
*/
@TableField(exist = false)
private Boolean hasTransferType;
} }

5
klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
View File

@@ -576,6 +576,11 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
qw.eq(bo.getCoilSurfaceTreatment() != null, "mc.coil_surface_treatment", bo.getCoilSurfaceTreatment()); qw.eq(bo.getCoilSurfaceTreatment() != null, "mc.coil_surface_treatment", bo.getCoilSurfaceTreatment());
// 调拨类型 // 调拨类型
qw.eq(StringUtils.isNotBlank(bo.getTransferType()), "mc.transfer_type", bo.getTransferType()); qw.eq(StringUtils.isNotBlank(bo.getTransferType()), "mc.transfer_type", bo.getTransferType());
// 查询调拨类型不为空的钢卷
if (Boolean.TRUE.equals(bo.getHasTransferType())) {
qw.isNotNull("mc.transfer_type");
qw.ne("mc.transfer_type", "");
}
// 如果actualWarehouseId不为空，则根据实际库区ID进行查询 如果为-1,则查询无库区的数据 // 如果actualWarehouseId不为空，则根据实际库区ID进行查询 如果为-1,则查询无库区的数据
if (bo.getActualWarehouseId() != null) { if (bo.getActualWarehouseId() != null) {
if (bo.getActualWarehouseId() == -1) { if (bo.getActualWarehouseId() == -1) {