From 15ad2e8add262f3af8792bafb6ffd931db631a36 Mon Sep 17 00:00:00 2001
From: Zhu Zhonghua <zhonghua@qq.com>
Date: 星期四, 22 五月 2025 17:04:18 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-job/src/main/java/com/aps/job/controller/ApsWorkOrderJobController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/controller/ApsWorkOrderJobController.java b/aps-modules/aps-job/src/main/java/com/aps/job/controller/ApsWorkOrderJobController.java
index 54db310..a776bea 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/controller/ApsWorkOrderJobController.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/controller/ApsWorkOrderJobController.java
@@ -39,7 +39,7 @@
/**
* 鏌ヨ宸ュ崟鍚屾鍒楄〃
*/
- @RequiresPermissions("ApsWorkOrderJob:ApsWorkOrderJob:list")
+ @RequiresPermissions("apsWorkOrderJob:list")
@GetMapping("/list")
public TableDataInfo list(ApsWorkOrderJob apsWorkOrderJob)
{
@@ -51,7 +51,7 @@
/**
* 瀵煎嚭宸ュ崟鍚屾鍒楄〃
*/
- @RequiresPermissions("ApsWorkOrderJob:ApsWorkOrderJob:export")
+ @RequiresPermissions("apsWorkOrderJob:export")
@Log(title = "宸ュ崟鍚屾", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ApsWorkOrderJob apsWorkOrderJob)
@@ -64,7 +64,7 @@
/**
* 鑾峰彇宸ュ崟鍚屾璇︾粏淇℃伅
*/
- @RequiresPermissions("ApsWorkOrderJob:ApsWorkOrderJob:query")
+ @RequiresPermissions("apsWorkOrderJob:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -77,7 +77,7 @@
@PostMapping("/batchInsertApsWorkOrderJob")
public AjaxResult batchInsertApsWorkOrderJob(@RequestBody ApsWorkOrderJobParam param)
{
- apsWorkOrderJobService.batchInsertApsWorkOrderJob(param);
+ apsWorkOrderJobService.SyncWorkOrderByTime();
return success();
}
/**
@@ -89,4 +89,13 @@
apsWorkOrderJobService.syncPartOrderData();
return success();
}
+ /**
+ * 鍚屾闆朵欢宸ュ崟
+ * */
+ @PostMapping("/batchInsertPlateOrderJob")
+ public AjaxResult batchInsertPlateOrderJob()
+ {
+ apsWorkOrderJobService.syncPlateOrderData();
+ return success();
+ }
}
--
Gitblit v1.9.3