feat(wms): 获取消耗钢卷接口,用作报表或者导出
- 在IWmsCoilPendingActionService中新增queryActionIdCoilIdList方法 - 在WmsCoilPendingActionController中新增/actionCoilIdList端点 - 在WmsCoilPendingActionMapper中新增selectActionIdCoilIdList查询方法 - 在WmsCoilPendingActionMapper.xml中添加对应的SQL查询语句 - 在WmsCoilPendingActionServiceImpl中实现查询逻辑 - 创建WmsCoilPendingActionIdCoilVo数据传输对象,仅包含actionId和coilId字段
This commit is contained in:
@@ -18,6 +18,7 @@ import com.klp.common.core.validate.EditGroup;
|
||||
import com.klp.common.enums.BusinessType;
|
||||
import com.klp.common.utils.poi.ExcelUtil;
|
||||
import com.klp.domain.vo.WmsCoilPendingActionVo;
|
||||
import com.klp.domain.vo.WmsCoilPendingActionIdCoilVo;
|
||||
import com.klp.domain.vo.TheoryCycleRegressionResultVo;
|
||||
import com.klp.domain.bo.WmsCoilPendingActionBo;
|
||||
import com.klp.service.IWmsCoilPendingActionService;
|
||||
@@ -48,6 +49,14 @@ public class WmsCoilPendingActionController extends BaseController {
|
||||
return iWmsCoilPendingActionService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询钢卷待操作:仅返回 actionId 与 coilId
|
||||
*/
|
||||
@GetMapping("/actionCoilIdList")
|
||||
public R<List<WmsCoilPendingActionIdCoilVo>> actionCoilIdList(WmsCoilPendingActionBo bo) {
|
||||
return R.ok(iWmsCoilPendingActionService.queryActionIdCoilIdList(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出钢卷待操作列表
|
||||
*/
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
package com.klp.domain.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 钢卷待操作:仅返回 actionId 与 coilId
|
||||
*/
|
||||
@Data
|
||||
public class WmsCoilPendingActionIdCoilVo implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 操作主键ID
|
||||
*/
|
||||
private Long actionId;
|
||||
|
||||
/**
|
||||
* 对应的钢卷ID
|
||||
*/
|
||||
private Long coilId;
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.klp.common.core.mapper.BaseMapperPlus;
|
||||
import com.klp.domain.WmsCoilPendingAction;
|
||||
import com.klp.domain.vo.WmsCoilPendingActionVo;
|
||||
import com.klp.domain.vo.WmsCoilPendingActionIdCoilVo;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
/**
|
||||
@@ -17,6 +18,11 @@ public interface WmsCoilPendingActionMapper extends BaseMapperPlus<WmsCoilPendin
|
||||
|
||||
Page<WmsCoilPendingActionVo> selectVoPagePlus(Page<Object> build,@Param("ew") QueryWrapper<WmsCoilPendingAction> lqw);
|
||||
|
||||
/**
|
||||
* 仅返回 actionId 与 coilId
|
||||
*/
|
||||
java.util.List<WmsCoilPendingActionIdCoilVo> selectActionIdCoilIdList(@Param("ew") QueryWrapper<WmsCoilPendingAction> lqw);
|
||||
|
||||
/**
|
||||
* 更新删除标志(绕过@TableLogic注解限制)
|
||||
* @param actionId 操作ID
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.klp.service;
|
||||
|
||||
import com.klp.domain.vo.WmsCoilPendingActionVo;
|
||||
import com.klp.domain.vo.WmsCoilPendingActionIdCoilVo;
|
||||
import com.klp.domain.bo.WmsCoilPendingActionBo;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
@@ -33,6 +34,11 @@ public interface IWmsCoilPendingActionService {
|
||||
*/
|
||||
List<WmsCoilPendingActionVo> queryList(WmsCoilPendingActionBo bo);
|
||||
|
||||
/**
|
||||
* 查询钢卷待操作:仅返回 actionId 与 coilId 列表
|
||||
*/
|
||||
List<WmsCoilPendingActionIdCoilVo> queryActionIdCoilIdList(WmsCoilPendingActionBo bo);
|
||||
|
||||
/**
|
||||
* 新增钢卷待操作
|
||||
*/
|
||||
|
||||
@@ -18,6 +18,7 @@ import com.klp.domain.vo.TheoryCyclePointVo;
|
||||
import com.klp.domain.vo.TheoryCycleRegressionResultVo;
|
||||
import com.klp.domain.vo.TheoryCycleRegressionVo;
|
||||
import com.klp.domain.vo.WmsCoilPendingActionVo;
|
||||
import com.klp.domain.vo.WmsCoilPendingActionIdCoilVo;
|
||||
import com.klp.mapper.WmsCoilPendingActionMapper;
|
||||
import com.klp.mapper.WmsMaterialCoilMapper;
|
||||
import com.klp.service.IWmsCoilPendingActionService;
|
||||
@@ -149,6 +150,13 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<WmsCoilPendingActionIdCoilVo> queryActionIdCoilIdList(WmsCoilPendingActionBo bo) {
|
||||
// 复用与 /list 相同的查询条件(buildQueryWrapperPlus)
|
||||
QueryWrapper<WmsCoilPendingAction> lqw = buildQueryWrapperPlus(bo);
|
||||
return baseMapper.selectActionIdCoilIdList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<WmsCoilPendingAction> buildQueryWrapper(WmsCoilPendingActionBo bo) {
|
||||
LambdaQueryWrapper<WmsCoilPendingAction> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(bo.getCoilId() != null, WmsCoilPendingAction::getCoilId, bo.getCoilId());
|
||||
|
||||
@@ -90,6 +90,15 @@
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
|
||||
<!-- 仅返回 actionId 与 coilId -->
|
||||
<select id="selectActionIdCoilIdList" resultType="com.klp.domain.vo.WmsCoilPendingActionIdCoilVo">
|
||||
select
|
||||
wcpa.action_id as actionId,
|
||||
wcpa.coil_id as coilId
|
||||
from wms_coil_pending_action wcpa
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
|
||||
<!-- 根据操作ID和删除标志查询记录(包含已删除记录) -->
|
||||
<select id="selectByActionIdAndDelFlag" resultType="com.klp.domain.WmsCoilPendingAction">
|
||||
SELECT *
|
||||
|
||||
Reference in New Issue
Block a user