From a451e2d9e1abcae3286dfcfec4103aad1ee64085 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 08 四月 2025 15:08:54 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 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 da0f484..1d7fd6e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -176,6 +176,7 @@
TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
if (taskWrk != null) {
taskWrk.setMemo(errMsg);//灏嗛敊璇爜瀛樺叆澶囨敞瀛楁杩涜灞曠ず
+ taskWrk.setModiTime(new Date());
taskWrkMapper.updateById(taskWrk);
}
continue;
@@ -367,6 +368,7 @@
TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
if (taskWrk != null) {
taskWrk.setMemo(errMsg);//灏嗛敊璇爜瀛樺叆澶囨敞瀛楁杩涜灞曠ず
+ taskWrk.setModiTime(new Date());
taskWrkMapper.updateById(taskWrk);
}
}
@@ -420,8 +422,11 @@
// JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(r));
if (offer){
log.info("涓嬪彂杈撻�佺嚎浠诲姟鎴愬姛锛歵askWrk:"+JSON.toJSONString(taskWrk));
+ Date now = new Date();
taskWrk.setStatus(5);
taskWrk.setWrkSts(14);
+ taskWrk.setModiTime(now);
+ taskWrk.setCompleteTime(now);
taskWrkService.updateById(taskWrk);
}else {
log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛歵askWrk:"+JSON.toJSONString(taskWrk));
@@ -531,11 +536,13 @@
// int workNo = commonService.getWorkNo(WorkNoType.PAKIN.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
// taskWrk.setWrkNo(workNo);//宸ヤ綔鍙�
+ Date now = new Date();
taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//娲惧彂鐘舵��
- taskWrk.setAssignTime(new Date());//娲惧彂鏃堕棿
+// taskWrk.setAssignTime(now);//娲惧彂鏃堕棿
+ taskWrk.setExecuteTime(now);
taskWrk.setWrkSts(3);//宸ヤ綔鐘舵�� 3.鍚婅溅鍏ュ簱
taskWrk.setCrnNo(staDesc.getCrnNo());//鍫嗗灈鏈哄彿
- taskWrk.setModiTime(new Date());
+ taskWrk.setModiTime(now);
taskWrk.setModiUser(9988L);
// //鍙栧嚭鍛戒护
@@ -581,7 +588,7 @@
crnCommand.setDestinationPosX(Utils.getRowShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosY(Utils.getBayShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅灞�
crnCommand.setDestinationPosZ(Utils.getLevShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鎺�
- crnCommand.setCommand((short)1);
+// crnCommand.setCommand((short)0);
if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand),false)) {
log.error("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
throw new CoolException("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐�");
@@ -703,6 +710,7 @@
taskWrk.setWrkSts(12);
taskWrk.setStatus(2);
taskWrk.setModiTime(now);
+ taskWrk.setExecuteTime(now);
if (taskWrkMapper.updateById(taskWrk) == 0) {
log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
}
@@ -753,7 +761,8 @@
List<TaskWrk> taskWrks = taskWrkMapper.selectList(new EntityWrapper<TaskWrk>()
.eq("crn_no",slave.getId())
.eq("wrk_sts",11)
- .eq("io_type",3));
+ .eq("io_type",3)
+ .orderBy("io_pri",false));
for (TaskWrk taskWrk : taskWrks){
// 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
@@ -809,6 +818,7 @@
taskWrk.setWrkSts(12);
taskWrk.setStatus(2);
taskWrk.setModiTime(now);
+ taskWrk.setExecuteTime(now);
if (taskWrkMapper.updateById(taskWrk) == 0) {
log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
}
@@ -917,6 +927,7 @@
//纭瀹屾垚淇″彿
CrnOperatorParam crnOperatorParam=new CrnOperatorParam();
crnOperatorParam.setCrnNo(crn.getId());
+ Date now = new Date();
crnController.crnTaskComplete(crnOperatorParam);
if(!Cools.isEmpty(taskWrk)){
@@ -927,7 +938,7 @@
LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
locMast.setLocSts("F");//F.鍦ㄥ簱
locMast.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
- locMast.setModiTime(new Date());
+ locMast.setModiTime(now);
locMast.setModiUser(9999L);
locMastService.updateById(locMast);
}else if(taskWrk.getIoType()==2&&taskWrk.getWrkSts()==12){
@@ -937,7 +948,7 @@
LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
locMast.setLocSts("O");//O.绌哄簱浣�
locMast.setBarcode("");//鎵樼洏鐮�
- locMast.setModiTime(new Date());
+ locMast.setModiTime(now);
locMast.setModiUser(9999L);
locMastService.updateById(locMast);
}else if(taskWrk.getIoType()==3&&taskWrk.getWrkSts()==12){
@@ -947,17 +958,19 @@
LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
locMast.setLocSts("F");//F.鍦ㄥ簱
locMast.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
- locMast.setModiTime(new Date());
+ locMast.setModiTime(now);
locMast.setModiUser(9999L);
locMastService.updateById(locMast);
LocMast locMast1 = locMastService.selectByLocNo(taskWrk.getStartPoint());
locMast1.setLocSts("O");//O.绌哄簱浣�
locMast1.setBarcode("");//鎵樼洏鐮�
- locMast1.setModiTime(new Date());
+ locMast1.setModiTime(now);
locMast1.setModiUser(9999L);
locMastService.updateById(locMast1);
}
+ taskWrk.setModiTime(now);
+ taskWrk.setCompleteTime(now);
taskWrkService.updateById(taskWrk);
@@ -1324,6 +1337,9 @@
taskWrk.setWrkNo(workNo1);
taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
taskWrk.setCreateTime(now);
+ taskWrk.setAssignTime(now);
+ taskWrk.setModiTime(now);
+ taskWrk.setModiUser(5555L);
taskWrk.setIoType(1);//浠诲姟绫诲瀷
taskWrk.setIoPri(Cools.isEmpty(dto.getTaskPriority()) ? 300 : Integer.parseInt(dto.getTaskPriority()));//浼樺厛绾�
taskWrk.setBarcode(barcode);//鏉＄爜
--
Gitblit v1.9.1