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 | 318 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 303 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index cf545f3..42ea5ea 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,21 +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.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.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
@@ -26,25 +34,33 @@
public class OpenController extends BaseController {
private static final boolean auth = true;
+ private static final String sign_arm_order = "|s|LABEL_";
+ private static final String sign_arm_sku = "|sku|LABEL_";
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
add("ea1f0459efc02a79f046f982767939ae");
}};
@Autowired
private OpenService openService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
- @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();
+// }
/****************************************************************************/
/********************************* 鎵撳寘涓婄嚎 **********************************/
@@ -198,4 +214,276 @@
System.out.println(JSON.toJSONString(param1));
}
+
+ /**
+ * 鍒嗘嫞绾夸笂鎶ユ帴鏀�
+ */
+ @PostMapping("/arm/task/v1")
+ @AppAuth(memo = "鍒嗘嫞绾夸笂鎶ユ帴鏀�")
+ public synchronized R TaskArmReport(@RequestHeader(required = false) String appkey,
+ @RequestBody TaskArmReportParam 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.getSku())) {
+ return R.error("瀹汉鍨嬪彿[sku]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getPo())) {
+ return R.error("瀹汉PO[po]涓嶈兘涓虹┖");
+ }
+ 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]涓嶈兘涓虹┖");
+ }
+ 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();
+ }
+
+
+ /**
+ * 鍗曠爜瀹屾垚
+ */
+ @PostMapping("/arm/task/cycle_result")
+ @AppAuth(memo = "鍗曠爜瀹屾垚")
+ public synchronized R TaskArmCycleResult(@RequestHeader(required = false) String appkey,
+ @RequestBody TaskArmCycleResultParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ 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]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getPick_num())) {
+ return R.error("瀹汉鍨嬪彿[pick_num]涓嶈兘涓虹┖");
+ }
+ try{
+ param.OrderIdTwo(sign_arm_order,sign_arm_sku);
+ } catch (Exception e){
+ return R.error("鍗曟嵁缂栧彿[order_id]浠� "+sign_arm_sku+" 涓� "+sign_arm_order+" 浣滀负鎷嗗垎鏍囪鎷嗗垎澶辫触锛侊紒锛�");
+ }
+
+ openService.taskArmCycleResult(param);
+ return R.ok();
+ }
+
+
+ /**
+ * 鎵樼洏瀹屾垚
+ */
+ @PostMapping("/arm/task/workspace_status")
+ @AppAuth(memo = "鎵樼洏瀹屾垚")
+ public synchronized R TaskArmWorkspaceStatus(@RequestHeader(required = false) String appkey,
+ @RequestBody TaskArmWorkspaceStatusParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getArm_no())) {
+ return R.error("鏈烘鑷傜紪鍙穂Arm_no]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getId())) {
+ return R.error("鍗曟嵁缂栧彿[order_id]涓嶈兘涓虹┖");
+ }
+ if (Integer.parseInt(param.getId())<2){
+ return R.ok().add("鏉ユ枡鍙ｇ┖闂村浣嶆垚鍔�");
+ }
+ if (Cools.isEmpty(param.getType())) {
+ return R.error("瀹汉鍨嬪彿[pick_num]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getStatus())) {
+ return R.error("瀹汉鍨嬪彿[pick_num]涓嶈兘涓虹┖");
+ }
+
+ openService.taskArmWorkspaceStatus(param);
+ return R.ok();
+ }
+
+
+ /**
+ * 鎵樼洏灏辩华鐘舵�佹煡璇�
+ */
+ @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 = "寮傚父涓婃姤")
+ public synchronized R ArmAbnormalOperation(@RequestHeader(required = false) String appkey,
+ @RequestBody TaskArmErrorParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param.getArm_no())) {
+ return R.error("鏈烘鑷傜紪鍙穂Arm_no]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+
+ return R.ok().add(param);
+ }
+
+
+ /**
+ * 璁㈠崟瀹屾垚涓婃姤
+ */
+ @PostMapping("/arm/task/order_result")
+ @AppAuth(memo = "璁㈠崟瀹屾垚涓婃姤")
+ public synchronized R TaskArmWorkOrderStatus(@RequestHeader(required = false) String appkey,
+ @RequestBody OrderArmEndParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ 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){
+ 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){
+
+ System.out.println(param);
+ 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();
+ }
+
+ /**
+ * 绔欑偣鍚屾鎺ュ彛
+ * 鍚屾绔欑偣缂栧彿
+ * 鍚屾绔欑偣杩涘嚭绫诲瀷
+ * 鍚屾绔欑偣鍚嶇О
+ * 鍚屾鎿嶄綔绫诲瀷
+ * return
+ */
+ @PostMapping("/station/all")
+ public synchronized R stationAll(){
+ return openService.stationAll();
+ }
+
+ /**
+ * 缁勬墭淇℃伅涓嬪彂
+ * return
+ */
+ @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());
+// }
+
+ 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()+"-宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�");
+ }
+ }
+ for (MesToCombParam mesToCombParam : param) {
+ openService.mesToComb(mesToCombParam);
+ }
+
+ return R.ok();
+ }
+
+ /**
+ * 鍑哄簱閫氱煡鍗�
+ */
+
+ @PostMapping("/outOrder")
+ public synchronized R outOrder (@RequestBody ArrayList<OutTaskParam> params){
+ for (OutTaskParam outTaskParam : params) {
+ openService.outOrder(outTaskParam);
+ }
+ return R.ok();
+ }
+
+
+
}
--
Gitblit v1.9.1