From 4eb8d259b622226eb275666b0b06e7b19d5236f9 Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期四, 18 九月 2025 09:40:04 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/OpenController.java | 135 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 126 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index cb34a46..6541e1c 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -26,6 +26,7 @@
public class OpenController extends BaseController {
private static final boolean auth = true;
+ private static final String sign_arm = "|s|LABEL_0";
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
add("ea1f0459efc02a79f046f982767939ae");
}};
@@ -33,8 +34,26 @@
@Autowired
private OpenService openService;
+ @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 = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
+// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) MatSyncParam param,
HttpServletRequest request){
@@ -90,7 +109,7 @@
/**
* 鍏ュ簱鍗曞洖鍐�
*/
- @PostMapping("/order/pakin/complete/default/v1")
+// @PostMapping("/order/pakin/complete/default/v1")
public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) OpenOrderCompleteParam param,
HttpServletRequest request) {
@@ -110,12 +129,6 @@
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]涓嶈兘涓虹┖");
}
@@ -132,7 +145,7 @@
/**
* 鍑哄簱鍗曞洖鍐�
*/
- @PostMapping("/order/pakout/complete/default/v1")
+// @PostMapping("/order/pakout/complete/default/v1")
public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) OpenOrderCompleteParam param,
HttpServletRequest request) {
@@ -204,4 +217,108 @@
System.out.println(JSON.toJSONString(param1));
}
+
+ /**
+ * 鍒嗘嫞绾夸笂鎶ユ帴鏀�
+ */
+ @PostMapping("/arm/task/v1")
+ 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.getSupplier())) {
+ return R.error("璐ф簮[supplier]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getStaNo())) {
+ return R.error("鍒嗘嫞鐐逛綅[staNo]涓嶈兘涓虹┖");
+ }
+ openService.taskArmReport(param);
+ return R.ok();
+ }
+
+
+ /**
+ * 鍗曠爜瀹屾垚
+ */
+ @PostMapping("/arm/task/cycle_result")
+ 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.getOrder_id())) {
+ return R.error("鍗曟嵁缂栧彿[order_id]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getPick_num())) {
+ return R.error("瀹汉鍨嬪彿[pick_num]涓嶈兘涓虹┖");
+ }
+ try{
+ param.OrderIdTwo(sign_arm);
+ } catch (Exception e){
+ return R.error("鍗曟嵁缂栧彿[order_id]浠�"+sign_arm+"浣滀负鎷嗗垎鏍囪鎷嗗垎澶辫触锛侊紒锛�");
+ }
+
+ openService.taskArmCycleResult(param);
+ return R.ok();
+ }
+
+
+ /**
+ * 鎵樼洏瀹屾垚
+ */
+ @PostMapping("/arm/task/workspace_status")
+ 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.getId())) {
+ return R.error("鍗曟嵁缂栧彿[order_id]涓嶈兘涓虹┖");
+ }
+ 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("/armAbnormalOperation")
+ public synchronized R ArmAbnormalOperation(@RequestHeader(required = false) String appkey,
+ @RequestBody TaskArmErrorParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+
+ return R.ok().add(param);
+ }
+
}
--
Gitblit v1.9.1