From 31923911748e867d11365cbd0143e3460f8e9178 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 28 四月 2025 16:43:05 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
index bc0e484..65408e9 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
@@ -6,6 +6,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.domain.enums.WorkNoType;
+import com.zy.asrs.entity.DeviceError;
import com.zy.asrs.entity.StaDesc;
import com.zy.asrs.mapper.TaskWrkMapper;
import com.zy.asrs.entity.TaskWrk;
@@ -144,7 +145,7 @@
headParam.put("status",taskWrk.getStatus());
headParam.put("ioType",taskWrk.getIoType());
headParam.put("barcode",taskWrk.getBarcode());
- headParam.put("reportTime",new Date());
+// headParam.put("reportTime",new Date());
String response;
response = new HttpHandler.Builder()
// .setHeaders(headParam)
@@ -165,7 +166,7 @@
);
}catch (Exception e){
log.error("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触", taskWrk);
- throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
+// throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
}
}
@@ -213,8 +214,8 @@
//鐢熸垚杈撻�佺嚎鍛戒护
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo()).clone();
- staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
- staProtocol.setStaNo((short) Integer.parseInt(taskWrk.getTargetPoint()));
+ staProtocol.setWorkNo(taskWrk.getWrkNo());
+ staProtocol.setStaNo(Integer.parseInt(taskWrk.getTargetPoint()));
if (!CommandUtils.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(3, staProtocol))) {
log.error("杈撻�佺嚎鍛戒护鐢熸垚澶辫触锛屽爢鍨涙満鍙�={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
throw new CoolException("杈撻�佺嚎鍛戒护鐢熸垚澶辫触");
@@ -247,4 +248,22 @@
public int saveToHistory(String taskNo) {
return this.baseMapper.saveToHistory(taskNo);
}
+
+
+
+ @Override
+ public List<TaskWrk> selectTaskWrkList(Integer wrkNo,Integer taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd, Integer curr, Integer limit) {
+ return this.baseMapper.selectTaskWrkList(wrkNo,taskNo, status,modiTimeStart,modiTimeEnd,curr,limit);
+ }
+
+ @Override
+ public Long selectTaskWrkListTotal(Integer wrkNo,Integer taskNo,Integer status,Date modiTimeStart,Date modiTimeEnd) {
+ return this.baseMapper.selectTaskWrkListTotal(wrkNo,taskNo, status,modiTimeStart,modiTimeEnd);
+ }
+
+
+ @Override
+ public int saveToHistoryD(String taskNo) {
+ return this.baseMapper.saveToHistoryD(taskNo);
+ }
}
--
Gitblit v1.9.1