From 47e872ed061be9411493e6f097f666c20663fd13 Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期四, 12 三月 2026 13:12:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 179 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 91 insertions(+), 88 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index e2b47a7..3995dcb 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,22 +1,24 @@
package com.zy.asrs.controller;
-import com.alibaba.excel.event.Handler;
+
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.WaitPakin;
-import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
-import com.zy.asrs.service.ApiLogService;
+import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.WaitPakinService;
+import com.zy.asrs.service.WrkDetlService;
import com.zy.common.model.DetlDto;
-import com.zy.common.utils.HttpHandler;
+import com.zy.common.model.LocDetlDto;
+import com.zy.common.model.enums.WorkNoType;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.*;
import javax.naming.ldap.HasControls;
@@ -40,6 +42,12 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
// @PostMapping("/order/matSync/default/v1")
//// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
@@ -106,29 +114,17 @@
return R.ok().add(openService.pakinOrderComplete(param));
}
+
+
/**
- * 娣诲姞鍑哄簱鍗�
+ * pause out order
*/
- @PostMapping("/order/pakout/default/v1")
- @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
- public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakoutParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
+ @PostMapping("/order/pakout/pause/default/v1")
+ public synchronized R pakoutOrderPause(@RequestBody OpenOrderPakoutPauseParam param){
+ if (Cools.isEmpty(param) || Cools.isEmpty(param.getOrderId())) {
+ return R.error("orderNo is empty");
}
- if (Cools.isEmpty(param.getOrderNo())) {
- return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getOrderType())) {
- return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getOrderDetails())) {
- return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
- }
- openService.pakoutOrderCreate(param);
- return R.ok();
+ return openService.pakoutOrderPause(param);
}
/**
@@ -321,7 +317,7 @@
* 鎵樼洏灏辩华鐘舵�佹煡璇�
*/
@PostMapping("/arm/task/loc_status")
- @AppAuth(memo = "鎵樼洏灏辩华鐘舵�佹煡璇�")
+// @AppAuth(memo = "鎵樼洏灏辩华鐘舵�佹煡璇�")
public synchronized R TaskArmLocStatus(@RequestHeader(required = false) String appkey,
@RequestBody ArmOKParam param,
HttpServletRequest request) {
@@ -348,7 +344,7 @@
* 寮傚父涓婃姤
*/
@PostMapping("/armAbnormalOperation")
- @AppAuth(memo = "寮傚父涓婃姤")
+// @AppAuth(memo = "寮傚父涓婃姤")
public synchronized R ArmAbnormalOperation(@RequestHeader(required = false) String appkey,
@RequestBody TaskArmErrorParam param,
HttpServletRequest request) {
@@ -368,7 +364,7 @@
* 璁㈠崟瀹屾垚涓婃姤
*/
@PostMapping("/arm/task/order_result")
- @AppAuth(memo = "璁㈠崟瀹屾垚涓婃姤")
+// @AppAuth(memo = "璁㈠崟瀹屾垚涓婃姤")
public synchronized R TaskArmWorkOrderStatus(@RequestHeader(required = false) String appkey,
@RequestBody OrderArmEndParam param,
HttpServletRequest request) {
@@ -403,14 +399,17 @@
public synchronized R syncMatInfoV2(@RequestBody(required = false) List<MatSyncParam.MatParam> param){
System.out.println(param);
-// if (Cools.isEmpty(param)) {
-// return R.parse(BaseRes.PARAM);
-// }
-// MatSyncParam matSyncParam = new MatSyncParam();
-// List<MatSyncParam.MatParam> objects = new ArrayList<>();
-// objects.add(param);
-// matSyncParam.matDetails = objects;
-// openService.syncMat(matSyncParam);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ MatSyncParam matSyncParam = new MatSyncParam();
+ List<MatSyncParam.MatParam> objects = new ArrayList<>();
+ for (MatSyncParam.MatParam matParam : param) {
+ objects.add(matParam);
+ }
+
+ matSyncParam.matDetails = objects;
+ openService.syncMat(matSyncParam);
return R.ok();
}
@@ -420,62 +419,43 @@
* 鍚屾绔欑偣杩涘嚭绫诲瀷
* 鍚屾绔欑偣鍚嶇О
* 鍚屾鎿嶄綔绫诲瀷
- * @return
+ * return
*/
@PostMapping("/station/all")
public synchronized R stationAll(){
- List<LinkedHashMap<String,Object>> list =new ArrayList<>();
- LinkedHashMap<String,Object> map = new LinkedHashMap<>();
- map.put("stationId","101");
- map.put("stationType","3");
- map.put("stationName","101");
- list.add(map);
- System.out.println();
-// try {
-// //鑾峰彇Cookie鍊�
-// HashMap<String, Object> headers = new HashMap<>();
-// headers.put("accesstoken", erpSecret.getAccessToken());
-// headers.put("x-acgw-identity", xAcfwIdentity); // 鑷畾涔夎姹傚ご
-// response = new HttpHandler.Builder()
-// .setHeaders(headers)
-// .setUri(URL)
-// .setPath(path)
-// .setJson(add)
-// .build()
-// .doPost();
-// JSONObject jsonResponse = JSON.parseObject(response);
-// if (jsonResponse.getString("errorCode").equals("401")) {
-//
-// }
-// }catch (Exception e){
-// e.printStackTrace();
-// }
-// if (Cools.isEmpty(param)) {
-// return R.parse(BaseRes.PARAM);
-// }
-// MatSyncParam matSyncParam = new MatSyncParam();
-// List<MatSyncParam.MatParam> objects = new ArrayList<>();
-// objects.add(param);
-// matSyncParam.matDetails = objects;
-// openService.syncMat(matSyncParam);
- return R.ok().add(list);
+ return openService.stationAll();
}
/**
* 缁勬墭淇℃伅涓嬪彂
- * @return
+ * return
*/
@PostMapping("/comb/auth")
- public synchronized R comb(@RequestBody ArrayList<HashMap<String,Object>> param){
- System.out.println(param);
-// if (Cools.isEmpty(param)) {
-// return R.parse(BaseRes.PARAM);
+ public synchronized R comb(@RequestBody ArrayList<MesToCombParam> param){
+ for (MesToCombParam mesToCombParam : param) {
+// if (mesToCombParam.getPalletId().length() != 8) {
+// return R.error(mesToCombParam.getPalletId()+"-璇ユ墭鐩樼爜涓嶄负8浣�");
+// }
+// if (param.getCombMats().size()>1){
+// throw new CoolException("涓嶅厑璁告贩鏂�===>>" + param.getBarcode());
// }
-// MatSyncParam matSyncParam = new MatSyncParam();
-// List<MatSyncParam.MatParam> objects = new ArrayList<>();
-// objects.add(param);
-// matSyncParam.matDetails = objects;
-// openService.syncMat(matSyncParam);
+
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", mesToCombParam.getPalletId()));
+ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", mesToCombParam.getPalletId()));
+// int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getPalletId()));
+ if (countLoc > 0 || countWrk > 0) {
+ return R.error(mesToCombParam.getPalletId()+"-宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�");
+ }
+ // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
+ if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+ eq("zpallet", mesToCombParam.getPalletId()).eq("io_status", "N")) > 0) {
+ waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", mesToCombParam.getPalletId()));
+ }
+ }
+ for (MesToCombParam mesToCombParam : param) {
+ openService.mesToComb(mesToCombParam);
+ }
+
return R.ok();
}
@@ -484,11 +464,34 @@
*/
@PostMapping("/outOrder")
- public synchronized R outOrder (@RequestBody ArrayList<HashMap<String,Object>> param){
- System.out.println(param);
+ public synchronized R outOrder (@RequestBody ArrayList<OutTaskParam> params){
+ for (OutTaskParam outTaskParam : params) {
+ openService.outOrder(outTaskParam);
+ }
return R.ok();
}
-
-
+ /**
+ * 娣诲姞鍑哄簱鍗�
+ */
+ @PostMapping("/order/pakout/default/v1")
+// @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
+ public synchronized R pakoutOrderCreate(@RequestBody OpenOrderPakoutParam param) {
+// auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getOrderNo())) {
+ return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrderType())) {
+ return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrderDetails())) {
+ return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
+ }
+ openService.pakoutOrderCreate(param);
+ return R.ok();
+ }
}
+
--
Gitblit v1.9.1