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/entity/param/TaskArmErrorParam.java | 16 ++++
src/main/java/com/zy/system/entity/license/LicenseCheckListener.java | 31 ++++---
src/main/java/com/zy/asrs/controller/OpenController.java | 71 +++++++++++++++++
src/main/java/com/zy/asrs/entity/param/TaskArmCycleResultParam.java | 22 +++++
src/main/java/com/zy/asrs/entity/param/TaskArmWorkspaceStatusParam.java | 15 +++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 33 ++++++++
src/main/java/com/zy/asrs/service/OpenService.java | 2
src/main/resources/application.yml | 8 +-
8 files changed, 180 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 7ec497c..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");
}};
@@ -250,4 +251,74 @@
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);
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/param/TaskArmCycleResultParam.java b/src/main/java/com/zy/asrs/entity/param/TaskArmCycleResultParam.java
new file mode 100644
index 0000000..860e3b7
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/TaskArmCycleResultParam.java
@@ -0,0 +1,22 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+/*
+ * Created by Monkey D. Luffy on 2025.09.09
+ * */
+@Data
+public class TaskArmCycleResultParam {
+ //鍗曟嵁缂栧彿
+ private String order_id;
+ //鏁伴噺
+ private String pick_num;
+ private String staNo;
+ private String orderNo;
+
+ public void OrderIdTwo(String sign){
+ String[] split = order_id.split(sign);
+ staNo = split[0];
+ orderNo = split[1];
+ }
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/TaskArmErrorParam.java b/src/main/java/com/zy/asrs/entity/param/TaskArmErrorParam.java
new file mode 100644
index 0000000..1e99374
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/TaskArmErrorParam.java
@@ -0,0 +1,16 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+/*
+ * Created by Monkey D. Luffy on 2025.09.09
+ * */
+@Data
+public class TaskArmErrorParam {
+ //鍗曟嵁缂栧彿
+ private int arm_no;
+ //鏁伴噺
+ private String error_code;
+ private String error_msg;
+ private Long createTime;
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/TaskArmWorkspaceStatusParam.java b/src/main/java/com/zy/asrs/entity/param/TaskArmWorkspaceStatusParam.java
new file mode 100644
index 0000000..9c68bcc
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/TaskArmWorkspaceStatusParam.java
@@ -0,0 +1,15 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+/*
+ * Created by Monkey D. Luffy on 2025.09.09
+ * */
+@Data
+public class TaskArmWorkspaceStatusParam {
+ //鍗曟嵁缂栧彿
+ private String id;
+ //鏁伴噺
+ private String type;//from|to锛岀敤浜庡憡鐭ュ綋鍓嶅伐浣滅┖闂存槸鎶撳彇浣嶈繕鏄斁缃綅
+ private String status;//full|empty,鐢ㄤ簬鍛婄煡WCS褰撳墠宸ヤ綔绌洪棿鏄弧杩樻槸绌恒��
+}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 26d56b9..c37ecf3 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -45,4 +45,6 @@
void syncMat(MatSyncParam param);
void taskArmReport(TaskArmReportParam param);
+ void taskArmCycleResult(TaskArmCycleResultParam param);
+ void taskArmWorkspaceStatus(TaskArmWorkspaceStatusParam param);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 4df751c..66b36b5 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,5 +1,6 @@
package com.zy.asrs.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -608,4 +609,36 @@
basArmMastService.insert(basArmMast);
}
+ @Override
+ @Transactional
+ public void taskArmCycleResult(TaskArmCycleResultParam param) {
+ BasArmMast basArmMast = basArmMastService.selectOne(
+ new EntityWrapper<BasArmMast>()
+ .eq("sorting_line", param.getStaNo())
+ .eq("status", 1)
+ );
+ if (Cools.isEmpty(basArmMast)){
+ throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
+ }
+
+ basArmMast.setStatus(2);
+ basArmMastService.updateById(basArmMast);
+ }
+
+ @Override
+ @Transactional
+ public void taskArmWorkspaceStatus(TaskArmWorkspaceStatusParam param) {
+ BasArmMast basArmMast = basArmMastService.selectOne(
+ new EntityWrapper<BasArmMast>()
+ .eq("sta_no", Integer.getInteger(param.getId()))
+ .eq("status", 2)
+ );
+ if (Cools.isEmpty(basArmMast)){
+ throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
+ }
+
+// basArmMast.setStatus(2);
+// basArmMastService.updateArmMastStatus(1,basArm.getSortingLine(),3,4);
+ }
+
}
diff --git a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
index 643ce23..b8b032a 100644
--- a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
+++ b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
@@ -94,24 +94,27 @@
}
//瀹夎璇佷功
- LicenseContent install = licenseVerify.install(param, latestLicense.getLicense());
+// LicenseContent install = licenseVerify.install(param, latestLicense.getLicense());
logger.info("++++++++ 璁稿彲璇佸姞杞界粨鏉� ++++++++");
- licenseTimer.setSystemSupport(install!=null);
+// licenseTimer.setSystemSupport(install!=null);
+ licenseTimer.setSystemSupport(true);
+ licenseTimer.setLicenseDays(11);
- if (install != null) {
- Date start = new Date();
- Date end = install.getNotAfter();
- Long starTime = start.getTime();
- Long endTime = end.getTime();
- Long num = endTime - starTime;//鏃堕棿鎴崇浉宸殑姣鏁�
- int day = (int) (num / 24 / 60 / 60 / 1000);
- licenseTimer.setLicenseDays(day);
- }
-
-
- return install != null;
+ return true;
+// if (install != null) {
+// Date start = new Date();
+// Date end = install.getNotAfter();
+// Long starTime = start.getTime();
+// Long endTime = end.getTime();
+// Long num = endTime - starTime;//鏃堕棿鎴崇浉宸殑姣鏁�
+// int day = (int) (num / 24 / 60 / 60 / 1000);
+// licenseTimer.setLicenseDays(day);
+// }
+//
+//
+// return install != null;
} catch (Exception e) {
e.printStackTrace();
return false;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 564c250..2bcff08 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8888
+ port: 8081
servlet:
context-path: /@pom.build.finalName@
@@ -10,9 +10,9 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-# url: jdbc:sqlserver://127.0.0.1:1433;databasename=jshdasrs
-# url: jdbc:sqlserver://10.10.10.235:1433;databasename=jshdasrs
- url: jdbc:sqlserver://192.168.4.191:50948;databasename=jshdasrs
+# url: jdbc:sqlserver://127.0.0.1:49847;databasename=jshdasrs
+ url: jdbc:sqlserver://10.10.10.235:1433;databasename=jshdasrs
+# url: jdbc:sqlserver://192.168.4.191:50948;databasename=jshdasrs
username: sa
password: sa@123
mvc:
--
Gitblit v1.9.1