diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java index 807c8268c..ea8a26518 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java @@ -915,5 +915,46 @@ public class SyncOrderInfoToPlatform { return ReturnT.SUCCESS; } + @XxlJob("syncWaybillInfoParceList") + public ReturnT syncWaybillInfoParceList(String param) { + log.info("############syncWaybillInfoParceList: 同步运单下订单信息 开始"); + + if(StringUtil.isBlank(param)){ + log.warn("###########syncWaybillOrderInfo: 仓库id为空"); + throw new CustomerException(405,"仓库id为空"); + } + + List list = warehouseMappingDataService.findAllNeedWaybillList(); + + list.forEach(json -> { + + Integer id = json.getInt("id"); + String waybillNo = json.getStr("waybillNo"); + + WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo); + if(Objects.isNull(warehouseWaybillEntity)){ + log.warn("###########syncWaybillOrderInfo: 运单信息为空"); + throw new CustomerException(405,"运单信息为空"); + } + + List orderCodes = warehouseMappingDataService.findOrderCodeList(waybillNo); + + Long waybillId = warehouseWaybillEntity.getId(); + Long departureWarehouseId = warehouseWaybillEntity.getDepartureWarehouseId(); + String departureWarehouseName = warehouseWaybillEntity.getDepartureWarehouseName(); + Long destinationWarehouseId = warehouseWaybillEntity.getDestinationWarehouseId(); + String destinationWarehouseName = warehouseWaybillEntity.getDestinationWarehouseName(); + + warehouseMappingDataService.updateParcelListWaybillInfo(orderCodes,waybillId,waybillNo,departureWarehouseId,departureWarehouseName,destinationWarehouseId,destinationWarehouseName); + + + warehouseMappingDataService.updateRepairParcelListWaybillById(id,1); + }); + + log.info("############syncWaybillOrderInfo: 同步运单信息 完成"); + + return ReturnT.SUCCESS; + } + } diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java index 681884fdf..ee7eba422 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.java @@ -138,5 +138,13 @@ public interface WarehouseMappingDataMapper { List findSyncWaybillOrderInfo(); void updateSyncWaybillOrderRecordById(@Param("id") Integer id, @Param("status") int status); + + List findAllNeedWaybillList(); + + List findOrderCodeList(@Param("waybillNo") String waybillNo); + + void updateParcelListWaybillInfo(@Param("orderCodes") List orderCodes, @Param("waybillId") Long waybillId, @Param("waybillNo") String waybillNo, @Param("departureWarehouseId") Long departureWarehouseId, @Param("departureWarehouseName") String departureWarehouseName, @Param("destinationWarehouseId") Long destinationWarehouseId, @Param("destinationWarehouseName") String destinationWarehouseName); + + void updateRepairParcelListWaybillById(@Param("id") Integer id, @Param("status") int status); } diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml index 28ecd7a2c..11930acef 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml @@ -451,4 +451,40 @@ where id = #{id} + + + + + + update logpm_distribution_parcel_list + set ldpl.waybill_id = #{waybillId}, + ldpl.waybill_number = #{waybillNo}, + ldpl.send_warehouse_name = #{departureWarehouseName}, + ldpl.send_warehouse_id = #{departureWarehouseId}, + ldpl.accept_warehouse_id = #{destinationWarehouseId}, + ldpl.accept_warehouse_name = #{destinationWarehouseName} + where ldpl.order_code in + + #{item} + + + + + update repair_parcel_list_waybill + set status = #{status} + where id = #{id} + + + diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java index a0525a212..430e60ee8 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/IWarehouseMappingDataService.java @@ -119,4 +119,12 @@ public interface IWarehouseMappingDataService { List findSyncWaybillOrderInfo(); void updateSyncWaybillOrderRecordById(Integer id, int status); + + List findAllNeedWaybillList(); + + List findOrderCodeList(String waybillNo); + + void updateParcelListWaybillInfo(List orderCodes, Long waybillId, String waybillNo, Long departureWarehouseId, String departureWarehouseName, Long destinationWarehouseId, String destinationWarehouseName); + + void updateRepairParcelListWaybillById(Integer id, int status); } diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java index 36712be59..2379d9409 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/WarehouseMappingDataServiceImpl.java @@ -285,4 +285,24 @@ public class WarehouseMappingDataServiceImpl implements IWarehouseMappingDataSer public void updateSyncWaybillOrderRecordById(Integer id, int status) { warehouseMappingDataMapper.updateSyncWaybillOrderRecordById(id,status); } + + @Override + public List findAllNeedWaybillList() { + return warehouseMappingDataMapper.findAllNeedWaybillList(); + } + + @Override + public List findOrderCodeList(String waybillNo) { + return warehouseMappingDataMapper.findOrderCodeList(waybillNo); + } + + @Override + public void updateParcelListWaybillInfo(List orderCodes, Long waybillId, String waybillNo, Long departureWarehouseId, String departureWarehouseName, Long destinationWarehouseId, String destinationWarehouseName) { + warehouseMappingDataMapper.updateParcelListWaybillInfo(orderCodes,waybillId,waybillNo,departureWarehouseId,departureWarehouseName,destinationWarehouseId,destinationWarehouseName); + } + + @Override + public void updateRepairParcelListWaybillById(Integer id, int status) { + warehouseMappingDataMapper.updateRepairParcelListWaybillById(id,status); + } } 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 42b7e598b..8e8136eee 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 @@ -87,4 +87,6 @@ public interface TrunklineAdvanceDetailMapper extends BaseMapper advanceIds, @Param("waybillNo") String waybillNo, @Param("waybillId") Long waybillId); List findListByAdvanceIds(@Param("advanceIds") List advanceIds); + + void deleteByAdvanceIds(@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 7f1d00c35..a5eb4faad 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 @@ -565,4 +565,12 @@ + + delete from logpm_trunkline_advance_detail + where advance_id in + + #{item} + + + 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 3deb213cd..d9df912ac 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 @@ -104,4 +104,6 @@ public interface ITrunklineAdvanceDetailService extends BaseService advanceIds, String waybillNo, Long waybillId); List findListByAdvanceIds(List advanceIds); + + void deleteByAdvanceIds(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 dcf9c6863..2261c3591 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 @@ -1059,9 +1059,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService { throw new CustomerException(405, "已有包件出库，不能删除"); } - for (Long advanceId : advanceIds) { - advanceDetailService.deleteByAdvanceId(advanceId); - } + + advanceDetailService.deleteByAdvanceIds(advanceIds); advanceService.deletedAdvance(advanceIds); //删除所有在库包件，并更新订单信息 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 a6a2b68d2..43823651a 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 @@ -552,4 +552,9 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl findListByAdvanceIds(List advanceIds) { return baseMapper.findListByAdvanceIds(advanceIds); } + + @Override + public void deleteByAdvanceIds(List advanceIds) { + baseMapper.deleteByAdvanceIds(advanceIds); + } }