From 49c0ee7ab5868d64ccb9a6314485bd7e06dc1ead Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 11 十二月 2025 09:00:51 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms
---
src/main/java/com/zy/asrs/controller/OpenController.java | 244 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 224 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 8002f80..0225ee2 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,18 +1,25 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.R;
+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.Task;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.TaskService;
+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 java.util.ArrayList;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
/**
* Created by vincent on 2022/4/8
@@ -20,9 +27,9 @@
@Slf4j
@RestController
@RequestMapping("open/asrs")
-public class OpenController {
+public class OpenController extends BaseController {
- private static final boolean auth = false;
+ private static final boolean auth = true;
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
add("ea1f0459efc02a79f046f982767939ae");
}};
@@ -30,13 +37,132 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private TaskService taskService;
+
+
+
+ @PostMapping("/agvPickupComplete/agvCallback")
+ @AppAuth(memo = "AGV鍙栬揣瀹屾垚鎺ュ彛")
+ public Map<String, Object> agvPickupComplete(@RequestBody AgvTaskParam agvTaskParam, HttpServletRequest request) {
+ // DecimalFormat df = new DecimalFormat("0000");
+ // String wrkNo = "Ctu"+df.format(param.getWrkNo())+date.getTime()/1000;
+ String wrkNo = agvTaskParam.getTaskCode().substring(3,7);
+ Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", Integer.parseInt(wrkNo)));
+ if (Cools.isEmpty(task)) {
+ log.error("鏈煡璇㈠埌浠诲姟鍙峰搴旂殑鏁版嵁");
+ }
+ task.setWrkSts(0L);
+ taskService.updateById(task);
+
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("code","0");
+ map.put("message","鎴愬姛");
+ map.put("reqCode", "");
+ log.info("agv璇锋眰鍙栬揣瀹屾垚锛寃ms浠诲姟鍙�:"+ JSON.toJSONString(agvTaskParam));
+ return map;
+
+ }
+
+ @PostMapping("/agvTaskComplete/agvCallback")
+ @AppAuth(memo = "AGV鏀捐揣瀹屾垚鎺ュ彛")
+ public Map<String, Object> agvTaskComplete(@RequestBody AgvTaskParam agvTaskParam,HttpServletRequest request) {
+ HashMap<String, Object> map = new HashMap<>();
+ String wrkNo = agvTaskParam.getTaskCode().substring(3,7);
+ Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", Integer.parseInt(wrkNo)));
+ if (Cools.isEmpty(task)) {
+ log.error("鏈煡璇㈠埌浠诲姟鍙峰搴旂殑鏁版嵁");
+ }
+
+ taskService.updateById(task);
+ if (task.getIoType() < 100 ){
+ task.setWrkSts(4L);
+ }else {
+ task.setWrkSts(14L);
+ }
+
+ taskService.updateById(task);
+
+ map.put("code","0");
+ map.put("message","鎴愬姛");
+ map.put("reqCode", "");
+ return map;
+ }
+
+ @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/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/adjustment/default/v1")
+ public synchronized R adjustmentOrderCreate(@RequestHeader(required = false) String appkey,
+ @RequestBody OpenAdjustmentOrderParam 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.getOrderDetails())) {
+ return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
+ }
+ openService.adjustmentOrderCreate(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);
}
@@ -56,25 +182,64 @@
/**
* 鍏ュ簱鍗曞洖鍐�
*/
- @PostMapping("/order/pakin/complete/default/v1")
- public synchronized R orderComplete(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderCompleteParam param) {
- auth(appkey, param);
+// @PostMapping("/order/pakin/complete/default/v1")
+ public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) OpenOrderCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
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();
+ }
+
+ /**
+ * 鍑哄簱鍗曞洖鍐�
+ */
+// @PostMapping("/order/pakout/complete/default/v1")
+ public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) OpenOrderCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok().add(openService.pakoutOrderComplete(param));
+ }
+
/**
* 搴撳瓨缁熻
*/
@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) {
- log.info("{}鎺ュ彛琚闂紒appkey:{},璇锋眰鏁版嵁锛歿}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(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;
}
@@ -86,4 +251,43 @@
}
}
+ public static void main(String[] args) {
+ // 1
+ System.out.println("======================================");
+ OpenOrderPakinParam param = new OpenOrderPakinParam();
+ param.setOrderNo(String.valueOf(new SnowflakeIdWorker().nextId()));
+ param.setOrderType("鎵撳寘涓婄嚎鍗�");
+ param.setOrderTime(DateUtils.convert(new Date()));
+ List<DetlDto> orderDetails = new ArrayList<>();
+ param.setOrderDetails(orderDetails);
+ for (int i = 0; i < 3; i++) {
+ DetlDto detlDto = new DetlDto();
+ switch (i) {
+ case 0:
+ detlDto.setMatnr("MDH020030530");
+ detlDto.setBatch("500");
+ detlDto.setAnfme(18.0);
+ break;
+ case 1:
+ detlDto.setMatnr("MDH020016416");
+ detlDto.setBatch("500");
+ detlDto.setAnfme(32.0);
+ break;
+ case 2:
+ detlDto.setMatnr("LSH90152025");
+ detlDto.setAnfme(50.0);
+ break;
+ default:
+ break;
+ }
+ orderDetails.add(detlDto);
+ }
+ System.out.println(JSON.toJSONString(param));
+ // 2
+ System.out.println("======================================");
+ OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
+ param1.setOrderNo("963001846497017856");
+ System.out.println(JSON.toJSONString(param1));
+ }
+
}
--
Gitblit v1.9.1