hbyt/evoToK3Cloud
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新，工序计划

Browse Source
This commit is contained in:
tzy 2026-04-15 19:43:06 +08:00
parent e5aab8b9a7
commit 1be74815a2
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/application.yml
View File

@ -29,7 +29,7 @@ server:
port: 8033 port: 8033
servlet: servlet:
# 应用的访问路径 # 应用的访问路径
context-path: / context-path: /dev-api
undertow: undertow:
# HTTP post内容的最大大小。当值为-1时，默认值为大小是无限的 # HTTP post内容的最大大小。当值为-1时，默认值为大小是无限的
max-http-post-size: -1 max-http-post-size: -1

9
ruoyi-system/src/main/java/com/ruoyi/system/controller/SfcOperationPlanningMainController.java
View File

@ -46,8 +46,7 @@ public class SfcOperationPlanningMainController extends BaseController {
/** /**
* 同步工序计划数据 * 同步工序计划数据
*/ */
@SaIgnore @SaCheckPermission("system:operationPlanningMain:sync")
//@SaCheckPermission("system:operationPlanningMain:sync")
@Log(title = "工序计划数据同步", businessType = BusinessType.INSERT) @Log(title = "工序计划数据同步", businessType = BusinessType.INSERT)
@PostMapping("/sync") @PostMapping("/sync")
public R<Void> syncData() { public R<Void> syncData() {
@ -57,7 +56,7 @@ public class SfcOperationPlanningMainController extends BaseController {
/** /**
* 直接从K3查询工序计划数据（不入库测试） * 直接从K3查询工序计划数据（不入库测试）
*/ */
@SaIgnore @SaCheckPermission("system:operationPlanningMain:queryK3")
@GetMapping("/queryFromK3") @GetMapping("/queryFromK3")
public R<List<OperationPlanResultDTO>> queryFromK3() { public R<List<OperationPlanResultDTO>> queryFromK3() {
return R.ok(iSfcOperationPlanningMainService.queryFromK3Directly()); return R.ok(iSfcOperationPlanningMainService.queryFromK3Directly());
@ -66,13 +65,13 @@ public class SfcOperationPlanningMainController extends BaseController {
/** /**
* 分页查询工序计划主及明细级联数据 * 分页查询工序计划主及明细级联数据
*/ */
@SaIgnore @SaCheckPermission("system:operationPlanningMain:list")
@GetMapping("/cascadeList") @GetMapping("/cascadeList")
public TableDataInfo<OperationPlanResultDTO> cascadeList(SfcOperationPlanningMainBo bo, PageQuery pageQuery) { public TableDataInfo<OperationPlanResultDTO> cascadeList(SfcOperationPlanningMainBo bo, PageQuery pageQuery) {
return iSfcOperationPlanningMainService.queryCascadePageList(bo, pageQuery); return iSfcOperationPlanningMainService.queryCascadePageList(bo, pageQuery);
} }
@SaIgnore @SaCheckPermission("system:operationPlanningMain:updateOperators")
@Log(title = "工序作业人员/设备更新", businessType = BusinessType.UPDATE) @Log(title = "工序作业人员/设备更新", businessType = BusinessType.UPDATE)
@PutMapping("/updateOperators") @PutMapping("/updateOperators")
public R<Void> updateOperators(@Validated @RequestBody OperationPlanningUpdateOperatorsReq req) { public R<Void> updateOperators(@Validated @RequestBody OperationPlanningUpdateOperatorsReq req) {

3
ruoyi-system/src/main/java/com/ruoyi/system/runner/JdUtil.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.system.runner; package com.ruoyi.system.runner;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
@ -3688,7 +3689,7 @@ public class JdUtil {
JsonObject filterObject1 = new JsonObject(); JsonObject filterObject1 = new JsonObject();
filterObject1.addProperty("FieldName", "FPlanFinishTime"); filterObject1.addProperty("FieldName", "FPlanFinishTime");
filterObject1.addProperty("Compare", "39"); 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("Left", "");
filterObject1.addProperty("Right", ""); filterObject1.addProperty("Right", "");
filterObject1.addProperty("Logic", 0); filterObject1.addProperty("Logic", 0);

2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SfcOperationPlanningMainServiceImpl.java
View File

@ -59,7 +59,7 @@ public class SfcOperationPlanningMainServiceImpl implements ISfcOperationPlannin
private final SfcOperationPlanningDetailMapper detailMapper; private final SfcOperationPlanningDetailMapper detailMapper;
/** /**
* 同步K3工序计划数据 * 同步K3工序计划数据（全量新增与更新）
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)