From 7a79eaa785da277289ccdce588206a349e5fac6e Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 14 一月 2026 10:26:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 287 +++++++++++++++++---------------------------------------
1 files changed, 89 insertions(+), 198 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 4fddbba..42ea5ea 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,23 +1,29 @@
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.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.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;
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
@@ -36,37 +42,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();
+// }
/****************************************************************************/
/********************************* 鎵撳寘涓婄嚎 **********************************/
@@ -248,9 +242,9 @@
if (Cools.isEmpty(param.getItem())) {
return R.error("UPC[item]涓嶈兘涓虹┖");
}
-// if (Cools.isEmpty(param.getSupplier())) {
-// return R.error("璐ф簮[supplier]涓嶈兘涓虹┖");
-// }
+ if (Cools.isEmpty(param.getSupplier())) {
+ return R.error("璐ф簮[supplier]涓嶈兘涓虹┖");
+ }
if (Cools.isEmpty(param.getStaNo())) {
return R.error("鍒嗘嫞鐐逛綅[staNo]涓嶈兘涓虹┖");
}
@@ -402,6 +396,7 @@
return R.error("鍗曟嵁缂栧彿[order_id]浠� "+sign_arm_sku+" 涓� "+sign_arm_order+" 浣滀负鎷嗗垎鏍囪鎷嗗垎澶辫触锛侊紒锛�");
}
if (param.getArm_no()>4){
+ openService.taskArmOrderResult(param);
return R.ok();
}
@@ -409,190 +404,86 @@
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+" 浣滀负鎷嗗垎鏍囪鎷嗗垎澶辫触锛侊紒锛�");
- }
- if (param.getArm_no()>4){
- return R.ok().add(true);
+ 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);
- }
-
-
- /**
- * AGV涓婃姤鎺ユ敹
- */
- @PostMapping("/agv/task/v1/agvCallback")
-// @AppAuth(memo = "AGV涓婃姤鎺ユ敹")
- public synchronized R TaskAgvReport(@RequestHeader(required = false) String appkey,
- @RequestBody TaskAgvReportParam param,
- HttpServletRequest request) {
-// auth(appkey, param, request);
- // 鏃ュ織璁板綍
- ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
- apiLogService.save(
- "AGV涓婃姤鎺ユ敹",
- "/open/asrs/agv/task/v1/agvCallback",
- null,
- request.getRemoteAddr(),
- JSON.toJSONString(param),
- null,
- true
- );
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getReqCode())) {
- return R.error("WMS浠诲姟鍙穂reqCode]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getTaskCode())) {
- return R.error("WMS浠诲姟鍙穂reqCode]涓嶈兘涓虹┖");
- }
- String taskCode = param.getTaskCode();
- if (taskCode == null || !taskCode.matches("^\\d+-.*$")) {
- throw new CoolException("taskCode 鏍煎紡閿欒锛岄渶涓� 鏁板瓧-xxx锛屼緥濡� 123-ABC");
- }
-
- param.setTaskNo(Integer.parseInt(taskCode.substring(0, taskCode.indexOf("-"))));
- boolean taskAgvReport = openService.TaskAgvReport(param);
- if (taskAgvReport){
-// agvBindAndBin(String.valueOf(param.getTaskNo()));
- return new R(0,"鎴愬姛");
- }
- return R.error("浠诲姟鍙蜂笉瀛樺湪");
+ matSyncParam.matDetails = objects;
+ openService.syncMat(matSyncParam);
+ return R.ok();
}
/**
- * PDA鍒涘缓AGV浠诲姟
+ * 绔欑偣鍚屾鎺ュ彛
+ * 鍚屾绔欑偣缂栧彿
+ * 鍚屾绔欑偣杩涘嚭绫诲瀷
+ * 鍚屾绔欑偣鍚嶇О
+ * 鍚屾鎿嶄綔绫诲瀷
+ * return
*/
- @PostMapping("/agv/task/v1/createTask")
- @AppAuth(memo = "PDA鍒涘缓AGV浠诲姟")
- public synchronized R TaskAgvCreate(@RequestHeader(required = false) String appkey,
- @RequestBody TaskAgvCreateParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- boolean taskAgvCreate = openService.taskAgvCreate(param);
- if (taskAgvCreate){
- return R.ok();
- }
- return R.error("浠诲姟鍙蜂笉瀛樺湪");
+ @PostMapping("/station/all")
+ public synchronized R stationAll(){
+ return openService.stationAll();
}
/**
- * PDA鑾峰彇AGV搴撲綅
+ * 缁勬墭淇℃伅涓嬪彂
+ * return
*/
- @PostMapping("/agv/loc/v1/getLocList")
- @AppAuth(memo = "PDA妫�绱GV搴撲綅")
- public synchronized R GetAgvLocList(@RequestHeader(required = false) String appkey,
- @RequestBody AgvLocListParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
+ @PostMapping("/comb/auth")
+ public synchronized R comb(@RequestBody ArrayList<MesToCombParam> param){
+ for (MesToCombParam mesToCombParam : param) {
+ // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
+ if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+ eq("zpallet", mesToCombParam.getPalletId()).eq("io_status", "N")) > 0) {
+ return R.error(mesToCombParam.getPalletId()+"-璇ユ墭鐩樼爜宸茬粡瀛樺湪缁勬墭妗ｄ腑");
+ }
+ if (mesToCombParam.getPalletId().length() != 8) {
+ return R.error(mesToCombParam.getPalletId()+"-璇ユ墭鐩樼爜涓嶄负8浣�");
+ }
+// if (param.getCombMats().size()>1){
+// throw new CoolException("涓嶅厑璁告贩鏂�===>>" + param.getBarcode());
+// }
- List<AgvLocListDetlParam> list = openService.getAgvLocList(param);
- if (!list.isEmpty()) {
- return R.ok(list);
- }
- return R.error("搴撲綅涓嶅瓨鍦ㄦ垨鏃犳槑缁�");
- }
-
- /**
- * PDA缁戝畾瑙ｇ粦
- */
- @PostMapping("/agv/bindCtnrAndBin/v1")
- @AppAuth(memo = "PDA缁戝畾涓庤В缁�")
- public synchronized R bindCtnrAndBin(@RequestHeader(required = false) String appkey,
- @RequestBody bindCtnrAndBinParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- boolean bindCtnrAndBin = openService.bindCtnrAndBin(param);
- if (bindCtnrAndBin) {
- return R.ok();
- }
- return R.error("搴撲綅涓嶅瓨鍦ㄦ垨鏃犳槑缁�");
- }
-
- /**
- * AGV鐢宠杩囧厜鏍�
- */
- @PostMapping("/agv/arm/grating/v1/agvCallback")
- @AppAuth(memo = "AGV鐢宠杩囧厜鏍�")
- public synchronized R agvGrating(@RequestHeader(required = false) String appkey,
- @RequestBody AgvGoTheArnParam param,
- HttpServletRequest request) {
-// auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getCurrentPositionCode())) {
- return R.error("浣嶇疆[currentPositionCode]涓嶈兘涓虹┖");
- }
- boolean bindCtnrAndBin = true;
- List<ArmAgvGratingParam> armList = param.getArmNo();
- if (armList.isEmpty()){
- return R.error("搴撲綅涓嶅瓨鍦ㄦ垨鏃犳槑缁�");
- }
- for (ArmAgvGratingParam arm : armList){
- if (bindCtnrAndBin){
- bindCtnrAndBin = openService.agvApplicationPassedTheGrating(arm);
-// System.out.println("璇锋眰閫氳繃鍏夋爡"+armNo);
+ 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 (bindCtnrAndBin) {
- asyncProcessAfterValidation(param);
- return new R(0,"鎴愬姛");
+ for (MesToCombParam mesToCombParam : param) {
+ openService.mesToComb(mesToCombParam);
}
- return R.error("搴撲綅涓嶅瓨鍦ㄦ垨鏃犳槑缁�");
+
+ return R.ok();
}
- @Async
- public void agvBindAndBin(String taskNo) {
- try {
- Thread.sleep(1000);
- openService.agvBindAndBin(taskNo);
- } catch (Exception e) {
- log.error("寮傛澶勭悊AGV鎼繍鍚庣画閫昏緫澶辫触", e);
+ /**
+ * 鍑哄簱閫氱煡鍗�
+ */
+
+ @PostMapping("/outOrder")
+ public synchronized R outOrder (@RequestBody ArrayList<OutTaskParam> params){
+ for (OutTaskParam outTaskParam : params) {
+ openService.outOrder(outTaskParam);
}
+ return R.ok();
}
- @Async
- public void asyncProcessAfterValidation(AgvGoTheArnParam param) {
- try {
- Thread.sleep(500);
- openService.agvApplicationPassedTheGrating(param);
- } catch (Exception e) {
- log.error("寮傛澶勭悊AGV鍏夋爡鍚庣画閫昏緫澶辫触", e);
- }
- }
+
}
--
Gitblit v1.9.1