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

YunaiV
1 parent 38915e96
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
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/outsourceissue/MesWmOutsourceIssueDetailDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkorderServiceImpl.java
@@ -26,6 +26,9 @@ public class MesWmOutsourceIssueDetailSaveReqVO {
     @NotNull(message = "物料ID不能为空")
     private Long itemId;
+    @Schema(description = "库存ID", example = "1")
+    private Long materialStockId;
+
     @Schema(description = "数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "300.00")
     @NotNull(message = "数量不能为空")
     @DecimalMin(value = "0.01", message = "数量必须大于 0")
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.mes.dal.dataobject.wm.outsourceissue;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstock.MesWmMaterialStockDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -44,6 +45,8 @@ public class MesWmOutsourceIssueDetailDO extends BaseDO {
     private Long issueId;
     /**
      * 库存ID
+     *
+     * 关联 {@link MesWmMaterialStockDO#getId()}
      */
     private Long materialStockId;
     /**
@@ -116,9 +116,10 @@ public interface MesProWorkOrderService {
     /**
      * 获得工单列表
      *
+     * @param type 工单类型（可选，为 null 时查询全部）
      * @return 工单列表
      */
-    List<MesProWorkOrderDO> getWorkOrderList();
+    List<MesProWorkOrderDO> getWorkOrderList(Integer type);
     /**
      * 累加工单的已生产数量
@@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderPageReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderSaveReqVO;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemBatchConfigDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderMapper;
@@ -230,8 +231,10 @@ public class MesProWorkOrderServiceImpl implements MesProWorkOrderService {
     }
     @Override
-    public List<MesProWorkOrderDO> getWorkOrderList() {
-        return workOrderMapper.selectList();
+    public List<MesProWorkOrderDO> getWorkOrderList(Integer type) {
+        return workOrderMapper.selectList(new LambdaQueryWrapperX<MesProWorkOrderDO>()
+                .eqIfPresent(MesProWorkOrderDO::getType, type)
+                .orderByDesc(MesProWorkOrderDO::getId));
     }
     @Override