From 2365e37d94bb0938166ecbad2f1d41614f268ac3 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 17 Aug 2023 17:10:49 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/WarehouseTrayTypeApiController.java | 20 +++++++++---------- .../mapper/WarehouseTrayTypeMapper.xml | 4 ++-- .../impl/WarehouseTrayTypeServiceImpl.java | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java index af452ef3a..6e3c75a92 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java @@ -91,10 +91,10 @@ public class WarehouseTrayTypeApiController { if(Objects.isNull(trayTypeDataVO)){ //如果没有对应数据就返回打托方式 List list = DictBizCache.getList(DictBizConstant.PALLET_ORDER_TYPE); - map.put("is_has_data",0); + map.put("isHasData",0); map.put("data",list); }else{ - map.put("is_has_data",1); + map.put("isHasData",1); map.put("data",trayTypeDataVO); } @@ -229,10 +229,10 @@ public class WarehouseTrayTypeApiController { if(Objects.isNull(trayTypeDataVO)){ //如果没有对应数据就返回打托方式 List list = DictBizCache.getList(DictBizConstant.PALLET_ZERO_TYPE); - map.put("is_has_data",0); + map.put("isHasData",0); map.put("data",list); }else{ - map.put("is_has_data",1); + map.put("isHasData",1); map.put("data",trayTypeDataVO); } @@ -303,10 +303,10 @@ public class WarehouseTrayTypeApiController { @ResponseBody @PostMapping("/deleteZeroOrderByTrayCode") @ApiOperationSupport(order = 1) - @ApiOperation(value = "录入零担订单绑定托盘", notes = "传入trayTypeDTO") + @ApiOperation(value = "删除零担订单绑定托盘", notes = "传入trayTypeDTO") public R deleteZeroOrderByTrayCode(@RequestBody TrayTypeDTO trayTypeDTO) { String method = "###########deleteZeroOrderByTrayCode: "; - log.info(method + "录入零担订单绑定托盘 trayTypeDTO={}", trayTypeDTO); + log.info(method + "删除零担订单绑定托盘 trayTypeDTO={}", trayTypeDTO); String orderCode = trayTypeDTO.getOrderCode(); String trayCode = trayTypeDTO.getTrayCode(); @@ -446,11 +446,11 @@ public class WarehouseTrayTypeApiController { //如果没有对应数据就返回打托方式 List list = DictBizCache.getList(DictBizConstant.PALLET_STOCK_TYPE); // List stockMallVOList = distributionStockListClient.getAllStockMall(); - map.put("is_has_data",0); + map.put("isHasData",0); map.put("data",list); // map.put("stockMallList",stockMallVOList); }else{ - map.put("is_has_data",1); + map.put("isHasData",1); map.put("data",trayTypeDataVO); } return R.data(map); @@ -598,11 +598,11 @@ public class WarehouseTrayTypeApiController { //如果没有对应数据就返回打托方式 List list = DictBizCache.getList(DictBizConstant.PALLET_STOCKNODATA_TYPE); // List stockMallVOList = distributionStockListClient.getAllStockMall(); - map.put("is_has_data",0); + map.put("isHasData",0); map.put("data",list); // map.put("stockMallList",stockMallVOList); }else{ - map.put("is_has_data",1); + map.put("isHasData",1); map.put("data",trayTypeDataVO); } return R.data(map); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml index 73f3d3979..a095073db 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml @@ -62,11 +62,11 @@ ldsa.order_code dataCode, ldsa.total_number - sum(lwtg.num) orderTotalNum from logpm_distribution_stock_article ldsa - left join logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldsa.id + left join logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldsa.id where ldsa.is_deleted = 0 and ldsa.is_zero = 1 and ldsa.waibill_number = #{waybillCode} - group by ldsa.order_code, + group by ldsa.id,ldsa.order_code, ldsa.total_number having sum(lwtg.num) < ldsa.total_number diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java index d4aa93f12..df04ed151 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java @@ -593,7 +593,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl