From bb11491778db0b4060011d8726f5e4e8d038f8ce Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Fri, 11 Aug 2023 17:59:43 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B4=A7=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/BasicdataGoodsShelfEntity.java | 12 +- .../feign/IWarehouseTrayGoodsClient.java | 6 + .../feign/IWarehouseTrayTypeClient.java | 47 +++++ .../vo/WarehouseWaybillDetentionVO.java | 41 +++++ .../basicdata/dto/BasicdataGoodsShelfDTO.java | 7 +- .../impl/BasicdataGoodsShelfServiceImpl.java | 161 +++++++++--------- .../impl/BasicdataTrayServiceImpl.java | 24 ++- .../WarehouseRetentionRecordController.java | 11 ++ .../feign/WarehouseTrayGoodsClient.java | 5 + .../feign/WarehouseTrayTypeClient.java | 24 +++ .../WarehouseRetentionRecordMapper.java | 8 +- .../mapper/WarehouseRetentionRecordMapper.xml | 3 + .../mapper/WarehouseTrayGoodsMapper.java | 2 + .../mapper/WarehouseTrayGoodsMapper.xml | 4 +- .../IWarehouseRetentionRecordService.java | 8 +- .../service/IWarehouseTrayGoodsService.java | 4 + .../service/IWarehouseTrayTypeService.java | 4 + .../WarehouseRetentionRecordServiceImpl.java | 7 + .../impl/WarehouseTrayGoodsServiceImpl.java | 25 +++ .../impl/WarehouseTrayTypeServiceImpl.java | 8 + 20 files changed, 320 insertions(+), 91 deletions(-) create mode 100644 blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayTypeClient.java create mode 100644 blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseWaybillDetentionVO.java create mode 100644 blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayTypeClient.java diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataGoodsShelfEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataGoodsShelfEntity.java index e8164f1f0..20dfdbb46 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataGoodsShelfEntity.java +++ b/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-未满 */ diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java index a5c869b96..4fc4da725 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java +++ b/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); + } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayTypeClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayTypeClient.java new file mode 100644 index 000000000..51ee3966c --- /dev/null +++ b/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); + +} diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseWaybillDetentionVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseWaybillDetentionVO.java new file mode 100644 index 000000000..ae62cf808 --- /dev/null +++ b/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; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataGoodsShelfDTO.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataGoodsShelfDTO.java index 9f5e757c1..6171a7ef5 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataGoodsShelfDTO.java +++ b/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; diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java index a90dc8169..fcb5343df 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java +++ b/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 implements IBasicdataGoodsShelfService { private BasicdataGoodsShelfMapper basicdataGoodsShelfMapper; @@ -77,7 +78,6 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl selectBasicdataGoodsShelfPage(IPage page, BasicdataGoodsShelfVO basicdataGoodsShelfVO) { return page.setRecords(baseMapper.selectBasicdataGoodsShelfPage(page, basicdataGoodsShelfVO)); @@ -94,8 +94,8 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl getGoodsShelfList(IPage page, Map basicdataGoodsShelf) { - IPage basicdataGoodsShelfVOIPage=basicdataGoodsShelfMapper.getGoodsShelfList(page,basicdataGoodsShelf); + public IPage getGoodsShelfList(IPage page, Map basicdataGoodsShelf) { + IPage basicdataGoodsShelfVOIPage = basicdataGoodsShelfMapper.getGoodsShelfList(page, basicdataGoodsShelf); // redisUtil.set("aaa","aaa"); // WebUtil.getResponseEncodedHtmlEscape() return basicdataGoodsShelfVOIPage; @@ -105,63 +105,70 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl>>>>>>>>>>>>>>>>>{}", 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 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 getQrRCodeImg(String qrCode, HttpServletResponse response) { String filename = null; @@ -210,8 +217,8 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl list= new ArrayList<>(); + List 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 map = JSONObject.parseObject(JSONObject.toJSONString(basicdataGoodsShelfEntity), Map.class); + Map 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 getShowTemplate(Map params,HttpServletResponse response) { + public R getShowTemplate(Map 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 { diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java index 35cbc2e30..cd2f36ca1 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java +++ b/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 selectBasicdataTrayPage(IPage page, BasicdataTrayVO BasicdataTray) { return page.setRecords(baseMapper.selectBasicdataTrayPage(page, BasicdataTray)); @@ -167,15 +171,19 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl>>>>>>>>>>>>>>>{}",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().lambda() - .eq(BasicdataTrayEntity::getId, basicdataTray.getId()) - .set(BasicdataTrayEntity::getTrayStatus, 1) - ); - return update; +// boolean update = this.update(new UpdateWrapper().lambda() +// .eq(BasicdataTrayEntity::getId, basicdataTray.getId()) +// .set(BasicdataTrayEntity::getTrayStatus, 1) +// ); + return aBoolean; } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseRetentionRecordController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseRetentionRecordController.java index d5010c44e..a696f1152 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseRetentionRecordController.java +++ b/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 pages = warehouseRetentionRecordService.selectWarehouseRetentionRecordPage(Condition.getPage(query), warehouseRetentionRecord); return R.data(pages); } + /** + * 滞留记录 运单 + */ + @GetMapping("/waybill") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "滞留记录 运单", notes = "传入warehouseRetentionRecord") + public R> waybill(WarehouseWaybillDetentionVO warehouseWaybillDetentionVO, Query query) { + IPage pages = warehouseRetentionRecordService.selectWarehouseRetentionWaybillPage(Condition.getPage(query), warehouseWaybillDetentionVO); + return R.data(pages); + } /** * 滞留记录 新增 diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayGoodsClient.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayGoodsClient.java index 68c08cf4a..f187b50c3 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayGoodsClient.java +++ b/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); + } } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayTypeClient.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayTypeClient.java new file mode 100644 index 000000000..f61144aab --- /dev/null +++ b/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); + } +} diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.java index 6e6e468a7..54ea1a0af 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.java +++ b/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 exportWarehouseRetentionRecord(@Param("ew") Wrapper queryWrapper); - + /** + * 滞留运单 + * warehouseWaybillDetentionVO + * @return + */ + List selectWarehouseWaybillRecordPage(IPage page,@Param("param") WarehouseWaybillDetentionVO warehouseWaybillDetentionVO); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.xml index 3bce34383..2e46d0579 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.xml @@ -44,5 +44,8 @@ + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.java index 172c08456..9489e8e2b 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.java @@ -23,4 +23,6 @@ public interface WarehouseTrayGoodsMapper extends BaseMapper getStockListByTrayTypeId(@Param("trayTypeId") Long trayTypeId); List getStockListNoDataByTrayTypeId(@Param("trayTypeId") Long trayTypeId); + + int deleteByMasterId(@Param("masterId") Long masterId); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml index edd34c3f5..0341aecf2 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml @@ -41,7 +41,9 @@ delete logpm_warehouse_tray_goods lwtg from lwtg.id = #{trayGoodsId} - + + delete from logpm_warehouse_tray_goods WHERE tray_id = #{masterId} +