From e178c7f992c56f9796596f56ebd82cfac1bc90d2 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 7 Jul 2023 11:51:42 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A4=84=E7=90=86=E8=80=81=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=9A=84=E8=BF=90=E5=8D=95=E5=88=B0=E6=96=B0=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionStockArticleEntity.java | 94 ++++- .../oldproject/entity/OrderDetailEntity.java | 176 +++++++++ .../oldproject/entity/WayBillEntity.java | 348 ++++++++++++++++++ .../feign/IAdvanceDetailClient.java | 2 + .../oldproject/feign/IOrderDetailClient.java | 39 ++ .../oldproject/feign/IWayBillClient.java | 40 ++ .../feign/IMainlineWaybillClient.java | 5 + blade-service/logpm-factory/pom.xml | 6 + .../service/impl/AsyncDataServiceImpl.java | 6 +- .../impl/PanFactoryDataServiceImpl.java | 59 ++- .../oldproject/feign/AdvanceDetailClient.java | 6 + .../oldproject/feign/OrderDetailClient.java | 44 +++ .../logpm/oldproject/feign/WayBillClient.java | 43 +++ .../oldproject/mapper/OrderDetailMapper.java | 31 ++ .../oldproject/mapper/OrderDetailMapper.xml | 7 + .../oldproject/mapper/WayBillMapper.java | 10 + .../service/IAdvanceDetailService.java | 1 + .../service/IOrderDetailService.java | 8 + .../oldproject/service/IWayBillService.java | 10 + .../impl/AdvanceDetailServiceImpl.java | 9 + .../service/impl/OrderDetailServiceImpl.java | 22 ++ .../service/impl/WayBillServiceImpl.java | 26 ++ 22 files changed, 979 insertions(+), 13 deletions(-) create mode 100644 blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/OrderDetailEntity.java create mode 100644 blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/WayBillEntity.java create mode 100644 blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IOrderDetailClient.java create mode 100644 blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWayBillClient.java create mode 100644 blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/OrderDetailClient.java create mode 100644 blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/WayBillClient.java create mode 100644 blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderDetailMapper.java create mode 100644 blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderDetailMapper.xml create mode 100644 blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/WayBillMapper.java create mode 100644 blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IOrderDetailService.java create mode 100644 blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IWayBillService.java create mode 100644 blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/OrderDetailServiceImpl.java create mode 100644 blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/WayBillServiceImpl.java diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java index 78c7e8145..28e8250c6 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java @@ -158,9 +158,9 @@ public class DistributionStockArticleEntity extends TenantEntity { @ApiModelProperty(value = "类型;1 预约单 2库存单") private Integer genre; /** - * 状态;1 配送 2 待配送 + * 状态;1 配送 2 待配送 3部分入库 4已入库 */ - @ApiModelProperty(value = "状态;1 配送 2 待配送") + @ApiModelProperty(value = "状态;1 配送 2 待配送 3部分入库 4已入库") private Integer state; /** @@ -201,7 +201,7 @@ public class DistributionStockArticleEntity extends TenantEntity { * 收货单位 */ @ApiModelProperty(value = "收货单位") - private Integer consigneeUnit; + private String consigneeUnit; /** * 到付费用 */ @@ -214,10 +214,98 @@ public class DistributionStockArticleEntity extends TenantEntity { private BigDecimal storageFee; + //-------------2023-07-16 新增在库订单字段 + /** + * 收货人 + */ + @ApiModelProperty(value = "收货人") + private String consigneePerson; + + /** + * 入库时间-终 + */ + @ApiModelProperty(value = "入库时间-终") + @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss") + private Date warehouseEntryTimeEnd; + + /** + * 分拣件数 + */ + @ApiModelProperty(value = "分拣件数") + private Integer sortingQuantity; + + /** + * 配送件数 + */ + @ApiModelProperty(value = "配送件数") + private Integer deliveryQuantity; + + /** + * 中转件数 + */ + @ApiModelProperty(value = "中转件数") + private Integer transferQuantity; + + /** + * 签收件数 + */ + @ApiModelProperty(value = "签收件数") + private Integer signinQuantity; + + /** + * 上架状态（0未上架 1部分上架 2已上架 3已下架） + */ + @ApiModelProperty(value = "上架状态") + private Integer groundingStatus; + /** + * 货位信息 + */ + @ApiModelProperty(value = "货位信息") + private String allocation; + /** + * 订单来源 + */ + @ApiModelProperty(value = "订单来源") + private String resource; + /** + * 托盘 + */ + @ApiModelProperty(value = "托盘") + private String trays; + /** + * 干仓配 + */ + @ApiModelProperty(value = "干仓配") + private Integer isOpai; + + + /** + * 盘点时间 + */ + @ApiModelProperty(value = "盘点时间") + private Date inventoryDate; + + /** + * 盘点人 + */ + @ApiModelProperty(value = "盘点人") + private String inventoryPerson; + + /** + * 盘点人id + */ + @ApiModelProperty(value = "盘点人id") + private String inventoryPersonId; + + /** + * 冻结状态0未冻结 1已冻结 + */ + @ApiModelProperty(value = "冻结状态0未冻结 1已冻结") + private String freezeStatus; } diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/OrderDetailEntity.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/OrderDetailEntity.java new file mode 100644 index 000000000..fd0d8081c --- /dev/null +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/OrderDetailEntity.java @@ -0,0 +1,176 @@ +package com.logpm.oldproject.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +@TableName("ht_order_detail") +@ApiModel(value = "Order对象", description = "订单信息") +public class OrderDetailEntity { + + @TableId( + value = "id", + type = IdType.AUTO + ) + private Integer id; + + @ApiModelProperty(value = "仓库id") + private Integer warehouseId; + + @ApiModelProperty(value = "包条码拆分") + private Integer isChildren; + + @ApiModelProperty(value = "") + private Integer test; + + @ApiModelProperty(value = "区域") + private String area; + + @ApiModelProperty(value = "来源") + private String source; + + @ApiModelProperty(value = "干仓配") + private Integer isOpai; + + @ApiModelProperty(value = "订单号") + private String number; + + @ApiModelProperty(value = "订单自编号") + private String detailNumber; + + @ApiModelProperty(value = "包条码") + @TableField("unitNo") + private String unitNo; + + @ApiModelProperty(value = "车次号") + @TableField("mctsTruck") + private String mctsTruck; + + @ApiModelProperty(value = "货物名称") + @TableField("title") + private String title; + + @ApiModelProperty(value = "数量") + @TableField("num") + private String num; + + @ApiModelProperty(value = "二级品类名称") + @TableField("secondPackName") + private String secondPackName; + + @ApiModelProperty(value = "二级品类") + @TableField("secondPackCode") + private String secondPackCode; + + @ApiModelProperty(value = "三级品类名称") + @TableField("thirdPackName") + private String thirdPackName; + + @ApiModelProperty(value = "三级品类") + @TableField("thirdPackCode") + private String thirdPackCode; + + @ApiModelProperty(value = "扫码人") + private Integer administratorsId; + + @ApiModelProperty(value = "状态") + private Integer status; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + + @ApiModelProperty(value = "删除时间") + private Integer deleteTime; + + @ApiModelProperty(value = "长") + @TableField("long") + private Double chang; + + @ApiModelProperty(value = "宽") + @TableField("wide") + private Double wide; + + @ApiModelProperty(value = "高") + @TableField("high") + private Double high; + + @ApiModelProperty(value = "体积") + @TableField("volume") + private Double volume; + + @ApiModelProperty(value = "单位") + @TableField("unit") + private String unit; + + @ApiModelProperty(value = "单价") + @TableField("price") + private Double price; + + @ApiModelProperty(value = "上架状态:1，上架，0，未上架") + private Integer onShelfType; + + @ApiModelProperty(value = "货位ID") + private Integer locationId; + + @ApiModelProperty(value = "") + private String locationInfo; + + @ApiModelProperty(value = "") + private Integer test1; + + @ApiModelProperty(value = "货位ID") + private Integer locationIds; + + @ApiModelProperty(value = "") + private String locationInfos; + + @ApiModelProperty(value = "拆分人ID") + private Integer splitPerson; + + @ApiModelProperty(value = "拆分人") + private String splitPersonName; + + @ApiModelProperty(value = "其他备注信息") + private String otherMsg; + + @ApiModelProperty(value = "所在仓库id") + private Integer nowWarehouseId; + + @ApiModelProperty(value = "车类型") + private Integer carsType; + + @ApiModelProperty(value = "车次号") + private String startCarsNo; + + @ApiModelProperty(value = "advance_id关联") + private Integer advanceId; + + @ApiModelProperty(value = "运单id") + private Integer waybillId; + + @ApiModelProperty(value = "运单号") + private String waybillNo; + + @ApiModelProperty(value = "是否签收：1否，2是") + private Integer signState; + + @ApiModelProperty(value = "签收仓库") + private Integer signWarehouseId; + + @ApiModelProperty(value = "签收时间") + private Date signTime; + + @ApiModelProperty(value = "") + private Integer oldId; + +} diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/WayBillEntity.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/WayBillEntity.java new file mode 100644 index 000000000..0fc91a80f --- /dev/null +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/WayBillEntity.java @@ -0,0 +1,348 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.oldproject.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 运单表; + * @author : http://www.chiner.pro + * @date : 2023-7-6 + */ +@ApiModel(value = "运单表",description = "") +@Data +@TableName("ht_order_detail") +public class WayBillEntity implements Serializable,Cloneable{ + /** ID */ + @TableId( + value = "id", + type = IdType.AUTO + ) + private Integer id; + /** 车次号 */ + @ApiModelProperty(name = "车次号",notes = "") + private String carNo ; + /** 运单号 */ + @ApiModelProperty(name = "运单号",notes = "") + private String waybillNo ; + /** 1=干仓配，2=非干仓配【用于价格计算】 */ + @ApiModelProperty(name = "1=干仓配，2=非干仓配【用于价格计算】",notes = "") + private Integer isOpai ; + /** 品牌id */ + @ApiModelProperty(name = "品牌id",notes = "") + private String brandId ; + /** 省 */ + @ApiModelProperty(name = "省",notes = "") + private Integer provinceId ; + /** 市 */ + @ApiModelProperty(name = "市",notes = "") + private Integer cityId ; + /** 区 */ + @ApiModelProperty(name = "区",notes = "") + private Integer areaId ; + /** 省 */ + @ApiModelProperty(name = "省",notes = "") + private String province ; + /** 市 */ + @ApiModelProperty(name = "市",notes = "") + private String city ; + /** 区 */ + @ApiModelProperty(name = "区",notes = "") + private String area ; + /** 品牌 */ + @ApiModelProperty(name = "品牌",notes = "") + private String brand ; + /** 二级品类 */ + @ApiModelProperty(name = "二级品类",notes = "") + private String firstName ; + /** 子订单：0=否，1=是 */ + @ApiModelProperty(name = "子订单：0=否，1=是",notes = "") + private Integer isChild ; + /** 拆单节点 */ + @ApiModelProperty(name = "拆单节点",notes = "") + private Integer childNode ; + /** 发站id */ + @ApiModelProperty(name = "发站id",notes = "") + private Integer startSiteId ; + /** 发站 */ + @ApiModelProperty(name = "发站",notes = "") + private String startSite ; + /** 到站id */ + @ApiModelProperty(name = "到站id",notes = "") + private Integer arriveSiteId ; + /** 到站 */ + @ApiModelProperty(name = "到站",notes = "") + private String arriveSite ; + /** 网站id */ + @ApiModelProperty(name = "网站id",notes = "") + private Integer warehouseId ; + /** 网点 */ + @ApiModelProperty(name = "网点",notes = "") + private String warehouseName ; + /** 类型：1=标准开单，2=零担开单，3=整车开单 */ + @ApiModelProperty(name = "类型：1=标准开单，2=零担开单，3=整车开单",notes = "") + private Integer type ; + /** 货号 */ + @ApiModelProperty(name = "货号",notes = "") + private String articleNumber ; + /** 委托单号 */ + @ApiModelProperty(name = "委托单号",notes = "") + private String orderNo ; + /** 发货方id */ + @ApiModelProperty(name = "发货方id",notes = "") + private Integer sendId ; + /** 发货单位 */ + @ApiModelProperty(name = "发货单位",notes = "") + private String sendCompany ; + /** 发货人 */ + @ApiModelProperty(name = "发货人",notes = "") + private String sendPerson ; + /** 发货方手机号 */ + @ApiModelProperty(name = "发货方手机号",notes = "") + private String sendPhone ; + /** 发货方电话 */ + @ApiModelProperty(name = "发货方电话",notes = "") + private String sendMobile ; + /** 发货方地址 */ + @ApiModelProperty(name = "发货方地址",notes = "") + private String sendAddress ; + /** 收货方id */ + @ApiModelProperty(name = "收货方id",notes = "") + private Integer takeId ; + /** 收货单位 */ + @ApiModelProperty(name = "收货单位",notes = "") + private String takeCompany ; + /** 收货人 */ + @ApiModelProperty(name = "收货人",notes = "") + private String takePerson ; + /** 收货方手机号 */ + @ApiModelProperty(name = "收货方手机号",notes = "") + private String takePhone ; + /** 收货方电话 */ + @ApiModelProperty(name = "收货方电话",notes = "") + private String takeMobile ; + /** 收货方地址 */ + @ApiModelProperty(name = "收货方地址",notes = "") + private String takeAddress ; + /** 到货-开始时间 */ + @ApiModelProperty(name = "到货-开始时间",notes = "") + private Date takeStartTime ; + /** 到货-结束时间 */ + @ApiModelProperty(name = "到货-结束时间",notes = "") + private Date takeEndTime ; + /** 合计行数量 */ + @ApiModelProperty(name = "合计行数量",notes = "") + private Integer total ; + /** 货物名称 */ + @ApiModelProperty(name = "货物名称",notes = "") + private String packname ; + /** 总件数 */ + @ApiModelProperty(name = "总件数",notes = "") + private Integer number ; + /** 总重量 */ + @ApiModelProperty(name = "总重量",notes = "") + private BigDecimal weight ; + /** 总体积 */ + @ApiModelProperty(name = "总体积",notes = "") + private BigDecimal volume ; + /** 物品合计费用 */ + @ApiModelProperty(name = "物品合计费用",notes = "") + private BigDecimal totalSmallPrice ; + /** 总费用 */ + @ApiModelProperty(name = "总费用",notes = "") + private BigDecimal totalPrice ; + /** 运费 */ + @ApiModelProperty(name = "运费",notes = "") + private BigDecimal freight ; + /** 送货费 */ + @ApiModelProperty(name = "送货费",notes = "") + private BigDecimal deliveryCost ; + /** 提货费 */ + @ApiModelProperty(name = "提货费",notes = "") + private BigDecimal takeCost ; + /** 装卸费 */ + @ApiModelProperty(name = "装卸费",notes = "") + private BigDecimal pretendCost ; + /** 申明价值 */ + @ApiModelProperty(name = "申明价值",notes = "") + private BigDecimal value ; + /** 保险率 */ + @ApiModelProperty(name = "保险率",notes = "") + private BigDecimal lnsuranceRate ; + /** 保价费 */ + @ApiModelProperty(name = "保价费",notes = "") + private BigDecimal priceProtectionFee ; + /** 仓储费 */ + @ApiModelProperty(name = "仓储费",notes = "") + private BigDecimal warehousingFee ; + /** 仓库管理费 */ + @ApiModelProperty(name = "仓库管理费",notes = "") + private BigDecimal warehouseManagementFee ; + /** 支付方式：1=现金，2=银行卡，3=微信，4=支付宝，5=支票，6=账本 */ + @ApiModelProperty(name = "支付方式：1=现金，2=银行卡，3=微信，4=支付宝，5=支票，6=账本",notes = "") + private Integer payType ; + /** 付款方式：1=现付，2=到付，3=月结，4=回付，5=免费，6=多笔付 */ + @ApiModelProperty(name = "付款方式：1=现付，2=到付，3=月结，4=回付，5=免费，6=多笔付",notes = "") + private Integer paymentMethod ; + /** 现付 */ + @ApiModelProperty(name = "现付",notes = "") + private BigDecimal xPay ; + /** 到付 */ + @ApiModelProperty(name = "到付",notes = "") + private BigDecimal dPay ; + /** 月付 */ + @ApiModelProperty(name = "月付",notes = "") + private BigDecimal yPay ; + /** 回付 */ + @ApiModelProperty(name = "回付",notes = "") + private BigDecimal hPay ; + /** 代收货款 */ + @ApiModelProperty(name = "代收货款",notes = "") + private BigDecimal replacePrice ; + /** 经办人 */ + @ApiModelProperty(name = "经办人",notes = "") + private String agent ; + /** 经办人 */ + @ApiModelProperty(name = "经办人",notes = "") + private Integer agentId ; + /** 操作人id */ + @ApiModelProperty(name = "操作人id",notes = "") + private Integer administratorsId ; + /** 操作人 */ + @ApiModelProperty(name = "操作人",notes = "") + private String administratorsName ; + /** 制单时间 */ + @ApiModelProperty(name = "制单时间",notes = "") + private Date preparationTime ; + /** 回扣 */ + @ApiModelProperty(name = "回扣",notes = "") + private BigDecimal rebate ; + /** 其他费用 */ + @ApiModelProperty(name = "其他费用",notes = "") + private BigDecimal otherFee ; + /** 三方操作费 */ + @ApiModelProperty(name = "三方操作费",notes = "") + private BigDecimal threeHandleFee ; + /** 送货方式：1=自提，2=送货，3=送货上门，4=送货上楼(有电梯)，5=送货上楼(无电梯)，6=送货卸货，7=送货安装，8=专车直送，9=送货不上楼 */ + @ApiModelProperty(name = "送货方式：1=自提，2=送货，3=送货上门，4=送货上楼(有电梯)，5=送货上楼(无电梯)，6=送货卸货，7=送货安装，8=专车直送，9=送货不上楼",notes = "") + private Integer sendType ; + /** 通知类型：1=控货，2=提货 */ + @ApiModelProperty(name = "通知类型：1=控货，2=提货",notes = "") + private Integer sendTiny ; + /** 紧急度：1=正常，2=急，3=加急，4=特急 */ + @ApiModelProperty(name = "紧急度：1=正常，2=急，3=加急，4=特急",notes = "") + private Integer urgency ; + /** 回单数 */ + @ApiModelProperty(name = "回单数",notes = "") + private Integer receiptNum ; + /** 回单要求 */ + @ApiModelProperty(name = "回单要求",notes = "") + private String receiptAsk ; + /** 运输方式：1=公路快运，2=海运，3=卡车航班，4=空运，5=普通汽班，6=汽运限时，7=铁路，8=快递 */ + @ApiModelProperty(name = "运输方式：1=公路快运，2=海运，3=卡车航班，4=空运，5=普通汽班，6=汽运限时，7=铁路，8=快递",notes = "") + private Integer shippingType ; + /** 备注 */ + @ApiModelProperty(name = "备注",notes = "") + private String msg ; + /** 单子类型：1=无运费，2=运单有运，3=测试 */ + @ApiModelProperty(name = "单子类型：1=无运费，2=运单有运，3=测试",notes = "") + private Integer noType ; + /** 运单标识: 1=改,2=审，3=废 */ + @ApiModelProperty(name = "运单标识: 1=改,2=审，3=废",notes = "") + private String orderFlat ; + /** 状态网点id */ + @ApiModelProperty(name = "状态网点id",notes = "") + private Integer statusSiteId ; + /** 所有状态网点 */ + @ApiModelProperty(name = "所有状态网点",notes = "") + private String allStatusId ; + /** 状态网点 */ + @ApiModelProperty(name = "状态网点",notes = "") + private String statusSite ; + /** 状态：-1=作废,0=已开单,1=已入库，2=短驳中，3=已装车，4=已发车，5=已到达，6=中转中，7=已接收，8=外部中转出库，9=已签收，10=已配送，11=部分签收，12=部分配送，13=外围配送,14=外围配送发车,15=外围配送签收,16=部分装车,17=部分入库，18=部分到达,19-部分中转出库,20=中转到达,21=部分中转到达 */ + @ApiModelProperty(name = "状态：-1=作废,0=已开单,1=已入库，2=短驳中，3=已装车，4=已发车，5=已到达，6=中转中，7=已接收，8=外部中转出库，9=已签收，10=已配送，11=部分签收，12=部分配送，13=外围配送,14=外围配送发车,15=外围配送签收,16=部分装车,17=部分入库，18=部分到达,19-部分中转出库,20=中转到达,21=部分中转到达",notes = "") + private Integer status ; + /** 配载批次号【记录最新的配载车次号信息】 */ + @ApiModelProperty(name = "配载批次号【记录最新的配载车次号信息】",notes = "") + private String startCarsNo ; + /** 创建时间 */ + @ApiModelProperty(name = "创建时间",notes = "") + private Date createTime ; + /** 修改时间 */ + @ApiModelProperty(name = "修改时间",notes = "") + private Date updateTime ; + /** 删除时间 */ + @ApiModelProperty(name = "删除时间",notes = "") + private Integer deleteTime ; + /** 审核状态：1=待审核，2=已审核 */ + @ApiModelProperty(name = "审核状态：1=待审核，2=已审核",notes = "") + private Integer verifyStatus ; + /** 后端开单：1=后端，2=pda */ + @ApiModelProperty(name = "后端开单：1=后端，2=pda",notes = "") + private Integer isAdmin ; + /** 财务状态:1=待结算，2=已结算 */ + @ApiModelProperty(name = "财务状态:1=待结算，2=已结算",notes = "") + private Integer financialStatus ; + /** 结算时间 */ + @ApiModelProperty(name = "结算时间",notes = "") + private Date financialTime ; + /** 结算人 */ + @ApiModelProperty(name = "结算人",notes = "") + private String financialPersonName ; + /** 结算id */ + @ApiModelProperty(name = "结算id",notes = "") + private Integer settlementDealId ; + /** 订单总数 */ + @ApiModelProperty(name = "订单总数",notes = "") + private Integer orderNum ; + /** 配载数量 */ + @ApiModelProperty(name = "配载数量",notes = "") + private Integer wayOrderCount ; + /** 送货时间 */ + @ApiModelProperty(name = "送货时间",notes = "") + private Date distributionTime ; + /** 签收时间 */ + @ApiModelProperty(name = "签收时间",notes = "") + private Date signTime ; + /** */ + @ApiModelProperty(name = "",notes = "") + private Integer oldId ; + /** 冻结：1=正常，2=冻结 */ + @ApiModelProperty(name = "冻结：1=正常，2=冻结",notes = "") + private Integer freeze ; + /** 曼好家回传订单号 */ + @ApiModelProperty(name = "曼好家回传订单号",notes = "") + private String mhjOrderNo ; + /** 送货司机[记录最新的送货司机信息] */ + @ApiModelProperty(name = "送货司机[记录最新的送货司机信息]",notes = "") + private String sendDriver ; + /** 提货状态：0=未提货，1=部分提货，2=提货完成 */ + @ApiModelProperty(name = "提货状态：0=未提货，1=部分提货，2=提货完成",notes = "") + private Integer pickUpStatus ; + /** 成本确认：1=是，2=否 */ + @ApiModelProperty(name = "成本确认：1=是，2=否",notes = "") + private Integer costAllocationType ; +} 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 b079e44de..115a64580 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 @@ -74,4 +74,6 @@ public interface IAdvanceDetailClient { @GetMapping(API_PREFIX + "/getByUnitNo") DistributionParcelListEntityVO getByUnitNo(@RequestParam String unitNo); + @GetMapping(API_PREFIX + "/getAllNumByOrderNo") + Integer getAllNumByOrderNo(@RequestParam String orderSelfNum); } diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IOrderDetailClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IOrderDetailClient.java new file mode 100644 index 000000000..e277a8562 --- /dev/null +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IOrderDetailClient.java @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.oldproject.feign; + +import com.logpm.oldproject.entity.OrderDetailEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 订单详情 Feign接口类 + * + * @author zhy + * @since 2023-06-24 + */ +@FeignClient( + value = "logpm-old-project" +) +public interface IOrderDetailClient { + + String API_PREFIX = "/client"; + + @GetMapping(API_PREFIX + "/findByUnitNo") + OrderDetailEntity findByUnitNo(@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 new file mode 100644 index 000000000..c8ab26947 --- /dev/null +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IWayBillClient.java @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.oldproject.feign; + +import com.logpm.oldproject.entity.WayBillEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 运单详情 Feign接口类 + * + * @author zhy + * @since 2023-06-24 + */ +@FeignClient( + value = "logpm-old-project" +) +public interface IWayBillClient { + + String API_PREFIX = "/client"; + + @GetMapping(API_PREFIX + "/getByWaybillNo") + WayBillEntity getByWaybillNo(@RequestParam String waybillNo); + +} diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/IMainlineWaybillClient.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/IMainlineWaybillClient.java index cfeb0b22c..f205f16da 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/IMainlineWaybillClient.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/IMainlineWaybillClient.java @@ -16,8 +16,11 @@ */ package com.logpm.trunkline.feign; +import com.logpm.trunkline.entity.MainlineWaybill; 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.RequestParam; /** * 运单表 Feign接口类 @@ -33,4 +36,6 @@ public interface IMainlineWaybillClient { String API_PREFIX = "/client"; String TOP = API_PREFIX + "/top"; + @GetMapping(API_PREFIX + "/findByWaybillNo") + MainlineWaybill findByWaybillNo(@RequestParam String waybillNo); } diff --git a/blade-service/logpm-factory/pom.xml b/blade-service/logpm-factory/pom.xml index ba96c5bc8..900c3c888 100644 --- a/blade-service/logpm-factory/pom.xml +++ b/blade-service/logpm-factory/pom.xml @@ -92,6 +92,12 @@ 3.1.0.RELEASE compile + + org.springblade + logpm-trunkline-api + 3.1.0.RELEASE + compile + diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java index 6c93d35bd..16fa0f79c 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java @@ -80,7 +80,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { advanceEntity.setType(FactoryConstant.PIANO); advanceEntity.setTotal(panFactoryOrder.getTotalQuantity()); //订单总数据 advanceEntity.setMctsTruck(StringUtil.isBlank(panFactoryOrder.getLoadingList())?"":panFactoryOrder.getLoadingList()); //车次 - advanceEntity.setMtdsNo("");// MTDS单号 可以为空 + advanceEntity.setMtdsNo(StringUtil.isBlank(panFactoryOrder.getDeliveryNumber())?"":panFactoryOrder.getDeliveryNumber());// MTDS单号 可以为空 advanceEntity.setFirstPackName(""); //一级品类 advanceEntity.setFirstPackCode(""); //一级品类 advanceEntity.setDealerName(""); //商场名称 @@ -105,7 +105,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { advanceEntity.setSenderName(StringUtil.isBlank(panFactoryOrder.getSendFactory())?"":panFactoryOrder.getSendFactory()); //发货工厂名称 可以为空 advanceEntity.setAdministratorsId(1078);// 导入人 advanceEntity.setCreateTime(LocalDate.now()); //添加时间 - advanceEntity.setCarsNum(StringUtil.isBlank(panFactoryOrder.getDeliveryNumber())?"":panFactoryOrder.getDeliveryNumber()); //派车单--snm 可以为空 + advanceEntity.setCarsNum(""); //派车单--snm 可以为空 advanceEntity.setDeleteTime(0); // 删除时间 advanceEntity.setWaybillNo("");//运单号 可以为空 Integer warehouseId = PanFactoryEnum.getId(panFactoryOrder.getPlantId()); @@ -165,7 +165,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { advanceDetailEntity.setMtdsNum(0);//销售数量 advanceDetailEntity.setVolume("");//体积 advanceDetailEntity.setUnitNo(StringUtil.isBlank(panPackageInfo.getUnitNo())?"":panPackageInfo.getUnitNo());//包条码 - advanceDetailEntity.setMctsTruck(StringUtil.isBlank(panFactoryOrder.getDeliveryNumber())?"":panFactoryOrder.getDeliveryNumber());//车次号 + advanceDetailEntity.setMctsTruck(StringUtil.isBlank(panFactoryOrder.getLoadingList())?"":panFactoryOrder.getLoadingList());//车次号 advanceDetailEntity.setMctsTruckNo("");//车牌号 advanceDetailEntity.setDate100(null);//基地发货日期 advanceDetailEntity.setDate2("");//预约到厂时间 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 afea27c11..6c4f9b9f6 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 @@ -34,11 +34,12 @@ import com.logpm.factory.snm.entity.PanPackageInfo; import com.logpm.factory.snm.entity.PanPackageList; import com.logpm.oldproject.entity.AdvanceDetailEntity; import com.logpm.oldproject.entity.AdvanceEntity; -import com.logpm.oldproject.feign.IAdvanceClient; -import com.logpm.oldproject.feign.IAdvanceDetailClient; -import com.logpm.oldproject.feign.IOrderClient; -import com.logpm.oldproject.feign.IWarehouseClient; +import com.logpm.oldproject.entity.OrderDetailEntity; +import com.logpm.oldproject.entity.WayBillEntity; +import com.logpm.oldproject.feign.*; import com.logpm.oldproject.vo.DistributionParcelListEntityVO; +import com.logpm.trunkline.entity.MainlineWaybill; +import com.logpm.trunkline.feign.IMainlineWaybillClient; import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -71,7 +72,10 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { private final IAdvanceDetailClient advanceDetailClient; private final IWarehouseClient warehouseClient; private final IOrderClient orderClient; + private final IOrderDetailClient orderDetailClient; private final IAdvanceClient advanceClient; + private final IMainlineWaybillClient mainlineWaybillClient; + private final IWayBillClient wayBillClient; private final IDistributionParcelListClient distributionParcelListClient; private final IDistributionStockArticleClient distributionStockArticleClient; @@ -341,6 +345,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { logger.warn("#################handleDataToPlatform: 未找到对应的订单信息 advanceId={}",advanceId); throw new CustomerException(405,"未找到对应的订单信息"); } + Integer total = advanceEntity.getTotal();//发货总数量 Map supplyData = advanceDetailClient.getSupplyData(unitNo); String destinationWarehouse = supplyData.get("destinationWarehouse");//目的仓名称 @@ -356,15 +361,24 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { distributionStockArticleEntity = new DistributionStockArticleEntity(); distributionStockArticleEntity.setServiceNumber(advanceEntity.getServiceNum()); - distributionStockArticleEntity.setOrderSelfNumbering(advanceEntity.getOrderSelfNum()); + distributionStockArticleEntity.setOrderSelfNumbering(orderSelfNum); distributionStockArticleEntity.setMallName(takeCompany); distributionStockArticleEntity.setDescriptionGoods(advanceEntity.getFirstPackName()); distributionStockArticleEntity.setWarehouse(destinationWarehouse); distributionStockArticleEntity.setWarehouseEntryTime(date); - distributionStockArticleEntity.setTotalNumber(advanceEntity.getTotal()); + distributionStockArticleEntity.setTotalNumber(total); distributionStockArticleEntity.setHandQuantity(0); - distributionStockArticleEntity.setCompleteSet(1); + //判断是否齐套 查询该订单自编号下面的包件是都全部都交由汇通了 + Integer allNum = advanceDetailClient.getAllNumByOrderNo(orderSelfNum); + if(total.equals(allNum)){ + //如果数据库中的数据和订单上的数量相等就是齐套 + distributionStockArticleEntity.setCompleteSet(1); + }else{ + distributionStockArticleEntity.setCompleteSet(0); + } + distributionStockArticleEntity.setBrand(advanceEntity.getType()); + distributionStockArticleEntity.setResource(advanceEntity.getType()); if(!Objects.isNull(basicdataWarehouseEntity)){ distributionStockArticleEntity.setCreateDept(Long.parseLong(basicdataWarehouseEntity.getDepartment())); } @@ -386,6 +400,25 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { distributionStockArticleEntity.setGenre(1); distributionStockArticleEntity.setState(2); distributionStockArticleEntity.setAdvanceId(advanceId); + //--------------2023-07-06 新增字段处理 + //查询包条码对应的运单信息 + OrderDetailEntity orderDetailEntity = orderDetailClient.findByUnitNo(unitNo); + if(!Objects.isNull(orderDetailEntity)){ + String waybillNo = orderDetailEntity.getWaybillNo(); + //查询新系统的运单表是否有存在数据 + MainlineWaybill mainlineWaybill = mainlineWaybillClient.findByWaybillNo(waybillNo); + if(Objects.isNull(mainlineWaybill)){ + mainlineWaybill = new MainlineWaybill(); + dealwithWaybillData(mainlineWaybill,waybillNo); + } + + } + +// distributionStockArticleEntity.setConsigneeUnit();//收货单位（经销商） +// distributionStockArticleEntity.setConsigneePerson();//收货人 + + + id = distributionStockArticleClient.addData(distributionStockArticleEntity); if(id == 0){ logger.warn("#################handleDataToPlatform: 保存订单信息失败 orderSelfNum={}",orderSelfNum); @@ -417,6 +450,18 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { } } + private void dealwithWaybillData(MainlineWaybill mainlineWaybill,String waybillNo) { + //查询老系统运单数据 + WayBillEntity wayBillEntity = wayBillClient.getByWaybillNo(waybillNo); +// if(!Objects.isNull(wayBillEntity)){ +// mainlineWaybill.setWaybillNumber(waybillNo); +// mainlineWaybill.setO +// } + + + + } + @Transactional @Override public Long saveData(PanFactoryOrderDTO factoryOrderDTO) { 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 4868eccc8..3c7fc12ea 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 @@ -79,4 +79,10 @@ public class AdvanceDetailClient implements IAdvanceDetailClient { return advanceDetailService.getByUnitNo(unitNo); } + @Override + @GetMapping(API_PREFIX + "/getAllNumByOrderNo") + public Integer getAllNumByOrderNo(String orderSelfNum) { + return advanceDetailService.getAllNumByOrderNo(orderSelfNum); + } + } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/OrderDetailClient.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/OrderDetailClient.java new file mode 100644 index 000000000..e7b810485 --- /dev/null +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/OrderDetailClient.java @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.oldproject.feign; + +import com.logpm.oldproject.entity.OrderDetailEntity; +import com.logpm.oldproject.service.IOrderDetailService; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * order Feign实现类 + * + * @author zhy + * @since 2023-06-24 + */ +@ApiIgnore() +@RestController +@AllArgsConstructor +public class OrderDetailClient implements IOrderDetailClient { + + private final IOrderDetailService orderDetailService; + + @Override + @GetMapping(API_PREFIX + "/findByUnitNo") + public OrderDetailEntity findByUnitNo(String unitNo) { + return orderDetailService.findByUnitNo(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 new file mode 100644 index 000000000..3e40d1f44 --- /dev/null +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/WayBillClient.java @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.oldproject.feign; + +import com.logpm.oldproject.entity.WayBillEntity; +import com.logpm.oldproject.service.IWayBillService; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 运单详情 Feign接口类 + * + * @author zhy + * @since 2023-06-24 + */ + +@ApiIgnore() +@RestController +@AllArgsConstructor +public class WayBillClient implements IWayBillClient { + + private final IWayBillService wayBillService; + + @Override + public WayBillEntity getByWaybillNo(String waybillNo) { + return wayBillService.getByWaybillNo(waybillNo); + } +} diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderDetailMapper.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderDetailMapper.java new file mode 100644 index 000000000..d37b5b29a --- /dev/null +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderDetailMapper.java @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.oldproject.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.logpm.oldproject.entity.OrderDetailEntity; + +/** + * 订单 Mapper 接口 + * + * @author zhy + * @since 2023-06-24 + */ +public interface OrderDetailMapper extends BaseMapper { + + +} diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderDetailMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderDetailMapper.xml new file mode 100644 index 000000000..d07b619fd --- /dev/null +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderDetailMapper.xml @@ -0,0 +1,7 @@ + + + + + + + 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 new file mode 100644 index 000000000..f6b22edba --- /dev/null +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/WayBillMapper.java @@ -0,0 +1,10 @@ +package com.logpm.oldproject.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.logpm.oldproject.entity.WayBillEntity; + +public interface WayBillMapper extends BaseMapper { + + + +} 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 90c4e5d1d..cbaf75d6d 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 @@ -38,4 +38,5 @@ public interface IAdvanceDetailService { DistributionParcelListEntityVO getByUnitNo(String unitNo); + Integer getAllNumByOrderNo(String orderSelfNum); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IOrderDetailService.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IOrderDetailService.java new file mode 100644 index 000000000..bec759211 --- /dev/null +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IOrderDetailService.java @@ -0,0 +1,8 @@ +package com.logpm.oldproject.service; + +import com.logpm.oldproject.entity.OrderDetailEntity; + +public interface IOrderDetailService { + + OrderDetailEntity findByUnitNo(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 new file mode 100644 index 000000000..d7b8bd5b7 --- /dev/null +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IWayBillService.java @@ -0,0 +1,10 @@ +package com.logpm.oldproject.service; + + +import com.logpm.oldproject.entity.WayBillEntity; + +public interface IWayBillService { + + + WayBillEntity getByWaybillNo(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 e12a2c209..e5931784b 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 @@ -64,5 +64,14 @@ public class AdvanceDetailServiceImpl implements IAdvanceDetailService { return advanceDetailMapper.getByUnitNo(unitNo); } + @Override + public Integer getAllNumByOrderNo(String orderSelfNum) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("orderSelfNum",orderSelfNum); + + List advanceDetailEntities = advanceDetailMapper.selectList(queryWrapper); + return advanceDetailEntities.size(); + } + } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/OrderDetailServiceImpl.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/OrderDetailServiceImpl.java new file mode 100644 index 000000000..9b3395236 --- /dev/null +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/OrderDetailServiceImpl.java @@ -0,0 +1,22 @@ +package com.logpm.oldproject.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.logpm.oldproject.entity.OrderDetailEntity; +import com.logpm.oldproject.mapper.OrderDetailMapper; +import com.logpm.oldproject.service.IOrderDetailService; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@AllArgsConstructor +public class OrderDetailServiceImpl implements IOrderDetailService { + + private final OrderDetailMapper orderDetailMapper; + + @Override + public OrderDetailEntity findByUnitNo(String unitNo) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("unitNo",unitNo); + return orderDetailMapper.selectOne(queryWrapper); + } +} 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 new file mode 100644 index 000000000..186453194 --- /dev/null +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/WayBillServiceImpl.java @@ -0,0 +1,26 @@ +package com.logpm.oldproject.service.impl; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.logpm.oldproject.entity.WayBillEntity; +import com.logpm.oldproject.mapper.WayBillMapper; +import com.logpm.oldproject.service.IWayBillService; +import lombok.AllArgsConstructor; +import lombok.extern.log4j.Log4j2; +import org.springframework.stereotype.Service; + +@Log4j2 +@Service +@AllArgsConstructor +public class WayBillServiceImpl implements IWayBillService { + + private final WayBillMapper wayBillMapper; + + @Override + public WayBillEntity getByWaybillNo(String waybillNo) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("waybill_no",waybillNo); + + return wayBillMapper.selectOne(queryWrapper); + } +}