update

易文鹏
1 parent 9ee034fa
Showing 2 changed files with 8 additions and 3 deletions
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
src/main/java/com/huaheng/pc/task/agvTask/controller/AgvTaskController.java
@@ -219,7 +219,7 @@ public class RyTask extends BaseController {
                 if (ajaxResult.getCode() != 200) {
                     //回传失败，修改回传次数
                     Integer pushErrorCount = receiptHeader.getPushErrorCount() == null ? 0 : receiptHeader.getPushErrorCount();
-                    if (receiptHeader.getPushErrorCount()!=1) {
+                    if (receiptHeader.getPushSuccessStatus()!=1) {
                         receiptHeader.setPushErrorCount(pushErrorCount + 1);//错误次数+1
                         receiptHeader.setPushSuccessStatus(2);//2失败
                         receiptHeader.setErpErrorMsg(ajaxResult.getMsg());
@@ -443,6 +443,8 @@ public class RyTask extends BaseController {
             List<Supplier> list1 = supplierService.list(new LambdaQueryWrapper<Supplier>().eq(Supplier::getCode, detail.getSupplierCode()));
             if (list1.isEmpty()) {
                 supplier.setName("没有供应商");
+            }else {
+                supplier.setName(list1.get(0).getName());
             }
             barcodedataDTO.setBatterybarcode(detail.getBatteryPackTwoCode());
             barcodedataDTO.setBatterysource(supplier.getName());
@@ -204,8 +204,11 @@ public class AgvTaskController extends BaseController {
                 .orderByDesc(AgvTask::getId));
         for (int i = 0; i < agvTaskList.size(); i++) {
             AgvTask agvTask = agvTaskList.get(i);
-            TaskHeader taskHeader = taskHeaderService.getOne(new LambdaQueryWrapper<TaskHeader>().eq(TaskHeader::getAgvTaskId, agvTask.getId()));
-            List<TaskDetail> taskDetailList = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getTaskId, taskHeader.getId()));
+            List<TaskHeader> taskHeader = taskHeaderService.list(new LambdaQueryWrapper<TaskHeader>().eq(TaskHeader::getAgvTaskId, agvTask.getId()));
+            if (taskHeader.size() == 0) {
+                continue;
+            }
+            List<TaskDetail> taskDetailList = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getTaskId, taskHeader.get(0).getId()));
             AgvTV agvTV = new AgvTV();
             agvTV.setTaskDetails(taskDetailList);
             agvTV.setFromPort(agvTask.getFromPort());