From e60658fec23ada118080f79b4ba8bc05b733138e Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 13 五月 2025 14:46:10 +0800
Subject: [PATCH] 整理代码，记录任务执行时间
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 54 ++++-----------------------
src/main/webapp/views/taskWrkLog/taskWrkLog.html | 4 +-
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 3 +
src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java | 1
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 9 ----
5 files changed, 14 insertions(+), 57 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 0b1a796..b35d47a 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -216,6 +216,7 @@
}
// toWmsService.addReportLog(taskWrk);
locMastService.updateById(locMast);
+ taskWrk.setCompleteTime(new Date());
taskWrk.setStatus(7);//鎵嬪姩瀹屾垚浠诲姟
taskWrk.setModiTime(new Date());
taskWrkService.updateById(taskWrk);
@@ -265,7 +266,7 @@
}
// toWmsService.addReportLog(taskWrk);
- taskWrk.setCompleteTime(now);//瀹岀粨鏃堕棿
+ taskWrk.setCancelTime(now);//瀹岀粨鏃堕棿
taskWrkService.updateById(taskWrk);
return R.ok();
}
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 fc61843..fa23700 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -104,12 +104,6 @@
@Value("${loc-move.enable}")
private boolean enable;
- @Value("${loc-move.crn1}")
- private boolean crn1;
- @Value("${loc-move.crn2}")
- private boolean crn2;
- @Value("${loc-move.crn3}")
- private boolean crn3;
public synchronized void generateStoreWrkFile() {
@@ -163,7 +157,6 @@
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
&& !staProtocol.isEmptyMk() && workNo >= 9000 && staProtocol.isPakMk()) {
-// if(true){
// 鑾峰彇鏉＄爜鎵弿浠俊鎭�
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
if (barcodeThread == null) {
@@ -178,15 +171,6 @@
if (!Cools.isEmpty(taskWrk1)) {
log.info("鎵樼洏鐮侊細" + BoxNo + "浠诲姟妗ｅ瓨鍦�");
continue;
-// if (taskWrk1.getIoType() == 1 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())) {
-// StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
-// .eq("crn_no", taskWrk1.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
-// if (Cools.isEmpty(staDesc)) {
-// return;
-// } else {
-// continue;
-// }
-// }
}
if (back) {
storageEscalationParam.setWCSStatus(1);
@@ -210,23 +194,6 @@
staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- //娣诲姞涓婃姤鏃ュ織
-// toWmsService.addReportLog(taskWrk);
-// if (!Cools.isEmpty(taskWrk)) {
-// StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
-// .eq("crn_no", taskWrk.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
-// staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
-// staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
-// MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-// //娣诲姞涓婃姤鏃ュ織
-// toWmsService.addReportLog(taskWrk);
-// } else {
-// log.info("鍒涘缓宸ヤ綔妗ｅけ璐�==>{}", taskWrk.getTaskNo());
-// staProtocol.setStaNo(inSta.getBackSta().shortValue());
-// devpThread.setPakMk(staProtocol.getSiteId(), false);
-// MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-// }
-
}
}
@@ -246,8 +213,6 @@
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
// 閬嶅巻鍫嗗灈鏈哄嚭搴撶珯
for (CrnSlave.CrnStn crnStn : crnSlave.getCrnOutStn()) {
-// List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("crn_no", crnSlave.getId()).eq("crn_stn", crnStn.getStaNo()));
-// for (StaDesc staDesc : staDescs) {
try {
// 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
@@ -263,13 +228,6 @@
if (taskWrk == null) {
continue;
}
- // 鍒ゆ柇鍚婅溅鏄惁瀹為檯宸插畬鎴愶紝涓旂數鑴戠姸鎬佸湪move涓紝浠ュ鐢佃剳杩涜鏇存柊宸ヤ綔妗�
-// CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, taskWrk.getCrnNo());
-// CrnProtocol crnProtocol = crnThread.getCrnProtocol();
-// log.info(crnProtocol.statusType+""+crnProtocol.getForkPosType());
-// if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo().equals(taskWrk.getWrkNo().shortValue())
-// && crnProtocol.statusType == CrnStatusType.HANDLING_COMPLETED
-// && crnProtocol.forkPosType == CrnForkPosType.HOME) {
log.info("涓嬪彂杈撻�佺嚎浠诲姟锛歵askWrk:" + JSON.toJSONString(taskWrk));
staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
staProtocol.setStaNo(Short.valueOf(taskWrk.getTargetPoint()));
@@ -284,6 +242,7 @@
log.info("涓嬪彂杈撻�佺嚎浠诲姟鎴愬姛锛歵askWrk:" + JSON.toJSONString(taskWrk));
taskWrk.setStatus(5);
taskWrk.setWrkSts(14);
+ taskWrk.setCompleteTime(new Date());
taskWrkService.updateById(taskWrk);
} else {
@@ -396,11 +355,12 @@
// int workNo = commonService.getWorkNo(WorkNoType.PAKIN.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
// taskWrk.setWrkNo(workNo);//宸ヤ綔鍙�
taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//娲惧彂鐘舵��
- taskWrk.setAssignTime(new Date());//娲惧彂鏃堕棿
+ taskWrk.setExecuteTime(new Date());
+// taskWrk.setAssignTime(new Date());//娲惧彂鏃堕棿
taskWrk.setWrkSts(3);//宸ヤ綔鐘舵�� 3.鍚婅溅鍏ュ簱
taskWrk.setCrnNo(staDesc.getCrnNo());//鍫嗗灈鏈哄彿
- taskWrk.setModiTime(new Date());
- taskWrk.setModiUser(9988L);
+// taskWrk.setModiTime(new Date());
+// taskWrk.setModiUser(9988L);
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
CrnCommand crnCommand = new CrnCommand();
@@ -543,7 +503,7 @@
Date now = new Date();
taskWrk.setWrkSts(12);
taskWrk.setStatus(2);
- taskWrk.setModiTime(now);
+ taskWrk.setExecuteTime(now);
if (taskWrkMapper.updateById(taskWrk) == 0) {
log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
}
@@ -616,6 +576,7 @@
Date now = new Date();
taskWrk.setWrkSts(12);
taskWrk.setStatus(2);
+ taskWrk.setExecuteTime(now);
taskWrk.setModiTime(now);
if (taskWrkMapper.updateById(taskWrk) == 0) {
log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
@@ -696,6 +657,7 @@
locMast1.setModiUser(9999L);
locMastService.updateById(locMast1);
}
+ taskWrk.setCompleteTime(new Date());
taskWrkService.updateById(taskWrk);
}
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 b0824a3..6ed1e22 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -78,14 +78,7 @@
taskWrk.setWrkNo(workNo1);
taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
taskWrk.setCreateTime(now);
-// try {
-// if (param.getIoType() > 1) {
-// if (Utils.locNoRowBoolean(locMast.getRow1())) {
-// param.setTaskPriority(11);
-// }
-// }
-// } catch (Exception e) {
-// }
+ taskWrk.setAssignTime(now);
taskWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
taskWrk.setIoPri(param.getTaskPriority());//浼樺厛绾�
taskWrk.setBarcode(param.getBarcode());//鏉＄爜
diff --git a/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java
index 78d5074..e45438d 100644
--- a/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java
@@ -171,6 +171,7 @@
taskWrk.setWrkNo(workNo1);
taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//浠诲姟鐘舵�侊細娲惧彂
taskWrk.setCreateTime(now);
+ taskWrk.setAssignTime(now);
taskWrk.setIoType(1);//浠诲姟绫诲瀷
taskWrk.setIoPri(13);//浼樺厛绾�
taskWrk.setBarcode(barcode);//鏉＄爜
diff --git a/src/main/webapp/views/taskWrkLog/taskWrkLog.html b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
index 1de0495..254c9c5 100644
--- a/src/main/webapp/views/taskWrkLog/taskWrkLog.html
+++ b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
@@ -24,7 +24,7 @@
<el-input v-model="tableSearchParam.wrk_no" placeholder="宸ヤ綔鍙�"></el-input>
</el-form-item>
<el-form-item label="">
- <el-input v-model="tableSearchParam.barcode" placeholder="绠卞彿"></el-input>
+ <el-input v-model="tableSearchParam.barcode" placeholder="鏉＄爜"></el-input>
</el-form-item>
<el-form-item label="">
<el-input v-model="tableSearchParam.start_point" placeholder="璧峰浣�"></el-input>
@@ -55,7 +55,7 @@
</el-table-column>
<el-table-column property="wrkNo" label="宸ヤ綔鍙�">
</el-table-column>
- <el-table-column property="createTime$" label="浠诲姟鏃堕棿">
+ <el-table-column property="createTime$" label="鍒涘缓鏃堕棿">
</el-table-column>
<el-table-column property="durationTime" label="鎸佺画鏃堕暱">
</el-table-column>
--
Gitblit v1.9.1