diff --git a/klp-wms/src/main/java/com/klp/controller/WmsCoilPendingActionController.java b/klp-wms/src/main/java/com/klp/controller/WmsCoilPendingActionController.java index 8b3c4baa..785ac40c 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsCoilPendingActionController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsCoilPendingActionController.java @@ -156,6 +156,15 @@ public class WmsCoilPendingActionController extends BaseController { return toAjax(iWmsCoilPendingActionService.restoreAction(actionId)); } + /** + * 查询待操作记录中,关联钢卷已是历史钢卷(dataType=0)且操作未完成(actionStatus != 2)的记录 + * 用于展示哪些操作虽然未完成,但钢卷已是历史钢卷,可手动完成 + */ + @GetMapping("/staleList") + public TableDataInfo staleList( PageQuery pageQuery) { + return iWmsCoilPendingActionService.queryStaleActionPageList(pageQuery); + } + /** * 计算理论节拍回归(默认近6个月),并返回散点+拟合线 */ diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsCoilPendingActionMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsCoilPendingActionMapper.java index 14e95723..7b7061bf 100644 --- a/klp-wms/src/main/java/com/klp/mapper/WmsCoilPendingActionMapper.java +++ b/klp-wms/src/main/java/com/klp/mapper/WmsCoilPendingActionMapper.java @@ -18,6 +18,11 @@ public interface WmsCoilPendingActionMapper extends BaseMapperPlus selectVoPagePlus(Page build,@Param("ew") QueryWrapper lqw); + /** + * 分页查询待操作记录中,关联钢卷已是历史钢卷(dataType=0)且操作未完成(actionStatus != 2)的记录 + */ + Page selectStaleActionVoPagePlus(Page page, @Param("ew") QueryWrapper lqw); + /** * 仅返回 actionId 与 coilId */ diff --git a/klp-wms/src/main/java/com/klp/service/IWmsCoilPendingActionService.java b/klp-wms/src/main/java/com/klp/service/IWmsCoilPendingActionService.java index d842fb4a..90eeecd2 100644 --- a/klp-wms/src/main/java/com/klp/service/IWmsCoilPendingActionService.java +++ b/klp-wms/src/main/java/com/klp/service/IWmsCoilPendingActionService.java @@ -80,7 +80,13 @@ public interface IWmsCoilPendingActionService { Boolean restoreAction(Long actionId); /** - * 计算理论节拍线性回归(默认近6个月),同时返回散点用于前端绘图并将结果缓存。 + * 查询待操作记录中,关联钢卷已是历史钢卷(dataType=0)且操作未完成(actionStatus != 2)的记录 + * 用于展示哪些操作虽然未完成,但钢卷已是历史钢卷,可手动完成 + */ + TableDataInfo queryStaleActionPageList(PageQuery pageQuery); + + /** + * 计算理论节拍线性回归(默认近6个月),并返回散点+拟合线 */ TheoryCycleRegressionResultVo calcTheoryCycleRegression(Date startTime, Date endTime); 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 433b6e72..e5c36445 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 @@ -26,6 +26,7 @@ import com.klp.system.service.ISysUserService; import lombok.RequiredArgsConstructor; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.math.RoundingMode; @@ -167,6 +168,19 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer return baseMapper.selectVoList(lqw); } + /** + * 查询待操作记录中,关联钢卷已是历史钢卷(dataType=0)且操作未完成(actionStatus != 2)的记录 + */ + @Override + @Transactional(readOnly = true) + public TableDataInfo queryStaleActionPageList(PageQuery pageQuery) { + QueryWrapper lqw = Wrappers.query(); + lqw.ne("wcpa.action_status", 2); + lqw.eq("wcpa.del_flag", 0); + Page result = baseMapper.selectStaleActionVoPagePlus(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + @Override public List queryActionIdCoilIdList(WmsCoilPendingActionBo bo) { // 复用与 /list 相同的查询条件(buildQueryWrapperPlus) diff --git a/klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml index 00639cf8..54a3da3d 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml @@ -90,6 +90,72 @@ ${ew.customSqlSegment} + + +