From d724176dbcf033a096d7dcbd864c05485f021fbb Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 17 十二月 2025 08:30:56 +0800
Subject: [PATCH] 1、 钢化前钢化出片逻辑调整，避免卧转立信号对调度任务的影响 2、修改出片方式，当玻璃未在关系表时，默认出一片 3、中空新增进片线路校验，避免钢化重复报工
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java
index 5fbde43..c1a6454 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeProjectController.java
@@ -1,14 +1,13 @@
package com.mes.pp.controller;
-import com.baomidou.mybatisplus.extension.api.R;
import com.mes.pp.entity.OptimizeProject;
+import com.mes.pp.entity.dto.ProgressDTO;
import com.mes.pp.entity.request.OptimizeRequest;
import com.mes.pp.service.OptimizeProjectService;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import liquibase.pro.packaged.O;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -66,6 +65,20 @@
List<OptimizeProject> resultList = optimizeProjectService.updateEngineerScheduling(type, engineerList);
return Result.build(200, "鏇存柊鎴愬姛", resultList);
}
+ @ApiOperation("鏇存柊鍒囧壊宸ョ▼淇℃伅")
+ @PostMapping("/updateCuttingLayout") //鏇存柊宸ョ▼鎺掍骇淇℃伅 engineerScheduling琛�
+ @ResponseBody
+ public Result<List<OptimizeProject>> updateCuttingLayout(@RequestParam Integer type, @RequestBody List<OptimizeProject> engineerList) {
+ List<OptimizeProject> resultList = optimizeProjectService.updateCuttingLayout(type, engineerList);
+ return Result.build(200, "鏇存柊鎴愬姛", resultList);
+ }
+ @ApiOperation("鏌ヨ宸ョ▼杩涘害")
+ @PostMapping("/selectProgress") //鏇存柊宸ョ▼鎺掍骇淇℃伅 engineerScheduling琛�
+ @ResponseBody
+ public Result<List<ProgressDTO>> selectProgress(@RequestBody OptimizeRequest optimizeRequest) {
+ List<ProgressDTO> resultList = optimizeProjectService.selectProgress(optimizeRequest.getProjectNo());
+ return Result.build(200, "鏇存柊鎴愬姛", resultList);
+ }
// @ApiOperation("淇濆瓨宸ョ▼淇℃伅")
// @PostMapping("/saveProject") //鏄剧ず宸ョ▼閫夋嫨淇℃伅
--
Gitblit v1.8.0