From 1be74815a20e16b1e8633cf20615598738b2822e Mon Sep 17 00:00:00 2001
From: tzy <tzy@qq.com>
Date: Wed, 15 Apr 2026 19:43:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=8C=E5=B7=A5=E5=BA=8F?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/application.yml           | 2 +-
 .../controller/SfcOperationPlanningMainController.java   | 9 ++++-----
 .../src/main/java/com/ruoyi/system/runner/JdUtil.java    | 3 ++-
 .../impl/SfcOperationPlanningMainServiceImpl.java        | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index f2d985f..0da6ca1 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -29,7 +29,7 @@ server:
   port: 8033
   servlet:
     # 应用的访问路径
-    context-path: /
+    context-path: /dev-api
   undertow:
     # HTTP post内容的最大大小。当值为-1时，默认值为大小是无限的
     max-http-post-size: -1
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/SfcOperationPlanningMainController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SfcOperationPlanningMainController.java
index 2b17766..c0c0c5e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/SfcOperationPlanningMainController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/SfcOperationPlanningMainController.java
@@ -46,8 +46,7 @@ public class SfcOperationPlanningMainController extends BaseController {
     /**
      * 同步工序计划数据
      */
-    @SaIgnore
-    //@SaCheckPermission("system:operationPlanningMain:sync")
+    @SaCheckPermission("system:operationPlanningMain:sync")
     @Log(title = "工序计划数据同步", businessType = BusinessType.INSERT)
     @PostMapping("/sync")
     public R<Void> syncData() {
@@ -57,7 +56,7 @@ public class SfcOperationPlanningMainController extends BaseController {
     /**
      * 直接从K3查询工序计划数据（不入库测试）
      */
-    @SaIgnore
+    @SaCheckPermission("system:operationPlanningMain:queryK3")
     @GetMapping("/queryFromK3")
     public R<List<OperationPlanResultDTO>> queryFromK3() {
         return R.ok(iSfcOperationPlanningMainService.queryFromK3Directly());
@@ -66,13 +65,13 @@ public class SfcOperationPlanningMainController extends BaseController {
     /**
      * 分页查询工序计划主及明细级联数据
      */
-    @SaIgnore
+    @SaCheckPermission("system:operationPlanningMain:list")
     @GetMapping("/cascadeList")
     public TableDataInfo<OperationPlanResultDTO> cascadeList(SfcOperationPlanningMainBo bo, PageQuery pageQuery) {
         return iSfcOperationPlanningMainService.queryCascadePageList(bo, pageQuery);
     }
 
-    @SaIgnore
+    @SaCheckPermission("system:operationPlanningMain:updateOperators")
     @Log(title = "工序作业人员/设备更新", businessType = BusinessType.UPDATE)
     @PutMapping("/updateOperators")
     public R<Void> updateOperators(@Validated @RequestBody OperationPlanningUpdateOperatorsReq req) {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/runner/JdUtil.java b/ruoyi-system/src/main/java/com/ruoyi/system/runner/JdUtil.java
index 67ef168..d9918c8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/runner/JdUtil.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/runner/JdUtil.java
@@ -1,5 +1,6 @@
 package com.ruoyi.system.runner;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -3688,7 +3689,7 @@ public class JdUtil {
         JsonObject filterObject1 = new JsonObject();
         filterObject1.addProperty("FieldName", "FPlanFinishTime");
         filterObject1.addProperty("Compare", "39");
-        filterObject1.addProperty("Value", "2026-04-15 00:00:00");
+        filterObject1.addProperty("Value", "2026-04-16 00:00:00");
         filterObject1.addProperty("Left", "");
         filterObject1.addProperty("Right", "");
         filterObject1.addProperty("Logic", 0);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SfcOperationPlanningMainServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SfcOperationPlanningMainServiceImpl.java
index 95c68f9..4d14708 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SfcOperationPlanningMainServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SfcOperationPlanningMainServiceImpl.java
@@ -59,7 +59,7 @@ public class SfcOperationPlanningMainServiceImpl implements ISfcOperationPlannin
     private final SfcOperationPlanningDetailMapper detailMapper;
 
     /**
-     * 同步K3工序计划数据
+     * 同步K3工序计划数据（全量新增与更新）
      */
     @Override
     @Transactional(rollbackFor = Exception.class)