From debe73f2997ecf18ad79857350fc50697c4ebe81 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 6 Dec 2023 17:24:09 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF=E6=A8=A1=E5=9D=97=E4=BB=A3?= =?UTF-8?q?=E7=A0=81bug=E4=BF=AE=E5=A4=8D=202.=E5=90=8C=E6=AD=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=92=8C=E6=8E=A8=E9=80=81=E6=95=B0=E6=8D=AE=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E8=BF=90=E5=8D=95=E5=92=8C=E8=AE=A2=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oldproject/entity/AdvanceEntity.java | 4 +- .../oldproject/feign/IAdvanceClient.java | 3 + .../feign/IAdvanceDetailClient.java | 5 +- .../feign/IDetailProductClient.java | 7 +- .../oldproject/feign/IWayBillClient.java | 4 + .../entity/TrunklineCarsLoadEntity.java | 4 + .../entity/TrunklineCarsLoadLineEntity.java | 8 + .../feign/ITrunklineAdvanceClient.java | 20 ++ .../feign/ITrunklineAdvanceDetailClient.java | 21 ++ .../feign/ITrunklineDetailProductClient.java | 23 ++ .../feign/ITrunklineWaybillOrderClient.java | 25 ++ .../impl/PanFactoryDataServiceImpl.java | 211 +++++++++++++++++ .../logpm/oldproject/feign/AdvanceClient.java | 8 + .../oldproject/feign/AdvanceDetailClient.java | 5 + .../oldproject/feign/DetailProductClient.java | 5 + .../logpm/oldproject/feign/WayBillClient.java | 7 + .../mapper/AdvanceDetailMapper.java | 2 + .../oldproject/mapper/AdvanceDetailMapper.xml | 6 + .../oldproject/mapper/AdvanceMapper.java | 1 + .../logpm/oldproject/mapper/AdvanceMapper.xml | 12 + .../mapper/DetailProductMapper.java | 2 + .../oldproject/mapper/DetailProductMapper.xml | 6 + .../logpm/oldproject/mapper/OrderMapper.xml | 2 + .../oldproject/mapper/WayBillMapper.java | 4 + .../logpm/oldproject/mapper/WayBillMapper.xml | 6 + .../service/IAdvanceDetailService.java | 2 + .../oldproject/service/IAdvanceService.java | 2 + .../service/IDetailProductService.java | 1 + .../oldproject/service/IWayBillService.java | 3 + .../impl/AdvanceDetailServiceImpl.java | 5 + .../service/impl/AdvanceServiceImpl.java | 5 + .../impl/DetailProductServiceImpl.java | 5 + .../service/impl/WayBillServiceImpl.java | 7 + blade-service/logpm-patch/pom.xml | 6 + .../impl/SyncOrderInfoServiceImpl.java | 216 +++++++++++++++++- .../feign/TrunklineAdvanceClient.java | 26 +++ .../feign/TrunklineAdvanceDetailClient.java | 24 ++ .../feign/TrunklineDetailProductClient.java | 33 +++ .../feign/TrunklineWaybillOrderClient.java | 37 +++ 39 files changed, 767 insertions(+), 6 deletions(-) create mode 100644 blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineAdvanceClient.java create mode 100644 blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineAdvanceDetailClient.java create mode 100644 blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineDetailProductClient.java create mode 100644 blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineWaybillOrderClient.java create mode 100644 blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineAdvanceClient.java create mode 100644 blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineAdvanceDetailClient.java create mode 100644 blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineDetailProductClient.java create mode 100644 blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineWaybillOrderClient.java diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/AdvanceEntity.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/AdvanceEntity.java index 439bc107e..3f2f2c383 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/AdvanceEntity.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/AdvanceEntity.java @@ -254,7 +254,7 @@ public class AdvanceEntity { * 开单状态：1=未开单，2=已开单 */ @ApiModelProperty(value = "开单状态：1=未开单，2=已开单") - private Byte waybillStatus; + private Integer waybillStatus; /** * 运单号 */ @@ -287,7 +287,7 @@ public class AdvanceEntity { * 冻结状态：1=正常，2=冻结 */ @ApiModelProperty(value = "冻结状态：1=正常，2=冻结") - private Byte freeze; + private Integer freeze; /** * 删除原因 */ diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceClient.java index 5e75d8f2e..9c8d9a177 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceClient.java @@ -96,4 +96,7 @@ public interface IAdvanceClient { @GetMapping(API_PREFIX + "/getAdvanceList") List getAdvanceList(@RequestParam String orderSelfNum); + + @PostMapping(API_PREFIX + "/findListByAdvanceIds") + List findListByAdvanceIds(@RequestBody List advanceIds); } diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java index a82354cea..86c4e16ec 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java @@ -39,7 +39,7 @@ import java.util.Map; ) public interface IAdvanceDetailClient { - String API_PREFIX = "/client"; + String API_PREFIX = "/oldAdvanceDetail/client"; String TOP = API_PREFIX + "/top1"; // /** @@ -105,4 +105,7 @@ public interface IAdvanceDetailClient { @GetMapping(API_PREFIX + "/getByUnitNoAndWarehouseId") DistributionParcelListEntityVO getByUnitNoAndWarehouseId(@RequestParam String unitNo, @RequestParam Integer oldWarehouseId); + + @GetMapping(API_PREFIX + "/findListByAdvanceId") + List findListByAdvanceId(@RequestParam Integer advanceId); } diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IDetailProductClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IDetailProductClient.java index f80ead9ae..703bcb630 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IDetailProductClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IDetailProductClient.java @@ -19,8 +19,10 @@ package com.logpm.oldproject.feign; import com.logpm.oldproject.entity.DetailProductEntity; import org.springblade.common.constant.ModuleNameConstant; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -35,7 +37,7 @@ import java.util.List; ) public interface IDetailProductClient { - String API_PREFIX = "/client"; + String API_PREFIX = "detailProduct/client"; String TOP = API_PREFIX + "/top2"; // /** @@ -58,4 +60,7 @@ public interface IDetailProductClient { @PostMapping(API_PREFIX + "/addDetailProductList") Boolean addDetailProductList(@RequestBody List detailProductEntitys); + + @GetMapping(API_PREFIX + "/findListByUnitNo") + List findListByUnitNo(@RequestParam String unitNo); } diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWayBillClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWayBillClient.java index 4e99141a1..3967598b9 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWayBillClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWayBillClient.java @@ -22,6 +22,8 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; +import java.util.List; + /** * 运单详情 Feign接口类 * @@ -44,4 +46,6 @@ public interface IWayBillClient { @GetMapping(API_PREFIX + "/getByWayBillByAdvanceId") WayBillEntity getByWayBillByAdvanceId(@RequestParam("advId") Integer advId); + @GetMapping(API_PREFIX + "/findAdvanceIdsByWaybillNo") + List findAdvanceIdsByWaybillNo(@RequestParam String waybillNo); } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadEntity.java index bc8f5fc84..ee337f761 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadEntity.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadEntity.java @@ -1,5 +1,7 @@ package com.logpm.trunkline.entity; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -129,9 +131,11 @@ public class TrunklineCarsLoadEntity extends TenantEntity { @ApiModelProperty(name = "最新到车仓库id",notes = "") private Long nowWarehouseId ; /** 发车时间 */ + @TableField(updateStrategy = FieldStrategy.ALWAYS) @ApiModelProperty(name = "发车时间",notes = "") private Date startTime ; /** 到车时间 */ + @TableField(updateStrategy = FieldStrategy.ALWAYS) @ApiModelProperty(name = "到车时间",notes = "") private Date arriveTime ; /** 取消时间 */ diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadLineEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadLineEntity.java index ce817da41..56b1b7b4f 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadLineEntity.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadLineEntity.java @@ -1,5 +1,7 @@ package com.logpm.trunkline.entity; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -77,21 +79,27 @@ public class TrunklineCarsLoadLineEntity extends TenantEntity { @ApiModelProperty(name = "排序",notes = "") private Integer sort ; /** 到车时间 */ + @TableField(updateStrategy = FieldStrategy.ALWAYS) @ApiModelProperty(name = "到车时间",notes = "") private Date arriveDate ; /** 到车时间确认人id */ + @TableField(updateStrategy = FieldStrategy.ALWAYS) @ApiModelProperty(name = "到车时间确认人id",notes = "") private Long arriveUserId ; /** 到车时间确认人名称 */ + @TableField(updateStrategy = FieldStrategy.ALWAYS) @ApiModelProperty(name = "到车时间确认人名称",notes = "") private String arriveUserName ; /** 发车时间 */ + @TableField(updateStrategy = FieldStrategy.ALWAYS) @ApiModelProperty(name = "发车时间",notes = "") private Date startDate ; /** 发车时间确认人id */ + @TableField(updateStrategy = FieldStrategy.ALWAYS) @ApiModelProperty(name = "发车时间确认人id",notes = "") private Long startUserId ; /** 发车时间确认人名称 */ + @TableField(updateStrategy = FieldStrategy.ALWAYS) @ApiModelProperty(name = "发车时间确认人名称",notes = "") private String startUserName ; /** 计划装车件数 */ diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineAdvanceClient.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineAdvanceClient.java new file mode 100644 index 000000000..6cb914ddc --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineAdvanceClient.java @@ -0,0 +1,20 @@ +package com.logpm.trunkline.feign; + +import com.logpm.trunkline.entity.TrunklineAdvanceEntity; +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.RequestBody; + +@FeignClient( + value = ModuleNameConstant.APPLICATION_TRUNKLINE_NAME +) +public interface ITrunklineAdvanceClient { + + String API_PREFIX = "trunklineAdvance/client"; + + @PostMapping(API_PREFIX+"/addAdvanceReturnId") + Long addAdvanceReturnId(@RequestBody TrunklineAdvanceEntity trunklineAdvanceEntity); + + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineAdvanceDetailClient.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineAdvanceDetailClient.java new file mode 100644 index 000000000..9970abe34 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineAdvanceDetailClient.java @@ -0,0 +1,21 @@ +package com.logpm.trunkline.feign; + +import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; +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.RequestBody; + +import java.util.List; + +@FeignClient( + value = ModuleNameConstant.APPLICATION_TRUNKLINE_NAME +) +public interface ITrunklineAdvanceDetailClient { + + String API_PREFIX = "trunklineAdvanceDetail/client"; + + @PostMapping(API_PREFIX+"/addAdvanceBatch") + void addAdvanceBatch(@RequestBody List advanceDetailEntities); + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineDetailProductClient.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineDetailProductClient.java new file mode 100644 index 000000000..4d5fd9d87 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineDetailProductClient.java @@ -0,0 +1,23 @@ +package com.logpm.trunkline.feign; + +import com.logpm.trunkline.entity.TrunklineDetailProductEntity; +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.RequestBody; + +import java.util.List; + +@FeignClient( + value = ModuleNameConstant.APPLICATION_TRUNKLINE_NAME +) +public interface ITrunklineDetailProductClient { + + String API_PREFIX = "trunklineDetailProduct/client"; + + @PostMapping(API_PREFIX+"/addEntityReturnId") + Long addEntityReturnId(@RequestBody TrunklineDetailProductEntity trunklineDetailProductEntity); + + @PostMapping(API_PREFIX+"/addListEntity") + void addListEntity(@RequestBody List trunklineDetailProductEntities); +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineWaybillOrderClient.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineWaybillOrderClient.java new file mode 100644 index 000000000..2d3f997f3 --- /dev/null +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineWaybillOrderClient.java @@ -0,0 +1,25 @@ +package com.logpm.trunkline.feign; + +import com.logpm.trunkline.entity.TrunklineWaybillOrderEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +@FeignClient( + value = ModuleNameConstant.APPLICATION_TRUNKLINE_NAME +) +public interface ITrunklineWaybillOrderClient { + + String API_PREFIX = "trunklineWaybillOrder/client"; + + @GetMapping(API_PREFIX+"/findListByWaybillNo") + List findListByWaybillNo(@RequestParam String waybillNo); + + @PostMapping(API_PREFIX+"/addEntityReturnId") + Long addEntityReturnId(@RequestBody TrunklineWaybillOrderEntity trunklineWaybillOrderEntity); +} diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java index d50a7c047..888c22a91 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java @@ -38,10 +38,19 @@ import com.logpm.factory.snm.entity.PanPackageList; import com.logpm.oldproject.entity.*; import com.logpm.oldproject.feign.*; import com.logpm.oldproject.vo.DistributionParcelListEntityVO; +import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; +import com.logpm.trunkline.entity.TrunklineAdvanceEntity; +import com.logpm.trunkline.entity.TrunklineDetailProductEntity; +import com.logpm.trunkline.entity.TrunklineWaybillOrderEntity; +import com.logpm.trunkline.feign.ITrunklineAdvanceClient; +import com.logpm.trunkline.feign.ITrunklineAdvanceDetailClient; +import com.logpm.trunkline.feign.ITrunklineDetailProductClient; +import com.logpm.trunkline.feign.ITrunklineWaybillOrderClient; import com.logpm.warehouse.entity.WarehouseWaybillEntity; import com.logpm.warehouse.feign.IWarehouseTrayTypeClient; import com.logpm.warehouse.feign.IWarehouseWaybillClient; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springblade.common.constant.TenantNum; @@ -59,6 +68,7 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.*; +@Slf4j @AllArgsConstructor @Service public class PanFactoryDataServiceImpl implements IPanFactoryDataService { @@ -96,6 +106,12 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { private final BladeRedis bladeRedis; + private final ITrunklineWaybillOrderClient waybillOrderClient; + private final ITrunklineAdvanceClient trunklineAdvanceClient; + private final IDetailProductClient detailProductClient; + private final ITrunklineDetailProductClient trunklineDetailProductClient; + private final ITrunklineAdvanceDetailClient trunklineAdvanceDetailClient; + // @Override // public FactoryTokenVO getToken(String corpId, String appKey, String appSecret) throws NoSuchAlgorithmException { // @@ -833,6 +849,29 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { warehouseWaybill.setWaybillType(wayBillEntity.getType()); warehouseWaybill.setReceivedStatus(0); + warehouseWaybill.setTotalFreight(wayBillEntity.getFreight()); + warehouseWaybill.setDeliveryFee(wayBillEntity.getDeliveryCost()); + warehouseWaybill.setPickupFee(wayBillEntity.getTakeCost()); + warehouseWaybill.setWarehouseManagementFee(wayBillEntity.getWarehouseManagementFee()); + warehouseWaybill.setStorageFee(wayBillEntity.getWarehousingFee()); + warehouseWaybill.setHandlingFee(wayBillEntity.getPretendCost()); + warehouseWaybill.setOtherFee(wayBillEntity.getOtherFee()); + warehouseWaybill.setInsuranceFee(wayBillEntity.getPriceProtectionFee()); + warehouseWaybill.setClaimingValue(wayBillEntity.getValue()); + warehouseWaybill.setPayType(wayBillEntity.getPayType()+""); + warehouseWaybill.setPayWay(wayBillEntity.getPaymentMethod()+""); + warehouseWaybill.setXPay(wayBillEntity.getXPay()); + warehouseWaybill.setDPay(wayBillEntity.getDPay()); + warehouseWaybill.setHPay(wayBillEntity.getHPay()); + warehouseWaybill.setYPay(wayBillEntity.getYPay()); + warehouseWaybill.setThirdOperationFee(wayBillEntity.getThreeHandleFee()); + warehouseWaybill.setDeliveryWay(wayBillEntity.getSendType()+""); + warehouseWaybill.setUrgency(wayBillEntity.getUrgency()+""); + warehouseWaybill.setReceipt(wayBillEntity.getReceiptAsk()); + warehouseWaybill.setReceiptNum(wayBillEntity.getReceiptNum()); + warehouseWaybill.setTransportType(wayBillEntity.getShippingType()+""); + warehouseWaybill.setRebate(wayBillEntity.getRebate()); + BasicdataClientEntity agentClient = basicdataClientClient.findByName(agent); if (!Objects.isNull(agentClient)) { Long clientEntityId = agentClient.getId();//基础客户 @@ -855,9 +894,181 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { warehouseWaybillClient.updateEntity(warehouseWaybill); } + //暂存单与运单的关联 + saveAdvanceData(warehouseWaybill); } + private void saveAdvanceData(WarehouseWaybillEntity warehouseWaybill) { + + String waybillNo = warehouseWaybill.getWaybillNo(); + Long waybillId = warehouseWaybill.getId(); + //查看新系统是否有关联数据 + List waybillOrderList = waybillOrderClient.findListByWaybillNo(waybillNo); + if(waybillOrderList.isEmpty()){ + //没有关联订单数据 + //查老系统的运单关联哪些订单 + List advanceIds = wayBillClient.findAdvanceIdsByWaybillNo(waybillNo); + if(advanceIds.isEmpty()){ + log.warn("#############saveAdvanceData: 老系统运单未有关联订单 waybillNo={}",waybillNo); + throw new CustomerException(405,"老系统运单未有关联订单"); + } + List advanceList = advanceClient.findListByAdvanceIds(advanceIds); + for (AdvanceEntity advanceEntity : advanceList) { + Integer advanceId = advanceEntity.getId(); + Integer oldWarehouseId = advanceEntity.getWarehouseId(); + String orderCode = advanceEntity.getOrderSelfNum(); + Integer totalNum = advanceEntity.getTotal(); + String brand = advanceEntity.getType(); + BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getWarehouseByOldId(oldWarehouseId); + Date date = new Date(); + TrunklineAdvanceEntity trunklineAdvanceEntity = new TrunklineAdvanceEntity(); + trunklineAdvanceEntity.setTenantId(TenantNum.HUITONGCODE); + trunklineAdvanceEntity.setCreateUser(1714696768639311873L); + trunklineAdvanceEntity.setCreateTime(date); + trunklineAdvanceEntity.setUpdateUser(1714696768639311873L); + trunklineAdvanceEntity.setUpdateTime(date); + trunklineAdvanceEntity.setStatus(1); + trunklineAdvanceEntity.setIsDeleted(0); + trunklineAdvanceEntity.setCreateDept(1649331096241836033L); + trunklineAdvanceEntity.setWarehouseId(basicdataWarehouseEntity.getId()); + trunklineAdvanceEntity.setWarehouseName(basicdataWarehouseEntity.getName()); + trunklineAdvanceEntity.setOrderCode(orderCode); + trunklineAdvanceEntity.setSiteName(advanceEntity.getSiteName()); + trunklineAdvanceEntity.setArea(advanceEntity.getArea()); + trunklineAdvanceEntity.setOrderType(advanceEntity.getOrderTypeName()); + trunklineAdvanceEntity.setBrand(advanceEntity.getType()); + trunklineAdvanceEntity.setTotalNum(totalNum); + trunklineAdvanceEntity.setPackCode(advanceEntity.getFirstPackCode()); + trunklineAdvanceEntity.setPackName(advanceEntity.getFirstPackName()); + trunklineAdvanceEntity.setDealerCode(advanceEntity.getDealerCode()); + trunklineAdvanceEntity.setDealerName(advanceEntity.getDealerName()); + trunklineAdvanceEntity.setCarrierName(advanceEntity.getCarrierName()); + trunklineAdvanceEntity.setCustomerName(advanceEntity.getCustomerName()); + trunklineAdvanceEntity.setCustomerPhone(advanceEntity.getCustomerPhone()); + trunklineAdvanceEntity.setCustomerAddress(advanceEntity.getCustomerRoad()); + trunklineAdvanceEntity.setSystemType(advanceEntity.getSystemType()); + trunklineAdvanceEntity.setStoreCode(advanceEntity.getStoreNo()); + trunklineAdvanceEntity.setStoreName(advanceEntity.getStoreName()); + trunklineAdvanceEntity.setServiceNum(advanceEntity.getServiceNum()); + trunklineAdvanceEntity.setMatingType(advanceEntity.getMatingCode()); + trunklineAdvanceEntity.setSenderName(advanceEntity.getSenderName()); + trunklineAdvanceEntity.setSenderPhone(advanceEntity.getSenderMobile()); + trunklineAdvanceEntity.setSenderAddress(advanceEntity.getSenderAddress()); + Integer waybillStatus = advanceEntity.getWaybillStatus(); + if(waybillStatus == 1){ + trunklineAdvanceEntity.setWaybillStatus("0"); + }else if(waybillStatus == 2){ + trunklineAdvanceEntity.setWaybillStatus("1"); + } + trunklineAdvanceEntity.setWaybillNo(advanceEntity.getWaybillNo()); + trunklineAdvanceEntity.setTrainNumber(advanceEntity.getMctsTruck()); + Integer freeze = advanceEntity.getFreeze(); + if(freeze == 1){ + trunklineAdvanceEntity.setFreezeStatus("0"); + }else if(freeze == 2){ + trunklineAdvanceEntity.setFreezeStatus("1"); + } + String leaveBehind = advanceEntity.getLeaveBehind(); + if("N".equals(leaveBehind)){ + trunklineAdvanceEntity.setLegacyStatus("0"); + }else if("Y".equals(leaveBehind)){ + trunklineAdvanceEntity.setLegacyStatus("1"); + } + trunklineAdvanceEntity.setDeliveryDate(CommonUtil.StringToDate(advanceEntity.getDueDate())); + Long newAdvanceId = trunklineAdvanceClient.addAdvanceReturnId(trunklineAdvanceEntity); + if(Objects.isNull(newAdvanceId)){ + log.warn("#############saveAdvanceData: 保存暂存单失败 orderCode={}",orderCode); + continue; + }else{ + //生成对应的运单关联订单信息 + TrunklineWaybillOrderEntity trunklineWaybillOrderEntity = new TrunklineWaybillOrderEntity(); + trunklineWaybillOrderEntity.setTenantId(TenantNum.HUITONGCODE); + trunklineWaybillOrderEntity.setCreateUser(1714696768639311873L); + trunklineWaybillOrderEntity.setCreateTime(date); + trunklineWaybillOrderEntity.setUpdateUser(1714696768639311873L); + trunklineWaybillOrderEntity.setUpdateTime(date); + trunklineWaybillOrderEntity.setStatus(1); + trunklineWaybillOrderEntity.setIsDeleted(0); + trunklineWaybillOrderEntity.setCreateDept(1649331096241836033L); + trunklineWaybillOrderEntity.setWarehouseId(basicdataWarehouseEntity.getId()); + trunklineWaybillOrderEntity.setWaybillNo(basicdataWarehouseEntity.getName()); + trunklineWaybillOrderEntity.setWaybillId(waybillId); + trunklineWaybillOrderEntity.setWaybillNo(waybillNo); + trunklineWaybillOrderEntity.setAdvanceId(newAdvanceId); + trunklineWaybillOrderEntity.setOrderCode(orderCode); + trunklineWaybillOrderEntity.setTotalNumber(totalNum); + trunklineWaybillOrderEntity.setHandleNumber(0); + waybillOrderClient.addEntityReturnId(trunklineWaybillOrderEntity); + + //查询暂存单包件 + List detailList = advanceDetailClient.findListByAdvanceId(advanceId); + List newPackageList = new ArrayList<>(); + for (AdvanceDetailEntity advanceDetailEntity : detailList) { + String unitNo = advanceDetailEntity.getUnitNo(); + TrunklineAdvanceDetailEntity trunklineAdvanceDetailEntity = new TrunklineAdvanceDetailEntity(); + trunklineAdvanceDetailEntity.setTenantId(TenantNum.HUITONGCODE); + trunklineAdvanceDetailEntity.setCreateUser(1714696768639311873L); + trunklineAdvanceDetailEntity.setCreateTime(date); + trunklineAdvanceDetailEntity.setUpdateUser(1714696768639311873L); + trunklineAdvanceDetailEntity.setUpdateTime(date); + trunklineAdvanceDetailEntity.setStatus(1); + trunklineAdvanceDetailEntity.setIsDeleted(0); + trunklineAdvanceDetailEntity.setCreateDept(1649331096241836033L); + trunklineAdvanceDetailEntity.setWarehouseId(basicdataWarehouseEntity.getId()); + trunklineAdvanceDetailEntity.setWarehouseName(basicdataWarehouseEntity.getName()); + trunklineAdvanceDetailEntity.setAdvanceId(newAdvanceId); + trunklineAdvanceDetailEntity.setOrderCode(advanceDetailEntity.getOrderSelfNum()); + trunklineAdvanceDetailEntity.setBrand(advanceDetailEntity.getType()); + trunklineAdvanceDetailEntity.setSystemType(advanceDetailEntity.getSystemType()); + trunklineAdvanceDetailEntity.setFirstPackName(advanceDetailEntity.getFirstPackName()); + trunklineAdvanceDetailEntity.setSecondPackName(advanceDetailEntity.getSecondPackName()); + trunklineAdvanceDetailEntity.setThirdPackName(advanceDetailEntity.getThirdPackName()); + trunklineAdvanceDetailEntity.setSiteCode(advanceDetailEntity.getSiteCode()); + trunklineAdvanceDetailEntity.setSiteName(advanceDetailEntity.getSiteName()); + trunklineAdvanceDetailEntity.setQuantity(Integer.parseInt(advanceDetailEntity.getMscsNum())); + trunklineAdvanceDetailEntity.setOrderPackageCode(unitNo); + trunklineAdvanceDetailEntity.setTrainNumber(advanceDetailEntity.getMctsTruck()); + trunklineAdvanceDetailEntity.setServiceNum(advanceDetailEntity.getServiceNum()); + trunklineAdvanceDetailEntity.setWaybillNo(waybillNo); + trunklineAdvanceDetailEntity.setPackageStatus("1"); + trunklineAdvanceDetailEntity.setChargeType(1); + newPackageList.add(trunklineAdvanceDetailEntity); + + //同步包内明细 + List detailProductList = detailProductClient.findListByUnitNo(unitNo); + List trunklineDetailProductEntities = new ArrayList<>(); + for (DetailProductEntity detailProductEntity : detailProductList) { + TrunklineDetailProductEntity trunklineDetailProductEntity = new TrunklineDetailProductEntity(); + trunklineDetailProductEntity.setTenantId(TenantNum.HUITONGCODE); + trunklineDetailProductEntity.setCreateUser(1714696768639311873L); + trunklineDetailProductEntity.setCreateTime(date); + trunklineDetailProductEntity.setUpdateUser(1714696768639311873L); + trunklineDetailProductEntity.setUpdateTime(date); + trunklineDetailProductEntity.setStatus(1); + trunklineDetailProductEntity.setIsDeleted(0); + trunklineDetailProductEntity.setCreateDept(1649331096241836033L); + trunklineDetailProductEntity.setWarehouseId(basicdataWarehouseEntity.getId()); + trunklineDetailProductEntity.setWarehouseName(basicdataWarehouseEntity.getName()); + trunklineDetailProductEntity.setUnitNo(detailProductEntity.getUnitNo()); + trunklineDetailProductEntity.setProductCode(detailProductEntity.getProductcode()); + trunklineDetailProductEntity.setProductName(detailProductEntity.getProductname()); + trunklineDetailProductEntity.setQuantity(detailProductEntity.getDelivernum()); + trunklineDetailProductEntities.add(trunklineDetailProductEntity); + } + trunklineDetailProductClient.addListEntity(trunklineDetailProductEntities); + } + trunklineAdvanceDetailClient.addAdvanceBatch(newPackageList); + } + } + log.info("##############saveAdvanceData: 运单同步已完成 waybillNo={}",waybillNo); + }else{ + log.info("##############saveAdvanceData: 运单已有关联订单 waybillNo={}",waybillNo); + } + + } + + /** * 构建订单的经销商信息和门店信息 * diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceClient.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceClient.java index bc6f90465..97fbb2b44 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceClient.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceClient.java @@ -95,4 +95,12 @@ public class AdvanceClient implements IAdvanceClient { public List getAdvanceList(String orderSelfNum) { return service.getAdvanceList(orderSelfNum); } + + @Override + public List findListByAdvanceIds(List advanceIds) { + + List list = service.findListByAdvanceIds(advanceIds); + + return null; + } } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceDetailClient.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceDetailClient.java index f0ced41fe..c81e2fcdc 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceDetailClient.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceDetailClient.java @@ -111,4 +111,9 @@ public class AdvanceDetailClient implements IAdvanceDetailClient { public DistributionParcelListEntityVO getByUnitNoAndWarehouseId(String unitNo, Integer oldWarehouseId) { return advanceDetailService.getByUnitNoAndWarehouseId(unitNo,oldWarehouseId); } + + @Override + public List findListByAdvanceId(Integer advanceId) { + return advanceDetailService.findListByAdvanceId(advanceId); + } } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/DetailProductClient.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/DetailProductClient.java index 4a5e42cc7..9d821553d 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/DetailProductClient.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/DetailProductClient.java @@ -62,4 +62,9 @@ public class DetailProductClient implements IDetailProductClient { return detailProductService.saveBatch(detailProductEntitys); } + @Override + public List findListByUnitNo(String unitNo) { + return detailProductService.findListByUnitNo(unitNo); + } + } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/WayBillClient.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/WayBillClient.java index ac59be8f3..88c887b6d 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/WayBillClient.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/WayBillClient.java @@ -23,6 +23,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; +import java.util.List; + /** * 运单详情 Feign接口类 * @@ -54,4 +56,9 @@ public class WayBillClient implements IWayBillClient { public WayBillEntity getByWayBillByAdvanceId(Integer advId) { return wayBillService.getByWayBillByAdvanceId(advId); } + + @Override + public List findAdvanceIdsByWaybillNo(String waybillNo) { + return wayBillService.findAdvanceIdsByWaybillNo(waybillNo); + } } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.java index 1a5f9bbcd..45a84eb69 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.java @@ -62,4 +62,6 @@ public interface AdvanceDetailMapper extends BaseMapper { DistributionParcelListEntityVO getByUnitNoAndWarehouseId(@Param("unitNo") String unitNo, @Param("oldWarehouseId") Integer oldWarehouseId); DistributionParcelListEntityVO getByUnitNoByPyl(@Param("unitNo")String unitNo); + + List findListByAdvanceId(@Param("advanceId") Integer advanceId); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml index f94920eac..dea7fb324 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml @@ -196,5 +196,11 @@ limit 1 + diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.java index aeee18ca6..f403eef3d 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.java @@ -53,4 +53,5 @@ public interface AdvanceMapper { List getAdvanceList(@Param("orderSelfNum") String orderSelfNum); + List findListByAdvanceIds(@Param("advanceIds") List advanceIds); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml index 97bada10e..02e171e15 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml @@ -68,4 +68,16 @@ and delete_time = 0 + + diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/DetailProductMapper.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/DetailProductMapper.java index 2fcc6632d..56eed12b8 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/DetailProductMapper.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/DetailProductMapper.java @@ -51,4 +51,6 @@ public interface DetailProductMapper extends BaseMapper { Boolean addAll(@Param("param") DetailProductEntity detailProduct); Boolean addList(@Param("list") List detailProducts); + + List findListByUnitNo(@Param("unitNo") String unitNo); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/DetailProductMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/DetailProductMapper.xml index ce7058a54..21b762bc4 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/DetailProductMapper.xml +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/DetailProductMapper.xml @@ -31,4 +31,10 @@ + + diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderMapper.xml index 67fc679f2..72509ccde 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderMapper.xml +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderMapper.xml @@ -12,6 +12,7 @@ INNER JOIN `ht_order` `order` ON `order`.`selfnumber` = `i`.`orderSelfNum` WHERE `i`.`status` <> 11 + and `i`.`history_type` = 0 AND `i`.`delete_time` = '0' AND ( ( `i`.`in_num` + `i`.`delives_num` ) > 0 ) AND `i`.`goods_type` = '1' @@ -33,6 +34,7 @@ INNER JOIN `ht_order` `order` ON `order`.`selfnumber` = `i`.`orderSelfNum` WHERE `i`.`status` <> 11 + and `i`.`history_type` = 0 AND `i`.`delete_time` = '0' AND ( ( `i`.`in_num` + `i`.`delives_num` ) > 0 ) AND `i`.`goods_type` = '1' diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/WayBillMapper.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/WayBillMapper.java index 9d4b7095c..201b11c07 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/WayBillMapper.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/WayBillMapper.java @@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.logpm.oldproject.entity.WayBillEntity; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface WayBillMapper extends BaseMapper { WayBillEntity getByWayBillByAdvanceId(@Param("advId") Integer advId); + + List findAdvanceIdsByWaybillNo(@Param("waybillNo") String waybillNo); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/WayBillMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/WayBillMapper.xml index cdec93bbb..99651a142 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/WayBillMapper.xml +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/WayBillMapper.xml @@ -8,5 +8,11 @@ select ht_way_bill.* FROM ht_way_bill LEFT JOIN ht_advance on ht_advance.waybill_no=ht_way_bill.waybill_no WHERE ht_advance.id = #{advId} and ht_way_bill.`status` !=-1 + diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IAdvanceDetailService.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IAdvanceDetailService.java index d690d7f86..3b7c30a70 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IAdvanceDetailService.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IAdvanceDetailService.java @@ -60,4 +60,6 @@ public interface IAdvanceDetailService { DistributionParcelListEntityVO getByUnitNoAndWarehouseId(String unitNo, Integer oldWarehouseId); DistributionParcelListEntityVO getByUnitNoByPyl(String unitNo); + + List findListByAdvanceId(Integer advanceId); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IAdvanceService.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IAdvanceService.java index a97ddbc04..572881bd6 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IAdvanceService.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IAdvanceService.java @@ -52,4 +52,6 @@ public interface IAdvanceService { List findAdvanceEntityByLogiBillNoAndOrderCode(String logiBillNo, String orderCode); List getAdvanceList(String orderSelfNum); + + List findListByAdvanceIds(List advanceIds); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IDetailProductService.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IDetailProductService.java index 905f2b3a7..c897b93f0 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IDetailProductService.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IDetailProductService.java @@ -33,4 +33,5 @@ public interface IDetailProductService{ Boolean saveBatch(List detailProductEntitys); + List findListByUnitNo(String unitNo); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IWayBillService.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IWayBillService.java index 964550c1c..d414d2620 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IWayBillService.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IWayBillService.java @@ -3,6 +3,8 @@ package com.logpm.oldproject.service; import com.logpm.oldproject.entity.WayBillEntity; +import java.util.List; + public interface IWayBillService { @@ -15,4 +17,5 @@ public interface IWayBillService { WayBillEntity getByWayBillByAdvanceId(Integer advId); + List findAdvanceIdsByWaybillNo(String waybillNo); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceDetailServiceImpl.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceDetailServiceImpl.java index 4a6c9e145..b759c7f30 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceDetailServiceImpl.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceDetailServiceImpl.java @@ -74,6 +74,11 @@ public class AdvanceDetailServiceImpl implements IAdvanceDetailService { return advanceDetailMapper.getByUnitNoByPyl(unitNo); } + @Override + public List findListByAdvanceId(Integer advanceId) { + return advanceDetailMapper.findListByAdvanceId(advanceId); + } + @Override public Integer getAllNumByOrderNo(String orderSelfNum) { QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceServiceImpl.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceServiceImpl.java index bd4729bab..1e76768b5 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceServiceImpl.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceServiceImpl.java @@ -79,4 +79,9 @@ public class AdvanceServiceImpl implements IAdvanceService { public List getAdvanceList(String orderSelfNum) { return advanceMapper.getAdvanceList(orderSelfNum); } + + @Override + public List findListByAdvanceIds(List advanceIds) { + return advanceMapper.findListByAdvanceIds(advanceIds); + } } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/DetailProductServiceImpl.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/DetailProductServiceImpl.java index ea798b0ed..8bb300f8d 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/DetailProductServiceImpl.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/DetailProductServiceImpl.java @@ -45,4 +45,9 @@ public class DetailProductServiceImpl implements IDetailProductService { public Boolean saveBatch(List detailProductEntitys) { return detailProductMapper.addList(detailProductEntitys); } + + @Override + public List findListByUnitNo(String unitNo) { + return detailProductMapper.findListByUnitNo(unitNo); + } } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/WayBillServiceImpl.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/WayBillServiceImpl.java index 377db7183..f77833ae3 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/WayBillServiceImpl.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/WayBillServiceImpl.java @@ -9,6 +9,8 @@ import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.stereotype.Service; +import java.util.List; + @Log4j2 @Service @AllArgsConstructor @@ -35,4 +37,9 @@ public class WayBillServiceImpl implements IWayBillService { return wayBillMapper.getByWayBillByAdvanceId(advId); } + + @Override + public List findAdvanceIdsByWaybillNo(String waybillNo) { + return wayBillMapper.findAdvanceIdsByWaybillNo(waybillNo); + } } diff --git a/blade-service/logpm-patch/pom.xml b/blade-service/logpm-patch/pom.xml index 98debe483..8bc35f33e 100644 --- a/blade-service/logpm-patch/pom.xml +++ b/blade-service/logpm-patch/pom.xml @@ -69,6 +69,12 @@ 3.2.0.RELEASE compile + + org.springblade + logpm-trunkline-api + 3.2.0.RELEASE + compile + diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java index 5f4920919..102380abe 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java @@ -16,6 +16,14 @@ import com.logpm.oldproject.entity.*; import com.logpm.oldproject.feign.*; import com.logpm.oldproject.vo.DistributionParcelListEntityVO; import com.logpm.patch.service.ISyncOrderInfoService; +import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; +import com.logpm.trunkline.entity.TrunklineAdvanceEntity; +import com.logpm.trunkline.entity.TrunklineDetailProductEntity; +import com.logpm.trunkline.entity.TrunklineWaybillOrderEntity; +import com.logpm.trunkline.feign.ITrunklineAdvanceClient; +import com.logpm.trunkline.feign.ITrunklineAdvanceDetailClient; +import com.logpm.trunkline.feign.ITrunklineDetailProductClient; +import com.logpm.trunkline.feign.ITrunklineWaybillOrderClient; import com.logpm.warehouse.entity.WarehouseWayBillDetail; import com.logpm.warehouse.entity.WarehouseWaybillEntity; import com.logpm.warehouse.feign.IWarehouseTrayTypeClient; @@ -68,6 +76,12 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { private final IOrderLocationClient orderLocationClient; private final IWarehouseUpdownTypeClient warehouseUpdownTypeClient; + private final ITrunklineWaybillOrderClient waybillOrderClient; + private final ITrunklineAdvanceClient trunklineAdvanceClient; + private final IDetailProductClient detailProductClient; + private final ITrunklineDetailProductClient trunklineDetailProductClient; + private final ITrunklineAdvanceDetailClient trunklineAdvanceDetailClient; + @Transactional(rollbackFor = Exception.class) @Override public void handleData(List orderCodeList,Integer oldWarehouseId,Long newWarehouseId) { @@ -1522,6 +1536,7 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { warehouseWaybill = new WarehouseWaybillEntity(); warehouseWaybill.setWaybillNo(waybillNo); + warehouseWaybill.setOrderNo(wayBillEntity.getOrderNo()); warehouseWaybill.setDestinationWarehouseName(warehouseName); warehouseWaybill.setDestinationWarehouseId(Objects.isNull(endhouse) ? null : endhouse.getId()); warehouseWaybill.setDepartureWarehouseName(startSite); @@ -1555,7 +1570,7 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { warehouseWaybill.setDestination(wayBillEntity.getArriveSite()); warehouseWaybill.setGoodsName(packname); warehouseWaybill.setTotalCount(number); - warehouseWaybill.setStockCount(1); + warehouseWaybill.setStockCount(number); warehouseWaybill.setTotalWeight(wayBillEntity.getWeight()); warehouseWaybill.setTotalVolume(wayBillEntity.getVolume()); warehouseWaybill.setDeliveryMethod(wayBillEntity.getSendType()); @@ -1571,6 +1586,29 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { warehouseWaybill.setWaybillType(wayBillEntity.getType()); warehouseWaybill.setReceivedStatus(0); + warehouseWaybill.setTotalFreight(wayBillEntity.getFreight()); + warehouseWaybill.setDeliveryFee(wayBillEntity.getDeliveryCost()); + warehouseWaybill.setPickupFee(wayBillEntity.getTakeCost()); + warehouseWaybill.setWarehouseManagementFee(wayBillEntity.getWarehouseManagementFee()); + warehouseWaybill.setStorageFee(wayBillEntity.getWarehousingFee()); + warehouseWaybill.setHandlingFee(wayBillEntity.getPretendCost()); + warehouseWaybill.setOtherFee(wayBillEntity.getOtherFee()); + warehouseWaybill.setInsuranceFee(wayBillEntity.getPriceProtectionFee()); + warehouseWaybill.setClaimingValue(wayBillEntity.getValue()); + warehouseWaybill.setPayType(wayBillEntity.getPayType()+""); + warehouseWaybill.setPayWay(wayBillEntity.getPaymentMethod()+""); + warehouseWaybill.setXPay(wayBillEntity.getXPay()); + warehouseWaybill.setDPay(wayBillEntity.getDPay()); + warehouseWaybill.setHPay(wayBillEntity.getHPay()); + warehouseWaybill.setYPay(wayBillEntity.getYPay()); + warehouseWaybill.setThirdOperationFee(wayBillEntity.getThreeHandleFee()); + warehouseWaybill.setDeliveryWay(wayBillEntity.getSendType()+""); + warehouseWaybill.setUrgency(wayBillEntity.getUrgency()+""); + warehouseWaybill.setReceipt(wayBillEntity.getReceiptAsk()); + warehouseWaybill.setReceiptNum(wayBillEntity.getReceiptNum()); + warehouseWaybill.setTransportType(wayBillEntity.getShippingType()+""); + warehouseWaybill.setRebate(wayBillEntity.getRebate()); + BasicdataClientEntity agentClient = basicdataClientClient.findByName(agent); if (!Objects.isNull(agentClient)) { Long clientEntityId = agentClient.getId();//基础客户 @@ -1588,14 +1626,188 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService { warehouseWaybill.setUpdateTime(date); warehouseWaybillClient.addEnntity(warehouseWaybill); } else { - warehouseWaybill.setStockCount(warehouseWaybill.getStockCount() + 1); +// warehouseWaybill.setStockCount(warehouseWaybill.getStockCount() + 1); warehouseWaybill.setUpdateTime(new Date()); warehouseWaybillClient.updateEntity(warehouseWaybill); } + //暂存单与运单的关联 + saveAdvanceData(warehouseWaybill); + return wayBillEntity; } + private void saveAdvanceData(WarehouseWaybillEntity warehouseWaybill) { + + String waybillNo = warehouseWaybill.getWaybillNo(); + Long waybillId = warehouseWaybill.getId(); + //查看新系统是否有关联数据 + List waybillOrderList = waybillOrderClient.findListByWaybillNo(waybillNo); + if(waybillOrderList.isEmpty()){ + //没有关联订单数据 + //查老系统的运单关联哪些订单 + List advanceIds = wayBillClient.findAdvanceIdsByWaybillNo(waybillNo); + if(advanceIds.isEmpty()){ + log.warn("#############saveAdvanceData: 老系统运单未有关联订单 waybillNo={}",waybillNo); + throw new CustomerException(405,"老系统运单未有关联订单"); + } + List advanceList = advanceClient.findListByAdvanceIds(advanceIds); + for (AdvanceEntity advanceEntity : advanceList) { + Integer advanceId = advanceEntity.getId(); + Integer oldWarehouseId = advanceEntity.getWarehouseId(); + String orderCode = advanceEntity.getOrderSelfNum(); + Integer totalNum = advanceEntity.getTotal(); + String brand = advanceEntity.getType(); + BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getWarehouseByOldId(oldWarehouseId); + Date date = new Date(); + TrunklineAdvanceEntity trunklineAdvanceEntity = new TrunklineAdvanceEntity(); + trunklineAdvanceEntity.setTenantId(TenantNum.HUITONGCODE); + trunklineAdvanceEntity.setCreateUser(1714696768639311873L); + trunklineAdvanceEntity.setCreateTime(date); + trunklineAdvanceEntity.setUpdateUser(1714696768639311873L); + trunklineAdvanceEntity.setUpdateTime(date); + trunklineAdvanceEntity.setStatus(1); + trunklineAdvanceEntity.setIsDeleted(0); + trunklineAdvanceEntity.setCreateDept(1649331096241836033L); + trunklineAdvanceEntity.setWarehouseId(basicdataWarehouseEntity.getId()); + trunklineAdvanceEntity.setWarehouseName(basicdataWarehouseEntity.getName()); + trunklineAdvanceEntity.setOrderCode(orderCode); + trunklineAdvanceEntity.setSiteName(advanceEntity.getSiteName()); + trunklineAdvanceEntity.setArea(advanceEntity.getArea()); + trunklineAdvanceEntity.setOrderType(advanceEntity.getOrderTypeName()); + trunklineAdvanceEntity.setBrand(advanceEntity.getType()); + trunklineAdvanceEntity.setTotalNum(totalNum); + trunklineAdvanceEntity.setPackCode(advanceEntity.getFirstPackCode()); + trunklineAdvanceEntity.setPackName(advanceEntity.getFirstPackName()); + trunklineAdvanceEntity.setDealerCode(advanceEntity.getDealerCode()); + trunklineAdvanceEntity.setDealerName(advanceEntity.getDealerName()); + trunklineAdvanceEntity.setCarrierName(advanceEntity.getCarrierName()); + trunklineAdvanceEntity.setCustomerName(advanceEntity.getCustomerName()); + trunklineAdvanceEntity.setCustomerPhone(advanceEntity.getCustomerPhone()); + trunklineAdvanceEntity.setCustomerAddress(advanceEntity.getCustomerRoad()); + trunklineAdvanceEntity.setSystemType(advanceEntity.getSystemType()); + trunklineAdvanceEntity.setStoreCode(advanceEntity.getStoreNo()); + trunklineAdvanceEntity.setStoreName(advanceEntity.getStoreName()); + trunklineAdvanceEntity.setServiceNum(advanceEntity.getServiceNum()); + trunklineAdvanceEntity.setMatingType(advanceEntity.getMatingCode()); + trunklineAdvanceEntity.setSenderName(advanceEntity.getSenderName()); + trunklineAdvanceEntity.setSenderPhone(advanceEntity.getSenderMobile()); + trunklineAdvanceEntity.setSenderAddress(advanceEntity.getSenderAddress()); + Integer waybillStatus = advanceEntity.getWaybillStatus(); + if(waybillStatus == 1){ + trunklineAdvanceEntity.setWaybillStatus("0"); + }else if(waybillStatus == 2){ + trunklineAdvanceEntity.setWaybillStatus("1"); + } + trunklineAdvanceEntity.setWaybillNo(advanceEntity.getWaybillNo()); + trunklineAdvanceEntity.setTrainNumber(advanceEntity.getMctsTruck()); + Integer freeze = advanceEntity.getFreeze(); + if(freeze == 1){ + trunklineAdvanceEntity.setFreezeStatus("0"); + }else if(freeze == 2){ + trunklineAdvanceEntity.setFreezeStatus("1"); + } + String leaveBehind = advanceEntity.getLeaveBehind(); + if("N".equals(leaveBehind)){ + trunklineAdvanceEntity.setLegacyStatus("0"); + }else if("Y".equals(leaveBehind)){ + trunklineAdvanceEntity.setLegacyStatus("1"); + } + trunklineAdvanceEntity.setDeliveryDate(CommonUtil.StringToDate(advanceEntity.getDueDate())); + Long newAdvanceId = trunklineAdvanceClient.addAdvanceReturnId(trunklineAdvanceEntity); + if(Objects.isNull(newAdvanceId)){ + log.warn("#############saveAdvanceData: 保存暂存单失败 orderCode={}",orderCode); + continue; + }else{ + //生成对应的运单关联订单信息 + TrunklineWaybillOrderEntity trunklineWaybillOrderEntity = new TrunklineWaybillOrderEntity(); + trunklineWaybillOrderEntity.setTenantId(TenantNum.HUITONGCODE); + trunklineWaybillOrderEntity.setCreateUser(1714696768639311873L); + trunklineWaybillOrderEntity.setCreateTime(date); + trunklineWaybillOrderEntity.setUpdateUser(1714696768639311873L); + trunklineWaybillOrderEntity.setUpdateTime(date); + trunklineWaybillOrderEntity.setStatus(1); + trunklineWaybillOrderEntity.setIsDeleted(0); + trunklineWaybillOrderEntity.setCreateDept(1649331096241836033L); + trunklineWaybillOrderEntity.setWarehouseId(basicdataWarehouseEntity.getId()); + trunklineWaybillOrderEntity.setWaybillNo(basicdataWarehouseEntity.getName()); + trunklineWaybillOrderEntity.setWaybillId(waybillId); + trunklineWaybillOrderEntity.setWaybillNo(waybillNo); + trunklineWaybillOrderEntity.setAdvanceId(newAdvanceId); + trunklineWaybillOrderEntity.setOrderCode(orderCode); + trunklineWaybillOrderEntity.setTotalNumber(totalNum); + trunklineWaybillOrderEntity.setHandleNumber(0); + waybillOrderClient.addEntityReturnId(trunklineWaybillOrderEntity); + + //查询暂存单包件 + List detailList = advanceDetailClient.findListByAdvanceId(advanceId); + List newPackageList = new ArrayList<>(); + for (AdvanceDetailEntity advanceDetailEntity : detailList) { + String unitNo = advanceDetailEntity.getUnitNo(); + TrunklineAdvanceDetailEntity trunklineAdvanceDetailEntity = new TrunklineAdvanceDetailEntity(); + trunklineAdvanceDetailEntity.setTenantId(TenantNum.HUITONGCODE); + trunklineAdvanceDetailEntity.setCreateUser(1714696768639311873L); + trunklineAdvanceDetailEntity.setCreateTime(date); + trunklineAdvanceDetailEntity.setUpdateUser(1714696768639311873L); + trunklineAdvanceDetailEntity.setUpdateTime(date); + trunklineAdvanceDetailEntity.setStatus(1); + trunklineAdvanceDetailEntity.setIsDeleted(0); + trunklineAdvanceDetailEntity.setCreateDept(1649331096241836033L); + trunklineAdvanceDetailEntity.setWarehouseId(basicdataWarehouseEntity.getId()); + trunklineAdvanceDetailEntity.setWarehouseName(basicdataWarehouseEntity.getName()); + trunklineAdvanceDetailEntity.setAdvanceId(newAdvanceId); + trunklineAdvanceDetailEntity.setOrderCode(advanceDetailEntity.getOrderSelfNum()); + trunklineAdvanceDetailEntity.setBrand(advanceDetailEntity.getType()); + trunklineAdvanceDetailEntity.setSystemType(advanceDetailEntity.getSystemType()); + trunklineAdvanceDetailEntity.setFirstPackName(advanceDetailEntity.getFirstPackName()); + trunklineAdvanceDetailEntity.setSecondPackName(advanceDetailEntity.getSecondPackName()); + trunklineAdvanceDetailEntity.setThirdPackName(advanceDetailEntity.getThirdPackName()); + trunklineAdvanceDetailEntity.setSiteCode(advanceDetailEntity.getSiteCode()); + trunklineAdvanceDetailEntity.setSiteName(advanceDetailEntity.getSiteName()); + trunklineAdvanceDetailEntity.setQuantity(Integer.parseInt(advanceDetailEntity.getMscsNum())); + trunklineAdvanceDetailEntity.setOrderPackageCode(unitNo); + trunklineAdvanceDetailEntity.setTrainNumber(advanceDetailEntity.getMctsTruck()); + trunklineAdvanceDetailEntity.setServiceNum(advanceDetailEntity.getServiceNum()); + trunklineAdvanceDetailEntity.setWaybillNo(waybillNo); + trunklineAdvanceDetailEntity.setPackageStatus("1"); + trunklineAdvanceDetailEntity.setChargeType(1); + newPackageList.add(trunklineAdvanceDetailEntity); + + //同步包内明细 + List detailProductList = detailProductClient.findListByUnitNo(unitNo); + List trunklineDetailProductEntities = new ArrayList<>(); + for (DetailProductEntity detailProductEntity : detailProductList) { + + TrunklineDetailProductEntity trunklineDetailProductEntity = new TrunklineDetailProductEntity(); + trunklineDetailProductEntity.setTenantId(TenantNum.HUITONGCODE); + trunklineDetailProductEntity.setCreateUser(1714696768639311873L); + trunklineDetailProductEntity.setCreateTime(date); + trunklineDetailProductEntity.setUpdateUser(1714696768639311873L); + trunklineDetailProductEntity.setUpdateTime(date); + trunklineDetailProductEntity.setStatus(1); + trunklineDetailProductEntity.setIsDeleted(0); + trunklineDetailProductEntity.setCreateDept(1649331096241836033L); + trunklineDetailProductEntity.setWarehouseId(basicdataWarehouseEntity.getId()); + trunklineDetailProductEntity.setWarehouseName(basicdataWarehouseEntity.getName()); + trunklineDetailProductEntity.setUnitNo(detailProductEntity.getUnitNo()); + trunklineDetailProductEntity.setProductCode(detailProductEntity.getProductcode()); + trunklineDetailProductEntity.setProductName(detailProductEntity.getProductname()); + trunklineDetailProductEntity.setQuantity(detailProductEntity.getDelivernum()); + trunklineDetailProductEntities.add(trunklineDetailProductEntity); + + } + trunklineDetailProductClient.addListEntity(trunklineDetailProductEntities); + } + trunklineAdvanceDetailClient.addAdvanceBatch(newPackageList); + } + } + log.info("##############saveAdvanceData: 运单同步已完成 waybillNo={}",waybillNo); + }else{ + log.info("##############saveAdvanceData: 运单已有关联订单 waybillNo={}",waybillNo); + } + + } + private void saveTrayTypeInfoPackageNew(String orderCode,Integer oldWarehouseId, Long newWarehouseId,Integer inventoryId) { diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineAdvanceClient.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineAdvanceClient.java new file mode 100644 index 000000000..93e0c4e8e --- /dev/null +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineAdvanceClient.java @@ -0,0 +1,26 @@ +package com.logpm.trunkline.feign; + +import com.logpm.trunkline.entity.TrunklineAdvanceEntity; +import com.logpm.trunkline.service.ITrunklineAdvanceService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +@Slf4j +@ApiIgnore() +@RestController +@AllArgsConstructor +public class TrunklineAdvanceClient implements ITrunklineAdvanceClient{ + + private final ITrunklineAdvanceService advanceService; + + @Override + public Long addAdvanceReturnId(TrunklineAdvanceEntity trunklineAdvanceEntity) { + boolean save = advanceService.save(trunklineAdvanceEntity); + if(!save){ + return null; + } + return trunklineAdvanceEntity.getId(); + } +} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineAdvanceDetailClient.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineAdvanceDetailClient.java new file mode 100644 index 000000000..e4f9572a2 --- /dev/null +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineAdvanceDetailClient.java @@ -0,0 +1,24 @@ +package com.logpm.trunkline.feign; + +import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; +import com.logpm.trunkline.service.ITrunklineAdvanceDetailService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.List; + +@Slf4j +@ApiIgnore() +@RestController +@AllArgsConstructor +public class TrunklineAdvanceDetailClient implements ITrunklineAdvanceDetailClient{ + + private final ITrunklineAdvanceDetailService advanceDetailService; + + @Override + public void addAdvanceBatch(List advanceDetailEntities) { + advanceDetailService.saveBatch(advanceDetailEntities); + } +} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineDetailProductClient.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineDetailProductClient.java new file mode 100644 index 000000000..942cc7337 --- /dev/null +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineDetailProductClient.java @@ -0,0 +1,33 @@ +package com.logpm.trunkline.feign; + +import com.logpm.trunkline.entity.TrunklineDetailProductEntity; +import com.logpm.trunkline.service.ITrunklineDetailProductService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.List; + +@Slf4j +@ApiIgnore() +@RestController +@AllArgsConstructor +public class TrunklineDetailProductClient implements ITrunklineDetailProductClient { + + private final ITrunklineDetailProductService detailProductService; + + @Override + public Long addEntityReturnId(TrunklineDetailProductEntity trunklineDetailProductEntity) { + boolean save = detailProductService.save(trunklineDetailProductEntity); + if(!save){ + return null; + } + return trunklineDetailProductEntity.getId(); + } + + @Override + public void addListEntity(List trunklineDetailProductEntities) { + detailProductService.saveBatch(trunklineDetailProductEntities); + } +} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineWaybillOrderClient.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineWaybillOrderClient.java new file mode 100644 index 000000000..005016eee --- /dev/null +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineWaybillOrderClient.java @@ -0,0 +1,37 @@ +package com.logpm.trunkline.feign; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.logpm.trunkline.entity.TrunklineWaybillOrderEntity; +import com.logpm.trunkline.service.ITrunklineWaybillOrderService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.List; + +@Slf4j +@ApiIgnore() +@RestController +@AllArgsConstructor +public class TrunklineWaybillOrderClient implements ITrunklineWaybillOrderClient{ + + private final ITrunklineWaybillOrderService waybillOrderService; + + @Override + public List findListByWaybillNo(String waybillNo) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("waybill_no",waybillNo); + List list = waybillOrderService.list(queryWrapper); + return list; + } + + @Override + public Long addEntityReturnId(TrunklineWaybillOrderEntity trunklineWaybillOrderEntity) { + boolean save = waybillOrderService.save(trunklineWaybillOrderEntity); + if(!save){ + return null; + } + return trunklineWaybillOrderEntity.getId(); + } +}