agv送达异常

xumiao
1 parent a47a0234
Showing 4 changed files with 45 additions and 2 deletions
src/main/java/com/huaheng/api/acs/controller/AgvTaskController.java
src/main/java/com/huaheng/api/acs/service/AcsService.java
src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java
src/main/resources/templates/task/taskHeader/agvHeader.html
@@ -161,6 +161,17 @@ public class AgvTaskController extends BaseController {
         return ajaxResult;
     }
  
+    @Log(title = "回传MES异常", operating = "回传MES异常", action = BusinessType.UPDATE)
+    @PostMapping( "/huichuan")
+    @ResponseBody
+    public AjaxResult huichuan(String taskId) throws Exception {
+        if (StringUtils.isEmpty(taskId)){
+            return AjaxResult.error("taskId不能为空");
+        }
+        AjaxResult<AgvTask> ajaxResult = acsService.huichuanMesError(Convert.toIntArray(taskId));
+        return ajaxResult;
+    }
+
  
     @GetMapping( "/editagv/{id}")
     public String edit(@PathVariable("id") Integer id, ModelMap mmap){
@@ -105,4 +105,6 @@ public interface AcsService  extends IService&lt;AgvTask&gt;{
     void shipmentAgvPortContext(TaskHeader task);
  
     AjaxResult emptyContainer(AgvTask agvTask);
+
+    AjaxResult<AgvTask> huichuanMesError(Integer[] toIntArray) throws Exception;
 }
@@ -11,6 +11,8 @@ import com.huaheng.api.acs.domain.AgvTask;
 import com.huaheng.api.acs.domain.StateInfoUploadModel;
 import com.huaheng.api.acs.domain.ToAgvTask;
 import com.huaheng.api.acs.mapper.AcsMapper;
+import com.huaheng.api.mes.domain.AgvPortMES;
+import com.huaheng.api.mes.service.MESHelper;
 import com.huaheng.common.constant.HttpConstant;
 import com.huaheng.common.constant.QuantityConstant;
 import com.huaheng.common.exception.service.ServiceException;
@@ -109,6 +111,8 @@ public class AcsServiceImpl extends ServiceImpl&lt;AcsMapper,AgvTask&gt; implements Ac
     private ReceiptTaskService receiptTaskService;
     @Resource
     private ReceiptDetailService receiptDetailService;
+    @Resource
+    private MESHelper mesHelper;
  
     /**
      * agv 信息上传
@@ -1112,4 +1116,20 @@ public class AcsServiceImpl extends ServiceImpl&lt;AcsMapper,AgvTask&gt; implements Ac
         agvTask.setWarehouseCode("CS0001");
         return createAGVTask(agvTask);
     }
+
+    @Override
+    public AjaxResult<AgvTask> huichuanMesError(Integer[] toIntArray) throws Exception {
+        for (Integer integer : toIntArray) {
+            AgvTask agvTask = acsService.getById(integer);
+            AgvPortMES agvPortMES=new AgvPortMES();
+            agvPortMES.setCode(agvTask.getCode());
+            agvPortMES.setStatus("error");
+            String s = JSONObject.toJSONString(agvPortMES);
+            mesHelper.returnMESEmptyFinsh(s);
+            agvTask.setSendToMes(1);
+            agvTask.setStatus(110);
+            acsService.updateById(agvTask);
+        }
+        return AjaxResult.success("");
+    }
 }
@@ -135,11 +135,14 @@
                         actions.push('<a class="btn btn-success btn-xs ' + executeFlag + '" href="#" onclick="execute(\'' + row.id + '\')"><i class="fa fa-send" style="padding-right: 1px;"></i>执行</a> ');
                         actions.push('<a class="btn btn-info btn-xs' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>取消</a> ');
-                        actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>完成</a>');
+                        // actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>完成</a>');
                     }
                     if (row.status >= 10 && row.status < 100)  {
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>取消</a> ');
-                        actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>完成</a>');
+                        // actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>完成</a>');
+                    }
+                    if(row.status < 100 && row.status>=10){
+                        actions.push('<a class="btn btn-info btn-xs ' + removeFlag + '" href="#" onclick="huichuan(\'' + row.id + '\')"><i class="fa fa-remove"></i>异常回传</a> ');
                     }
                     return actions.join('');
                 }
@@ -258,6 +261,13 @@
             $.operate.post(url, data);
         });
     }
+    function huichuan(taskId) {
+        $.modal.confirm("确定回传？", function() {
+            var url = ctx + 'agv/huichuan';
+            var data = { "taskId" : taskId };
+            $.operate.post(url, data);
+        });
+    }
     function complete(taskId) {
         $.modal.confirm("确定完成任务？", function() {
             var url = ctx + 'agv/completeTaskByWMS';