From 608fb6f9529ce51291ef682638a5efc7dd51ac63 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 18 十一月 2025 08:21:08 +0800
Subject: [PATCH] 1.完善找库位 2.新增erp订单删除后，wms订单跟着删除功能 3.新增订单完成后，上报erp，erp报错后显现在出货单中 4.新增一键查询到异常完成订单 5.对销售单据和其他单据进行区分出库 6.对中间表订单状态进行完善 7.新增锁单功能 8.新增任务查询维护加上订单号
---
src/main/java/com/zy/asrs/controller/OpenController.java | 170 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 139 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 19883d4..64c639e 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,21 +1,28 @@
package com.zy.asrs.controller;
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.param.OpenOrderCompleteParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
-import com.zy.asrs.entity.param.OpenOrderPakoutParam;
+import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.result.RobotTaskMessage;
import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.WaitPakinService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.common.model.DetlDto;
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.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
/**
@@ -33,35 +40,122 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private WrkMastService wrkMastService;
+ /**
+ * RGV浠诲姟鍙嶉
+ * 1:浠诲姟寮�濮�
+ * 2锛氬彇鍒拌浇鍏�
+ * 3锛氱寮�璧风偣
+ * 4锛氫换鍔″畬鎴�
+ */
+ @RequestMapping(value = "/api/robot/reporter/task")
+ public HashMap<String, Object> RGVtask(@RequestBody RobotTaskMessage robotTaskMessage) {
+ HashMap<String, Object> map = new HashMap<>();
+ RobotTaskMessage.Extra extra = robotTaskMessage.getExtra();
+ RobotTaskMessage.Values values = extra.getValues();
+ int method =Integer.valueOf(values.getMethod());
+ log.info("agv浠诲姟鍙嶉AGV浠诲姟鍙�={}浠诲姟鐘舵�佷负={}",robotTaskMessage.getRobotTaskCode(),method);
+ if(method == 4){
+ WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>()
+ .eq("supp", robotTaskMessage.getRobotTaskCode())
+ .eq("be_batch",2));
+ if(!Cools.isEmpty(waitPakin)){
+ /**
+ * agv鐘舵��
+ * be_batch
+ * 0锛氭棤闇�璋冪敤AGV
+ * 1锛氱瓑寰呰皟鐢ˋGV
+ * 2锛欰GV浠诲姟涓嬪彂鎴愬姛
+ * 3锛欰GV浠诲姟瀹屾垚
+ * 4锛氱粰杈撻�佺嚎涓嬪彂鍏ュ簱鎸囦护瀹屾垚
+ */
+ waitPakin.setBeBatch(3);
+ waitPakinService.update(waitPakin,new EntityWrapper<WaitPakin>().eq("supp_code",waitPakin.getSuppCode()));
+ }
+ //鎷ｆ枡鍥炲簱锛宎gv鎼繍璐х墿鍒拌緭閫佺嚎鍏ュ簱鍙�--銆嬩慨鏀筰nv_wh鐘舵�佺瓑寰呰緭閫佺嚎鍏ュ簱--銆媤cs涓嬪彂鍏ュ簱鎸囦护
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .in("wrk_sts", 34L)//34.涓嬫灦瀹屾垚绛夊緟鍥炲簱
+ .eq("inv_wh","0")
+ .eq("pdc_type", robotTaskMessage.getRobotTaskCode()));//AGV鍑哄簱鎼繍浠诲姟鍙�
+ if(!Cools.isEmpty(wrkMast)){
+ /**
+ * inv_wh
+ * 鎷ｆ枡鍥炲簱杈撻�佺嚎鍑哄彂
+ * 0绛夊緟agv鏀捐揣瀹屾垚
+ * 1绛夊緟杈撻�佺嚎鍏ュ簱
+ * 2杈撻�佺嚎鍏ュ簱浠诲姟涓嬪彂鎴愬姛
+ */
+ wrkMast.setInvWh("1");
+ wrkMast.setModiTime(new Date());
+ wrkMastService.updateById(wrkMast);
+ }
+
+ }
+ if(method == 3 || method == 4){
+ /**
+ * wrk_sts
+ * 30.绛夊緟缁橝GV涓嬪彂鍑哄簱浠诲姟
+ * 31.AGV鍑哄簱浠诲姟涓嬪彂鎴愬姛
+ * 32.AGV宸叉惉绂�
+ * 33.绛夊緟涓嬫灦
+ */
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .in("wrk_sts", 31L)//31.AGV鍑哄簱浠诲姟涓嬪彂鎴愬姛
+ .eq("Pdc_type", robotTaskMessage.getRobotTaskCode()));//AGV鍑哄簱鎼繍浠诲姟鍙�
+ if(!Cools.isEmpty(wrkMast)){
+ wrkMast.setWrkSts(32L);//31.AGV鍑哄簱浠诲姟涓嬪彂鎴愬姛---->32.AGV宸叉惉绂� 32鍚庣Щ浜ょ粰wcs绯荤粺锛屽绔欑偣淇℃伅杩涜娓呴櫎
+ wrkMast.setModiTime(new Date());
+ wrkMastService.updateById(wrkMast);
+ }
+ }
+ map.put("code", "SUCCESS");
+ map.put("message", "鎴愬姛");
+ return map;
+ }
+
+ @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/pakin/new/package/v1")
- @AppAuth(memo = "鎵撳寘涓婄嚎鎺ュ彛")
- public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey,
- @RequestParam(required = false) String barcode) {
- auth(appkey, barcode);
- if (Cools.isEmpty(barcode)) {
- return R.parse(BaseRes.PARAM);
- }
- openService.packageUp(barcode);
- return R.ok();
- }
-
-
+// @PostMapping("/order/pakin/new/package/v1")
+// @AppAuth(memo = "鎵撳寘涓婄嚎鎺ュ彛")
+// public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey,
+// @RequestBody(required = false) PackParam param,
+// HttpServletRequest request) {
+// auth(appkey, param, request);
+// if (Cools.isEmpty(param)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// openService.packageUp(param);
+// return R.ok();
+// }
/**
* 娣诲姞鍏ュ簱鍗�
*/
- @PostMapping("/order/pakin/new/default/v1")
+ @PostMapping("/order/pakin/default/v1")
public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakinParam param) {
- auth(appkey, param);
+ @RequestBody OpenOrderPakinParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
@@ -83,20 +177,29 @@
*/
@PostMapping("/order/pakin/complete/default/v1")
public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) OpenOrderCompleteParam param) {
- auth(appkey, param);
+ @RequestBody(required = false) OpenOrderCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
return R.ok().add(openService.pakinOrderComplete(param));
}
/**
* 娣诲姞鍑哄簱鍗�
*/
- @PostMapping("/order/pakout/new/default/v1")
+ @PostMapping("/order/pakout/default/v1")
+ @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakoutParam param) {
- auth(appkey, param);
+ @RequestBody OpenOrderPakoutParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getLgort())) {
+ return R.error("鍗曟嵁缂栧彿[lgort]涓嶈兘涓虹┖");
+ }
+ if (!param.getLgort().equals("5006")) {
+ return R.ok();
}
if (Cools.isEmpty(param.getOrderNo())) {
return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
@@ -116,8 +219,9 @@
*/
@PostMapping("/order/pakout/complete/default/v1")
public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) OpenOrderCompleteParam param) {
- auth(appkey, param);
+ @RequestBody(required = false) OpenOrderCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
return R.ok().add(openService.pakoutOrderComplete(param));
}
@@ -126,14 +230,15 @@
* 搴撳瓨缁熻
*/
@RequestMapping("/stock/default/v1")
- public R queryStock(@RequestHeader(required = false) String appkey) {
- auth(appkey, null);
+ public R queryStock(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request) {
+ auth(appkey, null, request);
return R.ok().add(openService.queryStock());
}
-
- private void auth(String appkey, Object obj) {
+ private void auth(String appkey, Object obj, HttpServletRequest request) {
log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+ request.setAttribute("cache", obj);
if (!auth) {
return;
}
@@ -184,4 +289,7 @@
System.out.println(JSON.toJSONString(param1));
}
+ /*********************************鍚屾鐗╂枡妗ｆ鍜岃鍗�****************************************************/
+
+
}
--
Gitblit v1.9.1