1.货架

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataGoodsShelfEntity.java

@@ -71,10 +71,18 @@ public class BasicdataGoodsShelfEntity extends TenantEntity {
 	@ApiModelProperty(value = "货架名称")
 	private String goodsShelfName;
 	/**
-	 * 仓库编号
+	 * 仓库Id
 	 */
-	@ApiModelProperty(value = "仓库编号")
+	@ApiModelProperty(value = "仓库Id")
 	private Long warehouseId;
+
+	/**
+	 * 仓库code
+	 */
+	@ApiModelProperty(value = "仓库code")
+	private String warehouseCode;
+
+
 	/**
 	 * 货架状态；1-已满；2-未满
 	 */

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java

@@ -51,4 +51,10 @@ public interface IWarehouseTrayGoodsClient {
 	@PostMapping(TOP+"/delEntityByMasterId")
 	Boolean removeByMasterId(@RequestParam Long id);
 
+	/**
+	 * 通过主表Id删除所有关联表
+	 */
+	@PostMapping(TOP+"/delRelevanceByTray")
+	Boolean delRelevanceByTray(@RequestParam Long id);
+
 }

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayTypeClient.java

@@ -0,0 +1,47 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.feign;
+
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 托盘 货物 绑定 Feign接口类
+ *
+ * @author zhy
+ * @since 2023-07-10
+ */
+@FeignClient(
+	value = ModuleNameConstant.APPLICATION_WAREHOUSE_NAME
+)
+public interface IWarehouseTrayTypeClient {
+
+	String API_PREFIX = "warehousetraytype/client";
+	String TOP = API_PREFIX + "/top5";
+
+
+
+	/**
+	 * 通过关联主表Id删除
+	 */
+	@PostMapping(TOP+"/delEntityByMasterId")
+	Boolean removeByMasterId(@RequestParam Long id);
+
+}

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseWaybillDetentionVO.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.warehouse.vo;
+
+import com.logpm.warehouse.entity.WarehouseWaybillEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 运单表 视图实体类
+ *
+ * @author lmy
+ * @since 2023-08-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WarehouseWaybillDetentionVO extends WarehouseWaybillEntity {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 滞留仓库
+	 */
+	@ApiModelProperty(value = "滞留仓库")
+	private String retentionWarehouseName;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataGoodsShelfDTO.java

@@ -33,7 +33,12 @@ import java.util.List;
 public class BasicdataGoodsShelfDTO extends BasicdataGoodsShelfEntity {
 	private static final long serialVersionUID = 1L;
 
-	String goodsAreaInfo;
+		private	 String goodsAreaInfo;
+
+	/**
+	 * 货区Name
+	 */
+		private	 String goodsAreaName;
 
 
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java

@@ -17,8 +17,6 @@
 package com.logpm.basicdata.service.impl;
 
 
-
-
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -35,6 +33,8 @@ import com.logpm.basicdata.service.IBasicdataGoodsAllocationService;
 import com.logpm.basicdata.service.IBasicdataGoodsShelfService;
 import com.logpm.basicdata.vo.BasicdataGoodsShelfVO;
 import lombok.AllArgsConstructor;
+import lombok.extern.log4j.Log4j;
+import lombok.extern.log4j.Log4j2;
 import org.springblade.common.utils.FileUtil;
 import org.springblade.common.utils.QRCodeUtil;
 import org.springblade.common.utils.TemplateUtil;
@@ -66,6 +66,7 @@ import java.util.concurrent.TimeUnit;
  */
 @Service
 @AllArgsConstructor
+@Log4j2
 public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoodsShelfMapper, BasicdataGoodsShelfEntity> implements IBasicdataGoodsShelfService {
 
 	private BasicdataGoodsShelfMapper basicdataGoodsShelfMapper;
@@ -77,7 +78,6 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 	private IBasicdataGoodsAllocationService basicdataGoodsAllocationService;
 
 
-
 	@Override
 	public IPage<BasicdataGoodsShelfVO> selectBasicdataGoodsShelfPage(IPage<BasicdataGoodsShelfVO> page, BasicdataGoodsShelfVO basicdataGoodsShelfVO) {
 		return page.setRecords(baseMapper.selectBasicdataGoodsShelfPage(page, basicdataGoodsShelfVO));
@@ -94,8 +94,8 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 	}
 
 	@Override
-	public IPage<BasicdataGoodsShelfVO> getGoodsShelfList(IPage<Object> page, Map<String, Object> basicdataGoodsShelf)  {
-		IPage<BasicdataGoodsShelfVO> basicdataGoodsShelfVOIPage=basicdataGoodsShelfMapper.getGoodsShelfList(page,basicdataGoodsShelf);
+	public IPage<BasicdataGoodsShelfVO> getGoodsShelfList(IPage<Object> page, Map<String, Object> basicdataGoodsShelf) {
+		IPage<BasicdataGoodsShelfVO> basicdataGoodsShelfVOIPage = basicdataGoodsShelfMapper.getGoodsShelfList(page, basicdataGoodsShelf);
 //		redisUtil.set("aaa","aaa");
 //		WebUtil.getResponseEncodedHtmlEscape()
 		return basicdataGoodsShelfVOIPage;
@@ -105,63 +105,70 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public boolean insertGoodsshelf(BasicdataGoodsShelfDTO basicdataGoodsShelfDTO) {
+		log.info("传入>>>>>>>>>>>>>>>>>>{}", basicdataGoodsShelfDTO);
 		//维护仓库、货区数据
 		boolean result = false;
 		//这里新增货架必须有仓库和货区的信息否则视为信息不合法
-		if (Func.isEmpty(basicdataGoodsShelfDTO) ){
+		if (Func.isEmpty(basicdataGoodsShelfDTO)) {
 			return result;
 		}
 		if (Objects.isNull(basicdataGoodsShelfDTO.getWarehouseId())&Objects.isNull(basicdataGoodsShelfDTO.getGoodsAreaId())){
 			log.error("仓库货区信息不合法");
 			throw new RuntimeException("请完善货区信息!!!");
 		}
-			BasicdataGoodsShelfEntity basicdataGoodsShelfEntity = new BasicdataGoodsShelfEntity();
-			BeanUtils.copyProperties(basicdataGoodsShelfDTO,basicdataGoodsShelfEntity);
+		BasicdataGoodsShelfEntity basicdataGoodsShelfEntity = new BasicdataGoodsShelfEntity();
+		BeanUtils.copyProperties(basicdataGoodsShelfDTO, basicdataGoodsShelfEntity);
 
-			BladeUser user = AuthUtil.getUser();
-			Long userId = user.getUserId();
-			basicdataGoodsShelfEntity.setCreateTime(new Date());
-			basicdataGoodsShelfEntity.setCreateDept( Long.valueOf(user.getDeptId()));
-			basicdataGoodsShelfEntity.setCreateUser(userId);
-			//数据状态默认正常
-			basicdataGoodsShelfEntity.setStatus(1);
-			//货架添加删除状态为正常
-			basicdataGoodsShelfEntity.setIsDeleted(0);
-			//货架添加初始未满
-			basicdataGoodsShelfEntity.setGoodsShelfStatus(1);
-			//货架添加默认启用
-			basicdataGoodsShelfEntity.setEnableStatus(1);
+//			BladeUser user = AuthUtil.getUser();
+//			Long userId = user.getUserId();
+//			basicdataGoodsShelfEntity.setCreateTime(new Date());
+//			basicdataGoodsShelfEntity.setCreateDept( Long.valueOf(user.getDeptId()));
+//			basicdataGoodsShelfEntity.setCreateUser(userId);
+//			//数据状态默认正常
+//			basicdataGoodsShelfEntity.setStatus(1);
+//			//货架添加删除状态为正常
+//			basicdataGoodsShelfEntity.setIsDeleted(0);
+//			//货架添加初始未满
+//			basicdataGoodsShelfEntity.setGoodsShelfStatus(1);
+//			//货架添加默认启用
+//			basicdataGoodsShelfEntity.setEnableStatus(1);
 
-			//获取租户编码规则
-			String code = basicTenantCodeClient.shelfCode(user.getTenantId(),"8");
-			//远程feign调用获取租户的货架码编码规则
-			String shelfCode = code + "--"+basicdataGoodsShelfEntity.getGoodsShelfName();
-			basicdataGoodsShelfEntity.setQrCode(shelfCode);
-			result = this.save(basicdataGoodsShelfEntity);
-			//这里需要根据货架的列数和层数进行货位信息的生成
-			Integer rowNum = basicdataGoodsShelfEntity.getRowNum();
-			Integer storeyNum = basicdataGoodsShelfEntity.getStoreyNum();
-			//查询租户对应的库位码前缀规则
-			String allocationCode = basicTenantCodeClient.shelfCode(user.getTenantId(),"5");
-			for (Integer i = 0; i < rowNum; i++) {
-					for (Integer j = 0; j < storeyNum; j++) {
-						BasicdataGoodsAllocationEntity basicdataGoodsAllocationEntity = new BasicdataGoodsAllocationEntity();
-						//设置所在列
-						basicdataGoodsAllocationEntity.setColumnNum(i+1);
-						//设置所在层
-						basicdataGoodsAllocationEntity.setLayerNum(j+1);
-						int row = i + 1;
-						int layer = j + 1;
-						basicdataGoodsAllocationEntity.setQrCode(allocationCode+"-"+row+"-"+layer);
-						basicdataGoodsAllocationEntity.setWarehouseId(basicdataGoodsShelfEntity.getWarehouseId());
-						basicdataGoodsAllocationEntity.setGoodsAreaId(basicdataGoodsShelfEntity.getGoodsAreaId());
-						basicdataGoodsAllocationEntity.setGoodsShelfId(basicdataGoodsShelfEntity.getId());
-						basicdataGoodsAllocationEntity.setGoodsAllocationName(row+"-"+"-"+layer+"-货位");
-						basicdataGoodsAllocationEntity.setAllocationStatuc("1");
-						basicdataGoodsAllocationEntity.setEnableStatus("1");
-						basicdataGoodsAllocationService.save(basicdataGoodsAllocationEntity);
-					}
-			}
+
+		//获取租户编码规则
+		//	String code = basicTenantCodeClient.shelfCode(user.getTenantId(),"8");
+		//远程feign调用获取租户的货架码编码规则
+		//查询货区
+		//查询当前登录人仓库
+		BladeUser user = AuthUtil.getUser();
+		log.info("当前登陆人>>>>>>>>>>>>{}",user);
+		String shelfCode =basicdataGoodsShelfDTO.getGoodsAreaName();
+		basicdataGoodsShelfEntity.setQrCode(shelfCode);
+		basicdataGoodsShelfEntity.setGoodsShelfName(shelfCode);
+		result = this.save(basicdataGoodsShelfEntity);
+		//这里需要根据货架的列数和层数进行货位信息的生成
+		Integer rowNum = basicdataGoodsShelfEntity.getRowNum();
+		Integer storeyNum = basicdataGoodsShelfEntity.getStoreyNum();
+		//查询租户对应的库位码前缀规则
+		//String allocationCode = basicTenantCodeClient.shelfCode(user.getTenantId(),"5");
+//		for (Integer i = 0; i < rowNum; i++) {
+//			for (Integer j = 0; j < storeyNum; j++) {
+//				BasicdataGoodsAllocationEntity basicdataGoodsAllocationEntity = new BasicdataGoodsAllocationEntity();
+//				//设置所在列
+//				basicdataGoodsAllocationEntity.setColumnNum(i + 1);
+//				//设置所在层
+//				basicdataGoodsAllocationEntity.setLayerNum(j + 1);
+//				int row = i + 1;
+//				int layer = j + 1;
+//				basicdataGoodsAllocationEntity.setQrCode(allocationCode + "-" + row + "-" + layer);
+//				basicdataGoodsAllocationEntity.setWarehouseId(basicdataGoodsShelfEntity.getWarehouseId());
+//				basicdataGoodsAllocationEntity.setGoodsAreaId(basicdataGoodsShelfEntity.getGoodsAreaId());
+//				basicdataGoodsAllocationEntity.setGoodsShelfId(basicdataGoodsShelfEntity.getId());
+//				basicdataGoodsAllocationEntity.setGoodsAllocationName(row + "-" + "-" + layer + "-货位");
+//				basicdataGoodsAllocationEntity.setAllocationStatuc("1");
+//				basicdataGoodsAllocationEntity.setEnableStatus("1");
+//				basicdataGoodsAllocationService.save(basicdataGoodsAllocationEntity);
+//			}
+//		}
 		return result;
 	}
 
@@ -169,31 +176,32 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 	@Transactional
 	public boolean updateGoodsShelfInfo(BasicdataGoodsShelfDTO basicdataGoodsShelfDTO) {
 		boolean result = false;
-		if (Func.isEmpty(basicdataGoodsShelfDTO) ){
-			log.error("参数异常:["+basicdataGoodsShelfDTO+"]");
+		if (Func.isEmpty(basicdataGoodsShelfDTO)) {
+			log.error("参数异常:[" + basicdataGoodsShelfDTO + "]");
 			return result;
 		}
 		BasicdataGoodsShelfEntity goodsShelfEntity = this.getById(basicdataGoodsShelfDTO.getId());
-		BeanUtils.copyProperties(basicdataGoodsShelfDTO,goodsShelfEntity);
-			result = SqlHelper.retBool(basicdataGoodsShelfMapper.updateById(goodsShelfEntity));
+		BeanUtils.copyProperties(basicdataGoodsShelfDTO, goodsShelfEntity);
+		result = SqlHelper.retBool(basicdataGoodsShelfMapper.updateById(goodsShelfEntity));
 		return result;
 	}
 
 	@Override
 	public BasicdataGoodsShelfVO getGoodsShelfDetail(BasicdataGoodsShelfDTO basicdataGoodsShelfDTO) {
-		BasicdataGoodsShelfVO basicdataGoodsShelf =  basicdataGoodsShelfMapper.getGoodsShelfDetail(basicdataGoodsShelfDTO);
+		BasicdataGoodsShelfVO basicdataGoodsShelf = basicdataGoodsShelfMapper.getGoodsShelfDetail(basicdataGoodsShelfDTO);
 		return basicdataGoodsShelf;
 	}
+
 	@Override
 	public boolean removeGoodsShelf(List<String> ids) {
-		if (Func.isEmpty(ids)){
-			log.error("参数错误:{}"+ids);
+		if (Func.isEmpty(ids)) {
+			log.error("参数错误:{}" + ids);
 			return false;
 		}
 		boolean result = false;
 		for (String id : ids) {
 			result = SqlHelper.retBool(basicdataGoodsShelfMapper.removeGoodsShelf(id));
-			if (!result){
+			if (!result) {
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 				return false;
 			}
@@ -202,7 +210,6 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 	}
 
 
-
 	@Override
 	public R<?> getQrRCodeImg(String qrCode, HttpServletResponse response) {
 		String filename = null;
@@ -210,8 +217,8 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 			filename = QRCodeUtil.createCodeToFile(qrCode);
 		} catch (Exception e) {
 			e.printStackTrace();
-			log.error("二维码图片生成失败+{"+e.getMessage()+"}");
-		}finally {
+			log.error("二维码图片生成失败+{" + e.getMessage() + "}");
+		} finally {
 			File file = new File(filename);
 			file.delete();
 		}
@@ -224,19 +231,19 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 		String templateByUrl = null;
 		StringBuffer buffer = new StringBuffer();
 		//待删除文件列表
-		List<String> list= new ArrayList<>();
+		List<String> list = new ArrayList<>();
 		for (String id : ids) {
 			BasicdataGoodsShelfEntity basicdataGoodsShelfEntity = basicdataGoodsShelfMapper.selectById(id);
 			String templateId = basicdataGoodsShelfEntity.getTemplateId();
 			BasicPrintTemplateEntity template = basicPrintTemplateClient.getTemplate(templateId);
-			if (Func.isEmpty(basicdataGoodsShelfEntity)){
-				return R.fail("货架信息异常+{"+basicdataGoodsShelfEntity+"}");
+			if (Func.isEmpty(basicdataGoodsShelfEntity)) {
+				return R.fail("货架信息异常+{" + basicdataGoodsShelfEntity + "}");
 			}
-			Map<String,Object> map = JSONObject.parseObject(JSONObject.toJSONString(basicdataGoodsShelfEntity), Map.class);
+			Map<String, Object> map = JSONObject.parseObject(JSONObject.toJSONString(basicdataGoodsShelfEntity), Map.class);
 			String qrCode = (String) map.get("qrCode");
 			String filename = QRCodeUtil.createCodeToFile(qrCode);
 			list.add(filename);
-			map.put("img",filename);
+			map.put("img", filename);
 			try {
 				templateByUrl = TemplateUtil.getTemplateByUrl(template.getFileName(), map, template.getTemplateUrl());
 			} catch (Exception e) {
@@ -246,32 +253,32 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 			buffer.append(templateByUrl);
 		}
 		ScheduledThreadPoolExecutor scheduledThreadPoolExecutor = new ScheduledThreadPoolExecutor(5);
-		scheduledThreadPoolExecutor.schedule(new FileUtil(list),30,TimeUnit.SECONDS);
+		scheduledThreadPoolExecutor.schedule(new FileUtil(list), 30, TimeUnit.SECONDS);
 		return R.data(buffer.toString());
 	}
 
 	@Override
-	public R<?> getShowTemplate(Map<String,Object> params,HttpServletResponse response)  {
+	public R<?> getShowTemplate(Map<String, Object> params, HttpServletResponse response) {
 		String tenantId = AuthUtil.getTenantId();
 		String templateId = (String) params.get("templateId");
 		BasicPrintTemplateEntity template = basicPrintTemplateClient.getTemplate(templateId);
 		String qrCode = (String) params.get("qrCode");
-		if (Func.isBlank(qrCode)){
-			log.error("参数异常：+{"+qrCode+"}");
+		if (Func.isBlank(qrCode)) {
+			log.error("参数异常：+{" + qrCode + "}");
 			return R.fail("服务器正忙!!!");
 		}
 		String filename = QRCodeUtil.createCodeToFile(qrCode);
-		params.put("img","/"+filename);
-		ServletOutputStream os =null;
+		params.put("img", "/" + filename);
+		ServletOutputStream os = null;
 		try {
-			BufferedImage image = TemplateUtil.turnImage(template.getTemplateName(), params,template.getTemplateUrl(),template.getTemplateWidth(),template.getTemplateHeight());
+			BufferedImage image = TemplateUtil.turnImage(template.getTemplateName(), params, template.getTemplateUrl(), template.getTemplateWidth(), template.getTemplateHeight());
 			os = response.getOutputStream();
-			ImageIO.write(image, "png",os);
+			ImageIO.write(image, "png", os);
 			os.flush();
 		} catch (IOException e) {
 			e.printStackTrace();
-			log.error("获取响应流失败+{"+e.getMessage()+"}");
-		}finally {
+			log.error("获取响应流失败+{" + e.getMessage() + "}");
+		} finally {
 			File file = new File(filename);
 			file.delete();
 			try {

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java

@@ -32,6 +32,7 @@ import com.logpm.basicdata.vo.BasicdataStockArticleVO;
 import com.logpm.basicdata.vo.WarehouseParcelListVO;
 import com.logpm.basicdata.vo.WarehouseStockListVO;
 import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient;
+import com.logpm.warehouse.feign.IWarehouseTrayTypeClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j;
 import lombok.extern.log4j.Log4j2;
@@ -70,6 +71,9 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
 
   	private IWarehouseTrayGoodsClient warehouseTrayGoodsClient;
 
+	 private IWarehouseTrayTypeClient warehouseTrayTypeClient;
+
+
 	@Override
 	public IPage<BasicdataTrayVO> selectBasicdataTrayPage(IPage<BasicdataTrayVO> page, BasicdataTrayVO BasicdataTray) {
 		return page.setRecords(baseMapper.selectBasicdataTrayPage(page, BasicdataTray));
@@ -167,15 +171,19 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
 
 	@Override
 	public Boolean vacantById(BasicdataTrayEntity basicdataTray) {
-		//删除托盘货物绑定表
-		Boolean aBoolean = warehouseTrayGoodsClient.removeByMasterId(basicdataTray.getId());
-		log.info("子表删除>>>>>>>>>>>>>>>>{}",aBoolean);
+//		//删除托盘货物绑定表
+//		Boolean aBoolean = warehouseTrayGoodsClient.removeByMasterId(basicdataTray.getId());
+//		//删除托盘打托方式表
+//		Boolean aBoolean1 = warehouseTrayTypeClient.removeByMasterId(basicdataTray.getId());
+//		log.info("删除托盘货物绑定表>>>>>>>>>>>>>>>>{}",aBoolean);
+//		log.info("删除托盘打托方式表>>>>>>>>>>>>>>>>{}",aBoolean1);
+		Boolean aBoolean = warehouseTrayGoodsClient.delRelevanceByTray(basicdataTray.getId());
 		//修改托盘表状态
-		boolean update = this.update(new UpdateWrapper<BasicdataTrayEntity>().lambda()
-			.eq(BasicdataTrayEntity::getId, basicdataTray.getId())
-			.set(BasicdataTrayEntity::getTrayStatus, 1)
-		);
-		return update;
+//		boolean update = this.update(new UpdateWrapper<BasicdataTrayEntity>().lambda()
+//			.eq(BasicdataTrayEntity::getId, basicdataTray.getId())
+//			.set(BasicdataTrayEntity::getTrayStatus, 1)
+//		);
+		return aBoolean;
 	}
 
 

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseRetentionRecordController.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.warehouse.controller;
 
+import com.logpm.warehouse.vo.WarehouseWaybillDetentionVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -90,6 +91,16 @@ public class WarehouseRetentionRecordController extends BladeController {
 		IPage<WarehouseRetentionRecordVO> pages = warehouseRetentionRecordService.selectWarehouseRetentionRecordPage(Condition.getPage(query), warehouseRetentionRecord);
 		return R.data(pages);
 	}
+	/**
+	 * 滞留记录 运单
+	 */
+	@GetMapping("/waybill")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "滞留记录 运单", notes = "传入warehouseRetentionRecord")
+	public R<IPage<WarehouseWaybillDetentionVO>> waybill(WarehouseWaybillDetentionVO warehouseWaybillDetentionVO, Query query) {
+		IPage<WarehouseWaybillDetentionVO> pages = warehouseRetentionRecordService.selectWarehouseRetentionWaybillPage(Condition.getPage(query), warehouseWaybillDetentionVO);
+		return R.data(pages);
+	}
 
 	/**
 	 * 滞留记录 新增

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayGoodsClient.java

@@ -33,4 +33,9 @@ public class WarehouseTrayGoodsClient implements IWarehouseTrayGoodsClient {
 	public Boolean removeByMasterId(Long id) {
 		return warehouseTrayGoodsService.deleteByMasterId(id);
 	}
+
+	@Override
+	public Boolean delRelevanceByTray(Long id) {
+		return warehouseTrayGoodsService.delRelevanceByTray(id);
+	}
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayTypeClient.java

@@ -0,0 +1,24 @@
+package com.logpm.warehouse.feign;
+
+import com.logpm.warehouse.service.IWarehouseTrayGoodsService;
+import com.logpm.warehouse.service.IWarehouseTrayTypeService;
+import lombok.AllArgsConstructor;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class WarehouseTrayTypeClient implements IWarehouseTrayTypeClient {
+
+	private final IWarehouseTrayTypeService warehouseTrayTypeService;
+
+
+
+	@Override
+	public Boolean removeByMasterId(Long id) {
+		return warehouseTrayTypeService.deleteByMasterId(id);
+	}
+}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.java

@@ -22,6 +22,7 @@ import com.logpm.warehouse.excel.WarehouseRetentionRecordExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.warehouse.vo.WarehouseWaybillDetentionVO;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
@@ -50,5 +51,10 @@ public interface WarehouseRetentionRecordMapper extends BaseMapper<WarehouseRete
 	 * @return
 	 */
 	List<WarehouseRetentionRecordExcel> exportWarehouseRetentionRecord(@Param("ew") Wrapper<WarehouseRetentionRecordEntity> queryWrapper);
-
+	/**
+	 * 滞留运单
+	 * warehouseWaybillDetentionVO
+	 * @return
+	 */
+	List<WarehouseWaybillDetentionVO> selectWarehouseWaybillRecordPage(IPage<WarehouseWaybillDetentionVO> page,@Param("param") WarehouseWaybillDetentionVO warehouseWaybillDetentionVO);
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.xml

@@ -44,5 +44,8 @@
     <select id="exportWarehouseRetentionRecord" resultType="com.logpm.warehouse.excel.WarehouseRetentionRecordExcel">
         SELECT * FROM logpm_warehouse_retention_record ${ew.customSqlSegment}
     </select>
+    <select id="selectWarehouseWaybillRecordPage" resultType="com.logpm.warehouse.vo.WarehouseWaybillDetentionVO">
+        SELECT  lwrr.waybill_no  waybillNo,GROUP_CONCAT( lwrr.retention_warehouse_name SEPARATOR ',' )  retentionWarehouseName  FROM logpm_warehouse_retention_record lwrr GROUP BY lwrr.waybill_no
+    </select>
 
 </mapper>

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.java

@@ -23,4 +23,6 @@ public interface WarehouseTrayGoodsMapper extends BaseMapper<WarehouseTrayGoodsE
 	List<TrayTypeDataListVO> getStockListByTrayTypeId(@Param("trayTypeId") Long trayTypeId);
 
 	List<TrayTypeDataListVO> getStockListNoDataByTrayTypeId(@Param("trayTypeId") Long trayTypeId);
+
+    int deleteByMasterId(@Param("masterId") Long masterId);
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml

@@ -41,7 +41,9 @@
     <delete id="deleteEntityByTrayGoodsId" >
         delete logpm_warehouse_tray_goods lwtg from lwtg.id = #{trayGoodsId}
     </delete>
-
+    <delete id="deleteByMasterId">
+        delete from logpm_warehouse_tray_goods   WHERE tray_id = #{masterId}
+    </delete>
     <select id="getStockListByTrayTypeId" resultType="com.logpm.warehouse.vo.TrayTypeDataListVO">
         select lbm.product_code dataCode,
                lbm.`name` dataName,

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseRetentionRecordService.java

@@ -21,6 +21,7 @@ import com.logpm.warehouse.entity.WarehouseRetentionRecordEntity;
 import com.logpm.warehouse.vo.WarehouseRetentionRecordVO;
 import com.logpm.warehouse.excel.WarehouseRetentionRecordExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.warehouse.vo.WarehouseWaybillDetentionVO;
 import org.springblade.core.mp.base.BaseService;
 import java.util.List;
 
@@ -48,5 +49,10 @@ public interface IWarehouseRetentionRecordService extends BaseService<WarehouseR
 	 * @return
 	 */
 	List<WarehouseRetentionRecordExcel> exportWarehouseRetentionRecord(Wrapper<WarehouseRetentionRecordEntity> queryWrapper);
-
+	/**
+	 * 滞留运单
+	 * warehouseWaybillDetentionVO
+	 * @return
+	 */
+	IPage<WarehouseWaybillDetentionVO> selectWarehouseRetentionWaybillPage(IPage<WarehouseWaybillDetentionVO> page, WarehouseWaybillDetentionVO warehouseWaybillDetentionVO);
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsService.java

@@ -35,4 +35,8 @@ public interface IWarehouseTrayGoodsService extends BaseService<WarehouseTrayGoo
 
 	List<TrayTypeDataListVO> getStockListNoDataByTrayTypeId(Long trayTypeId);
 
+	/**
+	 * 删除托盘所有关联表
+	 * */
+    Boolean delRelevanceByTray(Long id);
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayTypeService.java

@@ -36,5 +36,9 @@ public interface IWarehouseTrayTypeService extends BaseService<WarehouseTrayType
 
 	IPage<WarehouseTrayTypeVO> stockPageList(TrayTypeDTO trayTypeDTO);
 
+	/**
+	 *通过主表改id
+	 */
+	Boolean deleteByMasterId(Long id);
 	R scanStockOrderPackageCode(String trayCode, String trayType, String orderPackageCode);
 }

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

@@ -21,6 +21,7 @@ import com.logpm.warehouse.vo.WarehouseRetentionRecordVO;
 import com.logpm.warehouse.excel.WarehouseRetentionRecordExcel;
 import com.logpm.warehouse.mapper.WarehouseRetentionRecordMapper;
 import com.logpm.warehouse.service.IWarehouseRetentionRecordService;
+import com.logpm.warehouse.vo.WarehouseWaybillDetentionVO;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -51,4 +52,10 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
 		return warehouseRetentionRecordList;
 	}
 
+	@Override
+	public IPage<WarehouseWaybillDetentionVO> selectWarehouseRetentionWaybillPage(IPage<WarehouseWaybillDetentionVO> page, WarehouseWaybillDetentionVO warehouseWaybillDetentionVO) {
+		List<WarehouseWaybillDetentionVO> warehouseRetentionRecordVOS = baseMapper.selectWarehouseWaybillRecordPage(page,warehouseWaybillDetentionVO);
+		return page.setRecords(warehouseRetentionRecordVOS);
+	}
+
 }

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

@@ -1,11 +1,13 @@
 package com.logpm.warehouse.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.logpm.basicdata.feign.IBasicdataTrayClient;
 import com.logpm.distribution.entity.DistributionParcelListEntity;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity;
 import com.logpm.warehouse.entity.WarehouseTrayTypeEntity;
 import com.logpm.warehouse.mapper.WarehouseTrayGoodsMapper;
+import com.logpm.warehouse.mapper.WarehouseTrayTypeMapper;
 import com.logpm.warehouse.service.IWarehouseTrayGoodsService;
 import com.logpm.warehouse.vo.TrayTypeDataListVO;
 import lombok.AllArgsConstructor;
@@ -13,6 +15,7 @@ import lombok.extern.log4j.Log4j2;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.sql.SQLException;
 import java.util.List;
 
 @Log4j2
@@ -20,7 +23,9 @@ import java.util.List;
 @AllArgsConstructor
 public class WarehouseTrayGoodsServiceImpl extends BaseServiceImpl<WarehouseTrayGoodsMapper,WarehouseTrayGoodsEntity> implements IWarehouseTrayGoodsService {
 
+    private final WarehouseTrayTypeMapper warehouseTrayTypeMapper;
 
+	private final IBasicdataTrayClient basicdataTrayClient;
 	@Override
 	public List<TrayTypeDataListVO> getListByTrayTypeId(Long trayTypeId) {
 		return baseMapper.getListByTrayTypeId(trayTypeId);
@@ -97,6 +102,26 @@ public class WarehouseTrayGoodsServiceImpl extends BaseServiceImpl<WarehouseTray
 		return baseMapper.getStockListByTrayTypeId(trayTypeId);
 	}
 
+	@Override
+	public Boolean delRelevanceByTray(Long id) {
+		try {
+			//物理删除绑定表
+			int delete = baseMapper.deleteByMasterId(id);
+			log.info("物理删除绑定表>>>>>>>>>>{}",delete);
+			//逻辑删除打托方式表
+			int delete1 = warehouseTrayTypeMapper.delete(new QueryWrapper<WarehouseTrayTypeEntity>()
+				.lambda()
+				.eq(WarehouseTrayTypeEntity::getTrayId, id));
+			log.info("逻辑删除打托方式表>>>>>>>>>>{}",delete1);
+			//修改状态
+			basicdataTrayClient.updateTrayStatus(id,1);
+		}catch (Exception e){
+			log.error("删除托盘所有关联表>>>>>>>>>>{}",e);
+			return false;
+		}
+		return true;
+	}
+
 	@Override
 	public Boolean deleteByMasterId(Long masterId) {
 		int delete = baseMapper.delete(new QueryWrapper<WarehouseTrayGoodsEntity>().lambda()

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

@@ -917,4 +917,12 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		return trayTypeEntity;
 	}
 
+	@Override
+	public Boolean deleteByMasterId(Long id) {
+		int delete = baseMapper.delete(new QueryWrapper<WarehouseTrayTypeEntity>().lambda()
+			.eq(WarehouseTrayTypeEntity::getTrayId,id)
+		);
+		return delete>0?true:false;
+	}
+
 }