| | |
|---|
| | | if (offer) { |
|---|
| | | log.info("下发输送线任务成功：taskWrk:" + JSON.toJSONString(taskWrk)); |
|---|
| | | Date now = new Date(); |
|---|
| | | taskWrk.setStatus(TaskStatusType.OVER3.id); |
|---|
| | | if (taskWrk.getTargetPoint().equals(staProtocol.getSiteId().toString())){ |
|---|
| | | taskWrk.setStatus(TaskStatusType.OVER.id); |
|---|
| | | } else { |
|---|
| | | taskWrk.setStatus(TaskStatusType.OVER3.id); |
|---|
| | | } |
|---|
| | | taskWrk.setWrkSts(14); |
|---|
| | | taskWrk.setModiTime(now); |
|---|
| | | taskWrk.setCompleteTime(now); |
|---|
| | |
|---|
| | | } |
|---|
| | | |
|---|
| | | long endP = 0; |
|---|
| | | long endP1 = 0; |
|---|
| | | long endP2 = 0; |
|---|
| | | ConcurrentHashMap<String, TaskProtocol> allTaskProtocol = taskProtocolCache.getAllTaskProtocol(); |
|---|
| | | boolean sign = true; |
|---|
| | | for (TaskProtocol taskProtocol : allTaskProtocol.values()){ |
|---|
| | | if (taskProtocol.getTaskStatus() == 2){//取 |
|---|
| | | endP = taskProtocol.getTargetPosition(); |
|---|
| | | sign = false; |
|---|
| | | } else if (taskProtocol.getTaskStatus() == 3 && sign){//放 |
|---|
| | | endP = taskProtocol.getTargetPosition(); |
|---|
| | | endP1 = taskProtocol.getTargetPosition(); |
|---|
| | | } else if (taskProtocol.getTaskStatus() == 3){//放 |
|---|
| | | endP2 = taskProtocol.getTargetPosition(); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | if (endP1 > endP2){ |
|---|
| | | if (itSmall){ |
|---|
| | | endP = endP1; |
|---|
| | | } else { |
|---|
| | | endP = endP2; |
|---|
| | | } |
|---|
| | | } |
|---|
| | | if (endP == 0){ |
|---|
