From fbd31387721424c65b173cbb23b03202f3e7dce6 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 12 五月 2025 21:13:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java | 84 +++++++++++++++++++++++++++++-------------
1 files changed, 58 insertions(+), 26 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 90553bc..3723ff4 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,20 +1,21 @@
package com.mes.rawglassdetails.controller;
-
-import com.mes.entity.request.GeneralRequest;
-import com.mes.menu.entity.SysMenu;
-import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
+import com.mes.rawglassdetails.entity.dto.RawGlassStorageDetailsDTO;
+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;
+
+import java.util.List;
/**
- * <p>
* 鍓嶇鎺у埗鍣�
- * </p>
*
* @author wf
* @since 2024-09-10
@@ -24,28 +25,59 @@
public class RawGlassStorageDetailsController {
@Autowired
-// RawGlassStorageDetailsService rawGlassStorageDetailsService;
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);
- }
+
+ @ApiOperation("鍏ュ簱璇锋眰")
+ @PostMapping("/warehousingRequest")
+ public Result<String> warehousingRequest(int leftingStation) {
+ return Result.build(
+ 200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.warehousingRequest(leftingStation));
}
- @ApiOperation("鏂板鍏ュ簱")
- @PostMapping("/save")
- public Result save(@Validated @RequestBody RawGlassStorageDetails rawGlassStorageDetails) {
-// rawGlassStorageDetailsService.save(rawGlassStorageDetails);
-// GeneralRequest request=new GeneralRequest();
- return Result.success();
-
+ @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(Long slot) {
+ return Result.success(rawGlassStorageDetailsService.deleteWarehousing(slot));
+ }
+
+ @ApiOperation("鍘熺墖鍑哄簱")
+ @PostMapping("/outWarehousing")
+ 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));
+ }
+
+ @ApiOperation("鍘熺墖浣跨敤鎯呭喌")
+ @PostMapping("/patternUsage")
+ public Result<List<RawGlassStorageDetailsDTO>> patternUsage(String width, String height, String thickness, String films) {
+ return Result.build(200, "鏌ヨ鎴愬姛", rawGlassStorageDetailsService.patternUsage(width, height, thickness, films));
+ }
+
}
-
--
Gitblit v1.8.0