Browse Source

✨ feat(batch): 添加生产工单编号字段并重构选择器组件

YunaiV 5 months ago
parent
commit
51d64e0802

+ 0 - 7
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/MesWmBatchController.java

@@ -96,13 +96,6 @@ public class MesWmBatchController {
         return success(buildBatchRespVOList(list));
     }
 
-    @GetMapping("/simple-list")
-    @Operation(summary = "获得批次精简列表", description = "主要用于前端下拉")
-    public CommonResult<List<MesWmBatchRespVO>> getBatchSimpleList() {
-        List<MesWmBatchDO> list = batchService.getBatchList();
-        return success(BeanUtils.toBean(list, MesWmBatchRespVO.class));
-    }
-
     // ==================== 拼接 VO ====================
 
     private List<MesWmBatchRespVO> buildBatchRespVOList(List<MesWmBatchDO> list) {

+ 4 - 1
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/vo/MesWmBatchPageReqVO.java

@@ -30,4 +30,7 @@ public class MesWmBatchPageReqVO extends PageParam {
     @Schema(description = "采购订单编号", example = "PO20250314001")
     private String purchaseOrderCode;
 
-}
+    @Schema(description = "生产工单编号", example = "1")
+    private Long workOrderId;
+
+}

+ 1 - 0
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/batch/MesWmBatchMapper.java

@@ -32,6 +32,7 @@ public interface MesWmBatchMapper extends BaseMapperX<MesWmBatchDO> {
                 .eqIfPresent(MesWmBatchDO::getClientId, reqVO.getClientId())
                 .likeIfPresent(MesWmBatchDO::getSalesOrderCode, reqVO.getSalesOrderCode())
                 .likeIfPresent(MesWmBatchDO::getPurchaseOrderCode, reqVO.getPurchaseOrderCode())
+                .eqIfPresent(MesWmBatchDO::getWorkOrderId, reqVO.getWorkOrderId())
                 .orderByDesc(MesWmBatchDO::getId));
     }