From 01e45371334efcf7f4ccf2fbf8343ec063aa1ff2 Mon Sep 17 00:00:00 2001
From: dy <dingyang@lnfxkj.tech>
Date: 星期六, 19 四月 2025 11:14:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-job/src/main/java/com/aps/job/controller/ApsWorkOrderJobController.java | 47 ++++++++++++-----------------------------------
1 files changed, 12 insertions(+), 35 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 791a662..62e6c9e 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
@@ -1,7 +1,6 @@
package com.aps.job.controller;
import java.util.List;
-import java.io.IOException;
import com.aps.job.param.ApsWorkOrderJobParam;
import jakarta.servlet.http.HttpServletResponse;
@@ -73,43 +72,21 @@
}
/**
- * 鏂板宸ュ崟鍚屾
- */
- @RequiresPermissions("ApsWorkOrderJob:ApsWorkOrderJob:add")
- @Log(title = "宸ュ崟鍚屾", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody ApsWorkOrderJob apsWorkOrderJob)
- {
- return toAjax(apsWorkOrderJobService.insertApsWorkOrderJob(apsWorkOrderJob));
- }
-
- /**
- * 淇敼宸ュ崟鍚屾
- */
- @RequiresPermissions("ApsWorkOrderJob:ApsWorkOrderJob:edit")
- @Log(title = "宸ュ崟鍚屾", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody ApsWorkOrderJob apsWorkOrderJob)
- {
- return toAjax(apsWorkOrderJobService.updateApsWorkOrderJob(apsWorkOrderJob));
- }
-
- /**
- * 鍒犻櫎宸ュ崟鍚屾
- */
- @RequiresPermissions("ApsWorkOrderJob:ApsWorkOrderJob:remove")
- @Log(title = "宸ュ崟鍚屾", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
- return toAjax(apsWorkOrderJobService.deleteApsWorkOrderJobByIds(ids));
- }
-
-
+ * 鍚屾宸ュ崟鏁版嵁
+ * */
@PostMapping("/batchInsertApsWorkOrderJob")
public AjaxResult batchInsertApsWorkOrderJob(@RequestBody ApsWorkOrderJobParam param)
{
- apsWorkOrderJobService.batchInsertApsWorkOrderJob(param);
+ apsWorkOrderJobService.SyncWorkOrderByTime();
return success();
}
+ /**
+ * 鍚屾闆朵欢宸ュ崟
+ * */
+ @PostMapping("/batchInsertPartOrderJob")
+ public AjaxResult batchInsertPartOrderJob()
+ {
+ apsWorkOrderJobService.syncPartOrderData();
+ return success();
+ }
}
--
Gitblit v1.9.3