From 3c7d672fb7d6c34742fb7da6f66616ccf3be2c9a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 08 十一月 2024 14:50:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 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..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,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) {
@@ -47,4 +54,12 @@
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