From 4f45f8f3ec334a73ba24fc5d16017b5c044168aa Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期五, 13 三月 2026 11:24:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 269 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 188 insertions(+), 81 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 8c343cc..19c03a1 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,21 +1,31 @@
package com.zy.asrs.controller;
+
import com.alibaba.fastjson.JSON;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.google.common.collect.Lists;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
+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.model.LocDetlDto;
+import com.zy.common.model.enums.WorkNoType;
+import com.zy.common.utils.Synchro;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.naming.ldap.HasControls;
import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* Created by vincent on 2022/4/8
@@ -34,37 +44,25 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
- @PostMapping("/order/matSync/default/v2")
-// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
- public synchronized R syncMatInfoV2(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) MatSyncParam.MatParam param,
- HttpServletRequest request){
-
- auth(appkey, param, request);
- 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();
- }
-
- @PostMapping("/order/matSync/default/v1")
-// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
- public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) MatSyncParam param,
- HttpServletRequest request){
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- openService.syncMat(param);
- return R.ok();
- }
+// @PostMapping("/order/matSync/default/v1")
+//// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
+// public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
+// @RequestBody(required = false) MatSyncParam param,
+// HttpServletRequest request){
+// auth(appkey, param, request);
+// if (Cools.isEmpty(param)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// openService.syncMat(param);
+// return R.ok();
+// }
/****************************************************************************/
/********************************* 鎵撳寘涓婄嚎 **********************************/
@@ -118,30 +116,9 @@
return R.ok().add(openService.pakinOrderComplete(param));
}
- /**
- * 娣诲姞鍑哄簱鍗�
- */
- @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);
- }
- 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();
- }
+
+
+
/**
* 鍑哄簱鍗曞洖鍐�
@@ -243,13 +220,23 @@
if (Cools.isEmpty(param.getUpc())) {
return R.error("UPC[upc]涓嶈兘涓虹┖");
}
+ if (Cools.isEmpty(param.getItem())) {
+ return R.error("UPC[item]涓嶈兘涓虹┖");
+ }
if (Cools.isEmpty(param.getSupplier())) {
return R.error("璐ф簮[supplier]涓嶈兘涓虹┖");
}
if (Cools.isEmpty(param.getStaNo())) {
return R.error("鍒嗘嫞鐐逛綅[staNo]涓嶈兘涓虹┖");
}
- openService.taskArmReport(param);
+ if (Cools.isEmpty(param.getBindingTags())) {
+ return R.error("鍒嗘嫞缁戝畾绫诲埆[bindingTags]涓嶈兘涓虹┖");
+ }
+ try{
+ openService.taskArmReport(param);
+ } catch (Exception e){
+ return R.error(e.getMessage()).add(e.getMessage());
+ }
return R.ok();
}
@@ -320,10 +307,37 @@
/**
+ * 鎵樼洏灏辩华鐘舵�佹煡璇�
+ */
+ @PostMapping("/arm/task/loc_status")
+// @AppAuth(memo = "鎵樼洏灏辩华鐘舵�佹煡璇�")
+ public synchronized R TaskArmLocStatus(@RequestHeader(required = false) String appkey,
+ @RequestBody ArmOKParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getArmNo())) {
+ return R.error("鏈烘鑷傜紪鍙穂armNo]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getStaNo())) {
+ return R.error("绔欑偣缂栧彿[staNo]涓嶈兘涓虹┖");
+ }
+
+ boolean taskArmLocStatus = openService.TaskArmLocStatus(param);
+ if (taskArmLocStatus){
+ return new R(200,"OK").add(true);
+ }
+ return R.error("涓嶇鍚�").add(false);
+ }
+
+
+ /**
* 寮傚父涓婃姤
*/
@PostMapping("/armAbnormalOperation")
- @AppAuth(memo = "寮傚父涓婃姤")
+// @AppAuth(memo = "寮傚父涓婃姤")
public synchronized R ArmAbnormalOperation(@RequestHeader(required = false) String appkey,
@RequestBody TaskArmErrorParam param,
HttpServletRequest request) {
@@ -343,7 +357,7 @@
* 璁㈠崟瀹屾垚涓婃姤
*/
@PostMapping("/arm/task/order_result")
- @AppAuth(memo = "璁㈠崟瀹屾垚涓婃姤")
+// @AppAuth(memo = "璁㈠崟瀹屾垚涓婃姤")
public synchronized R TaskArmWorkOrderStatus(@RequestHeader(required = false) String appkey,
@RequestBody OrderArmEndParam param,
HttpServletRequest request) {
@@ -362,39 +376,132 @@
} catch (Exception e){
return R.error("鍗曟嵁缂栧彿[order_id]浠� "+sign_arm_sku+" 涓� "+sign_arm_order+" 浣滀负鎷嗗垎鏍囪鎷嗗垎澶辫触锛侊紒锛�");
}
+ if (param.getArm_no()>4){
+ openService.taskArmOrderResult(param);
+ return R.ok();
+ }
openService.taskArmWorkOrderStatus(param);
return R.ok();
}
+ /**********************************************************鍝ユ柉鎷夐」鐩鎺ユ帴鍙�*******************************************************************/
+ @PostMapping("/order/matSync/default/v2")
+// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
+ public synchronized R syncMatInfoV2(@RequestBody(required = false) List<MatSyncParam.MatParam> param){
- /**
- * 鏄惁瀛樺湪鍚庣画鎵樼洏
- */
- @PostMapping("/arm/task/order_sign")
- @AppAuth(memo = "鏄惁瀛樺湪鍚庣画鎵樼洏")
- public synchronized R TaskArmWorkOrderSign(@RequestHeader(required = false) String appkey,
- @RequestBody OrderArmEndParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
+ System.out.println(param);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- if (Cools.isEmpty(param.getArm_no())) {
- return R.error("鏈烘鑷傜紪鍙穂Arm_no]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getOrder_id())) {
- return R.error("鍗曟嵁缂栧彿[order_id]涓嶈兘涓虹┖");
- }
- try{
- param.OrderIdTwo(sign_arm_order,sign_arm_sku);
- } catch (Exception e){
- return R.error("鍗曟嵁缂栧彿[order_id]浠� "+sign_arm_sku+" 涓� "+sign_arm_order+" 浣滀负鎷嗗垎鏍囪鎷嗗垎澶辫触锛侊紒锛�");
+ MatSyncParam matSyncParam = new MatSyncParam();
+ List<MatSyncParam.MatParam> objects = new ArrayList<>();
+ for (MatSyncParam.MatParam matParam : param) {
+ objects.add(matParam);
}
- boolean taskArmWorkOrderSign = openService.TaskArmWorkOrderSign(param);
- return R.ok().add(taskArmWorkOrderSign);
+ matSyncParam.matDetails = objects;
+ openService.syncMat(matSyncParam);
+ return R.ok();
}
+ /**
+ * 绔欑偣鍚屾鎺ュ彛
+ * 鍚屾绔欑偣缂栧彿
+ * 鍚屾绔欑偣杩涘嚭绫诲瀷
+ * 鍚屾绔欑偣鍚嶇О
+ * 鍚屾鎿嶄綔绫诲瀷
+ * return
+ */
+ @PostMapping("/station/all")
+ public synchronized R stationAll(){
+ return openService.stationAll();
+ }
+
+ /**
+ * 缁勬墭淇℃伅涓嬪彂
+ * return
+ */
+ @PostMapping("/comb/auth")
+ public synchronized R comb(@RequestBody ArrayList<MesToCombParam> param){
+ List<MesToCombReturnParam> errorComb = Lists.newArrayList();
+ 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());
+// }
+
+ 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) {
+ MesToCombReturnParam mesToCombReturnParam = new MesToCombReturnParam();
+ Synchro.Copy(mesToCombParam, mesToCombReturnParam);
+ errorComb.add(mesToCombReturnParam);
+// 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);
+ }
+ // TODO:寰呮祴璇�
+ if(errorComb.size() > 0) {
+ return R.error("鎵樼洏宸插湪搴撳瓨涓�/宸插紑濮嬪叆搴�").add(errorComb);
+ }
+
+ return R.ok();
+ }
+
+ /**
+ * 鍑哄簱閫氱煡鍗�
+ */
+
+ @PostMapping("/outOrder")
+ public synchronized R outOrder (@RequestBody ArrayList<OutTaskParam> params){
+ List<OutTaskReturnParam> errorOutOrders = Lists.newArrayList();
+ for (OutTaskParam outTaskParam : params) {
+ // TODO:寰呮脯瑭︼紝鏍￠搴瓨淇℃伅锛屼笉瀛樺湪鍓囪繑鍥�
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", outTaskParam.getPalletId()));
+ if (countLoc == 0){
+ OutTaskReturnParam outTaskReturnParam = new OutTaskReturnParam();
+ Synchro.Copy(outTaskParam, outTaskReturnParam);
+ errorOutOrders.add(outTaskReturnParam);
+
+ params.remove(outTaskParam);
+ }
+ }
+
+ for (OutTaskParam outTaskParam : params) {
+ R r = openService.outOrder(outTaskParam);
+ if (!r.get("code").equals(200)){
+ return r;
+ }
+ }
+
+ if(errorOutOrders.size() > 0) {
+ return R.error("搴撳瓨涓笉瀛樺湪璇ユ墭鐩�").add(errorOutOrders);
+ }
+
+ return R.ok();
+ }
+
+ /**
+ * pause out order
+ */
+ @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");
+ }
+ return openService.pakoutOrderPause(param);
+ }
}
+
--
Gitblit v1.9.1