fix:agv任务下发；

周鸿
1 parent bf1d1e44
Showing 8 changed files with 63 additions and 19 deletions
src/main/java/com/huaheng/api/acs/controller/AgvTaskCSController.java
src/main/java/com/huaheng/api/acs/service/AgvTaskCSServiceImpl.java
src/main/java/com/huaheng/pc/config/station/controller/StationLkController.java
src/main/java/com/huaheng/pc/config/station/service/StationService.java
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java
src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskService.java
@@ -93,7 +93,7 @@ public class AgvTaskCSController extends BaseController {
         String containerCode=taskHeader.getContainerCode();
         List<Location> list=locationService.getLocationListByContainerCode(taskHeader.getWarehouseCode(),containerCode,taskHeader.getToLocation());
         mmap.put("locationList", list);
-        List<Station> stationList=stationService.getStationByContainers(taskHeader.getContainerCode(),"3");
+        List<Station> stationList=stationService.getStationByContainers(taskHeader.getContainerCode(),"3",taskHeader.getWarehouseCode());
         mmap.put("stationList", stationList);
         return prefix + "/agvSetPort";
     }
@@ -134,7 +134,9 @@ public class AgvTaskCSServiceImpl extends ServiceImpl&lt;AgvTaskCsMapper, AgvTaskCS
                 return  AjaxResult.error("出库任务未完成，还不能下发agv任务");
             }
         }
-        if(flag){
+        //为1时，地面站台自动回库；演示用
+        String value= configService.getKey("AUTO_AGV_BACK",task.getWarehouseCode());
+        if(StringUtils.isNotEmpty(value)&&value.equals("1")){
             //agv库，地面站台分拣任务的入库任务，手动状态下发任务;自动状态下不下发
             if (task.getWarehouseCode().equals(QuantityConstant.WAREHOUSE_CS)&&task.getZoneCode().equals("V")) {
                 if(task.getTaskType().equals(QuantityConstant.AGV_TYPE_TAKE)&&!task.getFromPort().equals(QuantityConstant.AGV_PORT_CS)){
@@ -762,7 +764,7 @@ public class AgvTaskCSServiceImpl extends ServiceImpl&lt;AgvTaskCsMapper, AgvTaskCS
         task.setPort(taskHeader.getPort());
         task.setToPort(taskHeader.getToPort());
         task.setToLocation(taskHeader.getToLocation());
-        task.setStatus(QuantityConstant.TASK_STATUS_RELEASE);
+//        task.setStatus(QuantityConstant.TASK_STATUS_RELEASE);
  
         String tolocation=task.getToLocation();
         AgvTaskCS agvTaskCS=null;
@@ -321,7 +321,7 @@ public class StationLkController extends BaseController {
     @ResponseBody
     public Map<String, Object> getStationByContainers(StationType stationType) {
         Map<String, Object> map = new HashMap<>();
-        List<Station> stationList =  stationService.getStationByContainers(stationType.getContainerCode(),stationType.getType());
+        List<Station> stationList =  stationService.getStationByContainers(stationType.getContainerCode(),stationType.getType(),"CS0001");
         List<Map<String, Object>> list = new ArrayList<>();
         for (Station station : stationList) {
             Map<String, Object> resultMap = new HashMap<>();
@@ -54,8 +54,8 @@ public class StationService extends ServiceImpl&lt;StationMapper, Station&gt; {
         List<Station> stationList = this.list(queryWrapper);
         return stationList;
     }
-    public List<Station> getStationByContainers(String containerCode,String type){
-        Container container = containerService.getContainerByCode(containerCode);
+    public List<Station> getStationByContainers(String containerCode,String type,String warehouseCode){
+        Container container = containerService.getContainerByCode(containerCode,warehouseCode);
         ContainerType containerType = containerTypeService.getContainerTypeByCode(container.getContainerType(), container.getWarehouseCode());
         Map<String, Object> map = new HashMap<>();
         if (container == null) {
@@ -24,6 +24,7 @@ import com.huaheng.pc.config.location.domain.Location;
 import com.huaheng.pc.config.location.service.LocationService;
 import com.huaheng.pc.config.station.service.StationService;
 import com.huaheng.pc.config.zone.service.ZoneService;
+import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
 import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
 import com.huaheng.pc.inventory.snapshotInventoryDetail.domain.SnapshotInventoryDetail;
 import com.huaheng.pc.inventory.snapshotInventoryDetail.service.ISnapshotInventoryDetailService;
@@ -612,18 +613,27 @@ public class RyTask extends BaseController {
                     .and(i -> i.ne(Container::getLocationCode, "").isNotNull(Container::getLocationCode))
                     .eq(StringUtils.isNotEmpty(zoneCode), Container::getZoneCode, zoneCode)
                     .eq(Container::getStatus, QuantityConstant.STATUS_CONTAINER_EMPTY)
-//                    .last("limit 1"));
                     .last(" order by rand() limit 1"));
             if (container == null) {
                 continue;
             }
             AjaxResult ajaxResult = inventoryHeaderService.createEmptyCheckOut(container.getCode(), container.getLocationCode(), str, QuantityConstant.WAREHOUSE_CS);
+//            InventoryHeader inventoryHeader= inventoryHeaderService.getOne(new LambdaQueryWrapper<InventoryHeader>()
+//                    .eq(InventoryHeader::getWarehouseCode, QuantityConstant.WAREHOUSE_CS)
+//                    .and(i -> i.ne(InventoryHeader::getLocationCode, "").isNotNull(InventoryHeader::getLocationCode))
+//                    .eq(StringUtils.isNotEmpty(zoneCode), InventoryHeader::getZoneCode, zoneCode)
+//                    .last(" order by rand() limit 1"));
+//            if(inventoryHeader==null){
+//                continue;
+//            }
+//            AjaxResult ajaxResult = inventoryHeaderService.createCheckOutTask(Arrays.asList(Convert.toIntArray(inventoryHeader.getId().toString())), port);
             if (!ajaxResult.hasErr()) {
                 Integer taskid = (Integer) ajaxResult.getData();
                 TaskHeader taskHeader = new TaskHeader();
                 taskHeader.setId(taskid);
                 taskHeader.setPort(str);
                 taskHeader.setToLocation(container.getLocationCode());
+//                taskHeader.setToLocation(inventoryHeader.getLocationCode());
                 agvTaskService.setAgvPort(taskHeader);
             }
         }
@@ -41,7 +41,9 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
  
  
 @Controller
@@ -428,7 +430,7 @@ public class TaskHeaderController extends BaseController {
         }
         List<String> list = new ArrayList<>();
         list.add(locationCode);
-        return workTaskService.createCheckOutTask(list, null);
+        return workTaskService.createCheckOutTask(list, null,null);
     }
  
     /**
@@ -587,10 +589,28 @@ public class TaskHeaderController extends BaseController {
             List<Location> list=locationService.getLocationListByContainerCode(taskHeader.getWarehouseCode(),taskHeader.getContainerCode(),taskHeader.getToLocation());
             mmap.put("locationList", list);
         }
-        List<Station> stationList=stationService.getStationByContainers(taskHeader.getContainerCode(),type);
+        List<Station> stationList=stationService.getStationByContainers(taskHeader.getContainerCode(),type,taskHeader.getWarehouseCode());
         mmap.put("stationList", stationList);
         return prefix + "/lkSetPort";
     }
+
+    @PostMapping("/getLKPortData")
+    @ResponseBody
+    public AjaxResult getLKPortData(@RequestBody TaskHeader task) {
+        Map map=new HashMap<String,Object>();
+        TaskHeader taskHeader=taskHeaderService.getById(task.getId());
+        List<Station> dmStationList=stationService.getStationByAreaType(null,"2",taskHeader.getWarehouseCode());
+        map.put("taskId",taskHeader.getId());
+        map.put("containerCode",taskHeader.getContainerCode());
+        map.put("dmStationList",dmStationList);
+        String type="2";
+        if(taskHeader.getZoneCode().equals("V")){
+            type="3";
+        }
+        List<Station> stationList=stationService.getStationByContainers(taskHeader.getContainerCode(),type,taskHeader.getWarehouseCode());
+        map.put("stationList", stationList);
+        return AjaxResult.success().setData(map);
+    }
     @Log(title = "分配站台", operating = "分配站台", action = BusinessType.GRANT)
     @PostMapping("/setLKPort")
     @ResponseBody
@@ -479,6 +479,10 @@ public class TaskHeaderService extends ServiceImpl&lt;TaskHeaderMapper, TaskHeader&gt;
                         return AjaxResult.error(ajaxResult.getMsg());
                     }
                     break;
+                case "V":
+                    task = this.updateTaskRelease(task);
+                    break;
+
             }
  
         }
@@ -719,9 +719,13 @@ public class WorkTaskService {
      * @param port             出库口
      * @return
      */
-    public AjaxResult createCheckOutTask(List<String> locationCodeList, String port) {
+    public AjaxResult createCheckOutTask(List<String> locationCodeList, String port,String warehouseCode) {
+        if (ShiroUtils.getUser() != null ) {
+            warehouseCode=ShiroUtils.getWarehouseCode();
+        }
+        Integer taskid=null;
         for (String locationCode : locationCodeList) {
-            Location location = locationService.getLocationByCode(locationCode);
+            Location location = locationService.getLocationByCode(locationCode,warehouseCode);
             if (StringUtils.isNull(location)) {
                 throw new ServiceException("库存没有库位！");
             }
@@ -733,7 +737,7 @@ public class WorkTaskService {
             }
  
             TaskHeader taskHeader = new TaskHeader();
-            taskHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
+            taskHeader.setWarehouseCode(warehouseCode);
             taskHeader.setTaskType(QuantityConstant.TASK_TYPE_VIEW);
             taskHeader.setInternalTaskType(QuantityConstant.TASK_INTENERTYPE_WORK);
             taskHeader.setContainerCode(location.getContainerCode());
@@ -741,7 +745,7 @@ public class WorkTaskService {
                 taskHeader.setZoneCode(location.getZoneCode());
             }
             taskHeader.setFromLocation(locationCode);
-            String value = dictDataService.getDictValueByLabel(QuantityConstant.RULE_TASK_LOCATION, location.getZoneCode(), ShiroUtils.getWarehouseCode());
+            String value = dictDataService.getDictValueByLabel(QuantityConstant.RULE_TASK_LOCATION, location.getZoneCode(), warehouseCode);
 //            String value = configService.getKey(QuantityConstant.RULE_TASK_LOCATION,ShiroUtils.getWarehouseCode());
             int taskLocationRule = Integer.parseInt(value);
             if (taskLocationRule == QuantityConstant.RULE_TASK_SET_LOCATION) {
@@ -764,13 +768,13 @@ public class WorkTaskService {
             }
  
             LambdaQueryWrapper<InventoryDetail> queryWrapper = Wrappers.lambdaQuery();
-            queryWrapper.eq(InventoryDetail::getWarehouseCode, ShiroUtils.getWarehouseCode())
+            queryWrapper.eq(InventoryDetail::getWarehouseCode, warehouseCode)
                     .eq(InventoryDetail::getLocationCode, locationCode);
             List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(queryWrapper);
             if (inventoryDetailList != null && inventoryDetailList.size() > 0) {
                 taskHeader.setCompanyCode(inventoryDetailList.get(0).getCompanyCode());
             }
-            taskHeader.setCreatedBy(ShiroUtils.getUserName());
+//            taskHeader.setCreatedBy(ShiroUtils.getUserName());
             if (!taskHeaderService.save(taskHeader)) {
                 throw new ServiceException("创建任务失败");
             }
@@ -797,9 +801,9 @@ public class WorkTaskService {
                 }
             }
  
-            locationService.updateStatus(locationCode, QuantityConstant.STATUS_LOCATION_LOCK);
+            locationService.updateStatus(locationCode, QuantityConstant.STATUS_LOCATION_LOCK,warehouseCode);
             containerService.updateLocationCodeAndStatus(location.getContainerCode(),
-                    location.getCode(), QuantityConstant.STATUS_CONTAINER_LOCK);
+                    location.getCode(), QuantityConstant.STATUS_CONTAINER_LOCK,warehouseCode);
  
             //判断长沙agv库则添加agv任务
 //            String warehouseCode=taskHeader.getWarehouseCode();
@@ -808,9 +812,10 @@ public class WorkTaskService {
 //                //出库查看回库指令
 //                AgvTaskCS agvTask1=agvTaskCSService.saveAGVTaskByTaskReturn(taskHeader,agvTask);
 //            }
+            taskid=taskHeader.getId();
         }
  
-        return AjaxResult.success("成功");
+        return AjaxResult.success("成功").setData(taskid);
     }
  
     /**
@@ -822,9 +827,12 @@ public class WorkTaskService {
         LambdaQueryWrapper<InventoryHeader> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.in(InventoryHeader::getId, ids);
         List<InventoryHeader> inventoryHeaderList = inventoryHeaderService.list(queryWrapper);
+        if(inventoryHeaderList==null||inventoryHeaderList.size()<=0){
+            return AjaxResult.error("找不到库存");
+        }
         List<String> locationCodeList = inventoryHeaderList.stream().map(
                 InventoryHeader::getLocationCode).distinct().collect(Collectors.toList());
-        return createCheckOutTask(locationCodeList, port);
+        return createCheckOutTask(locationCodeList, port,inventoryHeaderList.get(0).getWarehouseCode());
     }
  
     /**