AGV定时任务

xumiao
1 parent 71906267
Showing 7 changed files with 114 additions and 41 deletions
src/main/java/com/huaheng/api/acs/service/AgvTaskServiceImpl.java
src/main/java/com/huaheng/api/wcs/service/taskFinish/TaskFinishServiceImpl.java
src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java
src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskService.java
@@ -217,7 +217,7 @@ public class AgvTaskServiceImpl extends ServiceImpl&lt;AgvTaskCsMapper, AgvTask&gt; im
         if (StringUtils.isNull(o3)) {
             return AjaxResult.error("任务状态为空");
         }
-        String status = o3.toString();
+        Integer status = Integer.valueOf(o3.toString());
         agvTask.setId(taskNo);
         agvTaskStatusNowStart(status, agvTask);
         return AjaxResult.success();
@@ -257,12 +257,12 @@ public class AgvTaskServiceImpl extends ServiceImpl&lt;AgvTaskCsMapper, AgvTask&gt; im
     }
  
     //根据agv的任务状态来判断
-    private AjaxResult agvTaskStatusNowStart(String o3, AgvTask agvTask) {
+    private AjaxResult agvTaskStatusNowStart(Integer o3, AgvTask agvTask) {
         AgvTask task = getById(agvTask.getId());
         if (task == null) {
             return AjaxResult.error("任务号" + agvTask.getId() + "不存在");
         }
-        if (task.getStatus().equals(QuantityConstant.TASK_STATUS_COMPLETED)) {
+        if (task.getStatus()==QuantityConstant.TASK_STATUS_COMPLETED) {
             return AjaxResult.error("任务" + agvTask.getId() + "已经完成");
         }
         if (o3.equals(QuantityConstant.STATUS_TASK_AGV_START)) {
@@ -85,10 +85,6 @@ public class TaskFinishServiceImpl implements TaskFinishService {
             locationService.updateContainerCodeAndStatus(locationCode, "",
                     QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
         }
-        if(taskHeader.getWarehouseCode().equals("CS0001")&&taskHeader.getTaskType()==QuantityConstant.TASK_TYPE_EMPTYSHIPMENT&&taskHeader.getPort().equals("P1016-1")) {
-            taskHeader.setUserDef1("空托出库完成");
-            taskHeaderService.updateById(taskHeader);
-        }
-            return ajaxResult;
+        return ajaxResult;
     }
 }
@@ -119,8 +119,8 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
                     .ge(Location::getHigh, high)
 //                    .eq(StringUtils.isNotEmpty(materialAreaCode), Location::getMaterialAreaCode, materialAreaCode)
                     .in(!warehouseCode.equalsIgnoreCase("KS0001"),Location::getLocationType, locationTypeCodeList)
-                    .eq(Location::getContainerCode, "");
-            locationLambdaQueryWrapper.orderByAsc(Location::getHigh);
+                    .eq(Location::getContainerCode, "")
+                    .last(warehouseCode.equalsIgnoreCase("KS0001"),"ORDER BY CASE WHEN iRow=3 THEN 0 WHEN iRow=1 THEN 1 WHEN iRow=2 THEN 2 END,high ASC");
             List<Location> totalLocationList = locationService.list(locationLambdaQueryWrapper);
             if (totalLocationList.size() <= reserveNumber) {
                 removeRoadWays.add(roadWay);
@@ -137,8 +137,8 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
 //                .eq(StringUtils.isNotEmpty(materialAreaCode), Location::getMaterialAreaCode, materialAreaCode)
                 .eq(Location::getRowFlag, QuantityConstant.ROW_OUT)
                 .in(!warehouseCode.equalsIgnoreCase("KS0001"),Location::getLocationType, locationTypeCodeList)
-                .eq(Location::getContainerCode, "");
-        locationLambda.orderByAsc(Location::getHigh);
+                .eq(Location::getContainerCode, "")
+                .last(warehouseCode.equalsIgnoreCase("KS0001"),"ORDER BY CASE WHEN iRow=3 THEN 0 WHEN iRow=1 THEN 1 WHEN iRow=2 THEN 2 END,high ASC");
         List<Location> locationList = locationService.list(locationLambda);
         List<Location> removeLocaationList = new ArrayList<>();
         if(locationList != null && locationList.size() > 0) {
@@ -167,8 +167,8 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
 //                    .eq(StringUtils.isNotEmpty(materialAreaCode), Location::getMaterialAreaCode, materialAreaCode)
                     .eq(Location::getRowFlag, QuantityConstant.ROW_IN)
                     .in(!warehouseCode.equalsIgnoreCase("KS0001"),Location::getLocationType, locationTypeCodeList)
-                    .eq(Location::getContainerCode, "");
-            locationLambda.orderByAsc(Location::getHigh);
+                    .eq(Location::getContainerCode, "")
+                    .last(warehouseCode.equalsIgnoreCase("KS0001"),"ORDER BY CASE WHEN iRow=3 THEN 0 WHEN iRow=1 THEN 1 WHEN iRow=2 THEN 2 END,high ASC");
             locationList = locationService.list(locationLambda);
             removeLocaationList = new ArrayList<>();
             if(locationList != null && locationList.size() > 0) {
@@ -7,6 +7,7 @@ import com.huaheng.api.SSP.service.OrderAssignApiService;
 import com.huaheng.api.acs.domain.AgvTask;
 import com.huaheng.api.acs.service.AgvTaskService;
 import com.huaheng.api.wcs.service.taskAssignService.TaskAssignService;
+import com.huaheng.common.exception.service.ServiceException;
 import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.Wrappers;
 import com.fasterxml.jackson.databind.ser.Serializers;
@@ -50,6 +51,7 @@ import com.huaheng.pc.receipt.receiptHeaderHistory.service.ReceiptHeaderHistoryS
 import com.huaheng.pc.shipment.shipmentContainerHeader.service.ShipmentContainerHeaderService;
 import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
 import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
+import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
 import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
 import com.huaheng.pc.task.taskHeader.mapper.TaskHeaderMapper;
@@ -440,22 +442,88 @@ public class RyTask extends BaseController {
         lambdaQueryWrapper.eq(TaskHeader::getUserDef1,"空托出库完成");
         List<TaskHeader> list = taskHeaderService.list(lambdaQueryWrapper);
         if(CollectionUtils.isNotEmpty(list)){
-            com.huaheng.api.acs.domain.AgvTask agvTask = new AgvTask();
-            agvTask.setFromPort("P1016");
-            if(atomicInteger.get()==1){
-                agvTask.setToPort("P1001");
-                atomicInteger.set(0);
-            }else {
-                agvTask.setToPort("P1009");
-                atomicInteger.set(1);
+            atomicInteger.set(2);
+        }
+        if(atomicInteger.get()==1){
+            List<TaskHeader> taskHeaders = taskHeaderService.list(new LambdaQueryWrapper<TaskHeader>()
+                    .ge(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_BUILD)
+                    .lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED)
+                    .eq(TaskHeader::getTaskType, QuantityConstant.TASK_TYPE_EMPTYSHIPMENT)
+                    .eq(TaskHeader::getPort, "P1016-1")
+                    .eq(TaskHeader::getWarehouseCode, "CS0001")
+            );
+            if(CollectionUtils.isNotEmpty(taskHeaders)){
+                for (TaskHeader taskHeader : taskHeaders) {
+                    if(taskHeader.getStatus()==QuantityConstant.TASK_STATUS_BUILD){
+                        taskHeaderService.sendTaskToWcs(Convert.toIntArray(taskHeader.getId().toString()));
+                        return;
+                    }
+                }
+                if(taskHeaders.size()>2){
+                    return;
+                }
             }
-            agvTask.setContainerCode(list.get(0).getContainerCode());
-            agvTask.setWarehouseCode("CS0001");
-            if(!agvTaskService.createAGVTask(agvTask).hasErr()){
-                TaskHeader taskHeader = list.get(0);
-                taskHeader.setUserDef1("AGV搬运任务生成");
-                taskHeaderService.updateById(taskHeader);
+            List<Container> lk = containerService.list(new LambdaQueryWrapper<Container>()
+                    .eq(Container::getWarehouseCode, "CS0001")
+                    .and(i -> i.ne(Container::getLocationCode, "").isNotNull(Container::getLocationCode))
+                    .eq(Container::getZoneCode, "LK")
+                    .eq(Container::getStatus, QuantityConstant.STATUS_CONTAINER_EMPTY)
+                    .last("and containerType in ('B','L')")
+            );
+            if(CollectionUtils.isNotEmpty(lk)){
+                Container container = lk.get(0);
+//                AjaxResult emptyOut = inventoryHeaderService.createEmptyOut(container.getCode(), container.getLocationCode(), "P1016-1");
+                TaskHeader taskHeader = new TaskHeader();
+                taskHeader.setWarehouseCode("CS0001");
+                taskHeader.setTaskType(QuantityConstant.TASK_TYPE_EMPTYSHIPMENT);
+                taskHeader.setInternalTaskType(QuantityConstant.TASK_INTENERTYPE_SHIPMENT);
+                taskHeader.setContainerCode(container.getCode());
+                taskHeader.setZoneCode(container.getZoneCode());
+                taskHeader.setStatus(QuantityConstant.TASK_STATUS_BUILD);
+                taskHeader.setPriority(200);
+                taskHeader.setFromLocation(container.getLocationCode());
+                taskHeader.setToLocation("");
+                taskHeader.setPort("P1016-1");
+                if(taskHeaderService.save(taskHeader)){
+                    //锁定库位状态
+                    locationService.updateStatus(container.getLocationCode(),QuantityConstant.STATUS_LOCATION_LOCK,container.getWarehouseCode());
+                    containerService.updateStatus(container.getCode(),QuantityConstant.STATUS_CONTAINER_LOCK,container.getWarehouseCode());
+                } else {
+                    throw new ServiceException("空托出库主表生成失败！");
+                }
+                //写入任务细表
+                TaskDetail taskDetail = new TaskDetail();
+                taskDetail.setTaskId(taskHeader.getId());
+                taskDetail.setTaskType(taskHeader.getTaskType());
+                taskDetail.setInternalTaskType(taskHeader.getInternalTaskType());
+                taskDetail.setWarehouseCode(taskHeader.getWarehouseCode());
+                taskDetail.setFromLocation(taskHeader.getFromLocation());
+                taskDetail.setToLocation(taskHeader.getToLocation());
+                taskDetail.setContainerCode(taskHeader.getContainerCode());
+                if(!taskDetailService.save(taskDetail)){
+                    throw new ServiceException("空托出库任务明细生成失败！");
+                }
+            }
+            atomicInteger.set(2);
+        }else if(atomicInteger.get()==2){
+            if(CollectionUtils.isNotEmpty(list)){
+                com.huaheng.api.acs.domain.AgvTask agvTask = new AgvTask();
+                agvTask.setFromPort("P1016");
+                AgvTask one = agvTaskService.getOne(new LambdaQueryWrapper<AgvTask>().orderByDesc(AgvTask::getId).last("limit 1"));
+                if(one.getToPort().equals("P1001")){
+                    agvTask.setToPort("P1009");
+                }else {
+                    agvTask.setToPort("P1001");
+                }
+                agvTask.setContainerCode(list.get(0).getContainerCode());
+                agvTask.setWarehouseCode("CS0001");
+                if(!agvTaskService.createAGVTask(agvTask).hasErr()){
+                    TaskHeader taskHeader = list.get(0);
+                    taskHeader.setUserDef1("AGV搬运任务生成");
+                    taskHeaderService.updateById(taskHeader);
+                }
             }
+            atomicInteger.set(1);
         }
     }
  
@@ -209,11 +209,18 @@ public class ReceiptHeaderController extends BaseController {
     @Log(title = "入库-入库单 ",operating = "修改入库单 ", action = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
+    @Transactional
     public AjaxResult editSave(ReceiptHeader receiptHeader) {
-//        ReceiptHeader receiptHeader1 = receiptHeaderService.getById(receiptHeader.getId());
-        if (!QuantityConstant.RECEIPT_TYPE_PPI.equals(receiptHeader.getReceiptType())&&!QuantityConstant.MES_RECEIPT_TYPE_SI.equals(receiptHeader.getReceiptType())){
+        ReceiptHeader receiptHeader1 = receiptHeaderService.getById(receiptHeader.getId());
+        if (!QuantityConstant.RECEIPT_TYPE_PPI.equals(receiptHeader1.getReceiptType())&&!QuantityConstant.MES_RECEIPT_TYPE_SI.equals(receiptHeader1.getReceiptType())){
             return AjaxResult.error("只有手持入库单和產成品入庫可修改");
         }
+        List<ReceiptDetail> list = receiptDetailService.list(new LambdaQueryWrapper<ReceiptDetail>().eq(ReceiptDetail::getReceiptId, receiptHeader1.getId()));
+        list.forEach(l->{
+            l.setCompanyCode(receiptHeader.getCompanyCode());
+            l.setUWarehouseCode(receiptHeader.getUWarehouseCode());
+        });
+        receiptDetailService.updateBatchById(list);
         receiptHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
         return toAjax(receiptHeaderService.updateById(receiptHeader));
     }
@@ -1015,15 +1015,15 @@ public class TaskHeaderService  extends ServiceImpl&lt;TaskHeaderMapper, TaskHeader
         taskHeaderLambdaQueryWrapper.eq(TaskHeader::getToLocation, locationCode)
                 .lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED);
         List<TaskHeader> taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
-        if (taskHeaderList == null || taskHeaderList.size() == 0) {
-            taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
-            taskHeaderLambdaQueryWrapper.eq(TaskHeader::getFromLocation, locationCode)
-                    .lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED);
-            taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
-            if (taskHeaderList == null || taskHeaderList.size() == 0) {
-                return 0;
-            }
-        }
+//        if (taskHeaderList == null || taskHeaderList.size() == 0) {
+//            taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
+//            taskHeaderLambdaQueryWrapper.eq(TaskHeader::getFromLocation, locationCode)
+//                    .lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED);
+//            taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
+//            if (taskHeaderList == null || taskHeaderList.size() == 0) {
+//                return 0;
+//            }
+//        }
         return taskHeaderList.size();
     }
  
@@ -651,8 +651,10 @@ public class WorkTaskService {
                 "", QuantityConstant.STATUS_CONTAINER_EMPTY, taskHeader.getWarehouseCode());        //解锁库位，更新容器
        locationService.updateContainerCodeAndStatus(taskHeader.getFromLocation(),
                 "", QuantityConstant.STATUS_LOCATION_EMPTY, taskHeader.getWarehouseCode());
-       //生成AGV搬运任务
-
+        if(taskHeader.getWarehouseCode().equals("CS0001")&&taskHeader.getTaskType()==QuantityConstant.TASK_TYPE_EMPTYSHIPMENT&&taskHeader.getPort().equals("P1016-1")) {
+            taskHeader.setUserDef1("空托出库完成");
+            taskHeaderService.updateById(taskHeader);
+        }
        return AjaxResult.success();
     }