BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 49d144823ed53c3a007eca54e3383cffaaa31bcf

Authored by YunaiV
1 parent 38915e96

✨ feat(mes): 新增库存ID字段及工单列表查询参数

Inline Side-by-side
Showing 4 changed files with 13 additions and 3 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/vo/detail/MesWmOutsourceIssueDetailSaveReqVO.java
  View file @49d1448
... ... @@ -26,6 +26,9 @@ public class MesWmOutsourceIssueDetailSaveReqVO {
26 26 @NotNull(message = "物料ID不能为空")
27 27 private Long itemId;
28 28  
  29 + @Schema(description = "库存ID", example = "1")
  30 + private Long materialStockId;
  31 +
29 32 @Schema(description = "数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "300.00")
30 33 @NotNull(message = "数量不能为空")
31 34 @DecimalMin(value = "0.01", message = "数量必须大于 0")
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourceissue/MesWmOutsourceIssueDetailDO.java
  View file @49d1448
... ... @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.mes.dal.dataobject.wm.outsourceissue;
2 2  
3 3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
4 4 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
  5 +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstock.MesWmMaterialStockDO;
5 6 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
6 7 import com.baomidou.mybatisplus.annotation.KeySequence;
7 8 import com.baomidou.mybatisplus.annotation.TableId;
... ... @@ -44,6 +45,8 @@ public class MesWmOutsourceIssueDetailDO extends BaseDO {
44 45 private Long issueId;
45 46 /**
46 47 * 库存ID
  48 + *
  49 + * 关联 {@link MesWmMaterialStockDO#getId()}
47 50 */
48 51 private Long materialStockId;
49 52 /**
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderService.java
  View file @49d1448
... ... @@ -116,9 +116,10 @@ public interface MesProWorkOrderService {
116 116 /**
117 117 * 获得工单列表
118 118 *
  119 + * @param type 工单类型（可选，为 null 时查询全部）
119 120 * @return 工单列表
120 121 */
121   - List<MesProWorkOrderDO> getWorkOrderList();
  122 + List<MesProWorkOrderDO> getWorkOrderList(Integer type);
122 123  
123 124 /**
124 125 * 累加工单的已生产数量
... ...
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderServiceImpl.java
  View file @49d1448
... ... @@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 6 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
7 7 import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderPageReqVO;
8 8 import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderSaveReqVO;
  9 +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
9 10 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemBatchConfigDO;
10 11 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
11 12 import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderMapper;
... ... @@ -230,8 +231,10 @@ public class MesProWorkOrderServiceImpl implements MesProWorkOrderService {
230 231 }
231 232  
232 233 @Override
233   - public List<MesProWorkOrderDO> getWorkOrderList() {
234   - return workOrderMapper.selectList();
  234 + public List<MesProWorkOrderDO> getWorkOrderList(Integer type) {
  235 + return workOrderMapper.selectList(new LambdaQueryWrapperX<MesProWorkOrderDO>()
  236 + .eqIfPresent(MesProWorkOrderDO::getType, type)
  237 + .orderByDesc(MesProWorkOrderDO::getId));
235 238 }
236 239  
237 240 @Override
... ...