From 684f3e36bb926b7ec2d5561c8e79c9d087fcb851 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 16 十一月 2023 15:25:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 17 +++++
src/main/java/com/zy/asrs/utils/Utils.java | 5 +
src/main/java/com/zy/asrs/entity/param/TaskStatusFeedbackParam.java | 107 +++++++++++++++++++++++++++++++++++
3 files changed, 129 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/TaskStatusFeedbackParam.java b/src/main/java/com/zy/asrs/entity/param/TaskStatusFeedbackParam.java
new file mode 100644
index 0000000..c99af14
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/TaskStatusFeedbackParam.java
@@ -0,0 +1,107 @@
+package com.zy.asrs.entity.param;
+
+import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.utils.Utils;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TaskStatusFeedbackParam {
+
+ private String taskNo; //浠诲姟鍙�
+ private String warehouseId; //浠撳簱鏍囪瘑
+ private String feedbackFrom; //鏉ユ簮
+ private String equipmentCode; //璁惧缂栫爜
+
+ //wms鍑哄簱浠诲姟涓嬪彂鎺ュ彛
+ private String taskType; //浠诲姟绫诲瀷 CK銆乊K銆丷K銆丳D
+ private int taskPriority; //浼樺厛绾�
+ private String containerCode; //瀹瑰櫒缂栫爜
+ private String containerTypeCode; //瀹瑰櫒绫诲瀷
+ private String emptyContainer; //鏄惁绌烘墭鐩� Y:鏄� N锛氬惁
+ private int taskTunnel; //浠诲姟宸烽亾
+ private String sourceLocationCode; //璧峰璐т綅
+ private String targetLocationCode; //鐩爣璐т綅
+ private String groupNo; //浠诲姟缁� 鏍囪瘑鐫�鍝簺浠诲姟灞炰簬鍚屼竴缁�
+ private int taskSerialNo; //浠诲姟鎵ц椤哄簭 鍚屼竴浠诲姟缁勭殑浠诲姟锛屾寜浠诲姟鎵ц椤哄簭鎵ц浠诲姟
+ private String createTime; //鍒涘缓鏃堕棿 YYYY-MM-DD HH24:MI:SS
+ private String targetWharf; //鐩爣鐮佸ご鍖哄煙 鏁版嵁瀛楀吀锛孏寮�澶�=7杞﹂棿锛孒寮�澶�=8灞傦紝J寮�澶�=9杞﹂棿
+
+
+ //浠诲姟鐘舵�佸弽棣堟帴鍙�
+// feedbackFrom 鏉ユ簮 string
+// warehouseId 浠撳簱鏍囪瘑 string
+// taskType 浠诲姟绫诲瀷 string
+// equipmentCode 璁惧缂栫爜 string
+// taskNo 浠诲姟鍙� string
+// taskStatus 浠诲姟鐘舵�� string
+// sourceLocationCode 婧愬簱浣� string
+// targetLocationCode 鐩爣搴撲綅 string
+// containerCode 瀹瑰櫒缂栫爜 string
+// containerTypeCode 瀹瑰櫒绫诲瀷 string
+// emptyContainer 鏄惁绌烘墭鐩� string
+// errorCode 鏁呴殰缂栫爜 string
+ /*
+ * 銆�0001銆� 閲嶅叆寮傚父
+ 銆�0002銆� 绌哄嚭寮傚父
+ 銆�0003銆� 鏀炬繁娴呮湁
+ 銆�0004銆� 鍙栨繁娴呮湁
+ 銆�0005銆� 鏁版嵁鏍￠獙寮傚父
+ * */
+
+
+
+ //浠诲姟鍙栨秷鎺ュ彛
+ /*鎿嶄綔绫诲瀷:
+ * 1.姝ｅ父鍙栨秷--鍙兘鍙栨秷鏈墽琛岀殑浠诲姟锛岃揣鐗╁鍦ㄦ湭鎵ц浠诲姟鐘舵��
+ * 2.寮哄埗鍙栨秷--鍙彇娑堝凡鎵ц鏈畬鎴愮殑浠诲姟锛岃揣鐗╁鍦ㄦ湭鎵ц浠诲姟鐘舵��
+ * 3.姝ｅ父瀹屾垚--鍙兘瀹屾垚鏈墽琛岀殑浠诲姟锛岃揣鐗╁浜庝换鍔℃墽琛屽畬鎴愮姸鎬�
+ * 4.寮哄埗瀹屾垚--鍙畬鎴愬凡鎵ц鏈畬鎴愮殑浠诲姟锛岃揣鐗╁浜庝换鍔℃墽琛屽畬鎴愮姸鎬�
+ * */
+ private String taskStatus; //鎿嶄綔绫诲瀷
+ private String wharfSource; //婧愮爜澶�
+ private List<String> freeWharfs;
+ private String requestType; //璇锋眰绫诲瀷: 1=鍙栬揣锛�2=鏀捐揣
+ private String wharfCode; //鐮佸ご缂栧彿
+
+ public TaskStatusFeedbackParam(){}
+
+ public TaskStatusFeedbackParam(TaskWrk taskWrk){
+ this.taskNo = taskWrk.getTaskNo();
+ this.feedbackFrom = "WCS";
+ this.warehouseId = "1688469798893297665";
+ this.taskType = getTaskType(taskWrk.getIoType());
+ this.equipmentCode = Utils.getEquipmentCode(taskWrk.getTargetPoint());
+// this.taskStatus = "done";
+// 鏈墽琛� unExecute
+// 宸茬‘璁� confirmed
+// WCS宸蹭笅杈� wcsReleased
+// AGV宸蹭笅杈� agvReleased
+// 寮�濮嬫墽琛� executing
+// 璐т綅澶勭悊瀹屾垚 locationDone
+// 鑷姩瀹屾垚 done
+// 寮� 甯� exception
+// 宸插彇娑� cancelled
+// 鎵嬪姩瀹屾垚 handle
+
+ this.sourceLocationCode = taskWrk.getStartPoint();
+ this.targetLocationCode = taskWrk.getTargetPoint();
+ }
+
+ public static String getTaskType(Integer paramIoType){
+ switch (paramIoType){
+ case 1:
+ return "RK";
+ case 2:
+ return "CK";
+ case 3:
+ return "YK";
+ default:
+ return "鏈煡";
+ }
+ }
+
+
+
+}
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 27bac8f..d547639 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -4,10 +4,13 @@
import com.zy.asrs.entity.CommandInfo;
import com.zy.asrs.entity.TaskWrk;
import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.param.TaskStatusFeedbackParam;
import com.zy.asrs.service.CommandInfoService;
import com.zy.asrs.service.TaskWrkService;
+import com.zy.asrs.utils.PostMesDataUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -23,9 +26,23 @@
@Autowired
private CommandInfoService commandInfoService;
+ @Value("${wms.url}")
+ private String wmsUrl;
+ @Value("${wms.movePath}")
+ private String movePath;
+
@Scheduled(cron = "0/3 * * * * ? ")
public void execute() {
for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
+ TaskStatusFeedbackParam taskStatusFeedbackParam = new TaskStatusFeedbackParam(taskWrk);
+ if (taskWrk.getStatus()==3){
+ taskStatusFeedbackParam.setTaskStatus("done");
+ new PostMesDataUtils().postMesData("瀹屾垚涓婃姤",wmsUrl,movePath,taskWrk);
+ }else {
+ taskStatusFeedbackParam.setTaskStatus("cancelled");
+ new PostMesDataUtils().postMesData("鍙栨秷浠诲姟瀹屾垚",wmsUrl,movePath,taskWrk);
+
+ }
if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) > 0) {
//浠诲姟宸茬粡杞棩蹇楋紝灏嗚浠诲姟涓嬮潰鐨勬寚浠よ浆鏃ュ織
commandInfoService.saveToHistory(taskWrk.getTaskNo());
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 461fd2e..2fd2706 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -22,6 +22,11 @@
return (float) Arith.multiplys(2, f, 1);
}
+ //绔欑偣鍙疯浆鎹�
+ public static String getEquipmentCode(String targetPoint){
+ return "J-1"+targetPoint;
+ }
+
public static String zerofill(String msg, Integer count){
if (msg.length() == count){
return msg;
--
Gitblit v1.9.1