From 91d7afedf3ea51ee87ee47d4da2e1b6243f8fb84 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 05 一月 2025 21:50:21 +0800
Subject: [PATCH] 1、大理片笼进片任务新增数量校验，当收到进片请求时，拿电气的玻璃数量与mes接收到的数量作比较，相同继续执行，不相同结束本次任务 2、李赛克文件优化，合中空玻璃每个间隔框的类型可能不同，需要在界面上做选择 3、中空设备号与格子号不匹配bug解决 4、自动报工存在接口调用异常，临时将调用接口回退原版本，待最新接口调用无异常后更新接口 5、fixbug:中空大理片详情界面删除接口异常
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java | 64 ++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 23 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java
index 7eb1bdc..46e7155 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java
@@ -1,18 +1,18 @@
package com.mes.rawglassdetails.controller;
-
import com.mes.rawglassdetails.entity.request.RawGlassRequest;
import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
/**
- * <p>
* 鍓嶇鎺у埗鍣�
- * </p>
*
* @author wf
* @since 2024-09-10
@@ -21,27 +21,45 @@
@RequestMapping("/rawGlassStorageDetails")
public class RawGlassStorageDetailsController {
- @Autowired
- private RawGlassStorageDetailsService rawGlassStorageDetailsService;
- @ApiOperation("宸ヤ綅鐘舵��")
- @PostMapping("/updateEnableState")
- @ResponseBody
- public Result<Boolean> updateStatus(@RequestBody Integer enableState) {
- boolean result = rawGlassStorageDetailsService.updateRawGlassStorageDetails(String.valueOf(enableState));
- if (enableState == 1) {
- return Result.build(1, "鍚敤", result);
- } else {
- return Result.build(0, "绂佺敤", result);
- }
- }
+ @Autowired
+ private RawGlassStorageDetailsService rawGlassStorageDetailsService;
- @ApiOperation("鍘熺墖鍏ュ簱")
- @PostMapping("/patternWarehousing")
- public Result<String> patternWarehousing(@Validated @RequestBody RawGlassRequest request) {
+ @ApiOperation("鍏ュ簱璇锋眰")
+ @PostMapping("/warehousingRequest")
+ public Result<String> warehousingRequest(int leftingStation) {
+ return Result.build(
+ 200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.warehousingRequest(leftingStation));
+ }
- return Result.build(200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.patternWarehousing(request));
+ @ApiOperation("鍘熺墖鍏ュ簱")
+ @PostMapping("/patternWarehousing")
+ public Result<String> patternWarehousing(@Validated @RequestBody RawGlassRequest request) {
+ return Result.build(
+ 200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.patternWarehousing(request));
+ }
- }
+ @ApiOperation("鏇存柊鍓╀綑鏁伴噺")
+ @PostMapping("/updateQuantity")
+ public Result<Object> updateQuantity(@Validated @RequestBody RawGlassRequest request) {
+ return Result.success(rawGlassStorageDetailsService.UpdateQuantity(request));
+ }
+ @ApiOperation("鍒犻櫎鍘熺墖")
+ @PostMapping("/deleteWarehousing")
+ public Result<Object> deleteWarehousing(@RequestBody Long slotId) {
+ return Result.success(rawGlassStorageDetailsService.deleteWarehousing(slotId));
+ }
+ @ApiOperation("鍘熺墖鍑哄簱")
+ @PostMapping("/outWarehousing")
+ public Result<Object> outWarehousing(@RequestBody Long slotId) {
+ return Result.success(rawGlassStorageDetailsService.outWarehousing(slotId));
+ }
+
+
+ @ApiOperation("鍑哄簱璇锋眰")
+ @PostMapping("/outWarehousingRequest")
+ public Result<String> outWarehousingRequest(int leftingStation) {
+ return Result.build(
+ 200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.outWarehousingRequest(leftingStation));
+ }
}
-
--
Gitblit v1.8.0