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

Merge remote-tracking branch 'gitee/0.8.X' into 0.8.X

Browse Source
This commit is contained in:
86156
2026-01-09 19:04:33 +08:00
parent f146975594 8f89ff3b10
commit 47d1278fa0
3 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
klp-wms/src/main/java/com/klp/domain/bo/WmsCoilPendingActionBo.java
View File

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
import java.util.Date;
import com.klp.common.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 钢卷待操作业务对象 wms_coil_pending_action
@@ -96,5 +97,14 @@ public class WmsCoilPendingActionBo extends BaseEntity {
*/
@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSX", timezone = "GMT+8")
private Date completeTime;
//开始时间和结束时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
}

3
klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java
View File

@@ -85,6 +85,9 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer
qw.like(StringUtils.isNotBlank(bo.getSourceType()), "wcpa.source_type", bo.getSourceType());
qw.orderByDesc("wcpa.create_time");
qw.orderByDesc("wcpa.scan_time");
//根据开始时间和结束时间筛选修改时间
qw.ge(bo.getStartTime() != null, "wcpa.update_time", bo.getStartTime());
qw.le(bo.getEndTime() != null, "wcpa.update_time", bo.getEndTime());
//逻辑删除
qw.eq("wcpa.del_flag", 0);
return qw;

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

@@ -1881,6 +1881,23 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
lqw.eq("mc.item_id", bo.getItemId());
}
// 添加coilIds查询条件，支持逗号分隔的多个coilId查询
if (StringUtils.isNotBlank(bo.getCoilIds())) {
String[] coilIdArray = bo.getCoilIds().split(",");
List<Long> coilIdList = new ArrayList<>();
for (String coilIdStr : coilIdArray) {
if (StringUtils.isNotBlank(coilIdStr)) {
try {
coilIdList.add(Long.parseLong(coilIdStr.trim()));
} catch (NumberFormatException e) {
// 忽略无效的ID格式
}
}
}
if (!coilIdList.isEmpty()) {
lqw.in("mc.coil_id", coilIdList);
}
}
lqw.eq(bo.getStatus() != null, "mc.status", bo.getStatus());
lqw.eq(StringUtils.isNotBlank(bo.getMaterialType()), "mc.material_type", bo.getMaterialType());
lqw.eq(StringUtils.isNotBlank(bo.getQualityStatus()), "mc.quality_status", bo.getQualityStatus());