From 342108bdc3b08ba44b99d9e147cb9c97d387db23 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 08 十一月 2025 08:38:53 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/OpenController.java | 144 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 105 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index efc1528..d0061c3 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -197,7 +197,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 +209,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,15 +219,41 @@
}
/**
- * 涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
+ * 涓帶(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) {
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 = "涓帶锛氬嚭搴撳畬鎴愭湀鍙扮浉鍏�") //old闇�瑕佷慨鏀�
+ public synchronized R balconyComplete(@RequestHeader(required = false) String appkey,
+ @RequestBody LabellerMatParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.balconyComplete(param);
return R.ok(param);
}
@@ -241,7 +267,11 @@
@RequestBody SingleUnstackingCompleteParam param,
HttpServletRequest request) {
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);
}
@@ -254,51 +284,87 @@
@RequestBody SingleMountUnstackingCompleteParam param,
HttpServletRequest request) {
auth(appkey, param, request);
- openService.singleMountUnstackingComplete(param);
- return R.ok(param);
- }
-
-
- /**
- * 涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭� 娴嬭瘯1
- */
- @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
+ * 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 QualityInspectionParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
- openService.cs3();
- return R.ok(param);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ //鍒ゆ柇param鍙傛暟
+ if (Cools.isEmpty(param.getBoxNo())){
+ throw new CoolException("鍙傛暟锛氱鍙� boxNo涓虹┖");
+ }
+ //鍒ゆ柇param鍙傛暟
+ if (Cools.isEmpty(param.getModel())){
+ throw new CoolException("鍙傛暟锛氬嵎鍙� Model涓虹┖");
+ }
+ //鍒ゆ柇param鍙傛暟
+ if (Cools.isEmpty(param.getMemo())){
+ throw new CoolException("鍙傛暟锛氬娉� Memo涓虹┖");
+ }
+
+ return openService.packagingAreaOrderCreate(param);
}
+
+ /**
+ * 璁″垝缁勮揣鍗�
+ */
+ @PostMapping("/order/cargo/booking/note/v1")
+ @AppAuth(memo = "璁″垝缁勮揣鍗�")
+ public synchronized R cargoBookingNote(@RequestHeader(required = false) String appkey,
+ @RequestBody OrderCargoBookingNoteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ //鍒ゆ柇param鍙傛暟
+ if (Cools.isEmpty(param.getGroupGoodsNo())){
+ throw new CoolException("鍙傛暟锛氱粍璐у崟鍙� groupGoodsNo涓虹┖");
+ }
+ //鍒ゆ柇param鍙傛暟
+ if (Cools.isEmpty(param.getModelList()) || param.getBoxNoList().isEmpty()){
+ throw new CoolException("鍙傛暟锛氬嵎鍙� modelList涓虹┖");
+ }
+ //鍒ゆ柇param鍙傛暟
+ if (Cools.isEmpty(param.getBoxNoList()) || param.getModelList().isEmpty()){
+ throw new CoolException("鍙傛暟锛氱鍙烽泦鍚� boxNoList涓虹┖");
+ }
+
+ return openService.cargoBookingNote(param);
+ }
+
/*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
}
--
Gitblit v1.9.1