Merge branch 'feat/mes' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17

YunaiV
2 parents 4eaed881 bd3d7880
Showing 386 changed files with 4611 additions and 1134 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/team/MesCalTeamMemberController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkplan/MesDvCheckPlanMachineryController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkplan/vo/machinery/MesDvCheckPlanMachineryRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkrecord/MesDvCheckRecordController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkrecord/MesDvCheckRecordLineController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkrecord/vo/MesDvCheckRecordRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/MesDvMachineryController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryImportExcelVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachineryRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/vo/MesDvMachinerySaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/maintenrecord/MesDvMaintenRecordController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/maintenrecord/MesDvMaintenRecordLineController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/maintenrecord/vo/MesDvMaintenRecordRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/repair/MesDvRepairController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/repair/MesDvRepairLineController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/repair/vo/MesDvRepairRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/client/vo/MesMdClientImportExcelVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/client/vo/MesMdClientSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/MesMdItemController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/MesMdProductBomController.java
@@ -37,6 +37,7 @@ public class MesCalTeamMemberController {
  
     @Resource
     private MesCalTeamMemberService teamMemberService;
+
     @Resource
     private AdminUserApi adminUserApi;
  
@@ -75,7 +75,7 @@ public class MesDvCheckPlanMachineryController {
         return BeanUtils.toBean(list, MesDvCheckPlanMachineryRespVO.class, vo ->
             MapUtils.findAndThen(machineryMap, vo.getMachineryId(), machinery ->
                 vo.setMachineryCode(machinery.getCode()).setMachineryName(machinery.getName())
-                  .setMachineryBrand(machinery.getBrand()).setMachinerySpec(machinery.getSpec())
+                  .setMachineryBrand(machinery.getBrand()).setMachinerySpecification(machinery.getSpecification())
             )
         );
     }
@@ -28,7 +28,7 @@ public class MesDvCheckPlanMachineryRespVO {
     private String machineryBrand;
  
     @Schema(description = "规格型号", example = "HTF120")
-    private String machinerySpec;
+    private String machinerySpecification;
  
     @Schema(description = "备注")
     private String remark;
@@ -46,10 +46,8 @@ public class MesDvCheckRecordController {
  
     @Resource
     private MesDvCheckRecordService checkRecordService;
-
     @Resource
     private MesDvCheckPlanService checkPlanService;
-
     @Resource
     private MesDvMachineryService machineryService;
  
@@ -143,7 +141,7 @@ public class MesDvCheckRecordController {
                             .setPlanCycleType(plan.getCycleType()).setPlanCycleCount(plan.getCycleCount()));
             MapUtils.findAndThen(machineryMap, vo.getMachineryId(), machinery -> vo
                     .setMachineryCode(machinery.getCode()).setMachineryName(machinery.getName())
-                    .setMachineryBrand(machinery.getBrand()).setMachinerySpec(machinery.getSpec()));
+                    .setMachineryBrand(machinery.getBrand()).setMachinerySpecification(machinery.getSpecification()));
             MapUtils.findAndThen(userMap, vo.getUserId(),
                     user -> vo.setNickname(user.getNickname()));
         });
@@ -36,7 +36,6 @@ public class MesDvCheckRecordLineController {
  
     @Resource
     private MesDvCheckRecordLineService checkRecordLineService;
-
     @Resource
     private MesDvSubjectService subjectService;
  
@@ -64,7 +64,7 @@ public class MesDvCheckRecordRespVO {
  
     @Schema(description = "规格型号", example = "X-100")
     @ExcelProperty("规格型号")
-    private String machinerySpec;
+    private String machinerySpecification;
  
     @Schema(description = "点检时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("点检时间")
@@ -48,10 +48,8 @@ public class MesDvMachineryController {
  
     @Resource
     private MesDvMachineryService machineryService;
-
     @Resource
     private MesDvMachineryTypeService machineryTypeService;
-
     @Resource
     private MesMdWorkshopService workshopService;
  
@@ -126,7 +124,7 @@ public class MesDvMachineryController {
         // 手动创建导出 demo
         List<MesDvMachineryImportExcelVO> list = Collections.singletonList(
                 MesDvMachineryImportExcelVO.builder().code("EQ-001").name("示例设备")
-                        .brand("示例品牌").spec("型号A").machineryTypeCode("MT-001")
+                        .brand("示例品牌").specification("型号A").machineryTypeCode("MT-001")
                         .workshopCode("WS-001").status(0).build()
         );
         // 输出
@@ -28,7 +28,7 @@ public class MesDvMachineryImportExcelVO {
     private String brand;
  
     @ExcelProperty("规格型号")
-    private String spec;
+    private String specification;
  
     @ExcelProperty("设备类型编码")
     private String machineryTypeCode;
@@ -33,7 +33,7 @@ public class MesDvMachineryRespVO {
  
     @Schema(description = "规格型号", example = "S7-300")
     @ExcelProperty("规格型号")
-    private String spec;
+    private String specification;
  
     @Schema(description = "设备类型编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
     private Long machineryTypeId;
@@ -26,7 +26,7 @@ public class MesDvMachinerySaveReqVO {
     private String brand;
  
     @Schema(description = "规格型号", example = "S7-300")
-    private String spec;
+    private String specification;
  
     @Schema(description = "设备类型编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
     @NotNull(message = "设备类型不能为空")
@@ -46,10 +46,8 @@ public class MesDvMaintenRecordController {
  
     @Resource
     private MesDvMaintenRecordService maintenRecordService;
-
     @Resource
     private MesDvCheckPlanService checkPlanService;
-
     @Resource
     private MesDvMachineryService machineryService;
  
@@ -146,7 +144,7 @@ public class MesDvMaintenRecordController {
                             .setPlanCycleCount(plan.getCycleCount()));
             MapUtils.findAndThen(machineryMap, vo.getMachineryId(), machinery -> vo
                     .setMachineryCode(machinery.getCode()).setMachineryName(machinery.getName())
-                    .setMachineryBrand(machinery.getBrand()).setMachinerySpec(machinery.getSpec()));
+                    .setMachineryBrand(machinery.getBrand()).setMachinerySpecification(machinery.getSpecification()));
             MapUtils.findAndThen(userMap, vo.getUserId(),
                     user -> vo.setNickname(user.getNickname()));
         });
@@ -42,7 +42,6 @@ public class MesDvMaintenRecordLineController {
  
     @Resource
     private MesDvMaintenRecordLineService maintenRecordLineService;
-
     @Resource
     private MesDvSubjectService subjectService;
  
@@ -64,7 +64,7 @@ public class MesDvMaintenRecordRespVO {
  
     @Schema(description = "规格型号", example = "X-100")
     @ExcelProperty("规格型号")
-    private String machinerySpec;
+    private String machinerySpecification;
  
     @Schema(description = "保养时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("保养时间")
@@ -48,7 +48,6 @@ public class MesDvRepairController {
  
     @Resource
     private MesDvRepairService repairService;
-
     @Resource
     private MesDvMachineryService machineryService;
  
@@ -160,7 +159,7 @@ public class MesDvRepairController {
         return BeanUtils.toBean(list, MesDvRepairRespVO.class, vo -> {
             MapUtils.findAndThen(machineryMap, vo.getMachineryId(), machinery -> vo
                     .setMachineryCode(machinery.getCode()).setMachineryName(machinery.getName())
-                    .setMachineryBrand(machinery.getBrand()).setMachinerySpec(machinery.getSpec()));
+                    .setMachineryBrand(machinery.getBrand()).setMachinerySpecification(machinery.getSpecification()));
             MapUtils.findAndThen(userMap, vo.getAcceptedUserId(),
                     user -> vo.setAcceptedUserNickname(user.getNickname()));
             MapUtils.findAndThen(userMap, vo.getConfirmUserId(),
@@ -42,7 +42,6 @@ public class MesDvRepairLineController {
  
     @Resource
     private MesDvRepairLineService repairLineService;
-
     @Resource
     private MesDvSubjectService subjectService;
  
@@ -44,7 +44,7 @@ public class MesDvRepairRespVO {
  
     @Schema(description = "规格型号", example = "X-100")
     @ExcelProperty("规格型号")
-    private String machinerySpec;
+    private String machinerySpecification;
  
     @Schema(description = "报修日期")
     @ExcelProperty("报修日期")
@@ -37,6 +37,39 @@ public class MesMdClientImportExcelVO {
     @ExcelProperty("客户邮箱地址")
     private String email;
  
+    @ExcelProperty("客户英文名称")
+    private String englishName;
+
+    @ExcelProperty("客户简介")
+    private String description;
+
+    @ExcelProperty("客户地址")
+    private String address;
+
+    @ExcelProperty("客户官网地址")
+    private String website;
+
+    @ExcelProperty("联系人1")
+    private String contact1Name;
+
+    @ExcelProperty("联系人1-电话")
+    private String contact1Telephone;
+
+    @ExcelProperty("联系人1-邮箱")
+    private String contact1Email;
+
+    @ExcelProperty("联系人2")
+    private String contact2Name;
+
+    @ExcelProperty("联系人2-电话")
+    private String contact2Telephone;
+
+    @ExcelProperty("联系人2-邮箱")
+    private String contact2Email;
+
+    @ExcelProperty("统一社会信用代码")
+    private String creditCode;
+
     @ExcelProperty(value = "状态", converter = DictConvert.class)
     @DictFormat(cn.iocoder.yudao.module.system.enums.DictTypeConstants.COMMON_STATUS)
     private Integer status;
 package cn.iocoder.yudao.module.mes.controller.admin.md.client.vo;
  
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
  
 @Schema(description = "管理后台 - MES 客户新增/修改 Request VO")
@@ -14,22 +16,28 @@ public class MesMdClientSaveReqVO {
  
     @Schema(description = "客户编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "C00184")
     @NotEmpty(message = "客户编码不能为空")
+    @Size(max = 64, message = "客户编码长度不能超过 64 个字符")
     private String code;
  
     @Schema(description = "客户名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "比亚迪")
     @NotEmpty(message = "客户名称不能为空")
+    @Size(max = 255, message = "客户名称长度不能超过 255 个字符")
     private String name;
  
     @Schema(description = "客户简称", example = "比亚迪")
+    @Size(max = 255, message = "客户简称长度不能超过 255 个字符")
     private String nickname;
  
     @Schema(description = "客户英文名称", example = "BYD")
+    @Size(max = 255, message = "客户英文名称长度不能超过 255 个字符")
     private String englishName;
  
     @Schema(description = "客户简介", example = "比亚迪品牌诞生于深圳")
+    @Size(max = 500, message = "客户简介长度不能超过 500 个字符")
     private String description;
  
     @Schema(description = "客户LOGO地址", example = "https://xxx.com/logo.png")
+    @Size(max = 255, message = "客户LOGO地址长度不能超过 255 个字符")
     private String logo;
  
     @Schema(description = "客户类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@@ -37,36 +45,50 @@ public class MesMdClientSaveReqVO {
     private Integer type;
  
     @Schema(description = "客户地址", example = "深圳南山区")
+    @Size(max = 500, message = "客户地址长度不能超过 500 个字符")
     private String address;
  
     @Schema(description = "客户官网地址", example = "https://www.bydglobal.com")
+    @Size(max = 255, message = "客户官网地址长度不能超过 255 个字符")
     private String website;
  
     @Schema(description = "客户邮箱地址", example = "salse@bydglobal.com")
+    @Size(max = 255, message = "客户邮箱地址长度不能超过 255 个字符")
+    @Email(message = "客户邮箱地址格式不正确")
     private String email;
  
     @Schema(description = "客户电话", example = "123432222")
+    @Size(max = 64, message = "客户电话长度不能超过 64 个字符")
     private String telephone;
  
     @Schema(description = "联系人1", example = "张三")
+    @Size(max = 64, message = "联系人1长度不能超过 64 个字符")
     private String contact1Name;
  
     @Schema(description = "联系人1-电话", example = "122212312")
+    @Size(max = 64, message = "联系人1-电话长度不能超过 64 个字符")
     private String contact1Telephone;
  
     @Schema(description = "联系人1-邮箱", example = "s1@bydglobal.com")
+    @Size(max = 255, message = "联系人1-邮箱长度不能超过 255 个字符")
+    @Email(message = "联系人1-邮箱格式不正确")
     private String contact1Email;
  
     @Schema(description = "联系人2", example = "李四")
+    @Size(max = 64, message = "联系人2长度不能超过 64 个字符")
     private String contact2Name;
  
     @Schema(description = "联系人2-电话", example = "1132323232")
+    @Size(max = 64, message = "联系人2-电话长度不能超过 64 个字符")
     private String contact2Telephone;
  
     @Schema(description = "联系人2-邮箱", example = "s2@bydglobal.com")
+    @Size(max = 255, message = "联系人2-邮箱长度不能超过 255 个字符")
+    @Email(message = "联系人2-邮箱格式不正确")
     private String contact2Email;
  
     @Schema(description = "统一社会信用代码", example = "11212121")
+    @Size(max = 64, message = "统一社会信用代码长度不能超过 64 个字符")
     private String creditCode;
  
     @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
@@ -74,6 +96,7 @@ public class MesMdClientSaveReqVO {
     private Integer status;
  
     @Schema(description = "备注", example = "备注")
+    @Size(max = 500, message = "备注长度不能超过 500 个字符")
     private String remark;
  
 }
@@ -48,10 +48,8 @@ public class MesMdItemController {
  
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdItemTypeService itemTypeService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
  
@@ -40,13 +40,10 @@ public class MesMdProductBomController {
  
     @Resource
     private MesMdProductBomService productBomService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdItemTypeService itemTypeService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
  
@@ -37,6 +37,39 @@ public class MesMdVendorImportExcelVO {
     @ExcelProperty("供应商邮箱地址")
     private String email;
  
+    @ExcelProperty("供应商英文名称")
+    private String englishName;
+
+    @ExcelProperty("供应商简介")
+    private String description;
+
+    @ExcelProperty("供应商地址")
+    private String address;
+
+    @ExcelProperty("供应商官网地址")
+    private String website;
+
+    @ExcelProperty("联系人1")
+    private String contact1Name;
+
+    @ExcelProperty("联系人1-电话")
+    private String contact1Telephone;
+
+    @ExcelProperty("联系人1-邮箱")
+    private String contact1Email;
+
+    @ExcelProperty("联系人2")
+    private String contact2Name;
+
+    @ExcelProperty("联系人2-电话")
+    private String contact2Telephone;
+
+    @ExcelProperty("联系人2-邮箱")
+    private String contact2Email;
+
+    @ExcelProperty("统一社会信用代码")
+    private String creditCode;
+
     @ExcelProperty(value = "状态", converter = DictConvert.class)
     @DictFormat(cn.iocoder.yudao.module.system.enums.DictTypeConstants.COMMON_STATUS)
     private Integer status;
 package cn.iocoder.yudao.module.mes.controller.admin.md.vendor.vo;
  
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
  
 @Schema(description = "管理后台 - MES 供应商新增/修改 Request VO")
@@ -14,61 +16,82 @@ public class MesMdVendorSaveReqVO {
  
     @Schema(description = "供应商编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "V00101")
     @NotEmpty(message = "供应商编码不能为空")
+    @Size(max = 64, message = "供应商编码长度不能超过 64 个字符")
     private String code;
  
     @Schema(description = "供应商名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "海力德电子")
     @NotEmpty(message = "供应商名称不能为空")
+    @Size(max = 255, message = "供应商名称长度不能超过 255 个字符")
     private String name;
  
     @Schema(description = "供应商简称", example = "海力德")
+    @Size(max = 255, message = "供应商简称长度不能超过 255 个字符")
     private String nickname;
  
     @Schema(description = "供应商英文名称", example = "HLD Electronics")
+    @Size(max = 255, message = "供应商英文名称长度不能超过 255 个字符")
     private String englishName;
  
     @Schema(description = "供应商简介", example = "专业从事电子元器件生产与销售")
+    @Size(max = 500, message = "供应商简介长度不能超过 500 个字符")
     private String description;
  
     @Schema(description = "供应商LOGO地址", example = "https://xxx.com/logo.png")
+    @Size(max = 255, message = "供应商LOGO地址长度不能超过 255 个字符")
     private String logo;
  
     @Schema(description = "供应商等级", example = "A")
+    @Size(max = 64, message = "供应商等级长度不能超过 64 个字符")
     private String level;
  
     @Schema(description = "供应商评分", example = "95")
     private Integer score;
  
     @Schema(description = "供应商地址", example = "深圳市宝安区")
+    @Size(max = 500, message = "供应商地址长度不能超过 500 个字符")
     private String address;
  
     @Schema(description = "供应商官网地址", example = "https://www.hld-elec.com")
+    @Size(max = 255, message = "供应商官网地址长度不能超过 255 个字符")
     private String website;
  
     @Schema(description = "供应商邮箱地址", example = "info@hld-elec.com")
+    @Size(max = 255, message = "供应商邮箱地址长度不能超过 255 个字符")
+    @Email(message = "供应商邮箱地址格式不正确")
     private String email;
  
     @Schema(description = "供应商电话", example = "0755-12345678")
+    @Size(max = 64, message = "供应商电话长度不能超过 64 个字符")
     private String telephone;
  
     @Schema(description = "联系人1", example = "王经理")
+    @Size(max = 64, message = "联系人1长度不能超过 64 个字符")
     private String contact1Name;
  
     @Schema(description = "联系人1-电话", example = "13800138001")
+    @Size(max = 64, message = "联系人1-电话长度不能超过 64 个字符")
     private String contact1Telephone;
  
     @Schema(description = "联系人1-邮箱", example = "wang@hld-elec.com")
+    @Size(max = 255, message = "联系人1-邮箱长度不能超过 255 个字符")
+    @Email(message = "联系人1-邮箱格式不正确")
     private String contact1Email;
  
     @Schema(description = "联系人2", example = "赵助理")
+    @Size(max = 64, message = "联系人2长度不能超过 64 个字符")
     private String contact2Name;
  
     @Schema(description = "联系人2-电话", example = "13800138002")
+    @Size(max = 64, message = "联系人2-电话长度不能超过 64 个字符")
     private String contact2Telephone;
  
     @Schema(description = "联系人2-邮箱", example = "zhao@hld-elec.com")
+    @Size(max = 255, message = "联系人2-邮箱长度不能超过 255 个字符")
+    @Email(message = "联系人2-邮箱格式不正确")
     private String contact2Email;
  
     @Schema(description = "统一社会信用代码", example = "91440300MA5EXAMPLE")
+    @Size(max = 64, message = "统一社会信用代码长度不能超过 64 个字符")
     private String creditCode;
  
     @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
@@ -76,6 +99,7 @@ public class MesMdVendorSaveReqVO {
     private Integer status;
  
     @Schema(description = "备注", example = "备注")
+    @Size(max = 500, message = "备注长度不能超过 500 个字符")
     private String remark;
  
 }
@@ -77,7 +77,11 @@ public class MesMdWorkshopController {
     @PreAuthorize("@ss.hasPermission('mes:md-workshop:query')")
     public CommonResult<MesMdWorkshopRespVO> getWorkshop(@RequestParam("id") Long id) {
         MesMdWorkshopDO workshop = workshopService.getWorkshop(id);
-        return success(BeanUtils.toBean(workshop, MesMdWorkshopRespVO.class));
+        if (workshop == null) {
+            return success(null);
+        }
+        List<MesMdWorkshopRespVO> voList = buildWorkshopRespVOList(Collections.singletonList(workshop));
+        return success(voList.get(0));
     }
  
     @GetMapping("/page")
@@ -92,8 +96,19 @@ public class MesMdWorkshopController {
     @Operation(summary = "获得车间精简列表", description = "只包含被开启的车间，主要用于前端的下拉选项")
     public CommonResult<List<MesMdWorkshopRespVO>> getWorkshopSimpleList() {
         List<MesMdWorkshopDO> list = workshopService.getWorkshopListByStatus(CommonStatusEnum.ENABLE.getStatus());
-        return success(convertList(list, ws -> new MesMdWorkshopRespVO()
-                .setId(ws.getId()).setCode(ws.getCode()).setName(ws.getName()).setArea(ws.getArea())));
+        if (CollUtil.isEmpty(list)) {
+            return success(Collections.emptyList());
+        }
+        // 批量获取负责人信息
+        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
+                convertSet(list, MesMdWorkshopDO::getChargeUserId));
+        return success(convertList(list, ws -> {
+            MesMdWorkshopRespVO vo = new MesMdWorkshopRespVO()
+                    .setId(ws.getId()).setCode(ws.getCode()).setName(ws.getName()).setArea(ws.getArea());
+            MapUtils.findAndThen(userMap, ws.getChargeUserId(),
+                    user -> vo.setChargeUserName(user.getNickname()));
+            return vo;
+        }));
     }
  
     @GetMapping("/export-excel")
@@ -34,7 +34,6 @@ public class MesMdWorkstationMachineController {
  
     @Resource
     private MesMdWorkstationMachineService workstationMachineService;
-
     @Resource
     private MesDvMachineryService machineryService;
  
@@ -34,7 +34,6 @@ public class MesMdWorkstationToolController {
  
     @Resource
     private MesMdWorkstationToolService workstationToolService;
-
     @Resource
     private MesTmToolTypeService toolTypeService;
  
@@ -50,13 +50,10 @@ public class MesProAndonRecordController {
  
     @Resource
     private MesProAndonRecordService andonRecordService;
-
     @Resource
     private MesMdWorkstationService workstationService;
-
     @Resource
     private MesProWorkOrderService workOrderService;
-
     @Resource
     private MesProProcessService processService;
  
@@ -47,13 +47,10 @@ public class MesProCardController {
  
     @Resource
     private MesProCardService cardService;
-
     @Resource
     private MesProWorkOrderService workOrderService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
  
@@ -128,12 +125,6 @@ public class MesProCardController {
         return success(new PageResult<>(buildCardRespVOList(pageResult.getList()), pageResult.getTotal()));
     }
  
-    @GetMapping("/simple-list")
-    @Operation(summary = "获得生产流转卡精简列表", description = "主要用于前端的下拉选项")
-    public CommonResult<List<MesProCardRespVO>> getCardSimpleList() {
-        List<MesProCardDO> list = cardService.getCardSimpleList();
-        return success(buildCardRespVOList(list));
-    }
  
     @GetMapping("/export-excel")
     @Operation(summary = "导出生产流转卡 Excel")
@@ -40,10 +40,8 @@ public class MesProCardProcessController {
  
     @Resource
     private MesProCardProcessService cardProcessService;
-
     @Resource
     private MesProProcessService processService;
-
     @Resource
     private MesMdWorkstationService workstationService;
  
@@ -24,5 +24,4 @@ public class MesProCardPageReqVO extends PageParam {
     @Schema(description = "批次号", example = "BATCH-001")
     private String batchCode;
  
-
 }
@@ -32,13 +32,13 @@ public class MesProCardRespVO {
     @ExcelProperty("工单名称")
     private String workOrderName;
  
+    @Schema(description = "产品物料编号", example = "200")
+    private Long itemId;
+
     @Schema(description = "批次号", example = "BATCH-001")
     @ExcelProperty("批次号")
     private String batchCode;
  
-    @Schema(description = "产品物料编号", example = "200")
-    private Long itemId;
-
     @Schema(description = "产品编码", example = "P-001")
     @ExcelProperty("产品编码")
     private String itemCode;
@@ -22,13 +22,13 @@ public class MesProCardSaveReqVO {
     @NotNull(message = "生产工单不能为空")
     private Long workOrderId;
  
-    @Schema(description = "批次号", example = "BATCH-001")
-    private String batchCode;
-
     @Schema(description = "产品物料编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "200")
     @NotNull(message = "产品物料不能为空")
     private Long itemId;
  
+    @Schema(description = "批次号", example = "BATCH-001")
+    private String batchCode;
+
     @Schema(description = "流转数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
     @NotNull(message = "流转数量不能为空")
     private BigDecimal transferedQuantity;
@@ -49,7 +49,7 @@ import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPOR
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
 import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+
  
 @Tag(name = "管理后台 - MES 生产报工")
 @RestController
@@ -158,7 +158,7 @@ public class MesProFeedbackController {
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('mes:pro-feedback:approve')")
     public CommonResult<Boolean> approveFeedback(@RequestParam("id") Long id) {
-        return success(feedbackService.approveFeedback(id, getLoginUserId()));
+        return success(feedbackService.approveFeedback(id));
     }
  
     // ==================== 拼接 VO ====================
@@ -38,7 +38,6 @@ public class MesProRouteProcessController {
  
     @Resource
     private MesProRouteProcessService routeProcessService;
-
     @Resource
     private MesProProcessService processService;
  
@@ -39,10 +39,8 @@ public class MesProRouteProductBomController {
  
     @Resource
     private MesProRouteProductBomService routeProductBomService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
  
@@ -38,10 +38,8 @@ public class MesProRouteProductController {
  
     @Resource
     private MesProRouteProductService routeProductService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
  
@@ -39,12 +39,13 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
  
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessDO;
+import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProcessService;
+
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
  
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -59,24 +60,20 @@ public class MesProTaskController {
  
     @Resource
     private MesProTaskService taskService;
-
     @Resource
     private MesProWorkOrderService workOrderService;
-
     @Resource
     private MesMdWorkstationService workstationService;
-
     @Resource
     private MesProProcessService processService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdClientService clientService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
+    @Resource
+    private MesProRouteProcessService routeProcessService;
  
     @PostMapping("/create")
     @Operation(summary = "创建生产任务")
@@ -122,18 +119,6 @@ public class MesProTaskController {
         return success(new PageResult<>(buildTaskRespVOList(pageResult.getList()), pageResult.getTotal()));
     }
  
-    @GetMapping("/simple-list")
-    @Operation(summary = "获得生产任务精简列表", description = "主要用于前端的下拉选项")
-    public CommonResult<List<MesProTaskRespVO>> getTaskSimpleList(
-            @RequestParam(value = "workOrderId", required = false) Long workOrderId) {
-        List<MesProTaskDO> list = taskService.getTaskListByWorkOrderId(workOrderId);
-        return success(convertList(list, task -> new MesProTaskRespVO()
-                .setId(task.getId()).setCode(task.getCode()).setName(task.getName())
-                .setWorkOrderId(task.getWorkOrderId()).setWorkstationId(task.getWorkstationId())
-                .setRouteId(task.getRouteId()).setProcessId(task.getProcessId())
-                .setItemId(task.getItemId()).setStatus(task.getStatus())));
-    }
-
     @GetMapping("/gantt-list")
     @Operation(summary = "获得甘特图任务列表", description = "后端组装工单=project + 任务=task 列表")
     @PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
@@ -229,11 +214,24 @@ public class MesProTaskController {
         Map<Long, MesMdWorkstationDO> workstationMap = workstationService.getWorkstationMap(
                 convertSet(list, MesProTaskDO::getWorkstationId));
         Map<Long, MesProProcessDO> processMap = processService.getProcessMap(
-                new java.util.ArrayList<>(convertSet(list, MesProTaskDO::getProcessId)));
+                new ArrayList<>(convertSet(list, MesProTaskDO::getProcessId)));
         Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
                 convertSet(list, MesProTaskDO::getItemId));
+        Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
+                convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
         Map<Long, MesMdClientDO> clientMap = clientService.getClientMap(
                 convertSet(list, MesProTaskDO::getClientId));
+        // 工序的 checkFlag：批量查询后构建 routeId -> processId -> checkFlag 的双层 Map
+        Set<Long> routeIds = convertSet(list, MesProTaskDO::getRouteId);
+        Map<Long, Map<Long, Boolean>> routeProcessCheckFlagMap = new HashMap<>();
+        if (CollUtil.isNotEmpty(routeIds)) {
+            List<MesProRouteProcessDO> allRouteProcesses = routeProcessService.getRouteProcessListByRouteIds(routeIds);
+            for (MesProRouteProcessDO rp : allRouteProcesses) {
+                routeProcessCheckFlagMap
+                        .computeIfAbsent(rp.getRouteId(), k -> new HashMap<>())
+                        .put(rp.getProcessId(), Boolean.TRUE.equals(rp.getCheckFlag()));
+            }
+        }
         // 拼接 VO
         return convertList(list, task -> {
             MesProTaskRespVO vo = BeanUtils.toBean(task, MesProTaskRespVO.class);
@@ -243,10 +241,15 @@ public class MesProTaskController {
                     vo.setWorkstationCode(ws.getCode()).setWorkstationName(ws.getName()));
             findAndThen(processMap, task.getProcessId(), p ->
                     vo.setProcessName(p.getName()));
-            findAndThen(itemMap, task.getItemId(), item ->
-                    vo.setItemCode(item.getCode()).setItemName(item.getName()).setItemSpec(item.getSpecification()));
+            findAndThen(itemMap, task.getItemId(), item -> {
+                vo.setItemCode(item.getCode()).setItemName(item.getName()).setItemSpecification(item.getSpecification());
+                findAndThen(unitMeasureMap, item.getUnitMeasureId(), unit ->
+                        vo.setUnitMeasureName(unit.getName()));
+            });
             findAndThen(clientMap, task.getClientId(), c ->
                     vo.setClientName(c.getName()));
+            findAndThen(routeProcessCheckFlagMap, task.getRouteId(), processCheckMap ->
+                    findAndThen(processCheckMap, task.getProcessId(), vo::setCheckFlag));
             return vo;
         });
     }
@@ -40,10 +40,8 @@ public class MesProTaskIssueController {
  
     @Resource
     private MesProTaskIssueService taskIssueService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
  
@@ -115,7 +113,7 @@ public class MesProTaskIssueController {
         return cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList(list, issue -> {
             MesProTaskIssueRespVO vo = BeanUtils.toBean(issue, MesProTaskIssueRespVO.class);
             findAndThen(itemMap, issue.getItemId(), item ->
-                    vo.setItemCode(item.getCode()).setItemName(item.getName()).setItemSpec(item.getSpecification()));
+                    vo.setItemCode(item.getCode()).setItemName(item.getName()).setItemSpecification(item.getSpecification()));
             findAndThen(unitMap, issue.getUnitMeasureId(), unit ->
                     vo.setUnitMeasureName(unit.getName()));
             return vo;
@@ -22,21 +22,21 @@ public class MesProTaskIssueRespVO {
     @Schema(description = "工作站编号", example = "1")
     private Long workstationId;
  
+    @Schema(description = "来源单据类型", example = "MATERIAL_ISSUE")
+    private String sourceDocType;
+
     @Schema(description = "来源单据编号", example = "1")
     private Long sourceDocId;
  
+    @Schema(description = "来源单据行编号", example = "1")
+    private Long sourceLineId;
+
     @Schema(description = "来源单据编码", example = "DOC-001")
     private String sourceDocCode;
  
-    @Schema(description = "来源单据类型", example = "MATERIAL_ISSUE")
-    private String sourceDocType;
-
     @Schema(description = "投料批次", example = "BATCH-001")
     private String batchCode;
  
-    @Schema(description = "来源单据行编号", example = "1")
-    private Long sourceLineId;
-
     @Schema(description = "产品物料编号", example = "100")
     private Long itemId;
  
@@ -47,7 +47,7 @@ public class MesProTaskIssueRespVO {
     private String itemName;
  
     @Schema(description = "规格型号", example = "100x200mm")
-    private String itemSpec;
+    private String itemSpecification;
  
     @Schema(description = "单位编号", example = "1")
     private Long unitMeasureId;
@@ -23,22 +23,22 @@ public class MesProTaskIssueSaveReqVO {
     @Schema(description = "工作站编号", example = "1")
     private Long workstationId;
  
+    @Schema(description = "来源单据类型", example = "MATERIAL_ISSUE")
+    private String sourceDocType;
+
     @Schema(description = "来源单据编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "来源单据编号不能为空")
     private Long sourceDocId;
  
+    @Schema(description = "来源单据行编号", example = "1")
+    private Long sourceLineId;
+
     @Schema(description = "来源单据编码", example = "DOC-001")
     private String sourceDocCode;
  
-    @Schema(description = "来源单据类型", example = "MATERIAL_ISSUE")
-    private String sourceDocType;
-
     @Schema(description = "投料批次", example = "BATCH-001")
     private String batchCode;
  
-    @Schema(description = "来源单据行编号", example = "1")
-    private Long sourceLineId;
-
     @Schema(description = "产品物料编号", example = "100")
     private Long itemId;
  
@@ -8,6 +8,7 @@ import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
  
 import java.time.LocalDateTime;
+import java.util.List;
  
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  
@@ -38,6 +39,12 @@ public class MesProTaskPageReqVO extends PageParam {
     @Schema(description = "任务状态", example = "0")
     private Integer status;
  
+    @Schema(description = "任务状态列表（IN 查询）", example = "[0, 1, 2]")
+    private List<Integer> statuses;
+
+    @Schema(description = "是否质检（关联工艺路线工序）", example = "true")
+    private Boolean checkFlag;
+
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
@@ -56,7 +56,10 @@ public class MesProTaskRespVO {
     private String itemName;
  
     @Schema(description = "规格型号", example = "100x200mm")
-    private String itemSpec;
+    private String itemSpecification;
+
+    @Schema(description = "计量单位名称", example = "个")
+    private String unitMeasureName;
  
     @Schema(description = "排产数量", example = "100.00")
     private BigDecimal quantity;
@@ -103,6 +106,9 @@ public class MesProTaskRespVO {
     @Schema(description = "任务状态", example = "0")
     private Integer status;
  
+    @Schema(description = "是否质检（派生自工艺路线工序 checkFlag）", example = "true")
+    private Boolean checkFlag;
+
     @Schema(description = "备注", example = "备注")
     private String remark;
  
@@ -43,16 +43,12 @@ public class MesProWorkOrderBomController {
  
     @Resource
     private MesProWorkOrderBomService workOrderBomService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
-
     @Resource
     private MesMdItemTypeService itemTypeService;
-
     @Resource
     private MesMdProductBomService productBomService;
  
@@ -122,6 +118,8 @@ public class MesProWorkOrderBomController {
         Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(leafItems.keySet());
         Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
                 convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+        Map<Long, MesMdItemTypeDO> itemTypeMap = itemTypeService.getItemTypeMap(
+                convertSet(itemMap.values(), MesMdItemDO::getItemTypeId));
         List<MesProWorkOrderItemRespVO> result = new ArrayList<>(leafItems.size());
         for (Map.Entry<Long, BigDecimal> entry : leafItems.entrySet()) {
             MesMdItemDO item = itemMap.get(entry.getKey());
@@ -130,9 +128,11 @@ public class MesProWorkOrderBomController {
             }
             MesProWorkOrderItemRespVO vo = new MesProWorkOrderItemRespVO()
                     .setItemId(item.getId()).setQuantity(entry.getValue())
-                    .setItemCode(item.getCode()).setItemName(item.getName()).setItemSpec(item.getSpecification());
+                    .setItemCode(item.getCode()).setItemName(item.getName()).setItemSpecification(item.getSpecification());
             MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
                     unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName()));
+            MapUtils.findAndThen(itemTypeMap, item.getItemTypeId(),
+                    itemType -> vo.setItemOrProduct(itemType.getItemOrProduct()));
             result.add(vo);
         }
         return success(result);
@@ -155,7 +155,7 @@ public class MesProWorkOrderBomController {
         return BeanUtils.toBean(list, MesProWorkOrderBomRespVO.class, vo -> {
             MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
                 vo.setItemName(item.getName()).setItemCode(item.getCode())
-                        .setItemSpec(item.getSpecification());
+                        .setItemSpecification(item.getSpecification());
                 MapUtils.findAndThen(itemTypeMap, item.getItemTypeId(),
                         itemType -> vo.setItemOrProduct(itemType.getItemOrProduct()));
                 MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
@@ -47,16 +47,12 @@ public class MesProWorkOrderController {
  
     @Resource
     private MesProWorkOrderService workOrderService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdClientService clientService;
-
     @Resource
     private MesMdVendorService vendorService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
  
@@ -165,7 +161,7 @@ public class MesProWorkOrderController {
         return BeanUtils.toBean(list, MesProWorkOrderRespVO.class, vo -> {
             MapUtils.findAndThen(itemMap, vo.getProductId(), item -> {
                 vo.setProductName(item.getName()).setProductCode(item.getCode())
-                        .setProductSpec(item.getSpecification());
+                        .setProductSpecification(item.getSpecification());
                 MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
                         unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName()));
             });
@@ -19,7 +19,7 @@ public class MesProWorkOrderItemRespVO {
     private String itemName;
  
     @Schema(description = "规格型号", example = "0603")
-    private String itemSpec;
+    private String itemSpecification;
  
     @Schema(description = "单位名称", example = "个")
     private String unitMeasureName;
@@ -27,4 +27,7 @@ public class MesProWorkOrderItemRespVO {
     @Schema(description = "需求数量", example = "1000.00")
     private BigDecimal quantity;
  
+    @Schema(description = "物料/产品标识", example = "ITEM")
+    private String itemOrProduct;
+
 }
@@ -35,6 +35,9 @@ public class MesProWorkOrderPageReqVO extends PageParam {
     @Schema(description = "客户编号", example = "300")
     private Long clientId;
  
+    @Schema(description = "工单状态", example = "1")
+    private Integer status;
+
     @Schema(description = "需求日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] requestDate;
@@ -55,7 +55,7 @@ public class MesProWorkOrderRespVO {
  
     @Schema(description = "规格型号", example = "100x200mm")
     @ExcelProperty("规格型号")
-    private String productSpec;
+    private String productSpecification;
  
     @Schema(description = "单位名称", example = "个")
     @ExcelProperty("单位")
@@ -33,7 +33,7 @@ public class MesProWorkOrderBomRespVO {
  
     @Schema(description = "规格型号", example = "10K 0603")
     @ExcelProperty("规格型号")
-    private String itemSpec;
+    private String itemSpecification;
  
     @Schema(description = "单位编号", example = "300")
     private Long unitMeasureId;
@@ -18,8 +18,8 @@ public class MesQcDefectPageReqVO extends PageParam {
     @Schema(description = "缺陷描述", example = "外观缺陷")
     private String name;
  
-    @Schema(description = "检测项类型", example = "APPEARANCE")
-    private String type;
+    @Schema(description = "检测项类型", example = "2")
+    private Integer type;
  
     @Schema(description = "缺陷等级", example = "1")
     private Integer level;
@@ -27,10 +27,10 @@ public class MesQcDefectRespVO {
     @ExcelProperty("缺陷描述")
     private String name;
  
-    @Schema(description = "检测项类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "APPEARANCE")
+    @Schema(description = "检测项类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @ExcelProperty(value = "检测项类型", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.MES_DEFECT_TYPE)
-    private String type;
+    private Integer type;
  
     @Schema(description = "缺陷等级", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @ExcelProperty(value = "缺陷等级", converter = DictConvert.class)
@@ -22,9 +22,9 @@ public class MesQcDefectSaveReqVO {
     @NotEmpty(message = "缺陷描述不能为空")
     private String name;
  
-    @Schema(description = "检测项类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "APPEARANCE")
-    @NotEmpty(message = "检测项类型不能为空")
-    private String type;
+    @Schema(description = "检测项类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotNull(message = "检测项类型不能为空")
+    private Integer type;
  
     @Schema(description = "缺陷等级", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "缺陷等级不能为空")
@@ -34,4 +34,4 @@ public class MesQcDefectSaveReqVO {
     @Schema(description = "备注", example = "备注")
     private String remark;
  
-    }
+}
@@ -46,7 +46,7 @@ public class MesQcDefectRecordController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除质检缺陷记录")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('mes:qc-defect:update')")
+    @PreAuthorize("@ss.hasPermission('mes:qc-defect:delete')")
     public CommonResult<Boolean> deleteDefectRecord(@RequestParam("id") Long id) {
         defectRecordService.deleteDefectRecord(id);
         return success(true);
@@ -77,13 +77,6 @@ public class MesQcIndicatorController {
         return success(BeanUtils.toBean(pageResult, MesQcIndicatorRespVO.class));
     }
  
-    @GetMapping("/simple-list")
-    @Operation(summary = "获得质检指标精简列表", description = "主要用于前端的下拉选项")
-    public CommonResult<List<MesQcIndicatorRespVO>> getIndicatorSimpleList() {
-        List<MesQcIndicatorDO> list = indicatorService.getIndicatorList();
-        return success(BeanUtils.toBean(list, MesQcIndicatorRespVO.class));
-    }
-
     @GetMapping("/export-excel")
     @Operation(summary = "导出质检指标 Excel")
     @PreAuthorize("@ss.hasPermission('mes:qc-indicator:export')")
@@ -18,8 +18,8 @@ public class MesQcIndicatorPageReqVO extends PageParam {
     @Schema(description = "检测项名称", example = "长度")
     private String name;
  
-    @Schema(description = "检测项类型", example = "SIZE")
-    private String type;
+    @Schema(description = "检测项类型", example = "1")
+    private Integer type;
  
     @Schema(description = "结果值类型", example = "1")
     private Integer resultType;
@@ -27,10 +27,10 @@ public class MesQcIndicatorRespVO {
     @ExcelProperty("检测项名称")
     private String name;
  
-    @Schema(description = "检测项类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "SIZE")
+    @Schema(description = "检测项类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @ExcelProperty(value = "检测项类型", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.MES_INDICATOR_TYPE)
-    private String type;
+    private Integer type;
  
     @Schema(description = "检测工具", example = "卡尺")
     @ExcelProperty("检测工具")
@@ -20,9 +20,9 @@ public class MesQcIndicatorSaveReqVO {
     @NotEmpty(message = "检测项名称不能为空")
     private String name;
  
-    @Schema(description = "检测项类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "SIZE")
-    @NotEmpty(message = "检测项类型不能为空")
-    private String type;
+    @Schema(description = "检测项类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "检测项类型不能为空")
+    private Integer type;
  
     @Schema(description = "检测工具", example = "卡尺")
     private String tool;
@@ -34,12 +34,12 @@ public class MesQcIpqcRespVO {
  
     // ========== 来源单据 ==========
  
-    @Schema(description = "来源单据 ID", example = "200")
-    private Long sourceDocId;
-
     @Schema(description = "来源单据类型", example = "304")
     private Integer sourceDocType;
  
+    @Schema(description = "来源单据 ID", example = "200")
+    private Long sourceDocId;
+
     @Schema(description = "来源单据行 ID", example = "300")
     private Long sourceLineId;
  
@@ -27,8 +27,8 @@ public class MesQcIpqcLineRespVO {
     @Schema(description = "检测指标名称", example = "外观")
     private String indicatorName;
  
-    @Schema(description = "检测指标类型", example = "QUANTITATIVE")
-    private String indicatorType;
+    @Schema(description = "检测指标类型", example = "1")
+    private Integer indicatorType;
  
     @Schema(description = "检测工具", example = "卡尺")
     private String tool;
@@ -30,12 +30,12 @@ public class MesQcIqcRespVO {
  
     // ========== 来源单据 ==========
  
-    @Schema(description = "来源单据 ID", example = "200")
-    private Long sourceDocId;
-
     @Schema(description = "来源单据类型", example = "100")
     private Integer sourceDocType;
  
+    @Schema(description = "来源单据 ID", example = "200")
+    private Long sourceDocId;
+
     @Schema(description = "来源单据行 ID", example = "300")
     private Long sourceLineId;
  
@@ -27,8 +27,8 @@ public class MesQcIqcLineRespVO {
     @Schema(description = "检测指标名称", example = "外观")
     private String indicatorName;
  
-    @Schema(description = "检测指标类型", example = "QUANTITATIVE")
-    private String indicatorType;
+    @Schema(description = "检测指标类型", example = "1")
+    private Integer indicatorType;
  
     @Schema(description = "检测工具", example = "卡尺")
     private String tool;
@@ -30,12 +30,12 @@ public class MesQcOqcRespVO {
  
     // ========== 来源单据 ==========
  
-    @Schema(description = "来源单据 ID", example = "200")
-    private Long sourceDocId;
-
     @Schema(description = "来源单据类型", example = "118")
     private Integer sourceDocType;
  
+    @Schema(description = "来源单据 ID", example = "200")
+    private Long sourceDocId;
+
     @Schema(description = "来源单据行 ID", example = "300")
     private Long sourceLineId;
  
@@ -51,12 +51,12 @@ public class MesQcOqcRespVO {
     @ExcelProperty("客户简称")
     private String clientNickname;
  
+    // ========== 物料 ==========
+
     @Schema(description = "批次号", example = "BC20250101")
     @ExcelProperty("批次号")
     private String batchCode;
  
-    // ========== 物料 ==========
-
     @Schema(description = "产品物料 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20")
     private Long itemId;
  
@@ -26,12 +26,12 @@ public class MesQcOqcSaveReqVO {
  
     // ========== 来源单据 ==========
  
-    @Schema(description = "来源单据 ID", example = "200")
-    private Long sourceDocId;
-
     @Schema(description = "来源单据类型", example = "118")
     private Integer sourceDocType;
  
+    @Schema(description = "来源单据 ID", example = "200")
+    private Long sourceDocId;
+
     @Schema(description = "来源单据行 ID", example = "300")
     private Long sourceLineId;
  
@@ -41,11 +41,11 @@ public class MesQcOqcSaveReqVO {
     @NotNull(message = "客户不能为空")
     private Long clientId;
  
+    // ========== 物料 ==========
+
     @Schema(description = "批次号", example = "BC20250101")
     private String batchCode;
  
-    // ========== 物料 ==========
-
     @Schema(description = "产品物料 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "20")
     @NotNull(message = "产品物料不能为空")
     private Long itemId;
@@ -74,9 +74,8 @@ public class MesQcOqcSaveReqVO {
  
     // ========== 检验 ==========
  
-    @Schema(description = "检测人员用户 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "检测人员不能为空")
-    private Long inspectorUserId;
+    @Schema(description = "检测结果", example = "1")
+    private Integer checkResult;
  
     @Schema(description = "出货日期", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "出货日期不能为空")
@@ -86,8 +85,9 @@ public class MesQcOqcSaveReqVO {
     @NotNull(message = "检测日期不能为空")
     private LocalDateTime inspectDate;
  
-    @Schema(description = "检测结果", example = "1")
-    private Integer checkResult;
+    @Schema(description = "检测人员用户 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "检测人员不能为空")
+    private Long inspectorUserId;
  
     @Schema(description = "备注", example = "备注")
     private String remark;
@@ -27,8 +27,8 @@ public class MesQcOqcLineRespVO {
     @Schema(description = "检测指标名称", example = "外观")
     private String indicatorName;
  
-    @Schema(description = "检测指标类型", example = "QUANTITATIVE")
-    private String indicatorType;
+    @Schema(description = "检测指标类型", example = "1")
+    private Integer indicatorType;
  
     @Schema(description = "检测工具", example = "卡尺")
     private String tool;
@@ -10,17 +10,16 @@ import java.time.LocalDateTime;
 @Data
 public class MesQcPendingInspectRespVO {
  
-    @Schema(description = "来源单据 ID", example = "100")
-    private Long sourceDocId;
-
     @Schema(description = "来源单据类型（MesBizTypeConstants）", example = "100")
     private Integer sourceDocType;
  
-    @Schema(description = "来源单据编号", example = "AN2025001")
-    private String sourceDocCode;
+    @Schema(description = "来源单据 ID", example = "100")
+    private Long sourceDocId;
  
     @Schema(description = "来源单据行 ID", example = "200")
     private Long sourceLineId;
+    @Schema(description = "来源单据编号", example = "AN2025001")
+    private String sourceDocCode;
  
     @Schema(description = "检验类型（MesQcTypeEnum）", example = "1")
     private Integer qcType;
@@ -30,12 +30,12 @@ public class MesQcRqcRespVO {
  
     // ========== 来源单据 ==========
  
-    @Schema(description = "来源单据 ID", example = "200")
-    private Long sourceDocId;
-
     @Schema(description = "来源单据类型", example = "116")
     private Integer sourceDocType;
  
+    @Schema(description = "来源单据 ID", example = "200")
+    private Long sourceDocId;
+
     @Schema(description = "来源单据行 ID", example = "300")
     private Long sourceLineId;
  
@@ -85,6 +85,26 @@ public class MesQcRqcRespVO {
     @ExcelProperty("不合格数量")
     private BigDecimal unqualifiedQuantity;
  
+    // ========== 缺陷统计 ==========
+
+    @Schema(description = "致命缺陷率（%）", example = "5.00")
+    private BigDecimal criticalRate;
+
+    @Schema(description = "严重缺陷率（%）", example = "10.00")
+    private BigDecimal majorRate;
+
+    @Schema(description = "轻微缺陷率（%）", example = "15.00")
+    private BigDecimal minorRate;
+
+    @Schema(description = "致命缺陷数量", example = "5")
+    private Integer criticalQuantity;
+
+    @Schema(description = "严重缺陷数量", example = "10")
+    private Integer majorQuantity;
+
+    @Schema(description = "轻微缺陷数量", example = "15")
+    private Integer minorQuantity;
+
     // ========== 检验 ==========
  
     @Schema(description = "检测结果", example = "1")
@@ -110,26 +130,6 @@ public class MesQcRqcRespVO {
     @ExcelProperty("备注")
     private String remark;
  
-    // ========== 缺陷统计 ==========
-
-    @Schema(description = "致命缺陷数量", example = "5")
-    private Integer criticalQuantity;
-
-    @Schema(description = "严重缺陷数量", example = "10")
-    private Integer majorQuantity;
-
-    @Schema(description = "轻微缺陷数量", example = "15")
-    private Integer minorQuantity;
-
-    @Schema(description = "致命缺陷率（%）", example = "5.00")
-    private BigDecimal criticalRate;
-
-    @Schema(description = "严重缺陷率（%）", example = "10.00")
-    private BigDecimal majorRate;
-
-    @Schema(description = "轻微缺陷率（%）", example = "15.00")
-    private BigDecimal minorRate;
-
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
@@ -32,12 +32,12 @@ public class MesQcRqcSaveReqVO {
  
     // ========== 来源单据 ==========
  
-    @Schema(description = "来源单据 ID", example = "200")
-    private Long sourceDocId;
-
     @Schema(description = "来源单据类型", example = "116")
     private Integer sourceDocType;
  
+    @Schema(description = "来源单据 ID", example = "200")
+    private Long sourceDocId;
+
     @Schema(description = "来源单据行 ID", example = "300")
     private Long sourceLineId;
  
@@ -27,8 +27,8 @@ public class MesQcRqcLineRespVO {
     @Schema(description = "检测指标名称", example = "外观")
     private String indicatorName;
  
-    @Schema(description = "检测指标类型", example = "QUANTITATIVE")
-    private String indicatorType;
+    @Schema(description = "检测指标类型", example = "1")
+    private Integer indicatorType;
  
     @Schema(description = "检测工具", example = "卡尺")
     private String tool;
@@ -77,13 +77,6 @@ public class MesQcTemplateController {
         return success(BeanUtils.toBean(pageResult, MesQcTemplateRespVO.class));
     }
  
-    @GetMapping("/simple-list")
-    @Operation(summary = "获得质检方案精简列表", description = "主要用于前端的下拉选项")
-    public CommonResult<List<MesQcTemplateRespVO>> getTemplateSimpleList() {
-        List<MesQcTemplateDO> list = templateService.getTemplateList();
-        return success(BeanUtils.toBean(list, MesQcTemplateRespVO.class));
-    }
-
     @GetMapping("/export-excel")
     @Operation(summary = "导出质检方案 Excel")
     @PreAuthorize("@ss.hasPermission('mes:qc-template:export')")
@@ -63,9 +63,9 @@ public class MesQcTemplateIndicatorRespVO {
     @ExcelProperty("检测项名称")
     private String indicatorName;
  
-    @Schema(description = "检测项类型（字典 mes_index_type）", example = "SIZE")
+    @Schema(description = "检测项类型", example = "1")
     @ExcelProperty("检测项类型")
-    private String indicatorType;
+    private Integer indicatorType;
  
     @Schema(description = "检测工具", example = "卡尺")
     @ExcelProperty("检测工具")
@@ -43,7 +43,6 @@ public class MesTmToolController {
  
     @Resource
     private MesTmToolService toolService;
-
     @Resource
     private MesTmToolTypeService toolTypeService;
  
@@ -25,7 +25,7 @@ public class MesTmToolPageReqVO extends PageParam {
     private String brand;
  
     @Schema(description = "型号规格", example = "M5-100")
-    private String spec;
+    private String specification;
  
     @Schema(description = "状态", example = "1")
     private Integer status;
@@ -33,7 +33,7 @@ public class MesTmToolRespVO {
  
     @Schema(description = "型号规格", example = "M5-100")
     @ExcelProperty("型号规格")
-    private String spec;
+    private String specification;
  
     @Schema(description = "工具类型编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
     private Long toolTypeId;
@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.mes.controller.admin.tm.tool.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
  
 import java.time.LocalDateTime;
@@ -16,17 +17,21 @@ public class MesTmToolSaveReqVO {
  
     @Schema(description = "工具编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "T-001")
     @NotEmpty(message = "工具编码不能为空")
+    @Size(max = 64, message = "工具编码长度不能超过 64 个字符")
     private String code;
  
     @Schema(description = "工具名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "5mm 铣刀")
     @NotEmpty(message = "工具名称不能为空")
+    @Size(max = 255, message = "工具名称长度不能超过 255 个字符")
     private String name;
  
     @Schema(description = "品牌", example = "三菱")
+    @Size(max = 255, message = "品牌长度不能超过 255 个字符")
     private String brand;
  
     @Schema(description = "型号规格", example = "M5-100")
-    private String spec;
+    @Size(max = 255, message = "型号规格长度不能超过 255 个字符")
+    private String specification;
  
     @Schema(description = "工具类型编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
     @NotNull(message = "工具类型不能为空")
@@ -36,7 +41,8 @@ public class MesTmToolSaveReqVO {
     @NotNull(message = "数量不能为空")
     private Integer quantity;
  
-    @Schema(description = "可用数量", example = "1")
+    @Schema(description = "可用数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "可用数量不能为空")
     private Integer availableQuantity;
  
     @Schema(description = "保养维护类型", example = "1")
@@ -53,6 +59,7 @@ public class MesTmToolSaveReqVO {
     private Integer status;
  
     @Schema(description = "备注", example = "备注")
+    @Size(max = 500, message = "备注长度不能超过 500 个字符")
     private String remark;
  
-    }
+}
 \ No newline at end of file
@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.mes.controller.admin.tm.tool.vo.type;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
  
 @Schema(description = "管理后台 - MES 工具类型新增/修改 Request VO")
@@ -14,10 +15,12 @@ public class MesTmToolTypeSaveReqVO {
  
     @Schema(description = "类型编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "TT-001")
     @NotEmpty(message = "类型编码不能为空")
+    @Size(max = 64, message = "类型编码长度不能超过 64 个字符")
     private String code;
  
     @Schema(description = "类型名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "铣刀")
     @NotEmpty(message = "类型名称不能为空")
+    @Size(max = 255, message = "类型名称长度不能超过 255 个字符")
     private String name;
  
     @Schema(description = "是否编码管理", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
@@ -31,6 +34,7 @@ public class MesTmToolTypeSaveReqVO {
     private Integer maintenPeriod;
  
     @Schema(description = "备注", example = "备注")
+    @Size(max = 500, message = "备注长度不能超过 500 个字符")
     private String remark;
  
-    }
+}
 \ No newline at end of file
@@ -42,7 +42,6 @@ public class MesWmArrivalNoticeController {
  
     @Resource
     private MesWmArrivalNoticeService arrivalNoticeService;
-
     @Resource
     private MesMdVendorService vendorService;
  
@@ -112,15 +111,6 @@ public class MesWmArrivalNoticeController {
         return success(true);
     }
  
-    @GetMapping("/simple-list")
-    @Operation(summary = "获得到货通知单精简列表")
-    @Parameter(name = "status", description = "状态", example = "2")
-    public CommonResult<List<MesWmArrivalNoticeRespVO>> getArrivalNoticeSimpleList(
-            @RequestParam(value = "status", required = false) Integer status) {
-        List<MesWmArrivalNoticeDO> list = arrivalNoticeService.getArrivalNoticeListByStatus(status);
-        return success(buildRespVOList(list));
-    }
-
     // ==================== 拼接 VO ====================
  
     private List<MesWmArrivalNoticeRespVO> buildRespVOList(List<MesWmArrivalNoticeDO> list) {
@@ -40,13 +40,10 @@ public class MesWmArrivalNoticeLineController {
  
     @Resource
     private MesWmArrivalNoticeLineService arrivalNoticeLineService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
-
     @Resource
     private MesQcIqcService iqcService;
  
@@ -95,16 +92,6 @@ public class MesWmArrivalNoticeLineController {
         return success(new PageResult<>(buildRespVOList(pageResult.getList()), pageResult.getTotal()));
     }
  
-    @GetMapping("/list-by-notice-id")
-    @Operation(summary = "获得到货通知单行列表")
-    @Parameter(name = "noticeId", description = "到货通知单编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('mes:wm-arrival-notice:query')")
-    public CommonResult<List<MesWmArrivalNoticeLineRespVO>> getArrivalNoticeLineListByNoticeId(
-            @RequestParam("noticeId") Long noticeId) {
-        List<MesWmArrivalNoticeLineDO> list = arrivalNoticeLineService.getArrivalNoticeLineListByNoticeId(noticeId);
-        return success(buildRespVOList(list));
-    }
-
     // ==================== 拼接 VO ====================
  
     private List<MesWmArrivalNoticeLineRespVO> buildRespVOList(List<MesWmArrivalNoticeLineDO> list) {
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.mes.controller.admin.wm.itemconsume.vo;
  
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -13,6 +14,7 @@ import lombok.ToString;
 public class MesWmItemConsumeLinePageReqVO extends PageParam {
  
     @Schema(description = "报工记录编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "报工记录编号不能为空")
     private Long feedbackId;
  
 }
@@ -46,13 +46,10 @@ public class MesWmItemReceiptController {
  
     @Resource
     private MesWmItemReceiptService itemReceiptService;
-
     @Resource
     private MesMdVendorService vendorService;
-
     @Resource
     private MesQcIqcService iqcService;
-
     @Resource
     private MesWmArrivalNoticeService arrivalNoticeService;
  
@@ -42,19 +42,14 @@ public class MesWmItemReceiptDetailController {
  
     @Resource
     private MesWmItemReceiptDetailService itemReceiptDetailService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
-
     @Resource
     private MesWmWarehouseService warehouseService;
-
     @Resource
     private MesWmWarehouseLocationService locationService;
-
     @Resource
     private MesWmWarehouseAreaService areaService;
  
@@ -10,10 +10,12 @@ import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.line.MesWm
 import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.line.MesWmItemReceiptLineSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptLineDO;
 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
 import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
 import cn.iocoder.yudao.module.mes.service.wm.itemreceipt.MesWmItemReceiptLineService;
+import cn.iocoder.yudao.module.mes.service.wm.itemreceipt.MesWmItemReceiptService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -38,12 +40,12 @@ public class MesWmItemReceiptLineController {
  
     @Resource
     private MesWmItemReceiptLineService itemReceiptLineService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
+    @Resource
+    private MesWmItemReceiptService itemReceiptService;
  
     @PostMapping("/create")
     @Operation(summary = "创建采购入库单行")
@@ -101,6 +103,8 @@ public class MesWmItemReceiptLineController {
                 convertSet(list, MesWmItemReceiptLineDO::getItemId));
         Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
                 convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+        Map<Long, MesWmItemReceiptDO> receiptMap = itemReceiptService.getItemReceiptMap(
+                convertSet(list, MesWmItemReceiptLineDO::getReceiptId));
         // 2. 构建结果
         return BeanUtils.toBean(list, MesWmItemReceiptLineRespVO.class, vo -> {
             MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
@@ -108,6 +112,8 @@ public class MesWmItemReceiptLineController {
                 MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
                         unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName()));
             });
+            MapUtils.findAndThen(receiptMap, vo.getReceiptId(), receipt ->
+                    vo.setReceiptCode(receipt.getCode()).setPurchaseOrderCode(receipt.getPurchaseOrderCode()));
         });
     }
  
@@ -16,6 +16,12 @@ public class MesWmItemReceiptLineRespVO {
     @Schema(description = "入库单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Long receiptId;
  
+    @Schema(description = "入库单编码", example = "IR2026020001")
+    private String receiptCode;
+
+    @Schema(description = "采购订单号", example = "PO20260201")
+    private String purchaseOrderCode;
+
     @Schema(description = "到货通知单行编号", example = "1")
     private Long arrivalNoticeLineId;
  
@@ -52,22 +52,16 @@ public class MesWmMaterialStockController {
  
     @Resource
     private MesWmMaterialStockService materialStockService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
-
     @Resource
     private MesWmWarehouseService warehouseService;
-
     @Resource
     private MesWmWarehouseLocationService locationService;
-
     @Resource
     private MesWmWarehouseAreaService areaService;
-
     @Resource
     private MesMdVendorService vendorService;
  
@@ -139,8 +133,8 @@ public class MesWmMaterialStockController {
                 MapUtils.findAndThen(unitMeasureMap, item.getUnitMeasureId(),
                         unitMeasure -> vo.setUnitMeasureName(unitMeasure.getName()));
             });
-            MapUtils.findAndThen(warehouseMap, vo.getWarehouseId(),
-                    warehouse -> vo.setWarehouseName(warehouse.getName()));
+            MapUtils.findAndThen(warehouseMap, vo.getWarehouseId(), warehouse ->
+                    vo.setWarehouseCode(warehouse.getCode()).setWarehouseName(warehouse.getName()));
             MapUtils.findAndThen(locationMap, vo.getLocationId(),
                     location -> vo.setLocationName(location.getName()));
             MapUtils.findAndThen(areaMap, vo.getAreaId(),
@@ -12,6 +12,18 @@ import lombok.ToString;
 @ToString(callSuper = true)
 public class MesWmMaterialStockPageReqVO extends PageParam {
  
+    /**
+     * 虚拟仓过滤模式 - 排除虚拟仓
+     */
+    public static final String VIRTUAL_FILTER_EXCLUDE = "exclude";
+    /**
+     * 虚拟仓过滤模式 - 只看虚拟仓
+     */
+    public static final String VIRTUAL_FILTER_ONLY = "only";
+
+    @Schema(description = "虚拟仓过滤模式", example = "exclude")
+    private String virtualFilter;
+
     @Schema(description = "物料分类编号", example = "1")
     private Long itemTypeId;
  
@@ -21,6 +33,9 @@ public class MesWmMaterialStockPageReqVO extends PageParam {
     @Schema(description = "批次号", example = "B20260101")
     private String batchCode;
  
+    @Schema(description = "批次编号", example = "1")
+    private Long batchId;
+
     @Schema(description = "仓库编号", example = "1")
     private Long warehouseId;
  
@@ -49,6 +49,9 @@ public class MesWmMaterialStockRespVO {
     @Schema(description = "仓库编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Long warehouseId;
  
+    @Schema(description = "仓库编码", example = "WH001")
+    private String warehouseCode;
+
     @Schema(description = "仓库名称", example = "原料仓")
     @ExcelProperty("仓库")
     private String warehouseName;
@@ -44,19 +44,14 @@ public class MesWmMiscIssueLineController {
  
     @Resource
     private MesWmMiscIssueLineService miscIssueLineService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
-
     @Resource
     private MesWmWarehouseService warehouseService;
-
     @Resource
     private MesWmWarehouseLocationService warehouseLocationService;
-
     @Resource
     private MesWmWarehouseAreaService warehouseAreaService;
  
@@ -21,15 +21,14 @@ public class MesWmMiscIssueRespVO {
     @Schema(description = "杂项类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer type;
  
+    @Schema(description = "来源单据类型", example = "PURCHASE_ORDER")
+    private String sourceDocType;
     @Schema(description = "来源单据ID", example = "1")
     private Long sourceDocId;
  
     @Schema(description = "来源单据编号", example = "DOC20260302001")
     private String sourceDocCode;
  
-    @Schema(description = "来源单据类型", example = "PURCHASE_ORDER")
-    private String sourceDocType;
-
     @Schema(description = "出库日期", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime issueDate;
  
@@ -26,15 +26,14 @@ public class MesWmMiscIssueSaveReqVO {
     @NotNull(message = "杂项类型不能为空")
     private Integer type;
  
+    @Schema(description = "来源单据类型", example = "PURCHASE_ORDER")
+    private String sourceDocType;
     @Schema(description = "来源单据ID", example = "1")
     private Long sourceDocId;
  
     @Schema(description = "来源单据编号", example = "DOC20260302001")
     private String sourceDocCode;
  
-    @Schema(description = "来源单据类型", example = "PURCHASE_ORDER")
-    private String sourceDocType;
-
     @Schema(description = "出库日期", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "出库日期不能为空")
     private LocalDateTime issueDate;
@@ -47,19 +47,14 @@ public class MesWmMiscReceiptLineController {
  
     @Resource
     private MesWmMiscReceiptLineService miscReceiptLineService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
-
     @Resource
     private MesWmWarehouseService warehouseService;
-
     @Resource
     private MesWmWarehouseLocationService warehouseLocationService;
-
     @Resource
     private MesWmWarehouseAreaService warehouseAreaService;
  
@@ -21,15 +21,14 @@ public class MesWmMiscReceiptRespVO {
     @Schema(description = "杂项类型", example = "1")
     private Integer type;
  
+    @Schema(description = "来源单据类型", example = "WORK_ORDER")
+    private String sourceDocType;
     @Schema(description = "来源单据 ID", example = "1")
     private Long sourceDocId;
  
     @Schema(description = "来源单据编码", example = "WO2026030001")
     private String sourceDocCode;
  
-    @Schema(description = "来源单据类型", example = "WORK_ORDER")
-    private String sourceDocType;
-
     @Schema(description = "入库日期")
     private LocalDateTime receiptDate;
  
@@ -26,15 +26,14 @@ public class MesWmMiscReceiptSaveReqVO {
     @NotNull(message = "杂项类型不能为空")
     private Integer type;
  
+    @Schema(description = "来源单据类型", example = "WORK_ORDER")
+    private String sourceDocType;
     @Schema(description = "来源单据 ID", example = "1")
     private Long sourceDocId;
  
     @Schema(description = "来源单据编码", example = "WO2026030001")
     private String sourceDocCode;
  
-    @Schema(description = "来源单据类型", example = "WORK_ORDER")
-    private String sourceDocType;
-
     @Schema(description = "入库日期", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "入库日期不能为空")
     private LocalDateTime receiptDate;
@@ -49,7 +49,6 @@ public class MesWmOutsourceIssueController {
  
     @Resource
     private MesWmOutsourceIssueService outsourceIssueService;
-
     @Resource
     private MesMdVendorService vendorService;
     @Resource
@@ -47,19 +47,14 @@ public class MesWmOutsourceIssueDetailController {
  
     @Resource
     private MesWmOutsourceIssueDetailService outsourceIssueDetailService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
-
     @Resource
     private MesWmWarehouseService warehouseService;
-
     @Resource
     private MesWmWarehouseLocationService locationService;
-
     @Resource
     private MesWmWarehouseAreaService areaService;
  
@@ -47,13 +47,10 @@ public class MesWmOutsourceIssueLineController {
  
     @Resource
     private MesWmOutsourceIssueLineService outsourceIssueLineService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
-
     @Resource
     private MesWmBatchService batchService;
  
@@ -44,10 +44,8 @@ public class MesWmOutsourceReceiptController {
  
     @Resource
     private MesWmOutsourceReceiptService outsourceReceiptService;
-
     @Resource
     private MesMdVendorService vendorService;
-
     @Resource
     private MesProWorkOrderService workOrderService;
  
@@ -42,19 +42,14 @@ public class MesWmOutsourceReceiptDetailController {
  
     @Resource
     private MesWmOutsourceReceiptDetailService detailService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
-
     @Resource
     private MesWmWarehouseService warehouseService;
-
     @Resource
     private MesWmWarehouseLocationService locationService;
-
     @Resource
     private MesWmWarehouseAreaService areaService;
  
@@ -38,10 +38,8 @@ public class MesWmOutsourceReceiptLineController {
  
     @Resource
     private MesWmOutsourceReceiptLineService receiptLineService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
  
@@ -50,6 +50,7 @@ public class MesWmPackageController {
     private MesMdClientService clientService;
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
+
     @Resource
     private AdminUserApi adminUserApi;
  
@@ -125,20 +126,6 @@ public class MesWmPackageController {
         return success(true);
     }
  
-    @GetMapping("/childable-simple-list")
-    @Operation(summary = "可添加为子箱的装箱单精简列表")
-    @PreAuthorize("@ss.hasPermission('mes:wm-package:query')")
-    public CommonResult<List<MesWmPackageRespVO>> getChildablePackageSimpleList() {
-        List<MesWmPackageDO> list = packageService.getChildablePackageList();
-        return success(buildRespVOList(list));
-    }
-
-    @GetMapping("/simple-list")
-    @Operation(summary = "获得装箱单精简列表", description = "主要用于前端的下拉选项")
-    public CommonResult<List<MesWmPackageRespVO>> getPackageSimpleList() {
-        List<MesWmPackageDO> list = packageService.getPackageSimpleList();
-        return success(buildRespVOList(list));
-    }
  
     // ========== 私有方法 ==========
  
@@ -32,4 +32,7 @@ public class MesWmPackagePageReqVO extends PageParam {
     @Schema(description = "检查员用户 ID", example = "1")
     private Long inspectorUserId;
  
+    @Schema(description = "单据状态", example = "1")
+    private Integer status;
+
 }
@@ -36,10 +36,10 @@ public class MesWmPackageLineSaveReqVO {
     @DecimalMin(value = "0.01", message = "装箱数量必须大于 0")
     private BigDecimal quantity;
  
-    @Schema(description = "生产工单 ID", example = "1")
+    @Schema(description = "生产工单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "生产工单不能为空")
     private Long workOrderId;
  
-    // DONE @AI：时间都是 LocalDateTIme；
     @Schema(description = "有效期")
     private LocalDateTime expireDate;
  
@@ -42,19 +42,14 @@ public class MesWmProductIssueDetailController {
  
     @Resource
     private MesWmProductIssueDetailService issueDetailService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
-
     @Resource
     private MesWmWarehouseService warehouseService;
-
     @Resource
     private MesWmWarehouseLocationService locationService;
-
     @Resource
     private MesWmWarehouseAreaService areaService;
  
@@ -38,10 +38,8 @@ public class MesWmProductIssueLineController {
  
     @Resource
     private MesWmProductIssueLineService issueLineService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;