From 0926a39aef0c9fdcee823e189bac2e532c6f0d4b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 20 十月 2024 21:06:51 +0800
Subject: [PATCH] 1、对接原片仓储opc 2、关闭liquibase，仅需要有脚本变动的时候开启在执行，避免启动报错 3、原片仓储新增入库请求、出库情况，调整整体逻辑，增加格子号架子号，任务表、详情表、工位表都需要记录架子信息，用于任务执行过程中，架子在执行过程中可返回架子对应的工位上，避免架子乱放后格子架子号不对应的情况发生。
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
index 5851554..3d98ea2 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
@@ -36,7 +36,7 @@
private EngineeringService engineeringService;
@Autowired
private OptimizeProjectService optimizeProjectService;
- @ApiOperation("鏄剧ず姝ｅ湪鍑虹墖鐨勫伐绋嬩俊鎭�")
+ @ApiOperation("鏄剧ず閫夋嫨鐨勫伐绋嬩俊鎭�")
@GetMapping("/prioritylist") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
@ResponseBody
public Result<List<UpPattenUsage>> prioritylist() {
@@ -49,10 +49,34 @@
@PostMapping("/selectUpPattenUsage") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
@ResponseBody
public Result<List<UpPattenUsage>> selectUpPattenUsage(@RequestBody Engineering engineering) {
- List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId());
- return Result.build(200, "", upPattenUsages);
+ List<UpPattenUsage> upPattenUsages=null;
+ UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
+ if(upPattenUsage == null){
+ upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId());
+ }else {
+ upPattenUsages= upPattenUsageService.selectUpPattenUsage(upPattenUsage);
}
+ if (!upPattenUsages.isEmpty()) {
+ return Result.build(200, "鎴愬姛", upPattenUsages);
+ }else {
+ return Result.build(100, "澶辫触", upPattenUsages);
+ }
+
+ }
+
+ @ApiOperation("鍒囨崲鍘熺墖涓婄墖鐘舵��")
+ @PostMapping("/updateGlassState") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
+ @ResponseBody
+ public Result<Boolean> updateGlassState(@RequestBody UpPattenUsage upPattenUsage) {
+ Boolean whether = upPattenUsageService.updateGlassState(upPattenUsage);
+ if (whether){
+ return Result.build(200, "鎴愬姛", whether);
+ }else {
+ return Result.build(100, "澶辫触", whether);
+ }
+
+ }
}
--
Gitblit v1.8.0