From 756fa60cebfb82ba824e87d080d44fc9ec34ecc8 Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期二, 02 九月 2025 14:01:09 +0800
Subject: [PATCH] 订单出库显示明细是否完成修复
---
src/main/java/com/zy/asrs/controller/OpenController.java | 242 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 197 insertions(+), 45 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 752d5a2..c269880 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -5,6 +5,7 @@
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.OutLocInfoParam;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
import com.zy.common.web.BaseController;
@@ -14,6 +15,8 @@
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
/**
* Created by vincent on 2022/4/8
@@ -30,6 +33,186 @@
@Autowired
private OpenService openService;
+
+ @PostMapping("/scrk")
+ @AppAuth(memo = "GWMS璋冪敤鐢熸垚鍏ュ簱宸ヤ綔妗�")
+ public synchronized R gwmsGenerateInventory(@RequestHeader(required = false) String appkey,
+ @RequestBody GwmsGenerateInventoryDto param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok(openService.gwmsGenerateInventory(param));
+ }
+
+ @PostMapping("/fxprk")
+ @AppAuth(memo = "鍙嶄慨鍝佸叆搴�")
+ public synchronized R fxprk(@RequestHeader(required = false) String appkey,
+ @RequestBody FxprkParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok(openService.fxprk(param));
+ }
+
+ @PostMapping("/kthl")
+ @AppAuth(memo = "绌烘墭鐩樺洖娴�(浜屾ゼ娴佸埌涓�妤�)")
+ public synchronized R kthl(@RequestHeader(required = false) String appkey,
+ @RequestBody KthlParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return openService.kthl(param);
+ }
+
+ @PostMapping("/tb")
+ @AppAuth(memo = "涓�妤艰创鏍囪皟鐢�")
+ public synchronized R tb(@RequestHeader(required = false) String appkey,
+ @RequestBody TbParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return openService.tb(param);
+ }
+
+ @PostMapping("/dd")
+ @AppAuth(memo = "涓�妤兼墦甯﹁皟鐢�")
+ public synchronized R dd(@RequestHeader(required = false) String appkey,
+ @RequestBody TbParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return openService.dd(param);
+ }
+
+ @PostMapping("/zxrk")
+ @AppAuth(memo = "GWCS鍒拌揪鍫嗗灈鏈哄叆搴撶珯鐐硅姹俍WCS鎵ц")
+ public synchronized R crnExecute(@RequestHeader(required = false) String appkey,
+ @RequestBody CrnExecuteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok(openService.crnExecute(param));
+ }
+
+ @PostMapping("/ckrw")
+ @AppAuth(memo = "ZWMS鎺ユ敹MES涓嬪彂鍑哄簱浠诲姟")
+ public synchronized R zwmsOutLocWork(@RequestHeader(required = false) String appkey,
+ @RequestBody ZwmsOutLocWorkDto param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param,param.getOrderNo(),param.getOrderType(),param.getGroups())) {
+ R.parse("鍙傛暟涓嶈兘涓虹┖");
+ }
+ return openService.zwmsOutLocWork(param);
+ }
+
+ @PostMapping("/cxzk")
+ @AppAuth(memo = "鏍规嵁鍖呰缁勫彿鏌ヨ鍦ㄥ簱鏃堕棿-MES璋冪敤")
+ public synchronized R queryInLocTime(@RequestHeader(required = false) String appkey,
+ @RequestBody List<String> param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return openService.queryInLocTime(param);
+ }
+
+ @PostMapping("/ckjgsb")
+ @AppAuth(memo = "璐х墿鍒拌揪鍑哄簱鍙ｄ互鍚庯紝涓婃姤鍑哄簱缁撴灉")
+ public synchronized R outLocResultReport(@RequestHeader(required = false) String appkey,
+ @RequestBody GhjtApiParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok(openService.outLocResultReport(param));
+ }
+
+ @PostMapping("/cpjck")
+ @AppAuth(memo = "鎷嗙洏鏈哄嚭搴撴帴鍙�")
+ public synchronized R emptyOutLoc(@RequestHeader(required = false) String appkey,
+ @RequestBody GhjtApiParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok(openService.emptyOutLoc(param));
+ }
+
+ @PostMapping("/zpckdw")
+ @AppAuth(memo = "缁勭洏妗佹灦gwcs鍛婅瘔zwms璐х墿鍒颁綅锛寊mws鍛婅瘔gwcs鎬庝箞鎷�")
+ public synchronized R zphjDw(@RequestHeader(required = false) String appkey,
+ @RequestBody ZphjckdwParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return openService.zphjDw(param);
+ }
+
+ @PostMapping("/cdwc")
+ @AppAuth(memo = "缁勭洏妗佹灦鎷嗗灈瀹屾垚gwcs璇锋眰zwms")
+ public synchronized R zphjCdwc(@RequestHeader(required = false) String appkey,
+ @RequestBody ZphjcdwcParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return openService.zphjCdwc(param);
+ }
+
+ @PostMapping("/updateBarcode")
+ @AppAuth(memo = "鏇存柊搴撲綅绌烘墭鐩樻潯鐮�")
+ public synchronized R updateBarcode(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request) {
+ auth(appkey, null, request);
+ openService.updateBarcode();
+ return R.ok();
+ }
+
+ @PostMapping("/prodCheck")
+ @AppAuth(memo = "浜у搧鍚堟牸鏍￠獙,EMS璋冪敤")
+ public synchronized R prodCheck(@RequestHeader(required = false) String appkey,
+ @RequestBody List<ProdCheckParam> param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return openService.prodCheck(param);
+ }
+
+ @PostMapping("/xhd")
+ @AppAuth(memo = "鐩樼偣浣嶈姹備寒鐏�")
+ public synchronized R requestXhd(@RequestHeader(required = false) String appkey,
+ @RequestBody Map<String,Object> param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param.get("barcode"))){
+ return R.parse("鏉＄爜閿欒锛�" + param.get("barcode"));
+ }
+ return openService.requestXhd((String) param.get("barcode"));
+ }
+
+
+ @PostMapping("/kxlhcdwc")
+ @AppAuth(memo = "绌洪棽鐞嗚揣鎷嗗灈瀹屾垚")
+ public synchronized R kxlhCdwc(@RequestHeader(required = false) String appkey,
+ @RequestBody KxlhcdwcParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return openService.kxlhCdwc(param);
+ }
+
+ @PostMapping("/getUnfulfilledOrders")
+ @AppAuth(memo = "鑾峰彇鏈畬鎴愯鍗曠粺璁′俊鎭�")
+ public synchronized R getUnfulfilledOrders(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request) {
+ auth(appkey, null, request);
+ return openService.getUnfulfilledOrders();
+ }
+
+ @PostMapping("/getCrnLaneWayInfo")
+ @AppAuth(memo = "鑾峰彇鍫嗗灈鏈虹姸鎬佸強鎵�灞炲贩閬撳簱浣嶇粺璁′俊鎭�")
+ public synchronized R getCrnLaneWayInfo(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request) {
+ auth(appkey, null, request);
+ return openService.getCrnLaneWayInfo();
+ }
+
+ @PostMapping("/getOutLocInfoByBarcode")
+ @AppAuth(memo = "鏍规嵁鎵樼洏鐮侊紝鑾峰彇鍑哄簱鐗╂枡淇℃伅杩涜澶у睆鏄剧ず")
+ public synchronized R getOutLocInfoByBarcode(@RequestHeader(required = false) String appkey,
+ @RequestBody OutLocInfoParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param) || Cools.isEmpty(param.getBarcode())) {
+ return R.parse("鎵樼洏鐮佷笉鑳戒负绌�");
+ }
+ return openService.getOutLocInfoByBarcode(param.getBarcode());
+ }
+
/*@PostMapping("/order/matSync/default/v1")
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
@@ -134,7 +317,7 @@
}*/
private void auth(String appkey, Object obj, HttpServletRequest request) {
- log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+ log.info("OpenController绫�:銆恵}銆戞帴鍙ｈ璁块棶;appkey:銆恵}銆�;璇锋眰鏁版嵁锛氥�恵}銆�", request.getRequestURI(), appkey, JSON.toJSONString(obj));
request.setAttribute("cache", obj);
if (!auth) {
return;
@@ -147,50 +330,6 @@
}
}
- @PostMapping("/scrk")
- @AppAuth(memo = "GWMS璋冪敤鐢熸垚鍏ュ簱宸ヤ綔妗�")
- public synchronized R gwmsGenerateInventory(@RequestHeader(required = false) String appkey,
- @RequestBody GwmsGenerateInventoryDto param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- return R.ok(openService.gwmsGenerateInventory(param));
- }
-
- @PostMapping("/zxrk")
- @AppAuth(memo = "GWCS鍒拌揪鍫嗗灈鏈哄叆搴撶珯鐐硅姹俍WCS鎵ц")
- public synchronized R crnExecute(@RequestHeader(required = false) String appkey,
- @RequestBody CrnExecuteParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- return R.ok(openService.crnExecute(param));
- }
-
- @PostMapping("/ckrw")
- @AppAuth(memo = "ZWMS鎺ユ敹MES涓嬪彂鍑哄簱浠诲姟")
- public synchronized R zwmsOutLocWork(@RequestHeader(required = false) String appkey,
- @RequestBody ZwmsOutLocWorkDto param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- return R.ok(openService.zwmsOutLocWork(param));
- }
-
- @PostMapping("/ckjgsb")
- @AppAuth(memo = "璐х墿鍒拌揪鍑哄簱鍙ｄ互鍚庯紝涓婃姤鍑哄簱缁撴灉")
- public synchronized R outLocResultReport(@RequestHeader(required = false) String appkey,
- @RequestBody GhjtApiParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- return R.ok(openService.outLocResultReport(param));
- }
-
- @PostMapping("/cpjck")
- @AppAuth(memo = "鎷嗙洏鏈哄嚭搴撴帴鍙�")
- public synchronized R emptyOutLoc(@RequestHeader(required = false) String appkey,
- @RequestBody GhjtApiParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- return R.ok(openService.emptyOutLoc(param));
- }
// @PostMapping("/cpjck")
// @AppAuth(memo = "鐗╂枡淇℃伅鑾峰彇")
@@ -337,6 +476,19 @@
return R.ok(param);
}
+ /**
+ * 璁″垝缁勮揣鍗�
+ */
+ @PostMapping("/groupOrderConfirm/auth/v1")
+ @AppAuth(memo = "璁″垝鍗曟嵁涓嬪彂")
+ public synchronized R groupOrderConfirm(@RequestHeader(required = false) String appkey,
+ @RequestBody GroupOrderConfirmParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.groupOrderConfirm(param);
+ return R.ok(param);
+ }
+
/*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
}
--
Gitblit v1.9.1