1.修复bug

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<DictBiz> 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<DictBiz> 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<DictBiz> list = DictBizCache.getList(DictBizConstant.PALLET_STOCK_TYPE);
 //				List<StockMallVO> 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<DictBiz> list = DictBizCache.getList(DictBizConstant.PALLET_STOCKNODATA_TYPE);
 //				List<StockMallVO> 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);

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
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java

@@ -593,7 +593,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 
 		updateNumByTrayTypeId(trayTypeEntity);
 
-		return null;
+		return R.success("删除成功");
 	}
 
 	private void changeZeroTotalNumByTrayTypeId(DistributionStockArticleEntity stockArticleEntity, Long trayTypeId,Integer num,Integer addSub) {