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/receiver/WarehouseTrayAllocationListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/WarehouseTrayAllocationListener.java index d463b4bc2..1e5fd3b30 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/WarehouseTrayAllocationListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/WarehouseTrayAllocationListener.java @@ -842,7 +842,7 @@ public class WarehouseTrayAllocationListener { String[] split = storageLocation.split(","); List allocationList = new ArrayList<>(Arrays.asList(split)); allocationList.add(allocationName); - updateStockListEntity.setTrayName(StringUtil.join(allocationList,",")); + updateStockListEntity.setStorageLocation(StringUtil.join(allocationList,",")); updateStockListList.add(updateStockListEntity); } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java index d2592dd20..9058c76e9 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java @@ -350,6 +350,60 @@ public class OpenOrderController { } } + @ResponseBody + @PostMapping("/findAdvanceDetailListByAdvanceIds") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "查询暂存单明细", notes = "传入waybillDTO") + public R findAdvanceDetailListByAdvanceIds(@RequestBody AdvanceDTO advanceDTO) { + String method = "############findAdvanceDetailListByAdvanceIds: "; + log.info(method + "请求参数{}", advanceDTO); + List advanceIds = advanceDTO.getAdvanceIds(); + try{ + + if(CollUtil.isEmpty(advanceIds)){ + log.warn(method+"未选择暂存单 advanceIds={}",advanceIds); + return R.fail(403,"未选择暂存单"); + } + + return openOrderService.findAdvanceDetailListByAdvanceIds(advanceDTO); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常",e); + return R.fail(500,"系统异常"); + } + } + + + @ResponseBody + @PostMapping("/findAdvanceDetailListByWaybillId") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "查询暂存单明细通过运单id", notes = "传入waybillDTO") + public R findAdvanceDetailListByWaybillId(@RequestBody AdvanceDTO advanceDTO) { + String method = "############findAdvanceDetailListByWaybillId: "; + log.info(method + "请求参数{}", advanceDTO); + Long waybillId = advanceDTO.getWaybillId(); + try{ + + if(Objects.isNull(waybillId)){ + log.warn(method+"未选择运单 waybillId={}",waybillId); + return R.fail(403,"未选择运单"); + } + + return openOrderService.findAdvanceDetailListByWaybillId(advanceDTO); + }catch (CustomerException e){ + log.error(e.message,e); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常",e); + return R.fail(500,"系统异常"); + } + } + + + + @ResponseBody @PostMapping("/advanceNoPackageToWaybillInfo") @ApiOperationSupport(order = 1) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java index a48a34efb..fed8426ca 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java @@ -2,6 +2,7 @@ package com.logpm.trunkline.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.trunkline.dto.AdvanceDTO; import com.logpm.trunkline.dto.AdvanceDetailDTO; import com.logpm.trunkline.dto.OrderDetailsDTO; import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; @@ -72,4 +73,8 @@ public interface TrunklineAdvanceDetailMapper extends BaseMapper findAdvanceDetailListByAdvanceIds(@Param("param") AdvanceDTO advanceDTO); + + List findAdvanceDetailListByWaybillId(@Param("param") AdvanceDTO advanceDTO); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml index c61955c18..f38eddc76 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml @@ -45,7 +45,8 @@ @@ -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