From 87fd4ae058bc3103e8696f10615bf84472d54128 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 23 五月 2025 15:46:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 5
src/main/java/com/zy/asrs/task/AssignTasksRCSScheduler.java | 177 ++++++++++++++++++++++++++++++++-----------
2 files changed, 133 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index f7de4fd..c5ade16 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -194,7 +194,7 @@
taskWrk.setCreateTime(now);
taskWrk.setIoType(2);//鍑哄簱
taskWrk.setIoPri(100);//浼樺厛绾�
- taskWrk.setOriginTargetPoint(locMast1.getLocNo());
+ taskWrk.setStartPoint(locMast1.getLocNo());
taskWrk.setTargetPoint("101");//缁堢偣
boolean result = taskWrkService.insert(taskWrk);
@@ -243,7 +243,7 @@
Date now = new Date();
TaskWrk taskWrk = new TaskWrk();
- int workNo1 = commonService.getWorkNo(WorkNoType.PAKOUT.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
+ int workNo1 = commonService.getWorkNo(WorkNoType.PAKIN.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
taskWrk.setTaskNo(String.valueOf(workNo1));//浠诲姟鍙�
taskWrk.setWrkNo(workNo1);
taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
@@ -251,6 +251,7 @@
taskWrk.setIoType(1);//鍏ュ簱
taskWrk.setIoPri(100);//浼樺厛绾�
taskWrk.setOriginTargetPoint("1");
+ taskWrk.setOriginTargetPoint(String.valueOf(Utils.getLev(locMast1.getLocNo())));
taskWrk.setTargetPoint(locMast1.getLocNo());//缁堢偣
boolean result = taskWrkService.insert(taskWrk);
diff --git a/src/main/java/com/zy/asrs/task/AssignTasksRCSScheduler.java b/src/main/java/com/zy/asrs/task/AssignTasksRCSScheduler.java
index 3295e25..9de04e6 100644
--- a/src/main/java/com/zy/asrs/task/AssignTasksRCSScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AssignTasksRCSScheduler.java
@@ -32,63 +32,146 @@
private String wcsmovePath;
@Value("${wcs.outboundTaskRequest}")
private String wcsoutboundTaskRequest;
+ @Value("${wcs.inboundTaskApplyPathWcs}")
+ private String wcsInboundTaskApplyPathWcs;
@Value("${wms.TaskExecCallback}")
private String TaskExecCallback;
@Value("${wms.taskStatusFeedbackPath}")
private String taskStatusFeedbackPath;
/**
- * 鑷姩娲惧彂鍑哄簱浠诲姟缁橰CS
- *
- * @throws IOException
+ * 鑷姩娲惧彂绉诲簱浠诲姟缁橰CS
*/
@Scheduled(cron = "0/3 * * * * ? ")
- public void execute() throws IOException {
- if(true){
- List<TaskWrk> taskWrks=taskWrkService.selectList(new EntityWrapper<TaskWrk>()
- .eq("wrk_sts",1).eq("io_type",3));
- for(TaskWrk taskWrk:taskWrks){
- HashMap<String, Object> headParam = new HashMap<>();
- String response = "";
- Boolean bool = false;
- String dz="";
- if(taskWrk.getIoType()==2){
- dz=wcsoutboundTaskRequest;
- }else{
- dz=wcsmovePath;
+ public void executeMove() {
+ List<TaskWrk> taskWrks = taskWrkService.selectList(new EntityWrapper<TaskWrk>()
+ .eq("wrk_sts", 1).eq("io_type", 3));
+ for (TaskWrk taskWrk : taskWrks) {
+ HashMap<String, Object> headParam = new HashMap<>();
+ String response = "";
+ boolean bool = false;
+ try {
+ headParam.put("taskNo", taskWrk.getTaskNo());
+ headParam.put("sourceLocNo", taskWrk.getStartPoint());//婧愬簱浣�
+ headParam.put("locNo", taskWrk.getTargetPoint());//鐩爣搴撲綅
+ log.info("wcs娲惧彂浠诲姟缁橰CS绉诲簱={}", taskWrk);
+ response = new HttpHandler.Builder()
+ // .setHeaders(headParam)
+ .setUri(wcsUrl)
+ .setPath(wcsmovePath)
+ .setJson(JSON.toJSONString(headParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.get("code").equals(200)) {
+ //娲惧彂鍑哄簱浠诲姟缁橰CS==>鎴愬姛涓嬪彂绉诲簱浠诲姟
+ taskWrk.setWrkSts(2);
+ taskWrkService.updateById(taskWrk);
+ bool = true;
}
- try {
- headParam.put("taskNo", taskWrk.getTaskNo());
- headParam.put("sourceLocNo",taskWrk.getStartPoint());//婧愬簱浣�
- headParam.put("locNo",taskWrk.getTargetPoint());//鐩爣搴撲綅
- log.info("wcs娲惧彂浠诲姟缁橰CS鍑哄簱={}", taskWrk);
- response = new HttpHandler.Builder()
- // .setHeaders(headParam)
- .setUri(wcsUrl)
- .setPath(dz)
- .setJson(JSON.toJSONString(headParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if(jsonObject.get("code").equals(200)){
- //娲惧彂鍑哄簱浠诲姟缁橰CS==>鎴愬姛涓嬪彂鍑哄簱浠诲姟
- taskWrk.setWrkSts(2);
- taskWrkService.updateById(taskWrk);
- bool = true;
- }
- } catch (Exception e) {
- log.error("wcs娲惧彂浠诲姟缁橰CS鍑哄簱澶辫触{},杩斿洖鍊�={}", taskWrk, response);
- } finally {
- apiLogService.save("wcs娲惧彂浠诲姟缁橰CS鍑哄簱"
- , wcsUrl + dz
- , null
- , "127.0.0.1"
- , JSON.toJSONString(headParam)
- , response
- , bool
- );
- }
+ } catch (Exception e) {
+ log.error("wcs娲惧彂浠诲姟缁橰CS绉诲簱澶辫触{},杩斿洖鍊�={}", taskWrk, response);
+ } finally {
+ apiLogService.save("wcs娲惧彂浠诲姟缁橰CS绉诲簱"
+ , wcsUrl + wcsmovePath
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(headParam)
+ , response
+ , bool
+ );
}
}
}
+
+ /**
+ * 鑷姩娲惧彂鍑哄簱浠诲姟缁橰CS
+ */
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public void executeOut() {
+ List<TaskWrk> taskWrks = taskWrkService.selectList(new EntityWrapper<TaskWrk>()
+ .eq("wrk_sts", 1).eq("io_type", 2));
+ for(TaskWrk taskWrk:taskWrks){
+ HashMap<String, Object> headParam = new HashMap<>();
+ String response = "";
+ boolean bool = false;
+ try {
+ headParam.put("taskNo", taskWrk.getTaskNo());
+ headParam.put("sourceLocNo",taskWrk.getStartPoint());//婧愬簱浣�
+ headParam.put("staNo",taskWrk.getTargetPoint());//鐩爣绔�
+ log.info("wcs娲惧彂浠诲姟缁橰CS鍑哄簱={}", taskWrk);
+ response = new HttpHandler.Builder()
+ .setUri(wcsUrl)
+ .setPath(wcsoutboundTaskRequest)
+ .setJson(JSON.toJSONString(headParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if(jsonObject.get("code").equals(200)){
+ //娲惧彂鍑哄簱浠诲姟缁橰CS==>鎴愬姛涓嬪彂鍑哄簱浠诲姟
+ taskWrk.setWrkSts(11);
+ taskWrkService.updateById(taskWrk);
+ bool = true;
+ }
+ } catch (Exception e) {
+ log.error("wcs娲惧彂浠诲姟缁橰CS鍑哄簱澶辫触{},杩斿洖鍊�={}", taskWrk, response);
+ } finally {
+ apiLogService.save("wcs娲惧彂浠诲姟缁橰CS鍑哄簱"
+ , wcsUrl + wcsoutboundTaskRequest
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(headParam)
+ , response
+ , bool
+ );
+ }
+ }
+ }
+
+ /**
+ * 鑷姩娲惧彂鍏ュ簱浠诲姟缁橰CS
+ */
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public void executeIn() {
+ List<TaskWrk> taskWrks = taskWrkService.selectList(new EntityWrapper<TaskWrk>()
+ .eq("wrk_sts", 1).eq("io_type", 2));
+ for(TaskWrk taskWrk:taskWrks){
+ HashMap<String, Object> headParam = new HashMap<>();
+ String response = "";
+ boolean bool = false;
+ try {
+ headParam.put("taskNo", taskWrk.getTaskNo());
+ headParam.put("sourceStaNo",taskWrk.getOriginStartPoint());//婧愮珯
+ headParam.put("staNo",taskWrk.getOriginTargetPoint());//鐩爣绔�
+ headParam.put("locNo",taskWrk.getTargetPoint());//鐩爣搴撲綅
+
+ log.info("wcs娲惧彂浠诲姟缁橰CS鍏ュ簱={}", taskWrk);
+ response = new HttpHandler.Builder()
+ .setUri(wcsUrl)
+ .setPath(wcsInboundTaskApplyPathWcs)
+ .setJson(JSON.toJSONString(headParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if(jsonObject.get("code").equals(200)){
+ //娲惧彂鍑哄簱浠诲姟缁橰CS==>鎴愬姛涓嬪彂鍏ュ簱浠诲姟
+ taskWrk.setWrkSts(2);
+ taskWrkService.updateById(taskWrk);
+ bool = true;
+ }
+ } catch (Exception e) {
+ log.error("wcs娲惧彂浠诲姟缁橰CS鍏ュ簱澶辫触{},杩斿洖鍊�={}", taskWrk, response);
+ } finally {
+ apiLogService.save("wcs娲惧彂浠诲姟缁橰CS鍏ュ簱"
+ , wcsUrl + wcsInboundTaskApplyPathWcs
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(headParam)
+ , response
+ , bool
+ );
+ }
+ }
+ }
+
}
--
Gitblit v1.9.1