From 8d702fa2c62b3617f71c5e91293e338d1ccd1549 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 08 十一月 2025 13:15:23 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/OpenController.java | 121 +++++++++++++++++++++++++---------------
1 files changed, 75 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index a343c06..174e6b9 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -13,6 +13,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -197,7 +198,7 @@
* 璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�
*/
@PostMapping("/labeller/mat/auth/v1")
- @AppAuth(memo = "璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�")
+ @AppAuth(memo = "璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�") //old闇�瑕佷慨鏀�
public synchronized R labellerMat(@RequestHeader(required = false) String appkey,
@RequestBody LabellerMatParam param,
HttpServletRequest request) {
@@ -209,7 +210,7 @@
* 璐存爣鏈鸿创鏍囧畬鎴�
*/
@PostMapping("/labeller/complete/auth/v1")
- @AppAuth(memo = "璐存爣鏈鸿创鏍囧畬鎴�")
+ @AppAuth(memo = "璐存爣鏈鸿创鏍囧畬鎴�") //old闇�瑕佷慨鏀�
public synchronized R labellerComplete(@RequestHeader(required = false) String appkey,
@RequestBody LabellerCompleteParam param,
HttpServletRequest request) {
@@ -219,25 +220,36 @@
}
/**
- * 涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
+ * 涓帶(2妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
*/
@PostMapping("/palletizing/complete/auth/v1")
- @AppAuth(memo = "鐮佸灈瀹屾垚涓嬪彂鍏ュ簱淇℃伅")
- public synchronized R palletizingComplete(@RequestHeader(required = false) String appkey,
- @RequestBody PalletizingCompleteParam param,
+ @AppAuth(memo = "涓帶(2妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�")
+ public synchronized R PalletizingCompleteTwoFloorParam(@RequestHeader(required = false) String appkey,
+ @RequestBody PalletizingCompleteTwoFloorParam param,
HttpServletRequest request) {
-// appkey = "ea1f0459efc02a79f046f982767939ae";
-
auth(appkey, param, request);
- openService.palletizingComplete(param);
+ openService.PalletizingCompleteTwoFloorParam(param);
return R.ok(param);
+ }
+
+ /**
+ * 鏉剧洓(1妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
+ */
+ @PostMapping("/palletizing/complete/auth/v2")
+ @AppAuth(memo = "鏉剧洓(1妤�)锛氱爜鍨涘畬鎴愪笅鍙戠‘璁や俊鍙�")
+ public synchronized R palletizingCompleteS(@RequestHeader(required = false) String appkey,
+ @RequestBody PalletizingCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.palletizingCompleteS(param);
+ return R.ok();
}
/**
* 涓帶锛氬嚭搴撳畬鎴愭湀鍙扮浉鍏�
*/
@PostMapping("/balcony/complete/auth/v1")
- @AppAuth(memo = "涓帶锛氬嚭搴撳畬鎴愭湀鍙扮浉鍏�")
+ @AppAuth(memo = "涓帶锛氬嚭搴撳畬鎴愭湀鍙扮浉鍏�") //old闇�瑕佷慨鏀�
public synchronized R balconyComplete(@RequestHeader(required = false) String appkey,
@RequestBody LabellerMatParam param,
HttpServletRequest request) {
@@ -255,10 +267,12 @@
public synchronized R singleUnstackingComplete(@RequestHeader(required = false) String appkey,
@RequestBody SingleUnstackingCompleteParam param,
HttpServletRequest request) {
-// appkey = "ea1f0459efc02a79f046f982767939ae";
-
auth(appkey, param, request);
- openService.singleUnstackingComplete(param);
+ try{
+ openService.singleUnstackingComplete(param);
+ } catch (Exception e){
+ return R.error(e.getMessage()).add(e.getMessage());
+ }
return R.ok(param);
}
@@ -270,54 +284,69 @@
public synchronized R singleMountUnstackingComplete(@RequestHeader(required = false) String appkey,
@RequestBody SingleMountUnstackingCompleteParam param,
HttpServletRequest request) {
-// appkey = "ea1f0459efc02a79f046f982767939ae";
-
auth(appkey, param, request);
- openService.singleMountUnstackingComplete(param);
- return R.ok(param);
- }
-
-
- /**
- * 娴嬭瘯1 鍏ュ簱鍓嶈緭閫佺嚎鍐欏叆鎵樼洏鐮侊紝216绔欐祴璇曠敤
- */
- @PostMapping("/cs1/auth/v1")
- @AppAuth(memo = "")
- public synchronized R cs1(@RequestHeader(required = false) String appkey,
- @RequestBody PalletizingCompleteParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- openService.cs1(param.getBarcode());
+ try{
+ openService.singleMountUnstackingComplete(param);
+ } catch (Exception e){
+ return R.error(e.getMessage()).add(e.getMessage());
+ }
return R.ok(param);
}
/**
- * 娴嬭瘯2 娓呴櫎鎵樼洏鐮侊紝216绔欐祴璇曠敤 Copy
+ * FQC璐ㄦ
*/
- @PostMapping("/cs2/auth/v1")
- @AppAuth(memo = "")
- public synchronized R cs2(@RequestHeader(required = false) String appkey,
- @RequestBody PalletizingCompleteParam param,
- HttpServletRequest request) {
+ @PostMapping("/quality/inspection/auth/v1")
+ @AppAuth(memo = "FQC璐ㄦ")
+ public synchronized R qualityInspection(@RequestHeader(required = false) String appkey,
+ @RequestBody QualityInspectionParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
- openService.cs2();
- return R.ok(param);
+ openService.qualityInspection(param);
+ return R.ok();
}
+
+
/**
- * 娴嬭瘯3
+ * 娣诲姞鍑哄簱鍗曘�佹甯搁��搴撹嚦浜屾ゼ鍖呰
*/
- @PostMapping("/cs3/auth/v1")
-// @AppAuth(memo = "")
- public synchronized R cs3(@RequestHeader(required = false) String appkey,
- @RequestBody PalletizingCompleteParam param,
- HttpServletRequest request) {
+ @PostMapping("/order/normalTransferToTheSecond-floorPackagingArea/v1")
+ @AppAuth(memo = "鎷嗗寘瑁呮鍑哄簱")
+ public synchronized R packagingAreaOrderCreate(@RequestHeader(required = false) String appkey,
+ @RequestBody @Valid OrderCargoBookingNoteParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
- openService.cs3();
- return R.ok(param);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ return openService.packagingAreaOrderCreate(param);
}
+
+ /**
+ * 璁″垝缁勮揣鍗�
+ */
+ @PostMapping("/order/cargo/booking/note/v1")
+ @AppAuth(memo = "璁″垝缁勮揣鍗�")
+ public synchronized R cargoBookingNote(@RequestHeader(required = false) String appkey,
+ @RequestBody @Valid OrderCargoBookingNoteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getGroupGoodsNo())){
+ return new R(401,"缁勮揣鍗曞彿涓虹┖锛�");
+ }
+ if (Cools.isEmpty(param.getCstmrName())){
+ return new R(401,"瀹㈡埛鍚嶇О涓虹┖锛�");
+ }
+
+ return openService.cargoBookingNote(param);
+ }
+
/*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
}
--
Gitblit v1.9.1