diff --git a/klp-wms/src/main/java/com/klp/domain/WmsCoilPendingAction.java b/klp-wms/src/main/java/com/klp/domain/WmsCoilPendingAction.java index e43065c8..acf3900d 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsCoilPendingAction.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsCoilPendingAction.java @@ -102,5 +102,9 @@ public class WmsCoilPendingAction extends BaseEntity { */ @TableField(value = "remark") private String remark; + + + // 加工后的钢卷ids + private String processedCoilIds; } diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilPendingActionBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilPendingActionBo.java index 02dd3376..a13b7ff6 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilPendingActionBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilPendingActionBo.java @@ -114,5 +114,8 @@ public class WmsCoilPendingActionBo extends BaseEntity { * 是否包含已删除记录(0=不包含,1=包含已删除,2=仅查询已删除) */ private Integer includeDeleted; + + // 加工后的钢卷ids + private String processedCoilIds; } diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilPendingActionVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilPendingActionVo.java index 39ba7a27..6347f8b3 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilPendingActionVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilPendingActionVo.java @@ -201,5 +201,9 @@ public class WmsCoilPendingActionVo extends BaseEntity implements Serializable { private String actualWarehouseName; private Integer delFlag; + + + // 加工后的钢卷ids + private String processedCoilIds; } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java index e67fad85..cc68884a 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java @@ -114,6 +114,8 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer qw.le(bo.getEndTime() != null, "wcpa.complete_time", bo.getEndTime()); // 根据更新人查询 qw.eq(StringUtils.isNotBlank(bo.getUpdateBy()), "wcpa.update_by", bo.getUpdateBy()); + // 加工后的钢卷ids + qw.like(StringUtils.isNotBlank(bo.getProcessedCoilIds()), "wcpa.processed_coil_ids", bo.getProcessedCoilIds()); //逻辑删除 - 支持查询已删除记录 if (bo.getIncludeDeleted() != null) { if (bo.getIncludeDeleted() == 1) { diff --git a/klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml index 83d70905..cb74b3f5 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml @@ -20,6 +20,7 @@ + @@ -42,6 +43,7 @@ wcpa.operator_name as operatorName, wcpa.process_time as processTime, wcpa.complete_time as completeTime, + wcpa.processed_coil_ids as processedCoilIds, wcpa.remark as remark, wcpa.del_flag as delFlag, wcpa.create_time as createTime,