From ea94ccefcb62bac5ab4c9cdecb3dae657e8c4c34 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 20 二月 2025 11:05:38 +0800
Subject: [PATCH] 1、fixbug:优化钢化指定工程大数据插入异常bug 2、修复接口参数问题 3、钢化查询添加炉号排序
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 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 aa0665f..8e56d61 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,16 +1,15 @@
package com.mes.rawglassdetails.controller;
-import com.mes.entity.request.GeneralRequest;
import com.mes.rawglassdetails.entity.request.RawGlassRequest;
import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
-import com.mes.userinfo.entity.vo.SysUserVO;
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 java.util.List;
+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;
/**
* 鍓嶇鎺у埗鍣�
@@ -22,15 +21,23 @@
@RequestMapping("/rawGlassStorageDetails")
public class RawGlassStorageDetailsController {
- @Autowired private RawGlassStorageDetailsService rawGlassStorageDetailsService;
+ @Autowired
+ private RawGlassStorageDetailsService rawGlassStorageDetailsService;
+
+ @ApiOperation("鍏ュ簱璇锋眰")
+ @PostMapping("/warehousingRequest")
+ public Result<String> warehousingRequest(int leftingStation) {
+ return Result.build(
+ 200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.warehousingRequest(leftingStation));
+ }
@ApiOperation("鍘熺墖鍏ュ簱")
@PostMapping("/patternWarehousing")
public Result<String> patternWarehousing(@Validated @RequestBody RawGlassRequest request) {
-
return Result.build(
- 200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.patternWarehousing(request));
+ 200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.patternWarehousing(request));
}
+
@ApiOperation("鏇存柊鍓╀綑鏁伴噺")
@PostMapping("/updateQuantity")
public Result<Object> updateQuantity(@Validated @RequestBody RawGlassRequest request) {
@@ -38,13 +45,27 @@
}
@ApiOperation("鍒犻櫎鍘熺墖")
@PostMapping("/deleteWarehousing")
- public Result<Object> deleteWarehousing(@RequestBody Long slotId) {
+ public Result<Object> deleteWarehousing(Long slotId) {
return Result.success(rawGlassStorageDetailsService.deleteWarehousing(slotId));
}
@ApiOperation("鍘熺墖鍑哄簱")
@PostMapping("/outWarehousing")
- public Result<Object> outWarehousing(@RequestBody Long slotId) {
+ public Result<Object> outWarehousing(Long slotId) {
return Result.success(rawGlassStorageDetailsService.outWarehousing(slotId));
}
+
+
+ @ApiOperation("鍑哄簱璇锋眰")
+ @PostMapping("/outWarehousingRequest")
+ public Result<String> outWarehousingRequest(int leftingStation) {
+ return Result.build(
+ 200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.outWarehousingRequest(leftingStation));
+ }
+
+ @ApiOperation("鏋跺瓙澶嶄綅")
+ @PostMapping("/shelfReset")
+ public Result<String> shelfReset(Long slot) {
+ return Result.success(rawGlassStorageDetailsService.shelfReset(slot));
+ }
}
--
Gitblit v1.8.0