From 09473b4d89a4036c5aba5bba7981d481fd1a43d2 Mon Sep 17 00:00:00 2001 From: Huluwa22 <2667400744@qq.com> Date: Sat, 15 Mar 2025 16:58:50 +0800 Subject: [PATCH] 1 --- .../controller/app/AppPmsOrderInController.java | 2 +- .../web/controller/app/AppTaskController.java | 14 +++++++++++--- .../com/ruoyi/framework/config/SecurityConfig.java | 2 +- .../java/com/ruoyi/quartz/task/TaskExecutor.java | 2 +- .../main/resources/mapper/app/AppStockMapper.xml | 1 + .../main/resources/mapper/app/AppWaveMapper.xml | 1 + 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsOrderInController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsOrderInController.java index 139756d2..c5c8bfec 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsOrderInController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsOrderInController.java @@ -106,9 +106,9 @@ public class AppPmsOrderInController extends BaseController /** * 修改【请填写功能名称】 */ - @PreAuthorize("@ss.hasPermi('system:in:edit')") @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) @PutMapping + @Anonymous public AjaxResult edit(@RequestBody AppPmsOrderIn appPmsOrderIn) { return toAjax(appPmsOrderInService.updateAppPmsOrderIn(appPmsOrderIn)); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java index 865d70d3..925e1d0a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java @@ -616,15 +616,16 @@ public class AppTaskController extends BaseController AppPmsOrderOut appPmsOrderOut1 = new AppPmsOrderOut(); appPmsOrderOut1.setGoodsId(e.getKey()); appPmsOrderOut1.setOrderStatus(0); - appPmsOrderOut1.setIsLock("0"); + appPmsOrderOut1.setIsLock("1"); appPmsOrderOut1.setGoodsDesc(e.getValue().get(0).getGoodsDesc()); appPmsOrderOut1.setOrderWave(appWave.getWaveId()); appPmsOrderOut1.setPickNum(e.getValue().stream().map(AppPmsOrderOut::getGoodsNum).reduce(BigDecimal.ZERO, BigDecimal::add)); + appPmsOrderOut1.setShelvesNum(e.getValue().stream().map(AppPmsOrderOut::getGoodsNum).reduce(BigDecimal.ZERO, BigDecimal::add)); return appPmsOrderOut1; }).collect(Collectors.toList()); //把该波次出库单锁定 - appPmsOrderOutList1.forEach(e -> { + appPmsOrderOutList.forEach(e -> { e.setIsLock("1"); e.setUpdateTime(new Date()); e.setUpdateBy(getUsername()); @@ -843,7 +844,14 @@ public class AppTaskController extends BaseController if (appLocation.getwDepth() == 2) { //判断01是否有货 String locationId = locId.substring(0, locId.length() - 1) + "1"; - List appTasks = getAppTaskByVehicleId(null, locationId); + AppTask appTask1 =new AppTask(); + appTask1.setVehicleId(vehicleId); + appTask1.setLocationId(locationId); +// if(StringUtils.isBlank(locationId)) { +// appTask.setTaskType(AppConstants.TASK_TYPE_OUT); +// } + List appTasks = appTaskService.selectAppTaskList(appTask1); +// List appTasks = getAppTaskByVehicleId(null, locationId); if (!CollectionUtils.isEmpty(appTasks)) { logger.error(locationId + "有任务执行，请稍后再试"); throw new RuntimeException(locationId + "有任务执行，请稍后再试！"); diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 0784af60..47c3865d 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -114,7 +114,7 @@ public class SecurityConfig requests.antMatchers("/login", "/register", "/captchaImage").permitAll() // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() - .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/app/pms/orderIn", "/app/pmsOrderOut/**", "/app/task/sendLocation", "/app/task/taskResult","/app/task/createOutRequest", "/system/storage/**", "/app/location/count/**", "/app/vehicle/**", "/app/goods/getGoodsInfoByCode/**","/app/pms/**").permitAll() + .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/app/pms/orderIn", "/app/pmsOrderOut/**", "/app/task/sendLocation", "/app/task/taskResult","/app/task/createOutRequest", "/system/storage/**", "/app/location/count/**", "/app/vehicle/**", "/app/goods/getGoodsInfoByCode/**","/app/pms/**","/app/pmsOrderIn/**").permitAll() // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated(); }) diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java index e74ac356..838b139d 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java @@ -352,8 +352,8 @@ public class TaskExecutor { List appPmsOrderOuts = appPmsOrderOutMapper.selectAppPmsOrderOutList(appPmsOrderOut); //查询出来的列表，利用lamda表达式 根据orderId进行分组 Map> map = appPmsOrderOuts.stream().collect(Collectors.groupingBy(AppPmsOrderOut::getOrderId)); - AtomicBoolean flag = new AtomicBoolean(true); map.forEach((k, v) -> { + AtomicBoolean flag = new AtomicBoolean(true); // v中的数据进行遍历，查询orderStatus是否有为0和1的 for (AppPmsOrderOut appPmsOrderOut1 : v) { if (appPmsOrderOut1.getOrderStatus() == 0 || appPmsOrderOut1.getOrderStatus() == 1) { diff --git a/ruoyi-system/src/main/resources/mapper/app/AppStockMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppStockMapper.xml index 51fc20fb..6da1d7e4 100644 --- a/ruoyi-system/src/main/resources/mapper/app/AppStockMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/app/AppStockMapper.xml @@ -60,6 +60,7 @@ and storage_id = #{storageId} and goods_desc = #{goodsDesc} + order by goods_id desc, ware_date desc