Commit b595df008ad32a17b11f18d7c27b62fb05ea036f

Authored by YunaiV
1 parent 06de418c

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

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
@@ -37,6 +37,7 @@ public class MesCalTeamMemberController { @@ -37,6 +37,7 @@ public class MesCalTeamMemberController {
37 37
38 @Resource 38 @Resource
39 private MesCalTeamMemberService teamMemberService; 39 private MesCalTeamMemberService teamMemberService;
  40 +
40 @Resource 41 @Resource
41 private AdminUserApi adminUserApi; 42 private AdminUserApi adminUserApi;
42 43
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkrecord/MesDvCheckRecordController.java
@@ -46,10 +46,8 @@ public class MesDvCheckRecordController { @@ -46,10 +46,8 @@ public class MesDvCheckRecordController {
46 46
47 @Resource 47 @Resource
48 private MesDvCheckRecordService checkRecordService; 48 private MesDvCheckRecordService checkRecordService;
49 -  
50 @Resource 49 @Resource
51 private MesDvCheckPlanService checkPlanService; 50 private MesDvCheckPlanService checkPlanService;
52 -  
53 @Resource 51 @Resource
54 private MesDvMachineryService machineryService; 52 private MesDvMachineryService machineryService;
55 53
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/checkrecord/MesDvCheckRecordLineController.java
@@ -36,7 +36,6 @@ public class MesDvCheckRecordLineController { @@ -36,7 +36,6 @@ public class MesDvCheckRecordLineController {
36 36
37 @Resource 37 @Resource
38 private MesDvCheckRecordLineService checkRecordLineService; 38 private MesDvCheckRecordLineService checkRecordLineService;
39 -  
40 @Resource 39 @Resource
41 private MesDvSubjectService subjectService; 40 private MesDvSubjectService subjectService;
42 41
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/MesDvMachineryController.java
@@ -48,10 +48,8 @@ public class MesDvMachineryController { @@ -48,10 +48,8 @@ public class MesDvMachineryController {
48 48
49 @Resource 49 @Resource
50 private MesDvMachineryService machineryService; 50 private MesDvMachineryService machineryService;
51 -  
52 @Resource 51 @Resource
53 private MesDvMachineryTypeService machineryTypeService; 52 private MesDvMachineryTypeService machineryTypeService;
54 -  
55 @Resource 53 @Resource
56 private MesMdWorkshopService workshopService; 54 private MesMdWorkshopService workshopService;
57 55
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/maintenrecord/MesDvMaintenRecordController.java
@@ -46,10 +46,8 @@ public class MesDvMaintenRecordController { @@ -46,10 +46,8 @@ public class MesDvMaintenRecordController {
46 46
47 @Resource 47 @Resource
48 private MesDvMaintenRecordService maintenRecordService; 48 private MesDvMaintenRecordService maintenRecordService;
49 -  
50 @Resource 49 @Resource
51 private MesDvCheckPlanService checkPlanService; 50 private MesDvCheckPlanService checkPlanService;
52 -  
53 @Resource 51 @Resource
54 private MesDvMachineryService machineryService; 52 private MesDvMachineryService machineryService;
55 53
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/maintenrecord/MesDvMaintenRecordLineController.java
@@ -42,7 +42,6 @@ public class MesDvMaintenRecordLineController { @@ -42,7 +42,6 @@ public class MesDvMaintenRecordLineController {
42 42
43 @Resource 43 @Resource
44 private MesDvMaintenRecordLineService maintenRecordLineService; 44 private MesDvMaintenRecordLineService maintenRecordLineService;
45 -  
46 @Resource 45 @Resource
47 private MesDvSubjectService subjectService; 46 private MesDvSubjectService subjectService;
48 47
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/repair/MesDvRepairController.java
@@ -48,7 +48,6 @@ public class MesDvRepairController { @@ -48,7 +48,6 @@ public class MesDvRepairController {
48 48
49 @Resource 49 @Resource
50 private MesDvRepairService repairService; 50 private MesDvRepairService repairService;
51 -  
52 @Resource 51 @Resource
53 private MesDvMachineryService machineryService; 52 private MesDvMachineryService machineryService;
54 53
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/repair/MesDvRepairLineController.java
@@ -42,7 +42,6 @@ public class MesDvRepairLineController { @@ -42,7 +42,6 @@ public class MesDvRepairLineController {
42 42
43 @Resource 43 @Resource
44 private MesDvRepairLineService repairLineService; 44 private MesDvRepairLineService repairLineService;
45 -  
46 @Resource 45 @Resource
47 private MesDvSubjectService subjectService; 46 private MesDvSubjectService subjectService;
48 47
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/MesMdItemController.java
@@ -48,10 +48,8 @@ public class MesMdItemController { @@ -48,10 +48,8 @@ public class MesMdItemController {
48 48
49 @Resource 49 @Resource
50 private MesMdItemService itemService; 50 private MesMdItemService itemService;
51 -  
52 @Resource 51 @Resource
53 private MesMdItemTypeService itemTypeService; 52 private MesMdItemTypeService itemTypeService;
54 -  
55 @Resource 53 @Resource
56 private MesMdUnitMeasureService unitMeasureService; 54 private MesMdUnitMeasureService unitMeasureService;
57 55
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/item/MesMdProductBomController.java
@@ -40,13 +40,10 @@ public class MesMdProductBomController { @@ -40,13 +40,10 @@ public class MesMdProductBomController {
40 40
41 @Resource 41 @Resource
42 private MesMdProductBomService productBomService; 42 private MesMdProductBomService productBomService;
43 -  
44 @Resource 43 @Resource
45 private MesMdItemService itemService; 44 private MesMdItemService itemService;
46 -  
47 @Resource 45 @Resource
48 private MesMdItemTypeService itemTypeService; 46 private MesMdItemTypeService itemTypeService;
49 -  
50 @Resource 47 @Resource
51 private MesMdUnitMeasureService unitMeasureService; 48 private MesMdUnitMeasureService unitMeasureService;
52 49
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationMachineController.java
@@ -34,7 +34,6 @@ public class MesMdWorkstationMachineController { @@ -34,7 +34,6 @@ public class MesMdWorkstationMachineController {
34 34
35 @Resource 35 @Resource
36 private MesMdWorkstationMachineService workstationMachineService; 36 private MesMdWorkstationMachineService workstationMachineService;
37 -  
38 @Resource 37 @Resource
39 private MesDvMachineryService machineryService; 38 private MesDvMachineryService machineryService;
40 39
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationToolController.java
@@ -34,7 +34,6 @@ public class MesMdWorkstationToolController { @@ -34,7 +34,6 @@ public class MesMdWorkstationToolController {
34 34
35 @Resource 35 @Resource
36 private MesMdWorkstationToolService workstationToolService; 36 private MesMdWorkstationToolService workstationToolService;
37 -  
38 @Resource 37 @Resource
39 private MesTmToolTypeService toolTypeService; 38 private MesTmToolTypeService toolTypeService;
40 39
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/MesProAndonRecordController.java
@@ -50,13 +50,10 @@ public class MesProAndonRecordController { @@ -50,13 +50,10 @@ public class MesProAndonRecordController {
50 50
51 @Resource 51 @Resource
52 private MesProAndonRecordService andonRecordService; 52 private MesProAndonRecordService andonRecordService;
53 -  
54 @Resource 53 @Resource
55 private MesMdWorkstationService workstationService; 54 private MesMdWorkstationService workstationService;
56 -  
57 @Resource 55 @Resource
58 private MesProWorkOrderService workOrderService; 56 private MesProWorkOrderService workOrderService;
59 -  
60 @Resource 57 @Resource
61 private MesProProcessService processService; 58 private MesProProcessService processService;
62 59
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/card/MesProCardController.java
@@ -47,13 +47,10 @@ public class MesProCardController { @@ -47,13 +47,10 @@ public class MesProCardController {
47 47
48 @Resource 48 @Resource
49 private MesProCardService cardService; 49 private MesProCardService cardService;
50 -  
51 @Resource 50 @Resource
52 private MesProWorkOrderService workOrderService; 51 private MesProWorkOrderService workOrderService;
53 -  
54 @Resource 52 @Resource
55 private MesMdItemService itemService; 53 private MesMdItemService itemService;
56 -  
57 @Resource 54 @Resource
58 private MesMdUnitMeasureService unitMeasureService; 55 private MesMdUnitMeasureService unitMeasureService;
59 56
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/card/MesProCardProcessController.java
@@ -40,10 +40,8 @@ public class MesProCardProcessController { @@ -40,10 +40,8 @@ public class MesProCardProcessController {
40 40
41 @Resource 41 @Resource
42 private MesProCardProcessService cardProcessService; 42 private MesProCardProcessService cardProcessService;
43 -  
44 @Resource 43 @Resource
45 private MesProProcessService processService; 44 private MesProProcessService processService;
46 -  
47 @Resource 45 @Resource
48 private MesMdWorkstationService workstationService; 46 private MesMdWorkstationService workstationService;
49 47
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java
@@ -38,7 +38,6 @@ public class MesProRouteProcessController { @@ -38,7 +38,6 @@ public class MesProRouteProcessController {
38 38
39 @Resource 39 @Resource
40 private MesProRouteProcessService routeProcessService; 40 private MesProRouteProcessService routeProcessService;
41 -  
42 @Resource 41 @Resource
43 private MesProProcessService processService; 42 private MesProProcessService processService;
44 43
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProductBomController.java
@@ -39,10 +39,8 @@ public class MesProRouteProductBomController { @@ -39,10 +39,8 @@ public class MesProRouteProductBomController {
39 39
40 @Resource 40 @Resource
41 private MesProRouteProductBomService routeProductBomService; 41 private MesProRouteProductBomService routeProductBomService;
42 -  
43 @Resource 42 @Resource
44 private MesMdItemService itemService; 43 private MesMdItemService itemService;
45 -  
46 @Resource 44 @Resource
47 private MesMdUnitMeasureService unitMeasureService; 45 private MesMdUnitMeasureService unitMeasureService;
48 46
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProductController.java
@@ -38,10 +38,8 @@ public class MesProRouteProductController { @@ -38,10 +38,8 @@ public class MesProRouteProductController {
38 38
39 @Resource 39 @Resource
40 private MesProRouteProductService routeProductService; 40 private MesProRouteProductService routeProductService;
41 -  
42 @Resource 41 @Resource
43 private MesMdItemService itemService; 42 private MesMdItemService itemService;
44 -  
45 @Resource 43 @Resource
46 private MesMdUnitMeasureService unitMeasureService; 44 private MesMdUnitMeasureService unitMeasureService;
47 45
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskIssueController.java
@@ -40,10 +40,8 @@ public class MesProTaskIssueController { @@ -40,10 +40,8 @@ public class MesProTaskIssueController {
40 40
41 @Resource 41 @Resource
42 private MesProTaskIssueService taskIssueService; 42 private MesProTaskIssueService taskIssueService;
43 -  
44 @Resource 43 @Resource
45 private MesMdItemService itemService; 44 private MesMdItemService itemService;
46 -  
47 @Resource 45 @Resource
48 private MesMdUnitMeasureService unitMeasureService; 46 private MesMdUnitMeasureService unitMeasureService;
49 47
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderBomController.java
@@ -43,16 +43,12 @@ public class MesProWorkOrderBomController { @@ -43,16 +43,12 @@ public class MesProWorkOrderBomController {
43 43
44 @Resource 44 @Resource
45 private MesProWorkOrderBomService workOrderBomService; 45 private MesProWorkOrderBomService workOrderBomService;
46 -  
47 @Resource 46 @Resource
48 private MesMdItemService itemService; 47 private MesMdItemService itemService;
49 -  
50 @Resource 48 @Resource
51 private MesMdUnitMeasureService unitMeasureService; 49 private MesMdUnitMeasureService unitMeasureService;
52 -  
53 @Resource 50 @Resource
54 private MesMdItemTypeService itemTypeService; 51 private MesMdItemTypeService itemTypeService;
55 -  
56 @Resource 52 @Resource
57 private MesMdProductBomService productBomService; 53 private MesMdProductBomService productBomService;
58 54
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java
@@ -47,16 +47,12 @@ public class MesProWorkOrderController { @@ -47,16 +47,12 @@ public class MesProWorkOrderController {
47 47
48 @Resource 48 @Resource
49 private MesProWorkOrderService workOrderService; 49 private MesProWorkOrderService workOrderService;
50 -  
51 @Resource 50 @Resource
52 private MesMdItemService itemService; 51 private MesMdItemService itemService;
53 -  
54 @Resource 52 @Resource
55 private MesMdClientService clientService; 53 private MesMdClientService clientService;
56 -  
57 @Resource 54 @Resource
58 private MesMdVendorService vendorService; 55 private MesMdVendorService vendorService;
59 -  
60 @Resource 56 @Resource
61 private MesMdUnitMeasureService unitMeasureService; 57 private MesMdUnitMeasureService unitMeasureService;
62 58
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/tm/tool/MesTmToolController.java
@@ -43,7 +43,6 @@ public class MesTmToolController { @@ -43,7 +43,6 @@ public class MesTmToolController {
43 43
44 @Resource 44 @Resource
45 private MesTmToolService toolService; 45 private MesTmToolService toolService;
46 -  
47 @Resource 46 @Resource
48 private MesTmToolTypeService toolTypeService; 47 private MesTmToolTypeService toolTypeService;
49 48
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java
@@ -42,7 +42,6 @@ public class MesWmArrivalNoticeController { @@ -42,7 +42,6 @@ public class MesWmArrivalNoticeController {
42 42
43 @Resource 43 @Resource
44 private MesWmArrivalNoticeService arrivalNoticeService; 44 private MesWmArrivalNoticeService arrivalNoticeService;
45 -  
46 @Resource 45 @Resource
47 private MesMdVendorService vendorService; 46 private MesMdVendorService vendorService;
48 47
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeLineController.java
@@ -40,13 +40,10 @@ public class MesWmArrivalNoticeLineController { @@ -40,13 +40,10 @@ public class MesWmArrivalNoticeLineController {
40 40
41 @Resource 41 @Resource
42 private MesWmArrivalNoticeLineService arrivalNoticeLineService; 42 private MesWmArrivalNoticeLineService arrivalNoticeLineService;
43 -  
44 @Resource 43 @Resource
45 private MesMdItemService itemService; 44 private MesMdItemService itemService;
46 -  
47 @Resource 45 @Resource
48 private MesMdUnitMeasureService unitMeasureService; 46 private MesMdUnitMeasureService unitMeasureService;
49 -  
50 @Resource 47 @Resource
51 private MesQcIqcService iqcService; 48 private MesQcIqcService iqcService;
52 49
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptController.java
@@ -46,13 +46,10 @@ public class MesWmItemReceiptController { @@ -46,13 +46,10 @@ public class MesWmItemReceiptController {
46 46
47 @Resource 47 @Resource
48 private MesWmItemReceiptService itemReceiptService; 48 private MesWmItemReceiptService itemReceiptService;
49 -  
50 @Resource 49 @Resource
51 private MesMdVendorService vendorService; 50 private MesMdVendorService vendorService;
52 -  
53 @Resource 51 @Resource
54 private MesQcIqcService iqcService; 52 private MesQcIqcService iqcService;
55 -  
56 @Resource 53 @Resource
57 private MesWmArrivalNoticeService arrivalNoticeService; 54 private MesWmArrivalNoticeService arrivalNoticeService;
58 55
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemreceipt/MesWmItemReceiptDetailController.java
@@ -42,19 +42,14 @@ public class MesWmItemReceiptDetailController { @@ -42,19 +42,14 @@ public class MesWmItemReceiptDetailController {
42 42
43 @Resource 43 @Resource
44 private MesWmItemReceiptDetailService itemReceiptDetailService; 44 private MesWmItemReceiptDetailService itemReceiptDetailService;
45 -  
46 @Resource 45 @Resource
47 private MesMdItemService itemService; 46 private MesMdItemService itemService;
48 -  
49 @Resource 47 @Resource
50 private MesMdUnitMeasureService unitMeasureService; 48 private MesMdUnitMeasureService unitMeasureService;
51 -  
52 @Resource 49 @Resource
53 private MesWmWarehouseService warehouseService; 50 private MesWmWarehouseService warehouseService;
54 -  
55 @Resource 51 @Resource
56 private MesWmWarehouseLocationService locationService; 52 private MesWmWarehouseLocationService locationService;
57 -  
58 @Resource 53 @Resource
59 private MesWmWarehouseAreaService areaService; 54 private MesWmWarehouseAreaService areaService;
60 55
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java
@@ -52,22 +52,16 @@ public class MesWmMaterialStockController { @@ -52,22 +52,16 @@ public class MesWmMaterialStockController {
52 52
53 @Resource 53 @Resource
54 private MesWmMaterialStockService materialStockService; 54 private MesWmMaterialStockService materialStockService;
55 -  
56 @Resource 55 @Resource
57 private MesMdItemService itemService; 56 private MesMdItemService itemService;
58 -  
59 @Resource 57 @Resource
60 private MesMdUnitMeasureService unitMeasureService; 58 private MesMdUnitMeasureService unitMeasureService;
61 -  
62 @Resource 59 @Resource
63 private MesWmWarehouseService warehouseService; 60 private MesWmWarehouseService warehouseService;
64 -  
65 @Resource 61 @Resource
66 private MesWmWarehouseLocationService locationService; 62 private MesWmWarehouseLocationService locationService;
67 -  
68 @Resource 63 @Resource
69 private MesWmWarehouseAreaService areaService; 64 private MesWmWarehouseAreaService areaService;
70 -  
71 @Resource 65 @Resource
72 private MesMdVendorService vendorService; 66 private MesMdVendorService vendorService;
73 67
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/MesWmMiscIssueLineController.java
@@ -44,19 +44,14 @@ public class MesWmMiscIssueLineController { @@ -44,19 +44,14 @@ public class MesWmMiscIssueLineController {
44 44
45 @Resource 45 @Resource
46 private MesWmMiscIssueLineService miscIssueLineService; 46 private MesWmMiscIssueLineService miscIssueLineService;
47 -  
48 @Resource 47 @Resource
49 private MesMdItemService itemService; 48 private MesMdItemService itemService;
50 -  
51 @Resource 49 @Resource
52 private MesMdUnitMeasureService unitMeasureService; 50 private MesMdUnitMeasureService unitMeasureService;
53 -  
54 @Resource 51 @Resource
55 private MesWmWarehouseService warehouseService; 52 private MesWmWarehouseService warehouseService;
56 -  
57 @Resource 53 @Resource
58 private MesWmWarehouseLocationService warehouseLocationService; 54 private MesWmWarehouseLocationService warehouseLocationService;
59 -  
60 @Resource 55 @Resource
61 private MesWmWarehouseAreaService warehouseAreaService; 56 private MesWmWarehouseAreaService warehouseAreaService;
62 57
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscreceipt/MesWmMiscReceiptLineController.java
@@ -47,19 +47,14 @@ public class MesWmMiscReceiptLineController { @@ -47,19 +47,14 @@ public class MesWmMiscReceiptLineController {
47 47
48 @Resource 48 @Resource
49 private MesWmMiscReceiptLineService miscReceiptLineService; 49 private MesWmMiscReceiptLineService miscReceiptLineService;
50 -  
51 @Resource 50 @Resource
52 private MesMdItemService itemService; 51 private MesMdItemService itemService;
53 -  
54 @Resource 52 @Resource
55 private MesMdUnitMeasureService unitMeasureService; 53 private MesMdUnitMeasureService unitMeasureService;
56 -  
57 @Resource 54 @Resource
58 private MesWmWarehouseService warehouseService; 55 private MesWmWarehouseService warehouseService;
59 -  
60 @Resource 56 @Resource
61 private MesWmWarehouseLocationService warehouseLocationService; 57 private MesWmWarehouseLocationService warehouseLocationService;
62 -  
63 @Resource 58 @Resource
64 private MesWmWarehouseAreaService warehouseAreaService; 59 private MesWmWarehouseAreaService warehouseAreaService;
65 60
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java
@@ -49,7 +49,6 @@ public class MesWmOutsourceIssueController { @@ -49,7 +49,6 @@ public class MesWmOutsourceIssueController {
49 49
50 @Resource 50 @Resource
51 private MesWmOutsourceIssueService outsourceIssueService; 51 private MesWmOutsourceIssueService outsourceIssueService;
52 -  
53 @Resource 52 @Resource
54 private MesMdVendorService vendorService; 53 private MesMdVendorService vendorService;
55 @Resource 54 @Resource
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueDetailController.java
@@ -47,19 +47,14 @@ public class MesWmOutsourceIssueDetailController { @@ -47,19 +47,14 @@ public class MesWmOutsourceIssueDetailController {
47 47
48 @Resource 48 @Resource
49 private MesWmOutsourceIssueDetailService outsourceIssueDetailService; 49 private MesWmOutsourceIssueDetailService outsourceIssueDetailService;
50 -  
51 @Resource 50 @Resource
52 private MesMdItemService itemService; 51 private MesMdItemService itemService;
53 -  
54 @Resource 52 @Resource
55 private MesMdUnitMeasureService unitMeasureService; 53 private MesMdUnitMeasureService unitMeasureService;
56 -  
57 @Resource 54 @Resource
58 private MesWmWarehouseService warehouseService; 55 private MesWmWarehouseService warehouseService;
59 -  
60 @Resource 56 @Resource
61 private MesWmWarehouseLocationService locationService; 57 private MesWmWarehouseLocationService locationService;
62 -  
63 @Resource 58 @Resource
64 private MesWmWarehouseAreaService areaService; 59 private MesWmWarehouseAreaService areaService;
65 60
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueLineController.java
@@ -47,13 +47,10 @@ public class MesWmOutsourceIssueLineController { @@ -47,13 +47,10 @@ public class MesWmOutsourceIssueLineController {
47 47
48 @Resource 48 @Resource
49 private MesWmOutsourceIssueLineService outsourceIssueLineService; 49 private MesWmOutsourceIssueLineService outsourceIssueLineService;
50 -  
51 @Resource 50 @Resource
52 private MesMdItemService itemService; 51 private MesMdItemService itemService;
53 -  
54 @Resource 52 @Resource
55 private MesMdUnitMeasureService unitMeasureService; 53 private MesMdUnitMeasureService unitMeasureService;
56 -  
57 @Resource 54 @Resource
58 private MesWmBatchService batchService; 55 private MesWmBatchService batchService;
59 56
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/MesWmOutsourceReceiptController.java
@@ -44,10 +44,8 @@ public class MesWmOutsourceReceiptController { @@ -44,10 +44,8 @@ public class MesWmOutsourceReceiptController {
44 44
45 @Resource 45 @Resource
46 private MesWmOutsourceReceiptService outsourceReceiptService; 46 private MesWmOutsourceReceiptService outsourceReceiptService;
47 -  
48 @Resource 47 @Resource
49 private MesMdVendorService vendorService; 48 private MesMdVendorService vendorService;
50 -  
51 @Resource 49 @Resource
52 private MesProWorkOrderService workOrderService; 50 private MesProWorkOrderService workOrderService;
53 51
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/MesWmOutsourceReceiptDetailController.java
@@ -42,19 +42,14 @@ public class MesWmOutsourceReceiptDetailController { @@ -42,19 +42,14 @@ public class MesWmOutsourceReceiptDetailController {
42 42
43 @Resource 43 @Resource
44 private MesWmOutsourceReceiptDetailService detailService; 44 private MesWmOutsourceReceiptDetailService detailService;
45 -  
46 @Resource 45 @Resource
47 private MesMdItemService itemService; 46 private MesMdItemService itemService;
48 -  
49 @Resource 47 @Resource
50 private MesMdUnitMeasureService unitMeasureService; 48 private MesMdUnitMeasureService unitMeasureService;
51 -  
52 @Resource 49 @Resource
53 private MesWmWarehouseService warehouseService; 50 private MesWmWarehouseService warehouseService;
54 -  
55 @Resource 51 @Resource
56 private MesWmWarehouseLocationService locationService; 52 private MesWmWarehouseLocationService locationService;
57 -  
58 @Resource 53 @Resource
59 private MesWmWarehouseAreaService areaService; 54 private MesWmWarehouseAreaService areaService;
60 55
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourcereceipt/MesWmOutsourceReceiptLineController.java
@@ -38,10 +38,8 @@ public class MesWmOutsourceReceiptLineController { @@ -38,10 +38,8 @@ public class MesWmOutsourceReceiptLineController {
38 38
39 @Resource 39 @Resource
40 private MesWmOutsourceReceiptLineService receiptLineService; 40 private MesWmOutsourceReceiptLineService receiptLineService;
41 -  
42 @Resource 41 @Resource
43 private MesMdItemService itemService; 42 private MesMdItemService itemService;
44 -  
45 @Resource 43 @Resource
46 private MesMdUnitMeasureService unitMeasureService; 44 private MesMdUnitMeasureService unitMeasureService;
47 45
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageController.java
@@ -50,6 +50,7 @@ public class MesWmPackageController { @@ -50,6 +50,7 @@ public class MesWmPackageController {
50 private MesMdClientService clientService; 50 private MesMdClientService clientService;
51 @Resource 51 @Resource
52 private MesMdUnitMeasureService unitMeasureService; 52 private MesMdUnitMeasureService unitMeasureService;
  53 +
53 @Resource 54 @Resource
54 private AdminUserApi adminUserApi; 55 private AdminUserApi adminUserApi;
55 56
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueDetailController.java
@@ -42,19 +42,14 @@ public class MesWmProductIssueDetailController { @@ -42,19 +42,14 @@ public class MesWmProductIssueDetailController {
42 42
43 @Resource 43 @Resource
44 private MesWmProductIssueDetailService issueDetailService; 44 private MesWmProductIssueDetailService issueDetailService;
45 -  
46 @Resource 45 @Resource
47 private MesMdItemService itemService; 46 private MesMdItemService itemService;
48 -  
49 @Resource 47 @Resource
50 private MesMdUnitMeasureService unitMeasureService; 48 private MesMdUnitMeasureService unitMeasureService;
51 -  
52 @Resource 49 @Resource
53 private MesWmWarehouseService warehouseService; 50 private MesWmWarehouseService warehouseService;
54 -  
55 @Resource 51 @Resource
56 private MesWmWarehouseLocationService locationService; 52 private MesWmWarehouseLocationService locationService;
57 -  
58 @Resource 53 @Resource
59 private MesWmWarehouseAreaService areaService; 54 private MesWmWarehouseAreaService areaService;
60 55
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productissue/MesWmProductIssueLineController.java
@@ -38,10 +38,8 @@ public class MesWmProductIssueLineController { @@ -38,10 +38,8 @@ public class MesWmProductIssueLineController {
38 38
39 @Resource 39 @Resource
40 private MesWmProductIssueLineService issueLineService; 40 private MesWmProductIssueLineService issueLineService;
41 -  
42 @Resource 41 @Resource
43 private MesMdItemService itemService; 42 private MesMdItemService itemService;
44 -  
45 @Resource 43 @Resource
46 private MesMdUnitMeasureService unitMeasureService; 44 private MesMdUnitMeasureService unitMeasureService;
47 45
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/MesWmProductReceiptController.java
@@ -46,13 +46,10 @@ public class MesWmProductReceiptController { @@ -46,13 +46,10 @@ public class MesWmProductReceiptController {
46 46
47 @Resource 47 @Resource
48 private MesWmProductReceiptService productReceiptService; 48 private MesWmProductReceiptService productReceiptService;
49 -  
50 @Resource 49 @Resource
51 private MesProWorkOrderService workOrderService; 50 private MesProWorkOrderService workOrderService;
52 -  
53 @Resource 51 @Resource
54 private MesMdItemService itemService; 52 private MesMdItemService itemService;
55 -  
56 @Resource 53 @Resource
57 private MesMdUnitMeasureService unitMeasureService; 54 private MesMdUnitMeasureService unitMeasureService;
58 55
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/MesWmProductReceiptDetailController.java
@@ -42,19 +42,14 @@ public class MesWmProductReceiptDetailController { @@ -42,19 +42,14 @@ public class MesWmProductReceiptDetailController {
42 42
43 @Resource 43 @Resource
44 private MesWmProductReceiptDetailService productReceiptDetailService; 44 private MesWmProductReceiptDetailService productReceiptDetailService;
45 -  
46 @Resource 45 @Resource
47 private MesMdItemService itemService; 46 private MesMdItemService itemService;
48 -  
49 @Resource 47 @Resource
50 private MesMdUnitMeasureService unitMeasureService; 48 private MesMdUnitMeasureService unitMeasureService;
51 -  
52 @Resource 49 @Resource
53 private MesWmWarehouseService warehouseService; 50 private MesWmWarehouseService warehouseService;
54 -  
55 @Resource 51 @Resource
56 private MesWmWarehouseLocationService locationService; 52 private MesWmWarehouseLocationService locationService;
57 -  
58 @Resource 53 @Resource
59 private MesWmWarehouseAreaService areaService; 54 private MesWmWarehouseAreaService areaService;
60 55
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productreceipt/MesWmProductReceiptLineController.java
@@ -38,10 +38,8 @@ public class MesWmProductReceiptLineController { @@ -38,10 +38,8 @@ public class MesWmProductReceiptLineController {
38 38
39 @Resource 39 @Resource
40 private MesWmProductReceiptLineService productReceiptLineService; 40 private MesWmProductReceiptLineService productReceiptLineService;
41 -  
42 @Resource 41 @Resource
43 private MesMdItemService itemService; 42 private MesMdItemService itemService;
44 -  
45 @Resource 43 @Resource
46 private MesMdUnitMeasureService unitMeasureService; 44 private MesMdUnitMeasureService unitMeasureService;
47 45
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesController.java
@@ -43,7 +43,6 @@ public class MesWmProductSalesController { @@ -43,7 +43,6 @@ public class MesWmProductSalesController {
43 43
44 @Resource 44 @Resource
45 private MesWmProductSalesService productSalesService; 45 private MesWmProductSalesService productSalesService;
46 -  
47 @Resource 46 @Resource
48 private MesMdClientService clientService; 47 private MesMdClientService clientService;
49 @Resource 48 @Resource
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesDetailController.java
@@ -42,19 +42,14 @@ public class MesWmProductSalesDetailController { @@ -42,19 +42,14 @@ public class MesWmProductSalesDetailController {
42 42
43 @Resource 43 @Resource
44 private MesWmProductSalesDetailService productSalesDetailService; 44 private MesWmProductSalesDetailService productSalesDetailService;
45 -  
46 @Resource 45 @Resource
47 private MesMdItemService itemService; 46 private MesMdItemService itemService;
48 -  
49 @Resource 47 @Resource
50 private MesMdUnitMeasureService unitMeasureService; 48 private MesMdUnitMeasureService unitMeasureService;
51 -  
52 @Resource 49 @Resource
53 private MesWmWarehouseService warehouseService; 50 private MesWmWarehouseService warehouseService;
54 -  
55 @Resource 51 @Resource
56 private MesWmWarehouseLocationService locationService; 52 private MesWmWarehouseLocationService locationService;
57 -  
58 @Resource 53 @Resource
59 private MesWmWarehouseAreaService areaService; 54 private MesWmWarehouseAreaService areaService;
60 55
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/MesWmProductSalesLineController.java
@@ -40,10 +40,8 @@ public class MesWmProductSalesLineController { @@ -40,10 +40,8 @@ public class MesWmProductSalesLineController {
40 40
41 @Resource 41 @Resource
42 private MesWmProductSalesLineService productSalesLineService; 42 private MesWmProductSalesLineService productSalesLineService;
43 -  
44 @Resource 43 @Resource
45 private MesMdItemService itemService; 44 private MesMdItemService itemService;
46 -  
47 @Resource 45 @Resource
48 private MesMdUnitMeasureService unitMeasureService; 46 private MesMdUnitMeasureService unitMeasureService;
49 47
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueDetailController.java
@@ -42,19 +42,14 @@ public class MesWmReturnIssueDetailController { @@ -42,19 +42,14 @@ public class MesWmReturnIssueDetailController {
42 42
43 @Resource 43 @Resource
44 private MesWmReturnIssueDetailService issueDetailService; 44 private MesWmReturnIssueDetailService issueDetailService;
45 -  
46 @Resource 45 @Resource
47 private MesMdItemService itemService; 46 private MesMdItemService itemService;
48 -  
49 @Resource 47 @Resource
50 private MesMdUnitMeasureService unitMeasureService; 48 private MesMdUnitMeasureService unitMeasureService;
51 -  
52 @Resource 49 @Resource
53 private MesWmWarehouseService warehouseService; 50 private MesWmWarehouseService warehouseService;
54 -  
55 @Resource 51 @Resource
56 private MesWmWarehouseLocationService locationService; 52 private MesWmWarehouseLocationService locationService;
57 -  
58 @Resource 53 @Resource
59 private MesWmWarehouseAreaService areaService; 54 private MesWmWarehouseAreaService areaService;
60 55
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnissue/MesWmReturnIssueLineController.java
@@ -38,7 +38,6 @@ public class MesWmReturnIssueLineController { @@ -38,7 +38,6 @@ public class MesWmReturnIssueLineController {
38 38
39 @Resource 39 @Resource
40 private MesWmReturnIssueLineService issueLineService; 40 private MesWmReturnIssueLineService issueLineService;
41 -  
42 @Resource 41 @Resource
43 private MesMdItemService itemService; 42 private MesMdItemService itemService;
44 @Resource 43 @Resource
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesDetailController.java
@@ -47,19 +47,14 @@ public class MesWmReturnSalesDetailController { @@ -47,19 +47,14 @@ public class MesWmReturnSalesDetailController {
47 47
48 @Resource 48 @Resource
49 private MesWmReturnSalesDetailService returnSalesDetailService; 49 private MesWmReturnSalesDetailService returnSalesDetailService;
50 -  
51 @Resource 50 @Resource
52 private MesMdItemService itemService; 51 private MesMdItemService itemService;
53 -  
54 @Resource 52 @Resource
55 private MesMdUnitMeasureService unitMeasureService; 53 private MesMdUnitMeasureService unitMeasureService;
56 -  
57 @Resource 54 @Resource
58 private MesWmWarehouseService warehouseService; 55 private MesWmWarehouseService warehouseService;
59 -  
60 @Resource 56 @Resource
61 private MesWmWarehouseLocationService locationService; 57 private MesWmWarehouseLocationService locationService;
62 -  
63 @Resource 58 @Resource
64 private MesWmWarehouseAreaService areaService; 59 private MesWmWarehouseAreaService areaService;
65 60
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/MesWmReturnSalesLineController.java
@@ -43,10 +43,8 @@ public class MesWmReturnSalesLineController { @@ -43,10 +43,8 @@ public class MesWmReturnSalesLineController {
43 43
44 @Resource 44 @Resource
45 private MesWmReturnSalesLineService returnSalesLineService; 45 private MesWmReturnSalesLineService returnSalesLineService;
46 -  
47 @Resource 46 @Resource
48 private MesMdItemService itemService; 47 private MesMdItemService itemService;
49 -  
50 @Resource 48 @Resource
51 private MesMdUnitMeasureService unitMeasureService; 49 private MesMdUnitMeasureService unitMeasureService;
52 50
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorDetailController.java
@@ -42,19 +42,14 @@ public class MesWmReturnVendorDetailController { @@ -42,19 +42,14 @@ public class MesWmReturnVendorDetailController {
42 42
43 @Resource 43 @Resource
44 private MesWmReturnVendorDetailService returnVendorDetailService; 44 private MesWmReturnVendorDetailService returnVendorDetailService;
45 -  
46 @Resource 45 @Resource
47 private MesMdItemService itemService; 46 private MesMdItemService itemService;
48 -  
49 @Resource 47 @Resource
50 private MesMdUnitMeasureService unitMeasureService; 48 private MesMdUnitMeasureService unitMeasureService;
51 -  
52 @Resource 49 @Resource
53 private MesWmWarehouseService warehouseService; 50 private MesWmWarehouseService warehouseService;
54 -  
55 @Resource 51 @Resource
56 private MesWmWarehouseLocationService locationService; 52 private MesWmWarehouseLocationService locationService;
57 -  
58 @Resource 53 @Resource
59 private MesWmWarehouseAreaService areaService; 54 private MesWmWarehouseAreaService areaService;
60 55
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/MesWmReturnVendorLineController.java
@@ -38,10 +38,8 @@ public class MesWmReturnVendorLineController { @@ -38,10 +38,8 @@ public class MesWmReturnVendorLineController {
38 38
39 @Resource 39 @Resource
40 private MesWmReturnVendorLineService returnVendorLineService; 40 private MesWmReturnVendorLineService returnVendorLineService;
41 -  
42 @Resource 41 @Resource
43 private MesMdItemService itemService; 42 private MesMdItemService itemService;
44 -  
45 @Resource 43 @Resource
46 private MesMdUnitMeasureService unitMeasureService; 44 private MesMdUnitMeasureService unitMeasureService;
47 45
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeController.java
@@ -42,7 +42,6 @@ public class MesWmSalesNoticeController { @@ -42,7 +42,6 @@ public class MesWmSalesNoticeController {
42 42
43 @Resource 43 @Resource
44 private MesWmSalesNoticeService salesNoticeService; 44 private MesWmSalesNoticeService salesNoticeService;
45 -  
46 @Resource 45 @Resource
47 private MesMdClientService clientService; 46 private MesMdClientService clientService;
48 47
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/MesWmSalesNoticeLineController.java
@@ -38,10 +38,8 @@ public class MesWmSalesNoticeLineController { @@ -38,10 +38,8 @@ public class MesWmSalesNoticeLineController {
38 38
39 @Resource 39 @Resource
40 private MesWmSalesNoticeLineService salesNoticeLineService; 40 private MesWmSalesNoticeLineService salesNoticeLineService;
41 -  
42 @Resource 41 @Resource
43 private MesMdItemService itemService; 42 private MesMdItemService itemService;
44 -  
45 @Resource 43 @Resource
46 private MesMdUnitMeasureService unitMeasureService; 44 private MesMdUnitMeasureService unitMeasureService;
47 45
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/sn/MesWmSnController.java
@@ -13,7 +13,9 @@ import cn.iocoder.yudao.module.mes.controller.admin.wm.sn.vo.MesWmSnGroupRespVO; @@ -13,7 +13,9 @@ import cn.iocoder.yudao.module.mes.controller.admin.wm.sn.vo.MesWmSnGroupRespVO;
13 import cn.iocoder.yudao.module.mes.controller.admin.wm.sn.vo.MesWmSnPageReqVO; 13 import cn.iocoder.yudao.module.mes.controller.admin.wm.sn.vo.MesWmSnPageReqVO;
14 import cn.iocoder.yudao.module.mes.controller.admin.wm.sn.vo.MesWmSnRespVO; 14 import cn.iocoder.yudao.module.mes.controller.admin.wm.sn.vo.MesWmSnRespVO;
15 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO; 15 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
  16 +import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
16 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService; 17 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
  18 +import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
17 import cn.iocoder.yudao.module.mes.service.wm.sn.MesWmSnService; 19 import cn.iocoder.yudao.module.mes.service.wm.sn.MesWmSnService;
18 import io.swagger.v3.oas.annotations.Operation; 20 import io.swagger.v3.oas.annotations.Operation;
19 import io.swagger.v3.oas.annotations.Parameter; 21 import io.swagger.v3.oas.annotations.Parameter;
@@ -44,6 +46,8 @@ public class MesWmSnController { @@ -44,6 +46,8 @@ public class MesWmSnController {
44 private MesWmSnService snService; 46 private MesWmSnService snService;
45 @Resource 47 @Resource
46 private MesMdItemService itemService; 48 private MesMdItemService itemService;
  49 + @Resource
  50 + private MesMdUnitMeasureService unitMeasureService;
47 51
48 @PostMapping("/generate") 52 @PostMapping("/generate")
49 @Operation(summary = "生成 SN 码") 53 @Operation(summary = "生成 SN 码")
@@ -103,8 +107,12 @@ public class MesWmSnController { @@ -103,8 +107,12 @@ public class MesWmSnController {
103 return; 107 return;
104 } 108 }
105 Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(convertSet(list, MesWmSnGroupRespVO::getItemId)); 109 Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(convertSet(list, MesWmSnGroupRespVO::getItemId));
106 - list.forEach(vo -> MapUtils.findAndThen(itemMap, vo.getItemId(), item ->  
107 - vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification()))); 110 + Map<Long, MesMdUnitMeasureDO> unitMap = unitMeasureService.getUnitMeasureMap(
  111 + convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
  112 + list.forEach(vo -> MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
  113 + vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification());
  114 + MapUtils.findAndThen(unitMap, item.getUnitMeasureId(), unit -> vo.setUnitName(unit.getName()));
  115 + }));
108 } 116 }
109 117
110 private void buildItemInfo(List<MesWmSnRespVO> list) { 118 private void buildItemInfo(List<MesWmSnRespVO> list) {
@@ -112,8 +120,12 @@ public class MesWmSnController { @@ -112,8 +120,12 @@ public class MesWmSnController {
112 return; 120 return;
113 } 121 }
114 Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(convertSet(list, MesWmSnRespVO::getItemId)); 122 Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(convertSet(list, MesWmSnRespVO::getItemId));
115 - list.forEach(vo -> MapUtils.findAndThen(itemMap, vo.getItemId(), item ->  
116 - vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification()))); 123 + Map<Long, MesMdUnitMeasureDO> unitMap = unitMeasureService.getUnitMeasureMap(
  124 + convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
  125 + list.forEach(vo -> MapUtils.findAndThen(itemMap, vo.getItemId(), item -> {
  126 + vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification());
  127 + MapUtils.findAndThen(unitMap, item.getUnitMeasureId(), unit -> vo.setUnitName(unit.getName()));
  128 + }));
117 } 129 }
118 130
119 } 131 }
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/sn/vo/MesWmSnGroupRespVO.java
@@ -34,6 +34,10 @@ public class MesWmSnGroupRespVO { @@ -34,6 +34,10 @@ public class MesWmSnGroupRespVO {
34 @ExcelProperty("规格型号") 34 @ExcelProperty("规格型号")
35 private String specification; 35 private String specification;
36 36
  37 + @Schema(description = "单位", example = "个")
  38 + @ExcelProperty("单位")
  39 + private String unitName;
  40 +
37 @Schema(description = "批次号", example = "BATCH001") 41 @Schema(description = "批次号", example = "BATCH001")
38 @ExcelProperty("批次号") 42 @ExcelProperty("批次号")
39 private String batchCode; 43 private String batchCode;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/sn/vo/MesWmSnRespVO.java
@@ -37,6 +37,10 @@ public class MesWmSnRespVO { @@ -37,6 +37,10 @@ public class MesWmSnRespVO {
37 @ExcelProperty("规格型号") 37 @ExcelProperty("规格型号")
38 private String specification; 38 private String specification;
39 39
  40 + @Schema(description = "单位", example = "个")
  41 + @ExcelProperty("单位")
  42 + private String unitName;
  43 +
40 @Schema(description = "批次号", example = "BATCH001") 44 @Schema(description = "批次号", example = "BATCH001")
41 @ExcelProperty("批次号") 45 @ExcelProperty("批次号")
42 private String batchCode; 46 private String batchCode;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskController.java
@@ -44,6 +44,7 @@ public class MesWmStockTakingTaskController { @@ -44,6 +44,7 @@ public class MesWmStockTakingTaskController {
44 private MesWmStockTakingTaskService stockTakingTaskService; 44 private MesWmStockTakingTaskService stockTakingTaskService;
45 @Resource 45 @Resource
46 private MesWmStockTakingPlanService stockTakingPlanService; 46 private MesWmStockTakingPlanService stockTakingPlanService;
  47 +
47 @Resource 48 @Resource
48 private AdminUserApi adminUserApi; 49 private AdminUserApi adminUserApi;
49 50
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/MesWmTransferDetailController.java
@@ -42,19 +42,14 @@ public class MesWmTransferDetailController { @@ -42,19 +42,14 @@ public class MesWmTransferDetailController {
42 42
43 @Resource 43 @Resource
44 private MesWmTransferDetailService transferDetailService; 44 private MesWmTransferDetailService transferDetailService;
45 -  
46 @Resource 45 @Resource
47 private MesMdItemService itemService; 46 private MesMdItemService itemService;
48 -  
49 @Resource 47 @Resource
50 private MesMdUnitMeasureService unitMeasureService; 48 private MesMdUnitMeasureService unitMeasureService;
51 -  
52 @Resource 49 @Resource
53 private MesWmWarehouseService warehouseService; 50 private MesWmWarehouseService warehouseService;
54 -  
55 @Resource 51 @Resource
56 private MesWmWarehouseLocationService locationService; 52 private MesWmWarehouseLocationService locationService;
57 -  
58 @Resource 53 @Resource
59 private MesWmWarehouseAreaService areaService; 54 private MesWmWarehouseAreaService areaService;
60 55
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/transfer/MesWmTransferLineController.java
@@ -42,19 +42,14 @@ public class MesWmTransferLineController { @@ -42,19 +42,14 @@ public class MesWmTransferLineController {
42 42
43 @Resource 43 @Resource
44 private MesWmTransferLineService transferLineService; 44 private MesWmTransferLineService transferLineService;
45 -  
46 @Resource 45 @Resource
47 private MesMdItemService itemService; 46 private MesMdItemService itemService;
48 -  
49 @Resource 47 @Resource
50 private MesMdUnitMeasureService unitMeasureService; 48 private MesMdUnitMeasureService unitMeasureService;
51 -  
52 @Resource 49 @Resource
53 private MesWmWarehouseService warehouseService; 50 private MesWmWarehouseService warehouseService;
54 -  
55 @Resource 51 @Resource
56 private MesWmWarehouseLocationService locationService; 52 private MesWmWarehouseLocationService locationService;
57 -  
58 @Resource 53 @Resource
59 private MesWmWarehouseAreaService areaService; 54 private MesWmWarehouseAreaService areaService;
60 55
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/MesWmWarehouseAreaController.java
@@ -38,10 +38,8 @@ public class MesWmWarehouseAreaController { @@ -38,10 +38,8 @@ public class MesWmWarehouseAreaController {
38 38
39 @Resource 39 @Resource
40 private MesWmWarehouseAreaService areaService; 40 private MesWmWarehouseAreaService areaService;
41 -  
42 @Resource 41 @Resource
43 private MesWmWarehouseLocationService locationService; 42 private MesWmWarehouseLocationService locationService;
44 -  
45 @Resource 43 @Resource
46 private MesWmWarehouseService warehouseService; 44 private MesWmWarehouseService warehouseService;
47 45
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanServiceImpl.java
@@ -35,6 +35,7 @@ public class MesCalPlanServiceImpl implements MesCalPlanService { @@ -35,6 +35,7 @@ public class MesCalPlanServiceImpl implements MesCalPlanService {
35 35
36 @Resource 36 @Resource
37 private MesCalPlanMapper planMapper; 37 private MesCalPlanMapper planMapper;
  38 +
38 @Resource 39 @Resource
39 @Lazy 40 @Lazy
40 private MesCalPlanShiftService planShiftService; 41 private MesCalPlanShiftService planShiftService;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanShiftServiceImpl.java
@@ -34,6 +34,7 @@ public class MesCalPlanShiftServiceImpl implements MesCalPlanShiftService { @@ -34,6 +34,7 @@ public class MesCalPlanShiftServiceImpl implements MesCalPlanShiftService {
34 34
35 @Resource 35 @Resource
36 private MesCalPlanShiftMapper planShiftMapper; 36 private MesCalPlanShiftMapper planShiftMapper;
  37 +
37 @Resource 38 @Resource
38 @Lazy 39 @Lazy
39 private MesCalPlanService planService; 40 private MesCalPlanService planService;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/plan/MesCalPlanTeamServiceImpl.java
@@ -26,6 +26,7 @@ public class MesCalPlanTeamServiceImpl implements MesCalPlanTeamService { @@ -26,6 +26,7 @@ public class MesCalPlanTeamServiceImpl implements MesCalPlanTeamService {
26 26
27 @Resource 27 @Resource
28 private MesCalPlanTeamMapper planTeamMapper; 28 private MesCalPlanTeamMapper planTeamMapper;
  29 +
29 @Resource 30 @Resource
30 @Lazy 31 @Lazy
31 private MesCalPlanService planService; 32 private MesCalPlanService planService;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamMemberServiceImpl.java
@@ -29,9 +29,11 @@ public class MesCalTeamMemberServiceImpl implements MesCalTeamMemberService { @@ -29,9 +29,11 @@ public class MesCalTeamMemberServiceImpl implements MesCalTeamMemberService {
29 29
30 @Resource 30 @Resource
31 private MesCalTeamMemberMapper teamMemberMapper; 31 private MesCalTeamMemberMapper teamMemberMapper;
  32 +
32 @Resource 33 @Resource
33 @Lazy 34 @Lazy
34 private MesCalTeamService teamService; 35 private MesCalTeamService teamService;
  36 +
35 @Resource 37 @Resource
36 private AdminUserApi adminUserApi; 38 private AdminUserApi adminUserApi;
37 39
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamServiceImpl.java
@@ -32,6 +32,7 @@ public class MesCalTeamServiceImpl implements MesCalTeamService { @@ -32,6 +32,7 @@ public class MesCalTeamServiceImpl implements MesCalTeamService {
32 32
33 @Resource 33 @Resource
34 private MesCalTeamMapper teamMapper; 34 private MesCalTeamMapper teamMapper;
  35 +
35 @Resource 36 @Resource
36 @Lazy 37 @Lazy
37 private MesCalTeamMemberService teamMemberService; 38 private MesCalTeamMemberService teamMemberService;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamShiftServiceImpl.java
@@ -39,6 +39,7 @@ public class MesCalTeamShiftServiceImpl implements MesCalTeamShiftService { @@ -39,6 +39,7 @@ public class MesCalTeamShiftServiceImpl implements MesCalTeamShiftService {
39 39
40 @Resource 40 @Resource
41 private MesCalTeamShiftMapper teamShiftMapper; 41 private MesCalTeamShiftMapper teamShiftMapper;
  42 +
42 @Resource 43 @Resource
43 @Lazy 44 @Lazy
44 private MesCalPlanService planService; 45 private MesCalPlanService planService;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/checkplan/MesDvCheckPlanServiceImpl.java
@@ -33,6 +33,7 @@ public class MesDvCheckPlanServiceImpl implements MesDvCheckPlanService { @@ -33,6 +33,7 @@ public class MesDvCheckPlanServiceImpl implements MesDvCheckPlanService {
33 33
34 @Resource 34 @Resource
35 private MesDvCheckPlanMapper checkPlanMapper; 35 private MesDvCheckPlanMapper checkPlanMapper;
  36 +
36 @Resource 37 @Resource
37 @Lazy 38 @Lazy
38 private MesDvCheckPlanMachineryService checkPlanMachineryService; 39 private MesDvCheckPlanMachineryService checkPlanMachineryService;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/checkplan/MesDvCheckPlanSubjectServiceImpl.java
@@ -26,6 +26,7 @@ public class MesDvCheckPlanSubjectServiceImpl implements MesDvCheckPlanSubjectSe @@ -26,6 +26,7 @@ public class MesDvCheckPlanSubjectServiceImpl implements MesDvCheckPlanSubjectSe
26 26
27 @Resource 27 @Resource
28 private MesDvCheckPlanSubjectMapper checkPlanSubjectMapper; 28 private MesDvCheckPlanSubjectMapper checkPlanSubjectMapper;
  29 +
29 @Resource 30 @Resource
30 @Lazy 31 @Lazy
31 private MesDvCheckPlanService checkPlanService; 32 private MesDvCheckPlanService checkPlanService;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/checkrecord/MesDvCheckRecordServiceImpl.java
@@ -41,6 +41,7 @@ public class MesDvCheckRecordServiceImpl implements MesDvCheckRecordService { @@ -41,6 +41,7 @@ public class MesDvCheckRecordServiceImpl implements MesDvCheckRecordService {
41 41
42 @Resource 42 @Resource
43 private MesDvCheckRecordMapper checkRecordMapper; 43 private MesDvCheckRecordMapper checkRecordMapper;
  44 +
44 @Resource 45 @Resource
45 @Lazy 46 @Lazy
46 private MesDvCheckRecordLineService checkRecordLineService; 47 private MesDvCheckRecordLineService checkRecordLineService;
@@ -50,6 +51,7 @@ public class MesDvCheckRecordServiceImpl implements MesDvCheckRecordService { @@ -50,6 +51,7 @@ public class MesDvCheckRecordServiceImpl implements MesDvCheckRecordService {
50 private MesDvCheckPlanService checkPlanService; 51 private MesDvCheckPlanService checkPlanService;
51 @Resource 52 @Resource
52 private MesDvCheckPlanSubjectService checkPlanSubjectService; 53 private MesDvCheckPlanSubjectService checkPlanSubjectService;
  54 +
53 @Resource 55 @Resource
54 private AdminUserApi adminUserApi; 56 private AdminUserApi adminUserApi;
55 57
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryServiceImpl.java
@@ -49,26 +49,20 @@ public class MesDvMachineryServiceImpl implements MesDvMachineryService { @@ -49,26 +49,20 @@ public class MesDvMachineryServiceImpl implements MesDvMachineryService {
49 @Resource 49 @Resource
50 @Lazy // 延迟加载,避免循环依赖 50 @Lazy // 延迟加载,避免循环依赖
51 private MesDvMachineryTypeService machineryTypeService; 51 private MesDvMachineryTypeService machineryTypeService;
52 -  
53 @Resource 52 @Resource
54 @Lazy 53 @Lazy
55 private MesMdWorkshopService workshopService; 54 private MesMdWorkshopService workshopService;
56 -  
57 @Resource 55 @Resource
58 private MesWmBarcodeService barcodeService; 56 private MesWmBarcodeService barcodeService;
59 -  
60 @Resource 57 @Resource
61 @Lazy 58 @Lazy
62 private MesDvCheckPlanMachineryService checkPlanMachineryService; 59 private MesDvCheckPlanMachineryService checkPlanMachineryService;
63 -  
64 @Resource 60 @Resource
65 @Lazy 61 @Lazy
66 private MesDvCheckRecordService checkRecordService; 62 private MesDvCheckRecordService checkRecordService;
67 -  
68 @Resource 63 @Resource
69 @Lazy 64 @Lazy
70 private MesDvMaintenRecordService maintenRecordService; 65 private MesDvMaintenRecordService maintenRecordService;
71 -  
72 @Resource 66 @Resource
73 @Lazy 67 @Lazy
74 private MesDvRepairService repairService; 68 private MesDvRepairService repairService;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/maintenrecord/MesDvMaintenRecordServiceImpl.java
@@ -35,6 +35,7 @@ public class MesDvMaintenRecordServiceImpl implements MesDvMaintenRecordService @@ -35,6 +35,7 @@ public class MesDvMaintenRecordServiceImpl implements MesDvMaintenRecordService
35 35
36 @Resource 36 @Resource
37 private MesDvMaintenRecordMapper maintenRecordMapper; 37 private MesDvMaintenRecordMapper maintenRecordMapper;
  38 +
38 @Resource 39 @Resource
39 @Lazy 40 @Lazy
40 private MesDvMaintenRecordLineService maintenRecordLineService; 41 private MesDvMaintenRecordLineService maintenRecordLineService;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectServiceImpl.java
@@ -33,7 +33,7 @@ public class MesDvSubjectServiceImpl implements MesDvSubjectService { @@ -33,7 +33,7 @@ public class MesDvSubjectServiceImpl implements MesDvSubjectService {
33 33
34 @Resource 34 @Resource
35 private MesDvSubjectMapper subjectMapper; 35 private MesDvSubjectMapper subjectMapper;
36 - // DONE @AI:调用对方的 service 36 +
37 @Resource 37 @Resource
38 @Lazy 38 @Lazy
39 private MesDvCheckPlanSubjectService checkPlanSubjectService; 39 private MesDvCheckPlanSubjectService checkPlanSubjectService;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/autocode/MesMdAutoCodeRuleServiceImpl.java
@@ -29,7 +29,6 @@ public class MesMdAutoCodeRuleServiceImpl implements MesMdAutoCodeRuleService { @@ -29,7 +29,6 @@ public class MesMdAutoCodeRuleServiceImpl implements MesMdAutoCodeRuleService {
29 29
30 @Resource 30 @Resource
31 private MesMdAutoCodeRuleMapper ruleMapper; 31 private MesMdAutoCodeRuleMapper ruleMapper;
32 -  
33 @Resource 32 @Resource
34 private MesMdAutoCodePartMapper partMapper; 33 private MesMdAutoCodePartMapper partMapper;
35 34
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationServiceImpl.java
@@ -51,7 +51,6 @@ public class MesMdWorkstationServiceImpl implements MesMdWorkstationService { @@ -51,7 +51,6 @@ public class MesMdWorkstationServiceImpl implements MesMdWorkstationService {
51 private MesMdWorkstationToolService workstationToolService; 51 private MesMdWorkstationToolService workstationToolService;
52 @Resource 52 @Resource
53 private MesMdWorkstationWorkerService workstationWorkerService; 53 private MesMdWorkstationWorkerService workstationWorkerService;
54 -  
55 @Resource 54 @Resource
56 private MesMdWorkshopService workshopService; 55 private MesMdWorkshopService workshopService;
57 @Resource 56 @Resource
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/andon/MesProAndonRecordServiceImpl.java
@@ -34,13 +34,10 @@ public class MesProAndonRecordServiceImpl implements MesProAndonRecordService { @@ -34,13 +34,10 @@ public class MesProAndonRecordServiceImpl implements MesProAndonRecordService {
34 34
35 @Resource 35 @Resource
36 private MesMdWorkstationService workstationService; 36 private MesMdWorkstationService workstationService;
37 -  
38 @Resource 37 @Resource
39 private MesProWorkOrderService workOrderService; 38 private MesProWorkOrderService workOrderService;
40 -  
41 @Resource 39 @Resource
42 private MesProProcessService processService; 40 private MesProProcessService processService;
43 -  
44 @Resource 41 @Resource
45 private MesProAndonConfigService andonConfigService; 42 private MesProAndonConfigService andonConfigService;
46 43
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/card/MesProCardProcessServiceImpl.java
@@ -30,7 +30,6 @@ public class MesProCardProcessServiceImpl implements MesProCardProcessService { @@ -30,7 +30,6 @@ public class MesProCardProcessServiceImpl implements MesProCardProcessService {
30 @Resource 30 @Resource
31 @Lazy 31 @Lazy
32 private MesProCardService cardService; 32 private MesProCardService cardService;
33 -  
34 @Resource 33 @Resource
35 private MesProProcessService processService; 34 private MesProProcessService processService;
36 35
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/card/MesProCardServiceImpl.java
@@ -35,11 +35,9 @@ public class MesProCardServiceImpl implements MesProCardService { @@ -35,11 +35,9 @@ public class MesProCardServiceImpl implements MesProCardService {
35 @Resource 35 @Resource
36 private MesProCardMapper cardMapper; 36 private MesProCardMapper cardMapper;
37 37
38 - // DONE @AI:会用对应的 service  
39 @Resource 38 @Resource
40 @Lazy 39 @Lazy
41 private MesProCardProcessService cardProcessService; 40 private MesProCardProcessService cardProcessService;
42 -  
43 @Resource 41 @Resource
44 private MesProWorkOrderService workOrderService; 42 private MesProWorkOrderService workOrderService;
45 @Resource 43 @Resource
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/process/MesProProcessServiceImpl.java
@@ -37,7 +37,6 @@ public class MesProProcessServiceImpl implements MesProProcessService { @@ -37,7 +37,6 @@ public class MesProProcessServiceImpl implements MesProProcessService {
37 37
38 @Resource 38 @Resource
39 private MesProProcessContentService processContentService; 39 private MesProProcessContentService processContentService;
40 -  
41 @Resource 40 @Resource
42 @Lazy 41 @Lazy
43 private MesProRouteProcessService routeProcessService; 42 private MesProRouteProcessService routeProcessService;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskIssueServiceImpl.java
@@ -30,7 +30,6 @@ public class MesProTaskIssueServiceImpl implements MesProTaskIssueService { @@ -30,7 +30,6 @@ public class MesProTaskIssueServiceImpl implements MesProTaskIssueService {
30 30
31 @Resource 31 @Resource
32 private MesProTaskService taskService; 32 private MesProTaskService taskService;
33 -  
34 @Resource 33 @Resource
35 private MesMdItemService itemService; 34 private MesMdItemService itemService;
36 35
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workrecord/MesProWorkRecordServiceImpl.java
@@ -33,6 +33,7 @@ public class MesProWorkRecordServiceImpl implements MesProWorkRecordService { @@ -33,6 +33,7 @@ public class MesProWorkRecordServiceImpl implements MesProWorkRecordService {
33 private MesProWorkRecordLogMapper workRecordLogMapper; 33 private MesProWorkRecordLogMapper workRecordLogMapper;
34 @Resource 34 @Resource
35 private MesProWorkRecordMapper workRecordMapper; 35 private MesProWorkRecordMapper workRecordMapper;
  36 +
36 @Resource 37 @Resource
37 private MesMdWorkstationService workstationService; 38 private MesMdWorkstationService workstationService;
38 39
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defectrecord/MesQcDefectRecordServiceImpl.java
@@ -45,21 +45,18 @@ public class MesQcDefectRecordServiceImpl implements MesQcDefectRecordService { @@ -45,21 +45,18 @@ public class MesQcDefectRecordServiceImpl implements MesQcDefectRecordService {
45 @Resource 45 @Resource
46 @Lazy 46 @Lazy
47 private MesQcIqcLineService iqcLineService; 47 private MesQcIqcLineService iqcLineService;
48 -  
49 @Resource 48 @Resource
50 @Lazy 49 @Lazy
51 private MesQcIpqcService ipqcService; 50 private MesQcIpqcService ipqcService;
52 @Resource 51 @Resource
53 @Lazy 52 @Lazy
54 private MesQcIpqcLineService ipqcLineService; 53 private MesQcIpqcLineService ipqcLineService;
55 -  
56 @Resource 54 @Resource
57 @Lazy 55 @Lazy
58 private MesQcOqcService oqcService; 56 private MesQcOqcService oqcService;
59 @Resource 57 @Resource
60 @Lazy 58 @Lazy
61 private MesQcOqcLineService oqcLineService; 59 private MesQcOqcLineService oqcLineService;
62 -  
63 @Resource 60 @Resource
64 @Lazy 61 @Lazy
65 private MesQcRqcService rqcService; 62 private MesQcRqcService rqcService;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImpl.java
@@ -82,9 +82,6 @@ public class MesQcIpqcServiceImpl implements MesQcIpqcService { @@ -82,9 +82,6 @@ public class MesQcIpqcServiceImpl implements MesQcIpqcService {
82 @Resource 82 @Resource
83 @Lazy 83 @Lazy
84 private MesProTaskService taskService; 84 private MesProTaskService taskService;
85 -  
86 - @Resource  
87 - private AdminUserApi adminUserApi;  
88 @Resource 85 @Resource
89 @Lazy 86 @Lazy
90 private MesProFeedbackService feedbackService; 87 private MesProFeedbackService feedbackService;
@@ -92,6 +89,9 @@ public class MesQcIpqcServiceImpl implements MesQcIpqcService { @@ -92,6 +89,9 @@ public class MesQcIpqcServiceImpl implements MesQcIpqcService {
92 @Lazy 89 @Lazy
93 private MesQcIndicatorResultService indicatorResultService; 90 private MesQcIndicatorResultService indicatorResultService;
94 91
  92 + @Resource
  93 + private AdminUserApi adminUserApi;
  94 +
95 @Override 95 @Override
96 @Transactional(rollbackFor = Exception.class) 96 @Transactional(rollbackFor = Exception.class)
97 public Long createIpqc(MesQcIpqcSaveReqVO createReqVO) { 97 public Long createIpqc(MesQcIpqcSaveReqVO createReqVO) {
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImpl.java
@@ -64,13 +64,13 @@ public class MesQcIqcServiceImpl implements MesQcIqcService { @@ -64,13 +64,13 @@ public class MesQcIqcServiceImpl implements MesQcIqcService {
64 private MesMdVendorService vendorService; 64 private MesMdVendorService vendorService;
65 @Resource 65 @Resource
66 private MesMdItemService itemService; 66 private MesMdItemService itemService;
67 -  
68 - @Resource  
69 - private AdminUserApi adminUserApi;  
70 @Resource 67 @Resource
71 @Lazy 68 @Lazy
72 private MesQcIndicatorResultService indicatorResultService; 69 private MesQcIndicatorResultService indicatorResultService;
73 70
  71 + @Resource
  72 + private AdminUserApi adminUserApi;
  73 +
74 @Override 74 @Override
75 @Transactional(rollbackFor = Exception.class) 75 @Transactional(rollbackFor = Exception.class)
76 public Long createIqc(MesQcIqcSaveReqVO createReqVO) { 76 public Long createIqc(MesQcIqcSaveReqVO createReqVO) {
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcLineServiceImpl.java
@@ -37,6 +37,7 @@ public class MesQcOqcLineServiceImpl implements MesQcOqcLineService { @@ -37,6 +37,7 @@ public class MesQcOqcLineServiceImpl implements MesQcOqcLineService {
37 37
38 @Resource 38 @Resource
39 private MesQcOqcLineMapper oqcLineMapper; 39 private MesQcOqcLineMapper oqcLineMapper;
  40 +
40 @Resource 41 @Resource
41 private MesQcIndicatorService indicatorService; 42 private MesQcIndicatorService indicatorService;
42 @Resource 43 @Resource
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
@@ -48,6 +48,7 @@ public class MesQcOqcServiceImpl implements MesQcOqcService { @@ -48,6 +48,7 @@ public class MesQcOqcServiceImpl implements MesQcOqcService {
48 48
49 @Resource 49 @Resource
50 private MesQcOqcMapper oqcMapper; 50 private MesQcOqcMapper oqcMapper;
  51 +
51 @Resource 52 @Resource
52 private MesQcTemplateItemService templateItemService; 53 private MesQcTemplateItemService templateItemService;
53 @Resource 54 @Resource
@@ -67,13 +68,13 @@ public class MesQcOqcServiceImpl implements MesQcOqcService { @@ -67,13 +68,13 @@ public class MesQcOqcServiceImpl implements MesQcOqcService {
67 @Resource 68 @Resource
68 @Lazy 69 @Lazy
69 private MesWmProductSalesService productSalesService; 70 private MesWmProductSalesService productSalesService;
70 -  
71 - @Resource  
72 - private AdminUserApi adminUserApi;  
73 @Resource 71 @Resource
74 @Lazy 72 @Lazy
75 private MesQcIndicatorResultService indicatorResultService; 73 private MesQcIndicatorResultService indicatorResultService;
76 74
  75 + @Resource
  76 + private AdminUserApi adminUserApi;
  77 +
77 @Override 78 @Override
78 @Transactional(rollbackFor = Exception.class) 79 @Transactional(rollbackFor = Exception.class)
79 public Long createOqc(MesQcOqcSaveReqVO createReqVO) { 80 public Long createOqc(MesQcOqcSaveReqVO createReqVO) {
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImpl.java
@@ -47,6 +47,7 @@ public class MesQcRqcServiceImpl implements MesQcRqcService { @@ -47,6 +47,7 @@ public class MesQcRqcServiceImpl implements MesQcRqcService {
47 47
48 @Resource 48 @Resource
49 private MesQcRqcMapper rqcMapper; 49 private MesQcRqcMapper rqcMapper;
  50 +
50 @Resource 51 @Resource
51 private MesQcTemplateItemService templateItemService; 52 private MesQcTemplateItemService templateItemService;
52 @Resource 53 @Resource
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/template/MesQcTemplateServiceImpl.java
@@ -32,6 +32,7 @@ public class MesQcTemplateServiceImpl implements MesQcTemplateService { @@ -32,6 +32,7 @@ public class MesQcTemplateServiceImpl implements MesQcTemplateService {
32 32
33 @Resource 33 @Resource
34 private MesQcTemplateMapper templateMapper; 34 private MesQcTemplateMapper templateMapper;
  35 +
35 @Resource 36 @Resource
36 @Lazy 37 @Lazy
37 private MesQcTemplateIndicatorService templateIndicatorService; 38 private MesQcTemplateIndicatorService templateIndicatorService;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/tm/tool/MesTmToolServiceImpl.java
@@ -39,7 +39,6 @@ public class MesTmToolServiceImpl implements MesTmToolService { @@ -39,7 +39,6 @@ public class MesTmToolServiceImpl implements MesTmToolService {
39 @Resource 39 @Resource
40 @Lazy // 延迟加载,避免循环依赖 40 @Lazy // 延迟加载,避免循环依赖
41 private MesTmToolTypeService toolTypeService; 41 private MesTmToolTypeService toolTypeService;
42 -  
43 @Resource 42 @Resource
44 private MesWmBarcodeService barcodeService; 43 private MesWmBarcodeService barcodeService;
45 44
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/tm/tool/MesTmToolTypeServiceImpl.java
@@ -37,7 +37,6 @@ public class MesTmToolTypeServiceImpl implements MesTmToolTypeService { @@ -37,7 +37,6 @@ public class MesTmToolTypeServiceImpl implements MesTmToolTypeService {
37 @Resource 37 @Resource
38 @Lazy 38 @Lazy
39 private MesTmToolService toolService; 39 private MesTmToolService toolService;
40 -  
41 @Resource 40 @Resource
42 @Lazy 41 @Lazy
43 private MesMdWorkstationToolService workstationToolService; 42 private MesMdWorkstationToolService workstationToolService;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/batch/MesWmBatchServiceImpl.java
@@ -46,6 +46,7 @@ public class MesWmBatchServiceImpl implements MesWmBatchService { @@ -46,6 +46,7 @@ public class MesWmBatchServiceImpl implements MesWmBatchService {
46 46
47 @Resource 47 @Resource
48 private MesWmBatchMapper batchMapper; 48 private MesWmBatchMapper batchMapper;
  49 +
49 @Resource 50 @Resource
50 private MesMdItemService itemService; 51 private MesMdItemService itemService;
51 @Resource 52 @Resource
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeServiceImpl.java
@@ -48,6 +48,7 @@ public class MesWmItemConsumeServiceImpl implements MesWmItemConsumeService { @@ -48,6 +48,7 @@ public class MesWmItemConsumeServiceImpl implements MesWmItemConsumeService {
48 48
49 @Resource 49 @Resource
50 private MesWmItemConsumeMapper itemConsumeMapper; 50 private MesWmItemConsumeMapper itemConsumeMapper;
  51 +
51 @Resource 52 @Resource
52 private MesWmItemConsumeLineService itemConsumeLineService; 53 private MesWmItemConsumeLineService itemConsumeLineService;
53 @Resource 54 @Resource
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptDetailServiceImpl.java
@@ -32,11 +32,9 @@ public class MesWmItemReceiptDetailServiceImpl implements MesWmItemReceiptDetail @@ -32,11 +32,9 @@ public class MesWmItemReceiptDetailServiceImpl implements MesWmItemReceiptDetail
32 @Resource 32 @Resource
33 @Lazy 33 @Lazy
34 private MesWmItemReceiptService itemReceiptService; 34 private MesWmItemReceiptService itemReceiptService;
35 -  
36 @Resource 35 @Resource
37 @Lazy 36 @Lazy
38 private MesWmItemReceiptLineService itemReceiptLineService; 37 private MesWmItemReceiptLineService itemReceiptLineService;
39 -  
40 @Resource 38 @Resource
41 private MesWmWarehouseAreaService warehouseAreaService; 39 private MesWmWarehouseAreaService warehouseAreaService;
42 @Resource 40 @Resource
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java
@@ -58,7 +58,6 @@ public class MesWmItemReceiptServiceImpl implements MesWmItemReceiptService { @@ -58,7 +58,6 @@ public class MesWmItemReceiptServiceImpl implements MesWmItemReceiptService {
58 @Resource 58 @Resource
59 @Lazy 59 @Lazy
60 private MesQcIqcService iqcService; 60 private MesQcIqcService iqcService;
61 -  
62 @Resource 61 @Resource
63 private MesWmTransactionService wmTransactionService; 62 private MesWmTransactionService wmTransactionService;
64 63
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscissue/MesWmMiscIssueLineServiceImpl.java
@@ -32,14 +32,11 @@ public class MesWmMiscIssueLineServiceImpl implements MesWmMiscIssueLineService @@ -32,14 +32,11 @@ public class MesWmMiscIssueLineServiceImpl implements MesWmMiscIssueLineService
32 @Resource 32 @Resource
33 @Lazy 33 @Lazy
34 private MesWmMiscIssueService miscIssueService; 34 private MesWmMiscIssueService miscIssueService;
35 -  
36 @Resource 35 @Resource
37 @Lazy 36 @Lazy
38 private MesWmMiscIssueDetailService miscIssueDetailService; 37 private MesWmMiscIssueDetailService miscIssueDetailService;
39 -  
40 @Resource 38 @Resource
41 private MesMdItemService itemService; 39 private MesMdItemService itemService;
42 -  
43 @Resource 40 @Resource
44 private MesWmWarehouseAreaService warehouseAreaService; 41 private MesWmWarehouseAreaService warehouseAreaService;
45 42
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourceissue/MesWmOutsourceIssueDetailServiceImpl.java
@@ -30,6 +30,7 @@ public class MesWmOutsourceIssueDetailServiceImpl implements MesWmOutsourceIssue @@ -30,6 +30,7 @@ public class MesWmOutsourceIssueDetailServiceImpl implements MesWmOutsourceIssue
30 30
31 @Resource 31 @Resource
32 private MesWmOutsourceIssueDetailMapper outsourceIssueDetailMapper; 32 private MesWmOutsourceIssueDetailMapper outsourceIssueDetailMapper;
  33 +
33 @Resource 34 @Resource
34 @Lazy 35 @Lazy
35 private MesWmOutsourceIssueLineService outsourceIssueLineService; 36 private MesWmOutsourceIssueLineService outsourceIssueLineService;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptDetailServiceImpl.java
@@ -27,7 +27,6 @@ public class MesWmOutsourceReceiptDetailServiceImpl implements MesWmOutsourceRec @@ -27,7 +27,6 @@ public class MesWmOutsourceReceiptDetailServiceImpl implements MesWmOutsourceRec
27 27
28 @Resource 28 @Resource
29 private MesMdItemService itemService; 29 private MesMdItemService itemService;
30 -  
31 @Resource 30 @Resource
32 private MesWmWarehouseAreaService areaService; 31 private MesWmWarehouseAreaService areaService;
33 32
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptLineServiceImpl.java
@@ -37,19 +37,15 @@ public class MesWmOutsourceReceiptLineServiceImpl implements MesWmOutsourceRecei @@ -37,19 +37,15 @@ public class MesWmOutsourceReceiptLineServiceImpl implements MesWmOutsourceRecei
37 37
38 @Resource 38 @Resource
39 private MesMdItemService itemService; 39 private MesMdItemService itemService;
40 -  
41 @Resource 40 @Resource
42 @Lazy 41 @Lazy
43 private MesWmOutsourceReceiptDetailService outsourceReceiptDetailService; 42 private MesWmOutsourceReceiptDetailService outsourceReceiptDetailService;
44 -  
45 @Resource 43 @Resource
46 @Lazy 44 @Lazy
47 private MesWmOutsourceReceiptService outsourceReceiptService; 45 private MesWmOutsourceReceiptService outsourceReceiptService;
48 -  
49 @Resource 46 @Resource
50 @Lazy 47 @Lazy
51 private MesProWorkOrderService workOrderService; 48 private MesProWorkOrderService workOrderService;
52 -  
53 @Resource 49 @Resource
54 private MesWmBatchService batchService; 50 private MesWmBatchService batchService;
55 51
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageLineServiceImpl.java
@@ -29,6 +29,7 @@ public class MesWmPackageLineServiceImpl implements MesWmPackageLineService { @@ -29,6 +29,7 @@ public class MesWmPackageLineServiceImpl implements MesWmPackageLineService {
29 29
30 @Resource 30 @Resource
31 private MesWmPackageLineMapper packageLineMapper; 31 private MesWmPackageLineMapper packageLineMapper;
  32 +
32 @Resource 33 @Resource
33 @Lazy 34 @Lazy
34 private MesWmPackageService packageService; 35 private MesWmPackageService packageService;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/packages/MesWmPackageServiceImpl.java
@@ -34,6 +34,7 @@ public class MesWmPackageServiceImpl implements MesWmPackageService { @@ -34,6 +34,7 @@ public class MesWmPackageServiceImpl implements MesWmPackageService {
34 34
35 @Resource 35 @Resource
36 private MesWmPackageMapper packageMapper; 36 private MesWmPackageMapper packageMapper;
  37 +
37 @Resource 38 @Resource
38 private MesWmPackageLineService packageLineService; 39 private MesWmPackageLineService packageLineService;
39 @Resource 40 @Resource
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptDetailServiceImpl.java
@@ -28,7 +28,6 @@ public class MesWmProductReceiptDetailServiceImpl implements MesWmProductReceipt @@ -28,7 +28,6 @@ public class MesWmProductReceiptDetailServiceImpl implements MesWmProductReceipt
28 @Resource 28 @Resource
29 @Lazy 29 @Lazy
30 private MesWmProductReceiptService productReceiptService; 30 private MesWmProductReceiptService productReceiptService;
31 -  
32 @Resource 31 @Resource
33 private MesWmWarehouseAreaService warehouseAreaService; 32 private MesWmWarehouseAreaService warehouseAreaService;
34 33
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptLineServiceImpl.java
@@ -31,10 +31,8 @@ public class MesWmProductReceiptLineServiceImpl implements MesWmProductReceiptLi @@ -31,10 +31,8 @@ public class MesWmProductReceiptLineServiceImpl implements MesWmProductReceiptLi
31 @Resource 31 @Resource
32 @Lazy 32 @Lazy
33 private MesWmProductReceiptService productReceiptService; 33 private MesWmProductReceiptService productReceiptService;
34 -  
35 @Resource 34 @Resource
36 private MesWmProductReceiptDetailService productReceiptDetailService; 35 private MesWmProductReceiptDetailService productReceiptDetailService;
37 -  
38 @Resource 36 @Resource
39 private MesMdItemService itemService; 37 private MesMdItemService itemService;
40 38
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java
@@ -48,13 +48,10 @@ public class MesWmProductReceiptServiceImpl implements MesWmProductReceiptServic @@ -48,13 +48,10 @@ public class MesWmProductReceiptServiceImpl implements MesWmProductReceiptServic
48 48
49 @Resource 49 @Resource
50 private MesWmProductReceiptLineService productReceiptLineService; 50 private MesWmProductReceiptLineService productReceiptLineService;
51 -  
52 @Resource 51 @Resource
53 private MesWmProductReceiptDetailService productReceiptDetailService; 52 private MesWmProductReceiptDetailService productReceiptDetailService;
54 -  
55 @Resource 53 @Resource
56 private MesWmTransactionService wmTransactionService; 54 private MesWmTransactionService wmTransactionService;
57 -  
58 @Resource 55 @Resource
59 private MesProWorkOrderService workOrderService; 56 private MesProWorkOrderService workOrderService;
60 @Resource 57 @Resource
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java
@@ -43,6 +43,7 @@ public class MesWmProductSalesLineServiceImpl implements MesWmProductSalesLineSe @@ -43,6 +43,7 @@ public class MesWmProductSalesLineServiceImpl implements MesWmProductSalesLineSe
43 43
44 @Resource 44 @Resource
45 private MesWmProductSalesLineMapper productSalesLineMapper; 45 private MesWmProductSalesLineMapper productSalesLineMapper;
  46 +
46 @Resource 47 @Resource
47 private MesWmProductSalesDetailService productSalesDetailService; 48 private MesWmProductSalesDetailService productSalesDetailService;
48 @Resource 49 @Resource
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java
@@ -49,16 +49,12 @@ public class MesWmProductSalesServiceImpl implements MesWmProductSalesService { @@ -49,16 +49,12 @@ public class MesWmProductSalesServiceImpl implements MesWmProductSalesService {
49 49
50 @Resource 50 @Resource
51 private MesWmProductSalesLineService productSalesLineService; 51 private MesWmProductSalesLineService productSalesLineService;
52 -  
53 @Resource 52 @Resource
54 private MesWmProductSalesDetailService productSalesDetailService; 53 private MesWmProductSalesDetailService productSalesDetailService;
55 -  
56 @Resource 54 @Resource
57 private MesMdClientService clientService; 55 private MesMdClientService clientService;
58 -  
59 @Resource 56 @Resource
60 private MesWmSalesNoticeService salesNoticeService; 57 private MesWmSalesNoticeService salesNoticeService;
61 -  
62 @Resource 58 @Resource
63 private MesWmTransactionService wmTransactionService; 59 private MesWmTransactionService wmTransactionService;
64 60
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesDetailServiceImpl.java
@@ -40,10 +40,8 @@ public class MesWmReturnSalesDetailServiceImpl implements MesWmReturnSalesDetail @@ -40,10 +40,8 @@ public class MesWmReturnSalesDetailServiceImpl implements MesWmReturnSalesDetail
40 @Resource 40 @Resource
41 @Lazy 41 @Lazy
42 private MesWmReturnSalesService returnSalesService; 42 private MesWmReturnSalesService returnSalesService;
43 -  
44 @Resource 43 @Resource
45 private MesWmWarehouseAreaService warehouseAreaService; 44 private MesWmWarehouseAreaService warehouseAreaService;
46 -  
47 @Resource 45 @Resource
48 @Lazy 46 @Lazy
49 private MesWmMaterialStockService materialStockService; 47 private MesWmMaterialStockService materialStockService;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineServiceImpl.java
@@ -36,10 +36,8 @@ public class MesWmSalesNoticeLineServiceImpl implements MesWmSalesNoticeLineServ @@ -36,10 +36,8 @@ public class MesWmSalesNoticeLineServiceImpl implements MesWmSalesNoticeLineServ
36 @Resource 36 @Resource
37 @Lazy 37 @Lazy
38 private MesWmSalesNoticeService salesNoticeService; 38 private MesWmSalesNoticeService salesNoticeService;
39 -  
40 @Resource 39 @Resource
41 private MesWmBatchService batchService; 40 private MesWmBatchService batchService;
42 -  
43 @Resource 41 @Resource
44 private MesMdItemService itemService; 42 private MesMdItemService itemService;
45 43
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
@@ -37,7 +37,6 @@ public class MesWmSalesNoticeServiceImpl implements MesWmSalesNoticeService { @@ -37,7 +37,6 @@ public class MesWmSalesNoticeServiceImpl implements MesWmSalesNoticeService {
37 37
38 @Resource 38 @Resource
39 private MesWmSalesNoticeLineService salesNoticeLineService; 39 private MesWmSalesNoticeLineService salesNoticeLineService;
40 -  
41 @Resource 40 @Resource
42 private MesMdClientService clientService; 41 private MesMdClientService clientService;
43 42
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/sn/MesWmSnServiceImpl.java
@@ -9,6 +9,8 @@ import cn.iocoder.yudao.module.mes.dal.dataobject.wm.sn.MesWmSnDO; @@ -9,6 +9,8 @@ import cn.iocoder.yudao.module.mes.dal.dataobject.wm.sn.MesWmSnDO;
9 import cn.iocoder.yudao.module.mes.dal.mysql.wm.sn.MesWmSnMapper; 9 import cn.iocoder.yudao.module.mes.dal.mysql.wm.sn.MesWmSnMapper;
10 import cn.iocoder.yudao.module.mes.enums.md.autocode.MesMdAutoCodeRuleCodeEnum; 10 import cn.iocoder.yudao.module.mes.enums.md.autocode.MesMdAutoCodeRuleCodeEnum;
11 import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService; 11 import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
  12 +import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
  13 +import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
12 import jakarta.annotation.Resource; 14 import jakarta.annotation.Resource;
13 import lombok.extern.slf4j.Slf4j; 15 import lombok.extern.slf4j.Slf4j;
14 import org.springframework.stereotype.Service; 16 import org.springframework.stereotype.Service;
@@ -30,12 +32,24 @@ public class MesWmSnServiceImpl implements MesWmSnService { @@ -30,12 +32,24 @@ public class MesWmSnServiceImpl implements MesWmSnService {
30 32
31 @Resource 33 @Resource
32 private MesWmSnMapper snMapper; 34 private MesWmSnMapper snMapper;
  35 +
33 @Resource 36 @Resource
34 private MesMdAutoCodeRecordService autoCodeRecordService; 37 private MesMdAutoCodeRecordService autoCodeRecordService;
  38 + @Resource
  39 + private MesMdItemService itemService;
  40 + @Resource
  41 + private MesProWorkOrderService workOrderService;
35 42
36 @Override 43 @Override
37 @Transactional(rollbackFor = Exception.class) 44 @Transactional(rollbackFor = Exception.class)
38 public void generateSnCodes(MesWmSnGenerateReqVO reqVO) { 45 public void generateSnCodes(MesWmSnGenerateReqVO reqVO) {
  46 + // 校验物料是否存在
  47 + itemService.validateItemExists(reqVO.getItemId());
  48 + // 校验工单是否存在
  49 + if (reqVO.getWorkOrderId() != null) {
  50 + workOrderService.validateWorkOrderExists(reqVO.getWorkOrderId());
  51 + }
  52 +
39 List<MesWmSnDO> sns = new ArrayList<>(reqVO.getCount()); 53 List<MesWmSnDO> sns = new ArrayList<>(reqVO.getCount());
40 // 生成批次 UUID 54 // 生成批次 UUID
41 String uuid = IdUtil.fastSimpleUUID(); 55 String uuid = IdUtil.fastSimpleUUID();
@@ -66,4 +80,4 @@ public class MesWmSnServiceImpl implements MesWmSnService { @@ -66,4 +80,4 @@ public class MesWmSnServiceImpl implements MesWmSnService {
66 snMapper.deleteByUuid(uuid); 80 snMapper.deleteByUuid(uuid);
67 } 81 }
68 82
69 -} 83 -}
  84 +}
70 \ No newline at end of file 85 \ No newline at end of file
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/plan/MesWmStockTakingPlanParamServiceImpl.java
@@ -27,6 +27,7 @@ public class MesWmStockTakingPlanParamServiceImpl implements MesWmStockTakingPla @@ -27,6 +27,7 @@ public class MesWmStockTakingPlanParamServiceImpl implements MesWmStockTakingPla
27 27
28 @Resource 28 @Resource
29 private MesWmStockTakingPlanParamMapper stockTakingPlanParamMapper; 29 private MesWmStockTakingPlanParamMapper stockTakingPlanParamMapper;
  30 +
30 @Resource 31 @Resource
31 @Lazy 32 @Lazy
32 private MesWmStockTakingPlanService stockTakingPlanService; 33 private MesWmStockTakingPlanService stockTakingPlanService;
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/plan/MesWmStockTakingPlanServiceImpl.java
@@ -34,6 +34,7 @@ public class MesWmStockTakingPlanServiceImpl implements MesWmStockTakingPlanServ @@ -34,6 +34,7 @@ public class MesWmStockTakingPlanServiceImpl implements MesWmStockTakingPlanServ
34 34
35 @Resource 35 @Resource
36 private MesWmStockTakingPlanMapper stockTakingPlanMapper; 36 private MesWmStockTakingPlanMapper stockTakingPlanMapper;
  37 +
37 @Resource 38 @Resource
38 private MesWmStockTakingPlanParamService stockTakingPlanParamService; 39 private MesWmStockTakingPlanParamService stockTakingPlanParamService;
39 40
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskLineServiceImpl.java
@@ -43,6 +43,7 @@ public class MesWmStockTakingTaskLineServiceImpl implements MesWmStockTakingTask @@ -43,6 +43,7 @@ public class MesWmStockTakingTaskLineServiceImpl implements MesWmStockTakingTask
43 43
44 @Resource 44 @Resource
45 private MesWmStockTakingTaskLineMapper stockTakingTaskLineMapper; 45 private MesWmStockTakingTaskLineMapper stockTakingTaskLineMapper;
  46 +
46 @Resource 47 @Resource
47 private MesWmStockTakingPlanParamService stockTakingPlanParamService; 48 private MesWmStockTakingPlanParamService stockTakingPlanParamService;
48 @Resource 49 @Resource
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transaction/MesWmTransactionServiceImpl.java
@@ -41,6 +41,7 @@ public class MesWmTransactionServiceImpl implements MesWmTransactionService { @@ -41,6 +41,7 @@ public class MesWmTransactionServiceImpl implements MesWmTransactionService {
41 41
42 @Resource 42 @Resource
43 private MesWmTransactionMapper transactionMapper; 43 private MesWmTransactionMapper transactionMapper;
  44 +
44 @Resource 45 @Resource
45 private MesWmMaterialStockService materialStockService; 46 private MesWmMaterialStockService materialStockService;
46 @Resource 47 @Resource
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transfer/MesWmTransferDetailServiceImpl.java
@@ -37,7 +37,6 @@ public class MesWmTransferDetailServiceImpl implements MesWmTransferDetailServic @@ -37,7 +37,6 @@ public class MesWmTransferDetailServiceImpl implements MesWmTransferDetailServic
37 @Resource 37 @Resource
38 @Lazy 38 @Lazy
39 private MesWmTransferLineService transferLineService; 39 private MesWmTransferLineService transferLineService;
40 -  
41 @Resource 40 @Resource
42 private MesWmWarehouseAreaService warehouseAreaService; 41 private MesWmWarehouseAreaService warehouseAreaService;
43 42