From aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 17:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 147 ++++++++++--------------------------------------
1 files changed, 31 insertions(+), 116 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 1620332..cf1083a 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -1,26 +1,19 @@
package com.zy.asrs.task;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.asrs.domain.enums.TaskStatusType;
-import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.TaskOverToWms;
-import com.zy.asrs.entity.param.TaskStatusFeedbackParam;
-import com.zy.asrs.service.*;
-import com.zy.asrs.utils.PostMesDataUtils;
-import com.zy.common.utils.HttpHandler;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.entity.TaskWrkLog;
+import com.zy.asrs.entity.TaskWrkReport;
+import com.zy.asrs.service.TaskWrkReportService;
+import com.zy.asrs.service.TaskWrkService;
+import com.zy.asrs.service.impl.TaskWrkLogServiceImpl;
+import com.zy.common.utils.Synchro;
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;
import java.io.IOException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
/**
* 瀹氭椂灏嗕换鍔�(瀹屾垚銆佸彇娑�)杞垚鏃ュ織
@@ -31,114 +24,36 @@
@Autowired
private TaskWrkService taskWrkService;
- @Autowired
- private CommandInfoService commandInfoService;
- @Autowired
- private ApiLogService apiLogService;
- @Autowired
- private BasDevpService basDevpService;
@Autowired
- private StaDescService staDescService;
+ private TaskWrkLogServiceImpl wrkLogService;
+
+
@Autowired
- private LocMastService locMastService;
+ private TaskWrkReportService taskWrkReportService;
- @Value("${wms.url}")
- private String wmsUrl;
- @Value("${wms.movePath}")
- private String movePath;
- @Scheduled(cron = "0/3 * * * * ? ")
- public void execute() throws IOException {
+ @Scheduled(cron = "0/5 * * * * ? ")
+ public synchronized void execute() throws IOException {
for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
- TaskStatusFeedbackParam taskStatusFeedbackParam = new TaskStatusFeedbackParam(taskWrk);
- if (taskWrk.getStatus().equals(TaskStatusType.OVER.id)) {//瀹屾垚
- taskStatusFeedbackParam.setTaskStatus("done");
- Map<String, Object> map = new HashMap<>();
- map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2");
- TaskOverToWms taskOverToWms = new TaskOverToWms();
- taskOverToWms.setFeedbackFrom("WCS"); //鏉ユ簮
- taskOverToWms.setWarehouseId("1688469798893297665"); //浠撳簱鏍囪瘑
- taskOverToWms.setTaskNo(taskWrk.getTaskNo()); //浠诲姟鍙�
- taskOverToWms.setTaskType(taskStatusFeedbackParam.getTaskType()); // 浠诲姟绫诲瀷
- taskOverToWms.setContainerCode(taskWrk.getBarcode()); // 瀹瑰櫒缂栫爜
- //鍖哄垎鍏ュ嚭搴�
- if (taskWrk.getIoType() ==1 ){
- taskOverToWms.setEquipmentCode(String.valueOf(taskWrk.getCrnNo())); //璁惧缂栫爜
- taskOverToWms.setTargetLocationCode(taskWrk.getOriginTargetPoint()); //鐩爣搴撲綅
- }else if (taskWrk.getIoType() ==2){
- StaDesc staDesc = staDescService.queryCrn(2, Integer.valueOf(taskWrk.getTargetPoint()), taskWrk.getCrnNo());
- taskOverToWms.setEquipmentCode(staDesc.getStnDesc()); //璁惧缂栫爜
- taskOverToWms.setSourceLocationCode(taskWrk.getOriginStartPoint()); //婧愬簱浣�
- //鍒ゆ柇鎵樼洏鏄惁璧板埌鍑哄簱绔�
- BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", taskWrk.getTargetPoint()));
- if (!basDevp.getWrkNo().equals(taskWrk.getWrkNo())){
- continue;
- }
- } else if (taskWrk.getIoType() ==3) {
- taskOverToWms.setEquipmentCode(String.valueOf(taskWrk.getCrnNo())); //璁惧缂栫爜
- taskOverToWms.setTargetLocationCode(taskWrk.getOriginTargetPoint()); //鐩爣搴撲綅
- Date now = new Date();
- //鏇存柊搴撲綅鐘舵��
- LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
- locMast.setLocSts("O");//O.绌哄簱浣�
- locMast.setBarcode("");//鎵樼洏鐮�
- locMast.setModiTime(now);
- locMast.setModiUser(9999L);
- locMastService.updateById(locMast);
-
- //鏇存柊搴撲綅鐘舵��
- LocMast locMast2 = locMastService.selectByLocNo(taskWrk.getTargetPoint());
- locMast2.setLocSts("F");//F.鍦ㄥ簱
- locMast2.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
- locMast2.setModiTime(now);
- locMast2.setModiUser(9999L);
- locMastService.updateById(locMast);
- }
-
- taskOverToWms.setTaskStatus("done"); //浠诲姟鐘舵��
- String response = null;
- try {
- response = new HttpHandler.Builder()
- .setHeaders(map)
- .setUri(wmsUrl)
- .setPath("wcsManager/wcsInterface/taskStatusFeedback")
- .setJson(JSON.toJSONString(taskOverToWms))
- .build()
- .doPost();
- }catch (Exception e){
- continue;
- }
- apiLogService.save("Wms浠诲姟瀹屾垚鎺ュ彛"
- ,wmsUrl+"/wcsManager/wcsInterface/taskStatusFeedback"
- ,null
- ,"127.0.0.1"
- ,JSON.toJSONString(taskOverToWms)
- ,response
- ,true
- );
-
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)){
-
- }else {
- continue;
- }
-
- //new PostMesDataUtils().postMesData("瀹屾垚涓婃姤",wmsUrl,movePath,taskWrk);
- } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
- taskStatusFeedbackParam.setTaskStatus("cancelled");
- //new PostMesDataUtils().postMesData("鍙栨秷浠诲姟瀹屾垚",wmsUrl,movePath,taskWrk);
+ switch (taskWrk.getStatus()) {
+ case 4:
+ break;
+ case 5:
+ break;
}
-
- if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) > 0) {
- //浠诲姟宸茬粡杞棩蹇楋紝灏嗚浠诲姟涓嬮潰鐨勬寚浠よ浆鏃ュ織
- commandInfoService.saveToHistory(taskWrk.getTaskNo());
-
- //鍒犻櫎浠诲姟
- taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no", taskWrk.getTaskNo()));
- //鍒犻櫎鎸囦护
- commandInfoService.delete(new EntityWrapper<CommandInfo>().eq("task_no", taskWrk.getTaskNo()));
+ TaskWrkReport taskWrkReport = new TaskWrkReport();
+ TaskWrkLog taskWrkLog = new TaskWrkLog();
+ Synchro.Copy(taskWrk, taskWrkReport);
+ Synchro.Copy(taskWrk, taskWrkLog);
+ if (!taskWrkReportService.insert(taskWrkReport)) {
+ throw new CoolException("杞Щ鑷充笂鎶ヨ〃" + taskWrk);
+ }
+ if (!wrkLogService.insert(taskWrkLog)) {
+ throw new CoolException("杞巻鍙叉。澶辫触" + taskWrk);
+ }
+ if (!taskWrkService.deleteById(taskWrk)) {
+ throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrk);
}
}
}
--
Gitblit v1.9.1