diff --git a/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java b/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java index b8947397b..45ec65be1 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java +++ b/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java @@ -21,6 +21,7 @@ import org.springframework.util.StringUtils; import java.text.NumberFormat; import java.text.SimpleDateFormat; +import java.time.Instant; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.*; @@ -289,14 +290,20 @@ public class CommonUtil { public static String getHaxCodeByLong(String str,int changdu){ - long time = new Date().getTime(); - int hashValue = (str+time).hashCode(); // 获取哈希值（32位） - // 将32位哈希值转换为6位长度的纯数字形式 - String s = Math.abs(hashValue) + ""; - String substring = s.substring(0, changdu); - return substring; + // 计算输入字符串的哈希值 + int hash = str.hashCode(); + + // 结合当前时间戳和哈希值作为种子 + long seed = Instant.now().toEpochMilli() ^ hash; + + // 使用种子生成一个唯一的数字 + long uniqueNumber = Math.abs(seed) % (long)Math.pow(10, changdu); + + // 将生成的数字转换为字符串，并确保长度正确 + return String.format("%0" + changdu + "d", uniqueNumber); } + public static Date addDate(Date date, int second) { if(Objects.isNull(date)){ return null; diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/AdvanceDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/AdvanceDTO.java index 33d5d2d45..45945d43f 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/AdvanceDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/AdvanceDTO.java @@ -17,6 +17,8 @@ public class AdvanceDTO implements Serializable { private List warehouseIds; private Long advanceId; + private Long waybillId; + private List advanceIds = new ArrayList<>(); @@ -36,6 +38,11 @@ public class AdvanceDTO implements Serializable { private String trainNumber; private String serviceNum; private String brand; + private String orderPackageCode; + private String firstPackName; + private String secondPackName; + private String thirdPackName; + private String materialName; private Integer hasPackage; private Integer enterNum; diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java index 20b2c01e7..29590ed4f 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java @@ -1,5 +1,6 @@ package com.logpm.trunkline.dto; +import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; import lombok.Data; import java.io.Serializable; @@ -156,5 +157,7 @@ public class OpenOrderDTO implements Serializable { private Integer isEdit; + private List updateAdvanceDetailList; + } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceDetailEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceDetailEntity.java index e1c252fe6..33e137b21 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceDetailEntity.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceDetailEntity.java @@ -211,5 +211,14 @@ public class TrunklineAdvanceDetailEntity extends TenantEntity { */ @ApiModelProperty(name = "当前所在仓库名称", notes = "") private String nowWarehouseName; + @ApiModelProperty(name = "收入品类id", notes = "") + private Long incomeCategoryId;//收入品类id + @ApiModelProperty(name = "收入品类名称", notes = "") + private String incomeCategoryName;//收入品类名称 + @ApiModelProperty(name = "成本品类id", notes = "") + private Long costCategoryId;//成本品类id + @ApiModelProperty(name = "成本品类名称", notes = "") + private String costCategoryName;//成本品类名称 + } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/AdvanceDetailVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/AdvanceDetailVO.java new file mode 100644 index 000000000..1067d9025 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/AdvanceDetailVO.java @@ -0,0 +1,37 @@ +package com.logpm.trunkline.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +public class AdvanceDetailVO implements Serializable { + + private Long advanceDetailId;//暂存单明细id + + private String serviceNum;//服务号 + + private String orderCode;//订单号 + private String trainNumber;//车次号 + + private String orderPackageCode;//包件码 + + private String firstPackName;//一级品类 + private String secondPackName;//二级品类 + private String thirdPackName;//三级品类 + private String materialName;//物料名称 + + private Integer num;//数量 + private BigDecimal weight;//重量 + private BigDecimal volume;//体积 + + private String brand;//品牌 + + private Long incomeCategoryId;//收入品类id + private String incomeCategoryName;//收入品类名称 + + private Long costCategoryId;//成本品类id + private String costCategoryName;//成本品类名称 + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java index b37e5d760..e86651894 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockListController.java @@ -16,6 +16,7 @@ */ package com.logpm.distribution.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.distribution.dto.DistributionStockListDTO; @@ -79,7 +80,10 @@ public class DistributionStockListController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入distributionStockList") public R> list(@ApiIgnore @RequestParam Map distributionStockList, Query query) { - IPage pages = distributionStockListService.page(Condition.getPage(query), Condition.getQueryWrapper(distributionStockList, DistributionStockListEntity.class)); + + QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionStockList, DistributionStockListEntity.class); + queryWrapper.ne("quantity_stock", 0); + IPage pages = distributionStockListService.page(Condition.getPage(query), queryWrapper); return R.data(pages); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java index 05abf4554..f93bab9a0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionSignforClient.java @@ -121,13 +121,6 @@ public class DistributionSignforClient implements IDistributionSignforClient { @Override public Map clerkInventoryCheckPushData(String orderPackageCode) { - - - - - - - return distributionSignforService.clerkInventoryCheckPushData(orderPackageCode); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index 95738205c..0331af41b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -320,10 +320,7 @@ newldrs.reservation_id = #{reservationId} ANd newldrs.stock_list_status != 2 AND FIND_IN_SET(newldrs.stocklist_id,t.aaa)) AS planNum, - CASE ldslNew.source_type - WHEN 1 THEN t1.allocation_ids - ELSE t2.allocation_ids - END allocations + GROUP_CONCAT(DISTINCT IF(ldslNew.source_type = 1,t1.allocation_ids,t2.allocation_ids)) AS allocations, FROM ( SELECT @@ -343,7 +340,7 @@ AND ldrs.stock_list_status != 2 group by ldsl.cargo_number ) t - LEFT JOIN logpm_distribution_stock_list ldslNew ON t.cargo_number = ldslNew.cargo_number + LEFT JOIN logpm_distribution_stock_list ldslNew ON t.cargo_number = ldslNew.cargo_number and ldslNew.quantity_stock !=0 LEFT JOIN logpm_distribution_stock ldss ON FIND_IN_SET(ldss.stock_list_id,t.aaa) LEFT JOIN ( diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index be98e1163..1b19799da 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -1725,7 +1725,7 @@ AND ldl.is_deleted = 0 AND ldl.signfor_state = 2 - @@ -366,4 +367,117 @@ + + + + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderService.java index 6b9e355bb..c04085ce5 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderService.java @@ -91,6 +91,11 @@ public interface IOpenOrderService { R createOrderPackage(AdvanceDTO advanceDTO); + R findAdvanceDetailListByAdvanceIds(AdvanceDTO advanceDTO); + + R findAdvanceDetailListByWaybillId(AdvanceDTO advanceDTO); + + // R findWaybillInfo(String waybillNo); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java index aab0d4523..2d097a852 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java @@ -2,13 +2,11 @@ package com.logpm.trunkline.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.vo.OrderPackgeCodeDataVO; +import com.logpm.trunkline.dto.AdvanceDTO; import com.logpm.trunkline.dto.AdvanceDetailDTO; import com.logpm.trunkline.dto.OrderDetailsDTO; import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; -import com.logpm.trunkline.vo.AdvanceDetailGoodsVO; -import com.logpm.trunkline.vo.AdvanceDetailStockNumVO; -import com.logpm.trunkline.vo.BillladingPackageVO; -import com.logpm.trunkline.vo.TrunklineAdvanceDetailVO; +import com.logpm.trunkline.vo.*; import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; @@ -85,4 +83,8 @@ public interface ITrunklineAdvanceDetailService extends BaseService findListByOrderPackageCodeList(List orderPackageCodes); + + List findAdvanceDetailListByAdvanceIds(AdvanceDTO advanceDTO); + + List findAdvanceDetailListByWaybillId(AdvanceDTO advanceDTO); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index 3cfa6a2c9..505350d0c 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -262,48 +262,48 @@ public class OpenOrderServiceImpl implements IOpenOrderService { basicdataFreightApiVO.setDestination(openOrderVO.getDestinationCode()); basicdataFreightApiVO.setArrivalWarehouse(openOrderVO.getDestinationWarehouseId() + ""); - if (goodsList.isEmpty()) { - List ls = new ArrayList<>(); - //把list中的元素通过packName分组如果pickName为空则换为"其他" - Map> groupedEntities = list.stream() - .collect(Collectors.groupingBy(entity -> { - String packName = entity.getPackName(); - return packName != null ? packName : "其他"; - })); - - groupedEntities.keySet().forEach(packName -> { - int total; - List advanceEntityList = groupedEntities.get(packName); - total = advanceEntityList.stream().mapToInt(TrunklineAdvanceEntity::getTotalNum).sum(); - AdvanceDetailGoodsVO advanceDetailGoodsVO = new AdvanceDetailGoodsVO(); - advanceDetailGoodsVO.setChargeType(1); - advanceDetailGoodsVO.setGoodsName(packName); - advanceDetailGoodsVO.setNum(total); - advanceDetailGoodsVO.setVolume(BigDecimal.ZERO); - advanceDetailGoodsVO.setWeight(BigDecimal.ZERO); - ls.add(advanceDetailGoodsVO); - }); - goodsList = new ArrayList<>(ls); - } else { - for (AdvanceDetailGoodsVO advanceDetailGoodsVO : goodsList) { - String goodsName = advanceDetailGoodsVO.getGoodsName(); - BasicdataCategoryEntity basicdataCategoryEntity = basicdataCategoryClient.findByName(goodsName); - Long goodsId = null; - if (Objects.isNull(basicdataCategoryEntity)) { - basicdataCategoryEntity = new BasicdataCategoryEntity(); - basicdataCategoryEntity.setType(1); - basicdataCategoryEntity.setName(goodsName); - goodsId = basicdataCategoryClient.addReturnId(basicdataCategoryEntity); - } else { - goodsId = basicdataCategoryEntity.getId(); - } - advanceDetailGoodsVO.setGoodsId(goodsId); - basicdataFreightApiVO.setCategory(goodsId + ""); - List pirceList = basicdataFreightClient.pirce(basicdataFreightApiVO); - JSONArray price = JSONArray.parseArray(JSON.toJSONString(pirceList)); - advanceDetailGoodsVO.setArrPirce(price); - } - } +// if (goodsList.isEmpty()) { +// List ls = new ArrayList<>(); +// //把list中的元素通过packName分组如果pickName为空则换为"其他" +// Map> groupedEntities = list.stream() +// .collect(Collectors.groupingBy(entity -> { +// String packName = entity.getPackName(); +// return packName != null ? packName : "其他"; +// })); +// +// groupedEntities.keySet().forEach(packName -> { +// int total; +// List advanceEntityList = groupedEntities.get(packName); +// total = advanceEntityList.stream().mapToInt(TrunklineAdvanceEntity::getTotalNum).sum(); +// AdvanceDetailGoodsVO advanceDetailGoodsVO = new AdvanceDetailGoodsVO(); +// advanceDetailGoodsVO.setChargeType(1); +// advanceDetailGoodsVO.setGoodsName(packName); +// advanceDetailGoodsVO.setNum(total); +// advanceDetailGoodsVO.setVolume(BigDecimal.ZERO); +// advanceDetailGoodsVO.setWeight(BigDecimal.ZERO); +// ls.add(advanceDetailGoodsVO); +// }); +// goodsList = new ArrayList<>(ls); +// } else { +// for (AdvanceDetailGoodsVO advanceDetailGoodsVO : goodsList) { +// String goodsName = advanceDetailGoodsVO.getGoodsName(); +// BasicdataCategoryEntity basicdataCategoryEntity = basicdataCategoryClient.findByName(goodsName); +// Long goodsId = null; +// if (Objects.isNull(basicdataCategoryEntity)) { +// basicdataCategoryEntity = new BasicdataCategoryEntity(); +// basicdataCategoryEntity.setType(1); +// basicdataCategoryEntity.setName(goodsName); +// goodsId = basicdataCategoryClient.addReturnId(basicdataCategoryEntity); +// } else { +// goodsId = basicdataCategoryEntity.getId(); +// } +// advanceDetailGoodsVO.setGoodsId(goodsId); +// basicdataFreightApiVO.setCategory(goodsId + ""); +// List pirceList = basicdataFreightClient.pirce(basicdataFreightApiVO); +// JSONArray price = JSONArray.parseArray(JSON.toJSONString(pirceList)); +// advanceDetailGoodsVO.setArrPirce(price); +// } +// } @@ -508,18 +508,18 @@ public class OpenOrderServiceImpl implements IOpenOrderService { warehouseWayBillDetail.setWaybillNo(waybillEntity.getWaybillNo()); Long goodsId = waybillDetailDTO.getGoodsId(); String goodsName = waybillDetailDTO.getGoodsName(); - if (Objects.isNull(goodsId)) { - //如果品名id没有就先通过goodsName查寻，没有就新增 - BasicdataCategoryEntity basicdataCategoryEntity = basicdataCategoryClient.findByName(goodsName); - if (Objects.isNull(basicdataCategoryEntity)) { - basicdataCategoryEntity = new BasicdataCategoryEntity(); - basicdataCategoryEntity.setName(goodsName); - basicdataCategoryEntity.setType(1); - goodsId = basicdataCategoryClient.addReturnId(basicdataCategoryEntity); - } else { - goodsId = basicdataCategoryEntity.getId(); - } - } +// if (Objects.isNull(goodsId)) { +// //如果品名id没有就先通过goodsName查寻，没有就新增 +// BasicdataCategoryEntity basicdataCategoryEntity = basicdataCategoryClient.findByName(goodsName); +// if (Objects.isNull(basicdataCategoryEntity)) { +// basicdataCategoryEntity = new BasicdataCategoryEntity(); +// basicdataCategoryEntity.setName(goodsName); +// basicdataCategoryEntity.setType(1); +// goodsId = basicdataCategoryClient.addReturnId(basicdataCategoryEntity); +// } else { +// goodsId = basicdataCategoryEntity.getId(); +// } +// } warehouseWayBillDetail.setCreateUser(AuthUtil.getUserId()); warehouseWayBillDetail.setUpdateUser(AuthUtil.getUserId()); Date date = new Date(); @@ -582,6 +582,11 @@ public class OpenOrderServiceImpl implements IOpenOrderService { //修改暂存单的状态为已开单 advanceService.updateBatchById(advanceEntityList); + //修改暂存单明细的结算品类 + List updateAdvanceDetailList = openOrderDTO.getUpdateAdvanceDetailList(); + advanceDetailService.updateBatchById(updateAdvanceDetailList); + + //计算扫码入库的包件是否需要把运单和提货单挂上 openOrderAsyncService.dealwithBillladingInfo(advanceIds,warehouseId,warehouseName,waybillId,waybillNo); @@ -2165,6 +2170,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String warehouseName = openOrderDTO.getWarehouseName(); String editReson = openOrderDTO.getEditReson(); String refer = openOrderDTO.getRefer(); + List updateAdvanceDetailList = openOrderDTO.getUpdateAdvanceDetailList(); WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId); if (Objects.isNull(waybillEntity)) { @@ -2184,6 +2190,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService { warehouseWaybillClient.updateEntity(waybillEntity); + advanceDetailService.updateBatchById(updateAdvanceDetailList); + // String operationRemark = "修改运单"+waybillNo+",时间："+ CommonUtil.dateToString(waybillEntity.getCreateTime())+","+updateMsg; //异步存入日志 openOrderAsyncService.saveUpdateLog(waybillId, waybillNo, "888", editReson, "备注："+refer+" 修改内容："+updateMsg, AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName,waybillEntity); @@ -3441,6 +3449,23 @@ public class OpenOrderServiceImpl implements IOpenOrderService { return R.success("添加成功"); } + @Override + public R findAdvanceDetailListByAdvanceIds(AdvanceDTO advanceDTO) { + List advanceIds = advanceDTO.getAdvanceIds(); + + List advanceDetailVOList = advanceDetailService.findAdvanceDetailListByAdvanceIds(advanceDTO); + + return R.data(advanceDetailVOList); + } + + @Override + public R findAdvanceDetailListByWaybillId(AdvanceDTO advanceDTO) { + + List advanceDetailVOList = advanceDetailService.findAdvanceDetailListByWaybillId(advanceDTO); + + return R.data(advanceDetailVOList); + } + private List verifyData(OpenOrderDTO openOrderDTO, WarehouseWaybillEntity waybillEntity) { log.info("###################verifyData: 验证改单数据"); // StringBuilder stringBuilder = new StringBuilder(); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java index e6c150176..79f265c73 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java @@ -11,6 +11,7 @@ import com.logpm.basic.entity.BasicPrintTemplateEntity; import com.logpm.basic.feign.IBasicPrintTemplateClient; import com.logpm.distribution.vo.DistributionStockArticleQRCodeVO; import com.logpm.distribution.vo.OrderPackgeCodeDataVO; +import com.logpm.trunkline.dto.AdvanceDTO; import com.logpm.trunkline.dto.AdvanceDetailDTO; import com.logpm.trunkline.dto.OrderDetailsDTO; import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; @@ -18,11 +19,7 @@ import com.logpm.trunkline.entity.TrunklineAdvanceEntity; import com.logpm.trunkline.mapper.TrunklineAdvanceDetailMapper; import com.logpm.trunkline.mapper.TrunklineAdvanceMapper; import com.logpm.trunkline.service.ITrunklineAdvanceDetailService; -import com.logpm.trunkline.vo.AdvanceDetailGoodsVO; -import com.logpm.trunkline.vo.AdvanceDetailStockNumVO; -import com.logpm.trunkline.vo.BillladingPackageVO; -import com.logpm.trunkline.vo.OrderDetailInfoVO; -import com.logpm.trunkline.vo.TrunklineAdvanceDetailVO; +import com.logpm.trunkline.vo.*; import com.logpm.warehouse.entity.WarehouseWaybillEntity; import com.logpm.warehouse.feign.IWarehouseWaybillClient; import lombok.AllArgsConstructor; @@ -350,4 +347,14 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl advanceDetailEntities = baseMapper.selectList(queryWrapper); return advanceDetailEntities; } + + @Override + public List findAdvanceDetailListByAdvanceIds(AdvanceDTO advanceDTO) { + return baseMapper.findAdvanceDetailListByAdvanceIds(advanceDTO); + } + + @Override + public List findAdvanceDetailListByWaybillId(AdvanceDTO advanceDTO) { + return baseMapper.findAdvanceDetailListByWaybillId(advanceDTO); + } } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java index 74a04552b..c22ca2548 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java @@ -588,6 +588,13 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl