From cf43f66a917d1592f80a4ab19132556da139eba9 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Sat, 26 Oct 2024 17:28:47 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/IDistributionParcelListClient.java | 2 + .../com/logpm/trunkline/dto/LoadCarsDTO.java | 10 ++ .../feign/IWarehouseWaybillClient.java | 2 + .../feign/DistributionParcelListClient.java | 13 +++ .../mapper/DistributionParcelListMapper.java | 2 + .../mapper/DistributionParcelListMapper.xml | 8 ++ .../IDistributionParcelListService.java | 3 + .../DistributionParcelListServiceImpl.java | 5 + .../factory/receiver/DealWithDataHandler.java | 7 +- .../mapper/TrunklineAdvanceDetailMapper.java | 4 + .../mapper/TrunklineAdvanceDetailMapper.xml | 18 +++ .../mapper/TrunklineCarsLoadScanMapper.xml | 103 ++++++++++++++++++ .../ITrunklineAdvanceDetailService.java | 4 + .../service/impl/OpenOrderServiceImpl.java | 74 +++++++++---- .../TrunklineAdvanceDetailServiceImpl.java | 10 ++ .../impl/TrunklineCarsLoadServiceImpl.java | 18 +++ .../feign/WarehouseWaybillClient.java | 5 + .../mapper/WarehouseWaybillMapper.java | 2 + .../mapper/WarehouseWaybillMapper.xml | 10 ++ .../service/IWarehouseWaybillService.java | 2 + .../impl/WarehouseWaybillServiceImpl.java | 5 + 21 files changed, 281 insertions(+), 26 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java index 4afae622e..d6b266310 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java @@ -304,5 +304,7 @@ public interface IDistributionParcelListClient { @PostMapping(API_PREFIX + "/findListByOrderPackageCodes") List findListByOrderPackageCodes(@RequestBody List orderPackageCodes); + @PostMapping(API_PREFIX + "/deleteListByOrderPackageCodes") + R deleteListByOrderPackageCodes(@RequestBody FindParamterDTO findParamterDTO); } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java index c6733df1a..5755525d6 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java @@ -137,6 +137,16 @@ public class LoadCarsDTO implements Serializable { private String customerTrain; private String remark; + private String firsts; + + private String senconds; + + private String thirds; + + private String materialCode; + + private String materialName; + private String url; private Integer incomingType; diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillClient.java index 40de17732..150d2e637 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillClient.java @@ -95,4 +95,6 @@ public interface IWarehouseWaybillClient { @GetMapping(API_PREFIX+"/deleteByWaybillNo") void deleteByWaybillNo(String waybillNo); + @PostMapping(API_PREFIX + "/deleteByWaybillIds") + void deleteByWaybillIds(@RequestBody List waybillIds); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java index 3d8b9ada3..b126f0614 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java @@ -641,4 +641,17 @@ public class DistributionParcelListClient implements IDistributionParcelListClie return distributionParcelListService.findListByOrderPackageCodes(orderPackageCodes); } + @Override + public R deleteListByOrderPackageCodes(FindParamterDTO findParamterDTO) { + List orderPackageCodeList = findParamterDTO.getOrderPackageCodeList(); + Long warehouseId = findParamterDTO.getWarehouseId(); + + try{ + distributionParcelListService.deleteListByOrderPackageCodes(orderPackageCodeList,warehouseId); + }catch (Exception e){ + return R.fail("删除失败"); + } + return R.success("删除成功"); + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java index 4588f2d8c..116de710c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java @@ -338,4 +338,6 @@ public interface DistributionParcelListMapper extends BaseMapper findListByOrderPackageCodes(@Param("orderPackageCodes") List orderPackageCodes); List findWaybillNoByOrderIds(@Param("stockArticleIds") Set stockArticleIds); + + void deleteListByOrderPackageCodes(@Param("orderPackageCodeList") List orderPackageCodeList,@Param("warehouseId") Long warehouseId); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index 657b8242d..5e3e55136 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -2267,5 +2267,13 @@ + + delete from logpm_distribution_parcel_list + where order_package_code in + + #{item} + + and warehouse_id = #{warehouseId} + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java index c2d3fa8a5..d6280132f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java @@ -310,4 +310,7 @@ public interface IDistributionParcelListService extends BaseService findListByOrderPackageCodes(List orderPackageCodes); List findWaybillNoByOrderIds(Set stockArticleIds); + + void deleteListByOrderPackageCodes(List orderPackageCodeList,Long warehouseId); + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index e7d62894d..ac96df667 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -1578,4 +1578,9 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl findWaybillNoByOrderIds(Set stockArticleIds) { return baseMapper.findWaybillNoByOrderIds(stockArticleIds); } + + @Override + public void deleteListByOrderPackageCodes(List orderPackageCodeList, Long warehouseId) { + baseMapper.deleteListByOrderPackageCodes(orderPackageCodeList,warehouseId); + } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java index c9213cff5..b46312e99 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java @@ -1,10 +1,8 @@ package com.logpm.factory.receiver; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.logpm.factory.comfac.dto.OrderStatusDTO; import com.logpm.factory.comfac.mapper.OrderPackageStatusPushFailLogMapper; import com.logpm.factory.comfac.service.IFactoryCommonService; -import com.logpm.factory.entity.OrderPackageStatusPushFailLogEntity; import com.rabbitmq.client.Channel; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.RabbitConstant; @@ -16,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.io.IOException; -import java.util.List; import java.util.Map; @@ -44,7 +41,7 @@ public class DealWithDataHandler { // 如果手动ACK,消息会被监听消费,但是消息在队列中依旧存在,如果 未配置 acknowledge-mode 默认是会在消费完毕后自动ACK掉 OrderStatusDTO orderStatusDTO = (OrderStatusDTO) map.get("messageData"); - log.info("############dealWithDataHandler: 处理在库订单数据到新系统 {}",orderStatusDTO); + log.info("############dealWithDataHandler: 处理在库订单数据到新系统 2024-10-26-14-53关闭 {}",orderStatusDTO); String status = orderStatusDTO.getStatus(); String unitNo = orderStatusDTO.getUnitNo(); String operationTime = orderStatusDTO.getOperationTime(); @@ -57,7 +54,7 @@ public class DealWithDataHandler { } log.info("##################dealWithDataHandler: 处理在库订单数据到新系统 来源：{} 品牌：{}",sourceName,orderStatusDTO.getBrandName()); if("汇通".equals(sourceName)){ - factoryCommonService.extracted(status, unitNo, currentWarehouseId, operationTime, trayId); +// factoryCommonService.extracted(status, unitNo, currentWarehouseId, operationTime, trayId); }else{ log.warn(">>>> 不是汇通的数据 不进入汇通入库数据"); } 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 8e8136eee..62f6ae26e 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 @@ -89,4 +89,8 @@ public interface TrunklineAdvanceDetailMapper extends BaseMapper findListByAdvanceIds(@Param("advanceIds") List advanceIds); void deleteByAdvanceIds(@Param("advanceIds") List advanceIds); + + Integer findIncomingNumByAdvanceIds(@Param("advanceIds") List advanceIds); + + List findOrderPackageCodesByAdvanceIds(@Param("advanceIds") List advanceIds); } 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 7c8cb28db..b29fa87f1 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 @@ -573,4 +573,22 @@ + + + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml index 54b3bb331..53c061573 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml @@ -157,6 +157,21 @@ and Locate(#{param.destinationWarehouseName},lww.destination_warehouse_name) > 0 + + and cls.firsts like concat('%',#{param.firsts},'%') + + + and cls.senconds like concat('%',#{param.senconds},'%') + + + and cls.thirds like concat('%',#{param.thirds},'%') + + + and cls.material_code like concat('%',#{param.materialCode},'%') + + + and cls.material_name like concat('%',#{param.materialName},'%') + order by cls.loading_abnormal desc,cls.unload_abnormal desc,cls.create_time asc @@ -738,6 +753,94 @@ from logpm_trunkline_cars_load_scan ltcls left join logpm_warehouse_waybill lww on ltcls.waybill_id = lww.id where ltcls.load_id = #{param.loadId} + + and Locate(#{param.waybillNo},ltcls.waybill_no) > 0 + + + and Locate(#{param.orderCode},ltcls.order_code) > 0 + + + and Locate(#{param.scanCode},ltcls.scan_code) > 0 + + + and Locate(#{param.loadingUserName},ltcls.loading_user_name) > 0 + + + and Locate(#{param.warehouseName},ltcls.warehouse_name) > 0 + + + and Locate(#{param.finalNodeName},ltcls.final_node_name) > 0 + + + and Locate(#{param.finalNodeName},ltcls.final_node_name) > 0 + + + and ltcls.scan_status = #{param.scanStatus} + + + and Locate(#{param.trayName},ltcls.tray_name) > 0 + + + and Locate(#{param.trayCode},ltcls.tray_code) > 0 + + + and Locate(#{param.unloadTrayName},ltcls.unload_tray_name) > 0 + + + and Locate(#{param.unloadTrayCode},ltcls.unload_tray_code) > 0 + + + and Locate(#{param.unloadNodeName},ltcls.unload_node_name) > 0 + + + and Locate(#{param.unloadUserName},ltcls.unload_user_name) > 0 + + + and ltcls.`type` = #{param.type} + + + and ltcls.is_data = #{param.isData} + + + and ltcls.loading_abnormal = #{param.loadingAbnormal} + + + and ltcls.unload_abnormal = #{param.unloadAbnormal} + + + and ltcls.is_supple = #{param.isSupple} + + + and ltcls.create_time >= #{param.createTimeStart} + + + and ltcls.create_time <= #{param.createTimeEnd} + + + and ltcls.unload_time >= #{param.unloadTimeStart} + + + and ltcls.unload_time <= #{param.unloadTimeEnd} + + + and Locate(#{param.destinationWarehouseName},lww.destination_warehouse_name) > 0 + + + and ltcls.firsts like concat('%',#{param.firsts},'%') + + + and ltcls.senconds like concat('%',#{param.senconds},'%') + + + and ltcls.thirds like concat('%',#{param.thirds},'%') + + + and ltcls.material_code like concat('%',#{param.materialCode},'%') + + + and ltcls.material_name like concat('%',#{param.materialName},'%') + + order by ltcls.loading_abnormal desc,ltcls.unload_abnormal desc,ltcls.create_time asc 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 d9df912ac..9b51a7146 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 @@ -106,4 +106,8 @@ public interface ITrunklineAdvanceDetailService extends BaseService findListByAdvanceIds(List advanceIds); void deleteByAdvanceIds(List advanceIds); + + Integer findIncomingNumByAdvanceIds(List advanceIds); + + List findOrderPackageCodesByAdvanceIds(List advanceIds); } 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 ac308de89..2004f333c 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 @@ -16,6 +16,8 @@ import com.logpm.basicdata.entity.*; import com.logpm.basicdata.feign.*; import com.logpm.basicdata.vo.BasicdataClientVO; import com.logpm.basicdata.vo.BasicdataFreightApiVO; +import com.logpm.distribution.dto.FindParamterDTO; +import com.logpm.distribution.dto.OrderPackageDTO; import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.entity.DistributionParcelNumberEntity; import com.logpm.distribution.entity.DistributionStockArticleEntity; @@ -1144,11 +1146,13 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceService.updateBatchById(listByIds); } + @Transactional(rollbackFor = Exception.class) @Override public void deletedAdvance(AdvanceDTO advanceDTO) { List advanceIds = advanceDTO.getAdvanceIds(); Long warehouseId = advanceDTO.getWarehouseId(); + //查询包件是否已经不在库 List parcelListEntities = distributionParcelListClient.findPackagesByAdvanceIdsAndNoStock(advanceIds, warehouseId); if (!parcelListEntities.isEmpty()) { @@ -1157,12 +1161,32 @@ public class OpenOrderServiceImpl implements IOpenOrderService { } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("advance_id",advanceIds); + List detailEntityList = advanceDetailService.list(queryWrapper); + //把detailEntityList所有的orderPackageCode放入一个List + List orderPackageCodeList = detailEntityList.stream().map(TrunklineAdvanceDetailEntity::getOrderPackageCode).collect(Collectors.toList()); + Set orderCodeList = detailEntityList.stream().map(TrunklineAdvanceDetailEntity::getOrderCode).collect(Collectors.toSet()); + + FindParamterDTO findParamterDTO = new FindParamterDTO(); + findParamterDTO.setOrderPackageCodeList(orderPackageCodeList); + findParamterDTO.setWarehouseId(warehouseId); + + R r = distributionParcelListClient.deleteListByOrderPackageCodes(findParamterDTO); + int code = r.getCode(); + if(code != 200){ + log.warn("############deletedAdvance: 删除订单失败"); + throw new CustomerException(405, "删除订单失败"); + } + + OrderPackageDTO orderPackageDTO = new OrderPackageDTO(); + orderPackageDTO.setStrings(new ArrayList<>(orderCodeList)); + orderPackageDTO.setWarehouseId(warehouseId); + distributionStockArticleClient.updateOrdersInfo(orderPackageDTO); + advanceDetailService.deleteByAdvanceIds(advanceIds); advanceService.deletedAdvance(advanceIds); - //删除所有在库包件，并更新订单信息 - distributionParcelListClient.findAllOrderCodesAndDeleteByAdvanceIds(advanceIds, warehouseId); - } @Override @@ -2447,26 +2471,34 @@ public class OpenOrderServiceImpl implements IOpenOrderService { advanceDetailModel.setQuantity(1); advanceDetailModel.setServiceNum(advanceEntity.getServiceNum()); advanceDetailModel.setPackageStatus("0"); + + String volume1 = importStandardOuPaiDTO.getVolume(); + if(StringUtil.isBlank(volume1)){ + volume1 = "0"; + } + advanceDetailModel.setVolume(new BigDecimal(volume1)); + + String materialName = StringUtil.isNotBlank(importStandardOuPaiDTO.getMaterialName())?importStandardOuPaiDTO.getMaterialName():""; String materialCode = StringUtil.isNotBlank(importStandardOuPaiDTO.getMaterialCode())?importStandardOuPaiDTO.getMaterialCode():""; - BasicMaterialEntity basicMaterialEntity = materialEntityMap.get(materialCode + "&&" + materialName); - - if(!Objects.isNull(basicMaterialEntity)){ - advanceDetailModel.setMaterialId(basicMaterialEntity.getId()); - advanceDetailModel.setMaterialCode(materialCode); - advanceDetailModel.setMaterialName(materialName); - String weight = basicMaterialEntity.getWeight(); - if(StringUtil.isBlank(weight)){ - weight = "0"; - } - String volume1 = basicMaterialEntity.getVolume(); - if(StringUtil.isBlank(volume1)){ - volume1 = "0"; - } - advanceDetailModel.setWeight(new BigDecimal(weight)); - advanceDetailModel.setVolume(new BigDecimal(volume1)); - } +// BasicMaterialEntity basicMaterialEntity = materialEntityMap.get(materialCode + "&&" + materialName); +// +// if(!Objects.isNull(basicMaterialEntity)){ +// advanceDetailModel.setMaterialId(basicMaterialEntity.getId()); +// advanceDetailModel.setMaterialCode(materialCode); +// advanceDetailModel.setMaterialName(materialName); +// String weight = basicMaterialEntity.getWeight(); +// if(StringUtil.isBlank(weight)){ +// weight = "0"; +// } +// String volume1 = basicMaterialEntity.getVolume(); +// if(StringUtil.isBlank(volume1)){ +// volume1 = "0"; +// } +// advanceDetailModel.setWeight(new BigDecimal(weight)); +// advanceDetailModel.setVolume(new BigDecimal(volume1)); +// } // if (StringUtil.isNotBlank(materialCode) && StringUtil.isNotBlank(materialName)) { // Long materialId = materialMap.get(materialCode); @@ -4146,7 +4178,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { openOrderAsyncService.saveLog(waybillEntity.getId(), waybillEntity.getWaybillNo(), "1000", "作废运单", createOperationRemark+" 原因："+abolishReson, AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName); }); - warehouseWaybillClient.updateList(waybillList); + warehouseWaybillClient.deleteByWaybillIds(waybillIds); if(CollUtil.isNotEmpty(clearWaybillInfoParceListIds)){ distributionParcelListClient.clearWaybillInfoByParceListIds(clearWaybillInfoParceListIds); } 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 43823651a..2ada04268 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 @@ -557,4 +557,14 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl advanceIds) { baseMapper.deleteByAdvanceIds(advanceIds); } + + @Override + public Integer findIncomingNumByAdvanceIds(List advanceIds) { + return baseMapper.findIncomingNumByAdvanceIds(advanceIds); + } + + @Override + public List findOrderPackageCodesByAdvanceIds(List advanceIds) { + return baseMapper.findOrderPackageCodesByAdvanceIds(advanceIds); + } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 1b5507005..11fb287c3 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -7681,6 +7681,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl waybillIds) { + warehouseWaybillService.deleteByWaybillIds(waybillIds); + } } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java index 38cc0311d..f9e2dc6ed 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java @@ -74,4 +74,6 @@ public interface WarehouseWaybillMapper extends BaseMapper financeWaybillListExport(@Param("param") WarehouseWaybillDTO waybillDTO); + + void deleteByWaybillIds(@Param("waybillIds") List waybillIds); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml index 61f5f5648..221d80d08 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml @@ -184,6 +184,7 @@ lww.cancle_check_user_name cancleCheckUserName, lww.cancle_check_time cancleCheckTime, lww.waybill_status waybillStatus, + lww.agent agent, lww.waybill_type waybillType, lww.document_making_time documentMakingTime, lww.create_time createTime, @@ -942,6 +943,7 @@ lww.departure departure, lww.departure_warehouse_name departureWarehouseName, lww.destination_warehouse_name destinationWarehouseName, + lww.agent agent, lww.delivery_way deliveryWay, lww.customer_train customerTrain, IFNULL(lww.return_status,0) returnStatus, @@ -1153,4 +1155,12 @@ order by lww.create_time desc + + delete from logpm_warehouse_waybill + where id in + + #{item} + + + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java index 7c55487ea..8708a3d9d 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java @@ -86,4 +86,6 @@ public interface IWarehouseWaybillService extends BaseService financeWaybillListExport(WarehouseWaybillDTO waybillDTO); + + void deleteByWaybillIds(List waybillIds); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java index 555f32502..57d989c4c 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java @@ -1172,4 +1172,9 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl waybillIds) { + baseMapper.deleteByWaybillIds(waybillIds); + } }