添加异常判断

易文鹏
1 parent fdce854f
Showing 3 changed files with 15 additions and 6 deletions
src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
src/main/java/com/huaheng/pc/task/taskHeader/service/ShipmentTaskService.java
src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html
@@ -130,17 +130,17 @@ public class TaskHeaderController extends BaseController {
     public TableDataInfo list(TaskHeader taskHeader, @ApiParam(name = "InternalTaskType", value = "类型") Integer InternalTaskType,
                               @ApiParam(name = "createdBegin", value = "类型") String createdBegin, @ApiParam(name = "createdEnd", value = "类型") String createdEnd,Integer taskHeaderStatus) {
         LambdaQueryWrapper<TaskHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
-        String zone=taskHeader.getZoneCode();
-        if(StringUtils.isEmpty(zone)&&ShiroUtils.getUser()!=null&& Arrays.asList(QuantityConstant.USERID_AGV).contains(ShiroUtils.getUserId().toString())) {
-            zone="B";
-        }
+        //String zone=taskHeader.getZoneCode();
+        //if(StringUtils.isEmpty(zone)&&ShiroUtils.getUser()!=null&& Arrays.asList(QuantityConstant.USERID_AGV).contains(ShiroUtils.getUserId().toString())) {
+        //    zone="B";
+        //}
             lambdaQueryWrapper.eq(TaskHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
                 .eq(StringUtils.isNotNull(InternalTaskType), TaskHeader::getInternalTaskType, InternalTaskType)
                 .eq(StringUtils.isNotNull(taskHeader.getId()), TaskHeader::getId, taskHeader.getId())
                 .eq(StringUtils.isNotEmpty(taskHeader.getContainerCode()), TaskHeader::getContainerCode, taskHeader.getContainerCode())
                 .eq(StringUtils.isNotEmpty(taskHeader.getToLocation()), TaskHeader::getToLocation, taskHeader.getToLocation())
                 .eq(StringUtils.isNotEmpty(taskHeader.getFromLocation()), TaskHeader::getFromLocation, taskHeader.getFromLocation())
-                .eq(StringUtils.isNotEmpty(zone), TaskHeader::getZoneCode,zone)
+                .eq(StringUtils.isNotEmpty(taskHeader.getZoneCode()), TaskHeader::getZoneCode,taskHeader.getZoneCode())
                 .eq(StringUtils.isNotNull(taskHeader.getPriority()), TaskHeader::getPriority, taskHeader.getPriority())
                 .eq(StringUtils.isNotNull(taskHeader.getPush()), TaskHeader::getPush, taskHeader.getPush())
                 .eq(StringUtils.isNotNull(taskHeader.getStatus()), TaskHeader::getStatus, taskHeader.getStatus())
@@ -165,6 +165,9 @@ public class ShipmentTaskService {
         List<InventoryDetail> inventories = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper);
         if (inventories.size()>0) {
             List<InventoryHeader> list = inventoryHeaderService.list(new LambdaQueryWrapper<InventoryHeader>().eq(InventoryHeader::getId, inventories.get(0).getInventoryHeaderId()));
+            if (list.isEmpty()) {
+                throw new ServiceException("生成任务失败,该库存头不存在："+inventories.get(0).getInventoryHeaderId());
+            }
             barCodeHeaderCode=list.get(0).getBarCodeHeaderCode();
         }
         BigDecimal inventoryTotal = new BigDecimal("0");
@@ -337,7 +340,9 @@ public class ShipmentTaskService {
                 }
                 //减扣库存单
                 inventoryHeader = inventoryHeaderService.getById(inventoryDetail.getInventoryHeaderId());
-
+                if (inventoryHeader==null) {
+                    throw new ServiceException("该库存ID不存在："+inventoryDetail.getInventoryHeaderId());
+                }
                 //扣减库存明细
                 inventoryDetail.setTaskQty(inventoryDetail.getTaskQty().subtract(taskDetail.getQty()));
                 inventoryDetail.setQty(inventoryDetail.getQty().subtract(taskDetail.getQty()));
@@ -356,6 +361,7 @@ public class ShipmentTaskService {
                 if (inventoryDetail.getQty().signum() == 0&& inventoryDetail.getTaskQty().signum() == 0) {
                     //如果库存没有了，就删除这个库存
                     inventoryDetailService.removeById(inventoryDetail.getId());
+
                     inventoryHeader.setTotalQty(inventoryHeader.getTotalQty().subtract(taskDetail.getQty()));
                     inventoryHeader.setTotalLines(inventoryHeader.getTotalLines() - 1);
                     if (inventoryHeader.getTotalQty().signum() == 0) {
@@ -78,6 +78,9 @@
                            shiro:hasPermission="inventory:inventoryHeader:seeOut">
                             <i class="fa fa-eye"></i> 出库查看盘点
                         </a>
+                        <a class="btn btn-outline btn-info btn-rounded" onclick="$.table.exportExcel()">
+                            <i class="fa fa-download"></i> 导出库存
+                        </a>
 <!--                        <a class="btn btn-outline btn-info btn-rounded" onclick="emptyIn()"-->
 <!--                           shiro:hasPermission="inventory:inventoryHeader:emptyIn">-->
 <!--                            <i class="fa fa-level-down"></i> 空托入库-->