✨ feat(mes): 优化整体代码风格

YunaiV
1 parent 06de418c
Showing 112 changed files with 79 additions and 210 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/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/machinery/MesDvMachineryController.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/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/md/item/MesMdItemController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/MesMdProductBomController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationMachineController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationToolController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/MesProAndonRecordController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/card/MesProCardController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/card/MesProCardProcessController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProductBomController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProductController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskIssueController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderBomController.java
@@ -37,6 +37,7 @@ public class MesCalTeamMemberController {
  
     @Resource
     private MesCalTeamMemberService teamMemberService;
+
     @Resource
     private AdminUserApi adminUserApi;
  
@@ -46,10 +46,8 @@ public class MesDvCheckRecordController {
  
     @Resource
     private MesDvCheckRecordService checkRecordService;
-
     @Resource
     private MesDvCheckPlanService checkPlanService;
-
     @Resource
     private MesDvMachineryService machineryService;
  
@@ -36,7 +36,6 @@ public class MesDvCheckRecordLineController {
  
     @Resource
     private MesDvCheckRecordLineService checkRecordLineService;
-
     @Resource
     private MesDvSubjectService subjectService;
  
@@ -48,10 +48,8 @@ public class MesDvMachineryController {
  
     @Resource
     private MesDvMachineryService machineryService;
-
     @Resource
     private MesDvMachineryTypeService machineryTypeService;
-
     @Resource
     private MesMdWorkshopService workshopService;
  
@@ -46,10 +46,8 @@ public class MesDvMaintenRecordController {
  
     @Resource
     private MesDvMaintenRecordService maintenRecordService;
-
     @Resource
     private MesDvCheckPlanService checkPlanService;
-
     @Resource
     private MesDvMachineryService machineryService;
  
@@ -42,7 +42,6 @@ public class MesDvMaintenRecordLineController {
  
     @Resource
     private MesDvMaintenRecordLineService maintenRecordLineService;
-
     @Resource
     private MesDvSubjectService subjectService;
  
@@ -48,7 +48,6 @@ public class MesDvRepairController {
  
     @Resource
     private MesDvRepairService repairService;
-
     @Resource
     private MesDvMachineryService machineryService;
  
@@ -42,7 +42,6 @@ public class MesDvRepairLineController {
  
     @Resource
     private MesDvRepairLineService repairLineService;
-
     @Resource
     private MesDvSubjectService subjectService;
  
@@ -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;
  
@@ -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;
  
@@ -40,10 +40,8 @@ public class MesProCardProcessController {
  
     @Resource
     private MesProCardProcessService cardProcessService;
-
     @Resource
     private MesProProcessService processService;
-
     @Resource
     private MesMdWorkstationService workstationService;
  
@@ -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;
  
@@ -40,10 +40,8 @@ public class MesProTaskIssueController {
  
     @Resource
     private MesProTaskIssueService taskIssueService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
  
@@ -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;
  
@@ -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;
  
@@ -43,7 +43,6 @@ public class MesTmToolController {
  
     @Resource
     private MesTmToolService toolService;
-
     @Resource
     private MesTmToolTypeService toolTypeService;
  
@@ -42,7 +42,6 @@ public class MesWmArrivalNoticeController {
  
     @Resource
     private MesWmArrivalNoticeService arrivalNoticeService;
-
     @Resource
     private MesMdVendorService vendorService;
  
@@ -40,13 +40,10 @@ public class MesWmArrivalNoticeLineController {
  
     @Resource
     private MesWmArrivalNoticeLineService arrivalNoticeLineService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
-
     @Resource
     private MesQcIqcService iqcService;
  
@@ -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;
  
@@ -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;
  
@@ -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;
  
@@ -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;
  
@@ -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;
  
@@ -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;
  
@@ -46,13 +46,10 @@ public class MesWmProductReceiptController {
  
     @Resource
     private MesWmProductReceiptService productReceiptService;
-
     @Resource
     private MesProWorkOrderService workOrderService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
  
@@ -42,19 +42,14 @@ public class MesWmProductReceiptDetailController {
  
     @Resource
     private MesWmProductReceiptDetailService productReceiptDetailService;
-
     @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 MesWmProductReceiptLineController {
  
     @Resource
     private MesWmProductReceiptLineService productReceiptLineService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
  
@@ -43,7 +43,6 @@ public class MesWmProductSalesController {
  
     @Resource
     private MesWmProductSalesService productSalesService;
-
     @Resource
     private MesMdClientService clientService;
     @Resource
@@ -42,19 +42,14 @@ public class MesWmProductSalesDetailController {
  
     @Resource
     private MesWmProductSalesDetailService productSalesDetailService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
-
     @Resource
     private MesWmWarehouseService warehouseService;
-
     @Resource
     private MesWmWarehouseLocationService locationService;
-
     @Resource
     private MesWmWarehouseAreaService areaService;
  
@@ -40,10 +40,8 @@ public class MesWmProductSalesLineController {
  
     @Resource
     private MesWmProductSalesLineService productSalesLineService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
  
@@ -42,19 +42,14 @@ public class MesWmReturnIssueDetailController {
  
     @Resource
     private MesWmReturnIssueDetailService issueDetailService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
-
     @Resource
     private MesWmWarehouseService warehouseService;
-
     @Resource
     private MesWmWarehouseLocationService locationService;
-
     @Resource
     private MesWmWarehouseAreaService areaService;
  
@@ -38,7 +38,6 @@ public class MesWmReturnIssueLineController {
  
     @Resource
     private MesWmReturnIssueLineService issueLineService;
-
     @Resource
     private MesMdItemService itemService;
     @Resource
@@ -47,19 +47,14 @@ public class MesWmReturnSalesDetailController {
  
     @Resource
     private MesWmReturnSalesDetailService returnSalesDetailService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
-
     @Resource
     private MesWmWarehouseService warehouseService;
-
     @Resource
     private MesWmWarehouseLocationService locationService;
-
     @Resource
     private MesWmWarehouseAreaService areaService;
  
@@ -43,10 +43,8 @@ public class MesWmReturnSalesLineController {
  
     @Resource
     private MesWmReturnSalesLineService returnSalesLineService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
  
@@ -42,19 +42,14 @@ public class MesWmReturnVendorDetailController {
  
     @Resource
     private MesWmReturnVendorDetailService returnVendorDetailService;
-
     @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 MesWmReturnVendorLineController {
  
     @Resource
     private MesWmReturnVendorLineService returnVendorLineService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
  
@@ -42,7 +42,6 @@ public class MesWmSalesNoticeController {
  
     @Resource
     private MesWmSalesNoticeService salesNoticeService;
-
     @Resource
     private MesMdClientService clientService;
  
@@ -38,10 +38,8 @@ public class MesWmSalesNoticeLineController {
  
     @Resource
     private MesWmSalesNoticeLineService salesNoticeLineService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
  
@@ -13,7 +13,9 @@ import cn.iocoder.yudao.module.mes.controller.admin.wm.sn.vo.MesWmSnGroupRespVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.sn.vo.MesWmSnPageReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.sn.vo.MesWmSnRespVO;
 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.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
 import cn.iocoder.yudao.module.mes.service.wm.sn.MesWmSnService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -44,6 +46,8 @@ public class MesWmSnController {
     private MesWmSnService snService;
     @Resource
     private MesMdItemService itemService;
+    @Resource
+    private MesMdUnitMeasureService unitMeasureService;
  
     @PostMapping("/generate")
     @Operation(summary = "生成 SN 码")
@@ -103,8 +107,12 @@ public class MesWmSnController {
             return;
         }
         Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(convertSet(list, MesWmSnGroupRespVO::getItemId));
-        list.forEach(vo -> MapUtils.findAndThen(itemMap, vo.getItemId(), item ->
-                vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification())));
+        Map<Long, MesMdUnitMeasureDO> unitMap = unitMeasureService.getUnitMeasureMap(
+                convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+        list.forEach(vo -> MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
+            vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification());
+            MapUtils.findAndThen(unitMap, item.getUnitMeasureId(), unit -> vo.setUnitName(unit.getName()));
+        }));
     }
  
     private void buildItemInfo(List<MesWmSnRespVO> list) {
@@ -112,8 +120,12 @@ public class MesWmSnController {
             return;
         }
         Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(convertSet(list, MesWmSnRespVO::getItemId));
-        list.forEach(vo -> MapUtils.findAndThen(itemMap, vo.getItemId(), item ->
-                vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification())));
+        Map<Long, MesMdUnitMeasureDO> unitMap = unitMeasureService.getUnitMeasureMap(
+                convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+        list.forEach(vo -> MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
+            vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification());
+            MapUtils.findAndThen(unitMap, item.getUnitMeasureId(), unit -> vo.setUnitName(unit.getName()));
+        }));
     }
  
 }
@@ -34,6 +34,10 @@ public class MesWmSnGroupRespVO {
     @ExcelProperty("规格型号")
     private String specification;
  
+    @Schema(description = "单位", example = "个")
+    @ExcelProperty("单位")
+    private String unitName;
+
     @Schema(description = "批次号", example = "BATCH001")
     @ExcelProperty("批次号")
     private String batchCode;
@@ -37,6 +37,10 @@ public class MesWmSnRespVO {
     @ExcelProperty("规格型号")
     private String specification;
  
+    @Schema(description = "单位", example = "个")
+    @ExcelProperty("单位")
+    private String unitName;
+
     @Schema(description = "批次号", example = "BATCH001")
     @ExcelProperty("批次号")
     private String batchCode;
@@ -44,6 +44,7 @@ public class MesWmStockTakingTaskController {
     private MesWmStockTakingTaskService stockTakingTaskService;
     @Resource
     private MesWmStockTakingPlanService stockTakingPlanService;
+
     @Resource
     private AdminUserApi adminUserApi;
  
@@ -42,19 +42,14 @@ public class MesWmTransferDetailController {
  
     @Resource
     private MesWmTransferDetailService transferDetailService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesMdUnitMeasureService unitMeasureService;
-
     @Resource
     private MesWmWarehouseService warehouseService;
-
     @Resource
     private MesWmWarehouseLocationService locationService;
-
     @Resource
     private MesWmWarehouseAreaService areaService;
  
@@ -42,19 +42,14 @@ public class MesWmTransferLineController {
  
     @Resource
     private MesWmTransferLineService transferLineService;
-
     @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 MesWmWarehouseAreaController {
  
     @Resource
     private MesWmWarehouseAreaService areaService;
-
     @Resource
     private MesWmWarehouseLocationService locationService;
-
     @Resource
     private MesWmWarehouseService warehouseService;
  
@@ -35,6 +35,7 @@ public class MesCalPlanServiceImpl implements MesCalPlanService {
  
     @Resource
     private MesCalPlanMapper planMapper;
+
     @Resource
     @Lazy
     private MesCalPlanShiftService planShiftService;
@@ -34,6 +34,7 @@ public class MesCalPlanShiftServiceImpl implements MesCalPlanShiftService {
  
     @Resource
     private MesCalPlanShiftMapper planShiftMapper;
+
     @Resource
     @Lazy
     private MesCalPlanService planService;
@@ -26,6 +26,7 @@ public class MesCalPlanTeamServiceImpl implements MesCalPlanTeamService {
  
     @Resource
     private MesCalPlanTeamMapper planTeamMapper;
+
     @Resource
     @Lazy
     private MesCalPlanService planService;
@@ -29,9 +29,11 @@ public class MesCalTeamMemberServiceImpl implements MesCalTeamMemberService {
  
     @Resource
     private MesCalTeamMemberMapper teamMemberMapper;
+
     @Resource
     @Lazy
     private MesCalTeamService teamService;
+
     @Resource
     private AdminUserApi adminUserApi;
  
@@ -32,6 +32,7 @@ public class MesCalTeamServiceImpl implements MesCalTeamService {
  
     @Resource
     private MesCalTeamMapper teamMapper;
+
     @Resource
     @Lazy
     private MesCalTeamMemberService teamMemberService;
@@ -39,6 +39,7 @@ public class MesCalTeamShiftServiceImpl implements MesCalTeamShiftService {
  
     @Resource
     private MesCalTeamShiftMapper teamShiftMapper;
+
     @Resource
     @Lazy
     private MesCalPlanService planService;
@@ -33,6 +33,7 @@ public class MesDvCheckPlanServiceImpl implements MesDvCheckPlanService {
  
     @Resource
     private MesDvCheckPlanMapper checkPlanMapper;
+
     @Resource
     @Lazy
     private MesDvCheckPlanMachineryService checkPlanMachineryService;
@@ -26,6 +26,7 @@ public class MesDvCheckPlanSubjectServiceImpl implements MesDvCheckPlanSubjectSe
  
     @Resource
     private MesDvCheckPlanSubjectMapper checkPlanSubjectMapper;
+
     @Resource
     @Lazy
     private MesDvCheckPlanService checkPlanService;
@@ -41,6 +41,7 @@ public class MesDvCheckRecordServiceImpl implements MesDvCheckRecordService {
  
     @Resource
     private MesDvCheckRecordMapper checkRecordMapper;
+
     @Resource
     @Lazy
     private MesDvCheckRecordLineService checkRecordLineService;
@@ -50,6 +51,7 @@ public class MesDvCheckRecordServiceImpl implements MesDvCheckRecordService {
     private MesDvCheckPlanService checkPlanService;
     @Resource
     private MesDvCheckPlanSubjectService checkPlanSubjectService;
+
     @Resource
     private AdminUserApi adminUserApi;
  
@@ -49,26 +49,20 @@ public class MesDvMachineryServiceImpl implements MesDvMachineryService {
     @Resource
     @Lazy // 延迟加载，避免循环依赖
     private MesDvMachineryTypeService machineryTypeService;
-
     @Resource
     @Lazy
     private MesMdWorkshopService workshopService;
-
     @Resource
     private MesWmBarcodeService barcodeService;
-
     @Resource
     @Lazy
     private MesDvCheckPlanMachineryService checkPlanMachineryService;
-
     @Resource
     @Lazy
     private MesDvCheckRecordService checkRecordService;
-
     @Resource
     @Lazy
     private MesDvMaintenRecordService maintenRecordService;
-
     @Resource
     @Lazy
     private MesDvRepairService repairService;
@@ -35,6 +35,7 @@ public class MesDvMaintenRecordServiceImpl implements MesDvMaintenRecordService 
  
     @Resource
     private MesDvMaintenRecordMapper maintenRecordMapper;
+
     @Resource
     @Lazy
     private MesDvMaintenRecordLineService maintenRecordLineService;
@@ -33,7 +33,7 @@ public class MesDvSubjectServiceImpl implements MesDvSubjectService {
  
     @Resource
     private MesDvSubjectMapper subjectMapper;
-    // DONE @AI：调用对方的 service
+
     @Resource
     @Lazy
     private MesDvCheckPlanSubjectService checkPlanSubjectService;
@@ -29,7 +29,6 @@ public class MesMdAutoCodeRuleServiceImpl implements MesMdAutoCodeRuleService {
  
     @Resource
     private MesMdAutoCodeRuleMapper ruleMapper;
-
     @Resource
     private MesMdAutoCodePartMapper partMapper;
  
@@ -51,7 +51,6 @@ public class MesMdWorkstationServiceImpl implements MesMdWorkstationService {
     private MesMdWorkstationToolService workstationToolService;
     @Resource
     private MesMdWorkstationWorkerService workstationWorkerService;
-
     @Resource
     private MesMdWorkshopService workshopService;
     @Resource
@@ -34,13 +34,10 @@ public class MesProAndonRecordServiceImpl implements MesProAndonRecordService {
  
     @Resource
     private MesMdWorkstationService workstationService;
-
     @Resource
     private MesProWorkOrderService workOrderService;
-
     @Resource
     private MesProProcessService processService;
-
     @Resource
     private MesProAndonConfigService andonConfigService;
  
@@ -30,7 +30,6 @@ public class MesProCardProcessServiceImpl implements MesProCardProcessService {
     @Resource
     @Lazy
     private MesProCardService cardService;
-
     @Resource
     private MesProProcessService processService;
  
@@ -35,11 +35,9 @@ public class MesProCardServiceImpl implements MesProCardService {
     @Resource
     private MesProCardMapper cardMapper;
  
-    // DONE @AI：会用对应的 service
     @Resource
     @Lazy
     private MesProCardProcessService cardProcessService;
-
     @Resource
     private MesProWorkOrderService workOrderService;
     @Resource
@@ -37,7 +37,6 @@ public class MesProProcessServiceImpl implements MesProProcessService {
  
     @Resource
     private MesProProcessContentService processContentService;
-
     @Resource
     @Lazy
     private MesProRouteProcessService routeProcessService;
@@ -30,7 +30,6 @@ public class MesProTaskIssueServiceImpl implements MesProTaskIssueService {
  
     @Resource
     private MesProTaskService taskService;
-
     @Resource
     private MesMdItemService itemService;
  
@@ -33,6 +33,7 @@ public class MesProWorkRecordServiceImpl implements MesProWorkRecordService {
     private MesProWorkRecordLogMapper workRecordLogMapper;
     @Resource
     private MesProWorkRecordMapper workRecordMapper;
+
     @Resource
     private MesMdWorkstationService workstationService;
  
@@ -45,21 +45,18 @@ public class MesQcDefectRecordServiceImpl implements MesQcDefectRecordService {
     @Resource
     @Lazy
     private MesQcIqcLineService iqcLineService;
-
     @Resource
     @Lazy
     private MesQcIpqcService ipqcService;
     @Resource
     @Lazy
     private MesQcIpqcLineService ipqcLineService;
-
     @Resource
     @Lazy
     private MesQcOqcService oqcService;
     @Resource
     @Lazy
     private MesQcOqcLineService oqcLineService;
-
     @Resource
     @Lazy
     private MesQcRqcService rqcService;
@@ -82,9 +82,6 @@ public class MesQcIpqcServiceImpl implements MesQcIpqcService {
     @Resource
     @Lazy
     private MesProTaskService taskService;
-
-    @Resource
-    private AdminUserApi adminUserApi;
     @Resource
     @Lazy
     private MesProFeedbackService feedbackService;
@@ -92,6 +89,9 @@ public class MesQcIpqcServiceImpl implements MesQcIpqcService {
     @Lazy
     private MesQcIndicatorResultService indicatorResultService;
  
+    @Resource
+    private AdminUserApi adminUserApi;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createIpqc(MesQcIpqcSaveReqVO createReqVO) {
@@ -64,13 +64,13 @@ public class MesQcIqcServiceImpl implements MesQcIqcService {
     private MesMdVendorService vendorService;
     @Resource
     private MesMdItemService itemService;
-
-    @Resource
-    private AdminUserApi adminUserApi;
     @Resource
     @Lazy
     private MesQcIndicatorResultService indicatorResultService;
  
+    @Resource
+    private AdminUserApi adminUserApi;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createIqc(MesQcIqcSaveReqVO createReqVO) {
@@ -37,6 +37,7 @@ public class MesQcOqcLineServiceImpl implements MesQcOqcLineService {
  
     @Resource
     private MesQcOqcLineMapper oqcLineMapper;
+
     @Resource
     private MesQcIndicatorService indicatorService;
     @Resource
@@ -48,6 +48,7 @@ public class MesQcOqcServiceImpl implements MesQcOqcService {
  
     @Resource
     private MesQcOqcMapper oqcMapper;
+
     @Resource
     private MesQcTemplateItemService templateItemService;
     @Resource
@@ -67,13 +68,13 @@ public class MesQcOqcServiceImpl implements MesQcOqcService {
     @Resource
     @Lazy
     private MesWmProductSalesService productSalesService;
-
-    @Resource
-    private AdminUserApi adminUserApi;
     @Resource
     @Lazy
     private MesQcIndicatorResultService indicatorResultService;
  
+    @Resource
+    private AdminUserApi adminUserApi;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createOqc(MesQcOqcSaveReqVO createReqVO) {
@@ -47,6 +47,7 @@ public class MesQcRqcServiceImpl implements MesQcRqcService {
  
     @Resource
     private MesQcRqcMapper rqcMapper;
+
     @Resource
     private MesQcTemplateItemService templateItemService;
     @Resource
@@ -32,6 +32,7 @@ public class MesQcTemplateServiceImpl implements MesQcTemplateService {
  
     @Resource
     private MesQcTemplateMapper templateMapper;
+
     @Resource
     @Lazy
     private MesQcTemplateIndicatorService templateIndicatorService;
@@ -39,7 +39,6 @@ public class MesTmToolServiceImpl implements MesTmToolService {
     @Resource
     @Lazy // 延迟加载，避免循环依赖
     private MesTmToolTypeService toolTypeService;
-
     @Resource
     private MesWmBarcodeService barcodeService;
  
@@ -37,7 +37,6 @@ public class MesTmToolTypeServiceImpl implements MesTmToolTypeService {
     @Resource
     @Lazy
     private MesTmToolService toolService;
-
     @Resource
     @Lazy
     private MesMdWorkstationToolService workstationToolService;
@@ -46,6 +46,7 @@ public class MesWmBatchServiceImpl implements MesWmBatchService {
  
     @Resource
     private MesWmBatchMapper batchMapper;
+
     @Resource
     private MesMdItemService itemService;
     @Resource
@@ -48,6 +48,7 @@ public class MesWmItemConsumeServiceImpl implements MesWmItemConsumeService {
  
     @Resource
     private MesWmItemConsumeMapper itemConsumeMapper;
+
     @Resource
     private MesWmItemConsumeLineService itemConsumeLineService;
     @Resource
@@ -32,11 +32,9 @@ public class MesWmItemReceiptDetailServiceImpl implements MesWmItemReceiptDetail
     @Resource
     @Lazy
     private MesWmItemReceiptService itemReceiptService;
-
     @Resource
     @Lazy
     private MesWmItemReceiptLineService itemReceiptLineService;
-
     @Resource
     private MesWmWarehouseAreaService warehouseAreaService;
     @Resource
@@ -58,7 +58,6 @@ public class MesWmItemReceiptServiceImpl implements MesWmItemReceiptService {
     @Resource
     @Lazy
     private MesQcIqcService iqcService;
-
     @Resource
     private MesWmTransactionService wmTransactionService;
  
@@ -32,14 +32,11 @@ public class MesWmMiscIssueLineServiceImpl implements MesWmMiscIssueLineService 
     @Resource
     @Lazy
     private MesWmMiscIssueService miscIssueService;
-
     @Resource
     @Lazy
     private MesWmMiscIssueDetailService miscIssueDetailService;
-
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesWmWarehouseAreaService warehouseAreaService;
  
@@ -30,6 +30,7 @@ public class MesWmOutsourceIssueDetailServiceImpl implements MesWmOutsourceIssue
  
     @Resource
     private MesWmOutsourceIssueDetailMapper outsourceIssueDetailMapper;
+
     @Resource
     @Lazy
     private MesWmOutsourceIssueLineService outsourceIssueLineService;
@@ -27,7 +27,6 @@ public class MesWmOutsourceReceiptDetailServiceImpl implements MesWmOutsourceRec
  
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     private MesWmWarehouseAreaService areaService;
  
@@ -37,19 +37,15 @@ public class MesWmOutsourceReceiptLineServiceImpl implements MesWmOutsourceRecei
  
     @Resource
     private MesMdItemService itemService;
-
     @Resource
     @Lazy
     private MesWmOutsourceReceiptDetailService outsourceReceiptDetailService;
-
     @Resource
     @Lazy
     private MesWmOutsourceReceiptService outsourceReceiptService;
-
     @Resource
     @Lazy
     private MesProWorkOrderService workOrderService;
-
     @Resource
     private MesWmBatchService batchService;
  
@@ -29,6 +29,7 @@ public class MesWmPackageLineServiceImpl implements MesWmPackageLineService {
  
     @Resource
     private MesWmPackageLineMapper packageLineMapper;
+
     @Resource
     @Lazy
     private MesWmPackageService packageService;
@@ -34,6 +34,7 @@ public class MesWmPackageServiceImpl implements MesWmPackageService {
  
     @Resource
     private MesWmPackageMapper packageMapper;
+
     @Resource
     private MesWmPackageLineService packageLineService;
     @Resource
@@ -28,7 +28,6 @@ public class MesWmProductReceiptDetailServiceImpl implements MesWmProductReceipt
     @Resource
     @Lazy
     private MesWmProductReceiptService productReceiptService;
-
     @Resource
     private MesWmWarehouseAreaService warehouseAreaService;
  
@@ -31,10 +31,8 @@ public class MesWmProductReceiptLineServiceImpl implements MesWmProductReceiptLi
     @Resource
     @Lazy
     private MesWmProductReceiptService productReceiptService;
-
     @Resource
     private MesWmProductReceiptDetailService productReceiptDetailService;
-
     @Resource
     private MesMdItemService itemService;