From 3759a40aad8191f82f4a2eac54c9045dcf6a0fb3 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 04 十一月 2025 09:46:59 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 90 ++++++++++++++++++++++++--------------------
src/main/java/com/zy/asrs/controller/CrnController.java | 2 +
src/main/webapp/views/deviceOperate/crnOperate.html | 8 +++-
src/main/java/com/zy/asrs/domain/vo/CrnListVo.java | 17 ++++++++
4 files changed, 74 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 3032e40..3fc7a9d 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -333,6 +333,8 @@
vo.setOutEnable(basCrnp.getOutEnable());
vo.setHpMk(basCrnp.getHpMk());
vo.setTaskComplete(crnThread.getResetFlag()? "浠诲姟瀹屾垚涓嬪彂绛夊緟":"-");
+ vo.setDemo(SystemProperties.WCS_RUNNING_STATUS_DEMO.get()? "寮�鍚�":"鍏抽棴");
+ vo.setDemoValue(SystemProperties.WCS_RUNNING_STATUS_DEMO_VALUE);
}
return R.ok().add(list);
}
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnListVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnListVo.java
index 79ac01c..4debdf4 100644
--- a/src/main/java/com/zy/asrs/domain/vo/CrnListVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnListVo.java
@@ -115,6 +115,8 @@
private String hpMk;
private String taskComplete = "鏃�";
private String errorCrn;
+ private String demo;
+ private Integer demoValue;
public void setXspeed(Float xspeed) {
this.xspeed = Utils.scale(xspeed);
@@ -150,4 +152,19 @@
}
return CrnStatusType.get(this.wrkStatus.shortValue()).desc;
}
+
+ public String getDemoValue$() {
+ switch (this.demoValue) {
+ case 0:
+ return "鍋滄";
+ case 1:
+ return "杩愯鍚姩涓�";
+ case 2:
+ return "杩愯涓�";
+ case 3:
+ return "鍋滄涓�";
+ 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 2b65667..f6e820f 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -58,51 +58,59 @@
public void execute() throws IOException {
List<TaskWrk> taskWrkList = taskWrkService.selectToBeHistoryData();
for (TaskWrk taskWrk : taskWrkList) {
- JSONObject jsonObject = null;
- String response = null;
boolean success = false;
- HashMap<String, Object> map = new HashMap<>();
- try {
- map.put("taskNo",taskWrk.getTaskNo());
- map.put("taskStatus",taskWrk.getStatusWms());
- map.put("ioType",taskWrk.getIoTypeWms());
- map.put("barCode",taskWrk.getBarcode());
- map.put("reportTime", LocalDateTime.now());
- map.put("weight",taskWrk.getScWeight().doubleValue());
- response = new HttpHandler.Builder()
- .setUri(wmsUrl)
- .setPath(taskStatusFeedbackPath)
- .setJson(JSON.toJSONString(map))
- .build()
- .doPost();
- jsonObject = JSON.parseObject(response);
-
- if (!Cools.isEmpty(jsonObject.getInteger("code")) && jsonObject.getInteger("code").equals(200)) {
- if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) == 0) {
- log.error("浠诲姟妗ｈ浆浠诲姟鍘嗗彶妗ｅけ璐�" + taskWrk);
- return ;
- }
- success = true;
- //鍒犻櫎浠诲姟
- taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no", taskWrk.getTaskNo()));
- } else {
- log.error("wms鍏ュ簱鍑哄簱瀹屾垚涓婃姤澶辫触" + taskWrk);
+ if (taskWrk.getIoType()==4){
+ if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) == 0) {
+ log.error("浠诲姟妗ｈ浆浠诲姟鍘嗗彶妗ｅけ璐�" + taskWrk);
+ return ;
}
- } catch (Exception e) {
- log.error("wms閫氳澶辫触," + e.getMessage());
- } finally {
- apiLogService.save("wms鍏ュ簱鍑哄簱瀹屾垚涓婃姤"
- , wmsUrl + taskStatusFeedbackPath
- , null
- , "127.0.0.1"
- , JSON.toJSONString(map)
- , response
- , success
- );
+ success = true;
+ //鍒犻櫎浠诲姟
+ taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no", taskWrk.getTaskNo()));
+ } else {
+ JSONObject jsonObject = null;
+ String response = null;
+ HashMap<String, Object> map = new HashMap<>();
+ try {
+ map.put("taskNo",taskWrk.getTaskNo());
+ map.put("taskStatus",taskWrk.getStatusWms());
+ map.put("ioType",taskWrk.getIoTypeWms());
+ map.put("barCode",taskWrk.getBarcode());
+ map.put("reportTime", LocalDateTime.now());
+ map.put("weight",taskWrk.getScWeight().doubleValue());
+ response = new HttpHandler.Builder()
+ .setUri(wmsUrl)
+ .setPath(taskStatusFeedbackPath)
+ .setJson(JSON.toJSONString(map))
+ .build()
+ .doPost();
+ jsonObject = JSON.parseObject(response);
+
+ if (!Cools.isEmpty(jsonObject.getInteger("code")) && jsonObject.getInteger("code").equals(200)) {
+ if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) == 0) {
+ log.error("浠诲姟妗ｈ浆浠诲姟鍘嗗彶妗ｅけ璐�" + taskWrk);
+ return ;
+ }
+ success = true;
+ //鍒犻櫎浠诲姟
+ taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no", taskWrk.getTaskNo()));
+ } else {
+ log.error("wms鍏ュ簱鍑哄簱瀹屾垚涓婃姤澶辫触" + taskWrk);
+ }
+ } catch (Exception e) {
+ log.error("wms閫氳澶辫触," + e.getMessage());
+ } finally {
+ apiLogService.save("wms鍏ュ簱鍑哄簱瀹屾垚涓婃姤"
+ , wmsUrl + taskStatusFeedbackPath
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(map)
+ , response
+ , success
+ );
+ }
}
}
-
-
}
}
diff --git a/src/main/webapp/views/deviceOperate/crnOperate.html b/src/main/webapp/views/deviceOperate/crnOperate.html
index adf4e71..16af503 100644
--- a/src/main/webapp/views/deviceOperate/crnOperate.html
+++ b/src/main/webapp/views/deviceOperate/crnOperate.html
@@ -32,6 +32,10 @@
</el-table-column>
<el-table-column property="errorCrn" label="寮傚父鎻愮ず">
</el-table-column>
+ <el-table-column property="demo" label="婕旂ず">
+ </el-table-column>
+ <el-table-column property="demoValue$" label="婕旂ず鐘舵��">
+ </el-table-column>
</el-table>
</div>
@@ -77,10 +81,10 @@
<el-form-item label="娴嬭瘯搴撲綅">
<el-input v-model="formParam.locMastDemo" placeholder="娴嬭瘯搴撲綅 鍒嗛殧绗�;"></el-input>
</el-form-item>
- <el-form-item label="鐩爣绔�/鐩爣搴撲綅">
+ <el-form-item label="鍫嗗灈鏈烘斁璐х珯鐐�">
<el-input v-model="formParam.staOutDemo" placeholder="鍫嗗灈鏈烘斁璐х珯鐐�"></el-input>
</el-form-item>
- <el-form-item label="鐩爣绔�/鐩爣搴撲綅">
+ <el-form-item label="鍫嗗灈鏈哄彇璐х珯鐐�">
<el-input v-model="formParam.staIntDemo" placeholder="鍫嗗灈鏈哄彇璐х珯鐐�"></el-input>
</el-form-item>
</el-form>
--
Gitblit v1.9.1