1

ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java

@@ -276,7 +276,7 @@ public class AppTaskController extends BaseController
      * @param wcsStackerTask wcs请求的信息
      * @return 返回的任务
      */
-    @ApiOperation("接受wcs请求的入库请求")
+    @ApiOperation("接收wcs请求的入库请求")
     @PostMapping("/sendLocation")
     @Transactional(rollbackFor = Exception.class)
     @Anonymous
@@ -287,65 +287,7 @@ public class AppTaskController extends BaseController
         ObjectUtil.isEmpty(wcsStackerTask.getVehicleNo())){
             return error("缺少请求数据");
         }
-        // 检查是不是有库存，有库存并且货位是空的是捡货完回库的
+
-        AppStock appStock = new AppStock();
-        appStock.setVehicleId(wcsStackerTask.getVehicleNo());
-        appStock.setLocationId("");
-        List<AppStock> appStocks = appStockService.selectAppStockList(appStock);
-        if(appStocks == null){
-            return error("数据服务异常");
-        }
-        if(!appStocks.isEmpty()){
-            AppTask appTask = new AppTask();
-            appTask.setVehicleId(wcsStackerTask.getVehicleNo());
-            AppTask appTask2 = new AppTask();
-            BeanUtils.copyProperties(wcsStackerTask, appTask2);
-            appTask2.setTaskId(OrderCodeFactory.getOrderCode("",""));
-            appTask2.setWcsTaskId(OrderCodeFactory.getOrderCode("",""));
-            appTask2.setTaskStatus(1);
-            appTask2.setTaskType(1);
-            appTask2.setOrigin(wcsStackerTask.getPoint());
-            appTask2.setTaskPriority(1);
-            AppLocation location = appLocationService.requestLocation(1);
-            appTask2.setDestination(location.getLocationId());
-            appTask2.setVehicleId(wcsStackerTask.getVehicleNo());
-            int i1 = appTaskService.insertAppTask(appTask2);
-            if(i1 == 0 ){
-                return error("wms生成入库任务异常");
-            }
-            AppWcsTask appTask1 = new AppWcsTask();
-            BeanUtils.copyProperties(wcsStackerTask, appTask);
-            appTask1.setWcsTaskId(appTask2.getTaskId());
-            appTask1.setWcsTaskStatus(1);
-            appTask1.setWcsTaskType(appTask2.getTaskType());
-            appTask1.setOrigin("101");
-            appTask1.setTaskPriority(appTask2.getTaskPriority());
-            appTask1.setDestination(location.getLocationId());
-            appTask1.setSendTime(new Date());
-            appTask1.setVehicleId(appTask2.getVehicleId());
-            int i = appWcsTaskService.insertAppWcsTask(appTask1);
-            if(i == 0 ){
-                return error("wcs生成入库任务异常");
-            }
-            // 占用库位
-            AppLocation updateLocation = new AppLocation();
-            updateLocation.setLocationId(location.getLocationId());
-            updateLocation.setLocationStatus(1);
-            appLocationService.updateAppLocation(updateLocation);
-            WcsDate wcsDate = new WcsDate();
-            wcsDate.setTaskId(appTask2.getTaskId());
-            wcsDate.setUser("WMS");
-            wcsDate.setVehicleNo(wcsStackerTask.getVehicleNo());
-            wcsDate.setDestination(location.getLocationId());
-            return success(wcsDate);
-        }
-        // 没有库存，表示可能是新入库的
-        AppPendingStorage appPendingStorage = new AppPendingStorage();
-        appPendingStorage.setVehicleNo(wcsStackerTask.getVehicleNo());
-        List<AppPendingStorage> appPendingStorages = appPendingStorageService.selectAppPendingStorageList(appPendingStorage);
-        if(appPendingStorages == null || appPendingStorages.isEmpty()){
-            return error("该载具似乎还未码盘");
-        }
         AppTask appTask = new AppTask();
         appTask.setVehicleId(wcsStackerTask.getVehicleNo());
         List<AppTask> appTasks = appTaskService.selectAppTaskList(appTask);
@@ -364,24 +306,7 @@ public class AppTaskController extends BaseController
         AppLocation location = appLocationService.requestLocation(1);
         appTask2.setDestination(location.getLocationId());
         appTask2.setVehicleId(wcsStackerTask.getVehicleNo());
-        int i1 = appTaskService.insertAppTask(appTask2);
+        appTaskService.insertAppTask(appTask2);
-        if(i1 == 0 ){
-            return error("wms生成入库任务异常");
-        }
-        AppWcsTask appTask1 = new AppWcsTask();
-        BeanUtils.copyProperties(wcsStackerTask, appTask);
-        appTask1.setWcsTaskId(appTask2.getTaskId());
-        appTask1.setWcsTaskStatus(1);
-        appTask1.setWcsTaskType(appTask2.getTaskType());
-        appTask1.setOrigin("101");
-        appTask1.setTaskPriority(appTask2.getTaskPriority());
-        appTask1.setDestination(location.getLocationId());
-        appTask1.setSendTime(new Date());
-        appTask1.setVehicleId(appTask2.getVehicleId());
-        int i = appWcsTaskService.insertAppWcsTask(appTask1);
-        if(i == 0 ){
-            return error("wcs生成入库任务异常");
-        }
 
         WcsDate wcsDate = new WcsDate();
         wcsDate.setTaskId(appTask2.getTaskId());
@@ -393,7 +318,7 @@ public class AppTaskController extends BaseController
         updateLocation.setLocationId(location.getLocationId());
         updateLocation.setLocationStatus(1);
         appLocationService.updateAppLocation(updateLocation);
-        logger.info("更新库位成功");
+        logger.info("wcs入库请求创建成功");
         return success(wcsDate);
     }
 

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java

@@ -430,21 +430,6 @@ public class TaskExecutor {
                 continue;
             }
             AppPmsOrderOut appPmsOrderOut1 = appPmsOrderOuts.get(0);
-            //更新确认出库数量
-            if(appPmsOrderOut1.getTrNum() == null)
-                appPmsOrderOut1.setTrNum(BigDecimal.ZERO);
-            appPmsOrderOut1.setTrNum(appPmsOrderOut1.getTrNum().add(task.getOpNum()));
-            //如果确认出库数量等于了出库数量，则本通知单完成出库
-            if (appPmsOrderOut1.getTrNum().compareTo(appPmsOrderOut1.getGoodsNum()) == 0) {
-                appPmsOrderOut1.setOrderStatus(2);
-            }else{
-                appPmsOrderOut1.setOrderStatus(1);
-            }
-            appPmsOrderOut1.setIsLock("0");
-
-            //更新订单状态
-            appPmsOrderOutMapper.updateAppPmsOrderOut(appPmsOrderOut1);
-
 
             if (appPmsOrderOut1.getOrderType() == 9) {
                 continue;
@@ -495,14 +480,14 @@ public class TaskExecutor {
         }
         //java8 stream流过滤出appTasks数组中的stockId对应的vehicleId 去重
         List<String> locations = appTasks.stream().map(AppTask::getLocationId).distinct().collect(Collectors.toList());
-        List<String> vehicles = appTasks.stream().map(AppTask::getVehicleId).distinct().collect(Collectors.toList());
+       // List<String> vehicles = appTasks.stream().map(AppTask::getVehicleId).distinct().collect(Collectors.toList());
        //更新库存中中这些vehicleId对应的stock_status为0,并且把locationId置空
-        for (String vehicleId : vehicles) {
+//        for (String vehicleId : vehicles) {
-            AppStock appStock = new AppStock();
+//            AppStock appStock = new AppStock();
-            appStock.setVehicleId(vehicleId);
+//            appStock.setVehicleId(vehicleId);
-            appStock.setStockStatus(0);
+//            appStock.setStockStatus(0);
-            appStockService.updateSts(appStock);
+//            appStockService.updateSts(appStock);
-        }
+//        }
         for (String locationId : locations){
             appStockService.updateNewLocation(locationId,"");
             //更新库位表状态