空托盘组出库

xumiao
1 parent 3e0c5f08
Showing 6 changed files with 130 additions and 14 deletions
src/main/java/com/huaheng/pc/config/container/controller/ContainerController.java
src/main/java/com/huaheng/pc/config/container/domain/Container.java
src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java
src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
src/main/resources/templates/shipment/shippingCombination/shippingCombination.html
@@ -9,6 +9,7 @@ import com.huaheng.common.support.Convert;
 import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.poi.ExcelUtil;
 import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.aspectj.lang.annotation.ApiLogger;
 import com.huaheng.framework.aspectj.lang.annotation.Log;
 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
 import com.huaheng.framework.web.controller.BaseController;
@@ -21,6 +22,8 @@ import com.huaheng.pc.config.container.domain.Container;
 import com.huaheng.pc.config.container.service.ContainerService;
 import com.huaheng.pc.config.location.domain.Location;
 import com.huaheng.pc.config.location.service.LocationService;
+import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
+import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -48,6 +51,8 @@ public class ContainerController extends BaseController {
     @Resource
     private DataSource dataSource;
     @Resource
+    private InventoryHeaderService inventoryService;
+    @Resource
     private Print print;
     @RequiresPermissions("config:container:view")
     @GetMapping()
@@ -230,5 +235,30 @@ public class ContainerController extends BaseController {
     {
       print.jasperPrint(ids, prefix);// 不用返回json打印
     }
+    @ApiLogger(apiName = "获取空托盘组")
+    @PostMapping( "/getEmptyContainerMany")
+    @ResponseBody
+    public AjaxResult getEmptyContainerMany() {
+        List<Container> list = containerService.list(new LambdaQueryWrapper<Container>()
+                .eq(Container::getStatus, QuantityConstant.STATUS_CONTAINER_MANY)
+                .ne(Container::getLocationCode,"")
+                .isNotNull(Container::getLocationCode)
+        );
+        return AjaxResult.success(list);
+    }
+
+    @ApiLogger(apiName = "空托盘组出库")
+    @PostMapping( "/EmptyContainerManyOut")
+    @ResponseBody
+    public AjaxResult EmptyContainerManyOut(Container container) {
+        if(StringUtils.isNotEmpty(container.getCode())){
+           return AjaxResult.error("托盘号为空");
+        }
+        if(StringUtils.isNotEmpty(container.getPort())){
+            return AjaxResult.error("出库口为空");
+        }
+        AjaxResult ajaxResult = inventoryService.createEmptyContainerManyOut(container);
+        return ajaxResult;
+    }
  
 }
@@ -213,6 +213,9 @@ public class Container implements Serializable {
     @TableField(value = "sendToMes")
     @ApiModelProperty(value="")
     private Integer sendToMes;
+    @TableField(exist = false)
+    @ApiModelProperty(value="")
+    private String port;
  
   /**
    * 打印机名称
@@ -2,6 +2,7 @@ package com.huaheng.pc.inventory.inventoryHeader.service;
  
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.config.container.domain.Container;
 import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
 import org.springframework.stereotype.Service;
  
@@ -70,6 +71,8 @@ public interface InventoryHeaderService extends IService&lt;InventoryHeader&gt; {
     AjaxResult saveInventoryHeader(InventoryHeader inventoryHeader);
  
     AjaxResult removeInventory(String ids);
+
+    AjaxResult createEmptyContainerManyOut(Container container);
 }
  
  
@@ -25,6 +25,9 @@ import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerHead
 import com.huaheng.pc.receipt.receiptContainerHeader.service.ReceiptContainerHeaderService;
 import com.huaheng.pc.shipment.shipmentContainerHeader.domain.ShipmentContainerHeader;
 import com.huaheng.pc.shipment.shipmentContainerHeader.service.ShipmentContainerHeaderService;
+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.service.TaskHeaderService;
 import com.huaheng.pc.task.taskHeader.service.TransferTaskService;
 import com.huaheng.pc.task.taskHeader.service.WorkTaskService;
@@ -59,6 +62,10 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
     private ShipmentContainerHeaderService shipmentContainerHeaderService;
     @Resource
     private InventoryHeaderMapper inventoryHeaderMapper;
+    @Resource
+    private TaskHeaderService taskHeaderService;
+    @Resource
+    private TaskDetailService taskDetailService;
  
  
     /**
@@ -504,6 +511,75 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
         }
         return AjaxResult.success("删除成功");
     }
+
+    @Override
+    public AjaxResult createEmptyContainerManyOut(Container container) {
+        String containerCode = container.getCode();
+        String locationCode = container.getLocationCode();
+        //验证容器
+        if (StringUtils.isNotEmpty(containerCode)) {
+            LambdaQueryWrapper<InventoryDetail> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.eq(InventoryDetail::getContainerCode, containerCode);
+            if (inventoryDetailService.count(queryWrapper) > 0) {
+                return AjaxResult.error("该容器上有库存，无法空托出库！");
+            }
+        }
+        //验证库位
+        if (StringUtils.isNotEmpty(locationCode)) {
+            Location location = locationService.getLocationByCode(locationCode);
+            if (StringUtils.isEmpty(location.getContainerCode())) {
+                return AjaxResult.error(location.getCode()+"库位上没有容器");
+            }
+            if (StringUtils.isNotEmpty(containerCode)) {
+                if (!location.getContainerCode().equals(containerCode)) {
+                    return AjaxResult.error("该库位上容器编码与输入容器编码不同");
+                }
+            }
+            LambdaQueryWrapper<InventoryDetail> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.eq(InventoryDetail::getLocationCode, locationCode);
+            if (inventoryDetailService.count(queryWrapper) > 0) {
+                return AjaxResult.error("该库位上有库存，无法空托出库！");
+            }
+        }
+        Location location = locationService.getLocationByCode(locationCode);
+        TaskHeader taskHeader = new TaskHeader();
+        taskHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
+        taskHeader.setTaskType(QuantityConstant.TASK_TYPE_EMPTYSHIPMENT);
+        taskHeader.setInternalTaskType(QuantityConstant.TASK_INTENERTYPE_SHIPMENT);
+        taskHeader.setContainerCode(containerCode);
+        if(location != null) {
+            taskHeader.setZoneCode(location.getZoneCode());
+        }
+        taskHeader.setStatus(QuantityConstant.TASK_STATUS_BUILD);
+        taskHeader.setFromLocation(locationCode);
+        taskHeader.setToLocation("");
+        taskHeader.setPort(container.getPort());
+        if(taskHeaderService.save(taskHeader)){
+            //锁定库位状态
+            locationService.updateStatus(locationCode,QuantityConstant.STATUS_LOCATION_LOCK);
+            LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
+            containerLambdaQueryWrapper.eq(Container::getCode, containerCode);
+            Container container1 = containerService.getOne(containerLambdaQueryWrapper);
+            container1.setStatus(QuantityConstant.STATUS_CONTAINER_LOCK);
+            containerService.update(container1, containerLambdaQueryWrapper);
+        } 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.setCompanyCode(ShiroUtils.getCompanyCodeList().get(0));
+        taskDetail.setFromLocation(taskHeader.getFromLocation());
+        taskDetail.setToLocation(taskHeader.getToLocation());
+        taskDetail.setContainerCode(taskHeader.getContainerCode());
+        if(!taskDetailService.save(taskDetail)){
+            throw new ServiceException("空托出库任务明细生成失败！");
+        }
+        return AjaxResult.success(taskHeader.getId());
+    }
 }
  
  
@@ -224,18 +224,18 @@ public class RyTask extends BaseController {
             if(CollectionUtils.isNotEmpty(agvTasks)){
                 for (AgvTask agvTask : agvTasks) {
                     try{
-                        if(agvTask.getToPort().equals("Work 633")){
-                            List<AgvTask> list = acsService.list(new LambdaQueryWrapper<AgvTask>().eq(AgvTask::getToPort, "Work 633").ge(AgvTask::getStatus, 10).lt(AgvTask::getStatus, 100));
-                            if(CollectionUtils.isNotEmpty(list)&&list.size()>=2){
-                                continue;
-                            }
-                        }
-                        if(agvTask.getToPort().equals("Work 776")){
-                            List<AgvTask> list = acsService.list(new LambdaQueryWrapper<AgvTask>().eq(AgvTask::getToPort, "Work 776").ge(AgvTask::getStatus, 10).lt(AgvTask::getStatus, 100));
-                            if(CollectionUtils.isNotEmpty(list)&&list.size()>=2){
-                                continue;
-                            }
-                        }
+//                        if(agvTask.getToPort().equals("Work 633")){
+//                            List<AgvTask> list = acsService.list(new LambdaQueryWrapper<AgvTask>().eq(AgvTask::getToPort, "Work 633").ge(AgvTask::getStatus, 10).lt(AgvTask::getStatus, 100));
+//                            if(CollectionUtils.isNotEmpty(list)&&list.size()>=2){
+//                                continue;
+//                            }
+//                        }
+//                        if(agvTask.getToPort().equals("Work 776")){
+//                            List<AgvTask> list = acsService.list(new LambdaQueryWrapper<AgvTask>().eq(AgvTask::getToPort, "Work 776").ge(AgvTask::getStatus, 10).lt(AgvTask::getStatus, 100));
+//                            if(CollectionUtils.isNotEmpty(list)&&list.size()>=2){
+//                                continue;
+//                            }
+//                        }
                         acsService.sendTaskToAGV(Convert.toIntArray(agvTask.getId().toString()));
                     }catch (Exception e){
                         e.printStackTrace();
@@ -244,9 +244,13 @@
                 field : 'materialName',
                 title : '物料名称'
             },
+            // {
+            //     field : 'materialSpec',
+            //     title : '物料规格'
+            // },
             {
-                field : 'materialSpec',
-                title : '物料规格'
+                field : 'batch',
+                title : '批次'
             },
             {
                 field : 'supplierCode',