1.合并志邦 合并欧派的数推推送分支

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/dto/FactoryOrderDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      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.factory.oupai.dto;
+
+import com.logpm.factory.oupai.entity.FactoryOrderEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 欧派工厂订单 数据传输对象实体类
+ *
+ * @author pref
+ * @since 2023-08-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class FactoryOrderDTO extends FactoryOrderEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/dto/FactoryPackageDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      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.factory.oupai.dto;
+
+import com.logpm.factory.oupai.entity.FactoryPackageEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 欧派工厂包件 数据传输对象实体类
+ *
+ * @author pref
+ * @since 2023-08-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class FactoryPackageDTO extends FactoryPackageEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/dto/OuPaiFactoryOrderDTO.java

@@ -0,0 +1,137 @@
+package com.logpm.factory.oupai.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 欧派工厂 订单数据
+ */
+@Data
+public class OuPaiFactoryOrderDTO {
+
+	@ApiModelProperty("订单编号")
+	private String Code;
+	@ApiModelProperty("订单自编号")
+	private String SelfCode;
+	@ApiModelProperty("合同编号")
+	private String ContractNumber;
+	@ApiModelProperty("服 务 号")
+	private String ServiceNumber;
+	@ApiModelProperty("订单类别")
+	private String OrderClass;
+	@ApiModelProperty("订单类型")
+	private String OrderType;
+
+	@ApiModelProperty("订单状态 待送货:0\n" +
+		"\n" +
+		"已签收:2\n" +
+		"\n" +
+		"已取消:3\n" +
+		"\n" +
+		"部分签收:6")
+	private String FactoryStatus;
+	@ApiModelProperty("工厂发货状态 工厂未发货:0\n" +
+		"\n" +
+		"工厂部分发货:1\n" +
+		"\n" +
+		"工厂齐套发货:2")
+	private String FactoryShipStatus;
+	@ApiModelProperty("工厂发货件数")
+	private String FactorySendQty;
+
+
+	@ApiModelProperty("仓库收货状态 仓库未收货:0\n" +
+		"\n" +
+		"仓库部分收货:1\n" +
+		"\n" +
+		"仓库全部收货:2")
+	private String WarehouseReceiveStatus;
+
+
+	@ApiModelProperty("仓库收货件数")
+	private String WarehouseReceiveQty;
+
+	@ApiModelProperty("可预约状态 不可预约:0\n" +
+		"\n" +
+		"可预约:1")
+	private String ReservationStatus;
+
+
+	@ApiModelProperty("所属门店\t")
+	private String Store;
+
+	@ApiModelProperty("齐套模式")
+	private String MatingCode;
+	@ApiModelProperty("是否齐套")
+	private Boolean IsMating;
+
+	@ApiModelProperty("品类编码")
+	private String FirstClassCode;
+
+	@ApiModelProperty("是否遗留")
+	private Boolean Leave;
+
+	/**************************************/
+	@ApiModelProperty("客户名称")
+	private String Customer;
+
+
+	@ApiModelProperty("省")
+	private String Province;
+
+
+	@ApiModelProperty("市")
+	private String City;
+
+
+	@ApiModelProperty("客户地址")
+	private String CustomerAddress;
+
+
+	@ApiModelProperty("客户电话")
+	private String CustomerPhone;
+
+
+	/**************************************/
+
+
+	@ApiModelProperty("商场收货人")
+	private String ShopReceiver;
+
+	@ApiModelProperty("订单来源")
+	private String From;
+
+	@ApiModelProperty("发运时间")
+	private String OutGoingTime;
+
+	@ApiModelProperty("创建时间")
+	private String CreateTime;
+
+	@ApiModelProperty("冻结")
+	private String Freeze;
+
+	@ApiModelProperty("品牌编码")
+	private String BrandCode;
+
+	@ApiModelProperty("品牌名称")
+	private String BrandName;
+
+	@ApiModelProperty("首次发货时间")
+	private Data FirstShipTime;
+
+	@ApiModelProperty("齐套发货时间")
+	private Data MatingShipTime;
+
+	@ApiModelProperty("首次收货时间")
+	private Data FirstReceiveTime;
+
+	@ApiModelProperty("齐套收货时间")
+	private Data MatingReceiveTime;
+
+	@ApiModelProperty("包件列表")
+	private List<OuPaiFactoryOrderPackageDTO> ouPaiFactoryOrderPackageDTOList;
+
+
+}

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/dto/OuPaiFactoryOrderPackageDTO.java

@@ -0,0 +1,62 @@
+package com.logpm.factory.oupai.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 欧派工厂包件数据
+ */
+@Data
+public class OuPaiFactoryOrderPackageDTO {
+
+	private String Code;
+	private String PdaNumber;
+	private String FirstClassCode;
+	private String FirstClassName;
+	private String SecondClassCode;
+	private String SecondClassName;
+	private String ThirdClassCode;
+	private String ThirdClassName;
+	private Boolean BuyIn;
+	private String CosourcingCode;
+	private String CosourcingUnit;
+	private Integer Length;
+	private Integer Width;
+	private Integer Height;
+	private Integer Weight;
+	private Integer PathIndex;
+	private String PathDetail;
+	private String DeliveryOrders;
+	private String ReceivingOrders;
+	private String LPN;
+	private Integer LpnSerialNum;
+	private Boolean IsEntruck;
+	private String ReservationOrder;
+	private String OutGoingOrderDetail;
+	private String SignBill;
+	private Boolean IsInventory;
+	private Boolean Freeze;
+	private String From;
+	private String Creator;
+	private Date CreateTime;
+	private Date ShipTime;
+	private String CarNumber;
+	private String DeliveryMethod;
+	private String DeliveryReceiver;
+	private String DeliveryReceiverPhone;
+	private String ReturnNumber;
+	private String GroupType;
+	private String CarrierCode;
+	private String CarrierName;
+	private String PackageDetailNames;
+	private Date ReceivingTime;
+	private Date SendTime;
+	private String ExceptionSignRemark;
+	private String Descript;
+	private Date SignTime;
+	private String OutOrder;
+	private String TransferLPN;
+	private String TransferLPNs;
+	private Boolean IsReceiveByHand;
+}

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/dto/ReceivingOrderDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      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.factory.oupai.dto;
+
+import com.logpm.factory.oupai.entity.ReceivingOrderEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 欧派工厂收货单 数据传输对象实体类
+ *
+ * @author pref
+ * @since 2023-08-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ReceivingOrderDTO extends ReceivingOrderEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/FactoryLogEntity.java

@@ -0,0 +1,45 @@
+package com.logpm.factory.oupai.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+@Data
+@TableName("op_factory_log")
+@ApiModel(value = "FactoryLog对象", description = "欧派工厂日志")
+@EqualsAndHashCode(callSuper = true)
+public class FactoryLogEntity extends BaseEntity {
+
+	/** 请求内容 */
+	@ApiModelProperty(name = "请求内容",notes = "")
+	private String reqArgs ;
+	/** 响应内容 */
+	@ApiModelProperty(name = "响应内容",notes = "")
+	private String resBody ;
+	/** 数据状态 0 待解析 1 解析成功 2 解析失败 */
+	@ApiModelProperty(name = "数据状态 0 待解析 1 解析成功 2 解析失败",notes = "")
+	private Integer dataStatus ;
+	/** 状态 */
+	@ApiModelProperty(name = "状态",notes = "")
+	private Integer status ;
+	/** 预留1 */
+	@ApiModelProperty(name = "预留1",notes = "")
+	private String reserve1 ;
+	/** 预留2 */
+	@ApiModelProperty(name = "预留2",notes = "")
+	private String reserve2 ;
+	/** 预留3 */
+	@ApiModelProperty(name = "预留3",notes = "")
+	private String reserve3 ;
+	/** 预留4 */
+	@ApiModelProperty(name = "预留4",notes = "")
+	private String reserve4 ;
+	/** 预留5 */
+	@ApiModelProperty(name = "预留5",notes = "")
+	private String reserve5 ;
+
+}

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/FactoryOrderEntity.java

@@ -0,0 +1,252 @@
+/*
+ *      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.factory.oupai.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 欧派工厂订单 实体类
+ *
+ * @author pref
+ * @since 2023-08-23
+ */
+@Data
+@TableName("op_factory_order")
+@ApiModel(value = "FactoryOrder对象", description = "欧派工厂订单")
+@EqualsAndHashCode(callSuper = true)
+public class FactoryOrderEntity extends BaseEntity {
+
+	/**
+	 * 订单编号
+	 */
+	@ApiModelProperty(name = "订单编号", notes = "")
+	private String code;
+	/**
+	 * 订单自编号
+	 */
+	@ApiModelProperty(name = "订单自编号", notes = "")
+	private String selfCode;
+	/**
+	 * 合同编号
+	 */
+	@ApiModelProperty(name = "合同编号", notes = "")
+	private String contractNumber;
+	/**
+	 * 服 务 号
+	 */
+	@ApiModelProperty(name = "服 务 号", notes = "")
+	private String serviceNumber;
+	/**
+	 * 订单类别
+	 */
+	@ApiModelProperty(name = "订单类别", notes = "")
+	private String orderClass;
+	/**
+	 * 订单类型
+	 */
+	@ApiModelProperty(name = "订单类型", notes = "")
+	private String orderType;
+	/**
+	 * 订单状态 待送货:0 已签收:2 已取消:3 部分签收:6
+	 */
+	@ApiModelProperty(name = "订单状态 待送货:0 已签收:2 已取消:3 部分签收:6", notes = "")
+	private Integer factoryStatus;
+	/**
+	 * 工厂发货状态 工厂未发货:0 工厂部分发货:1 工厂齐套发货:2
+	 */
+	@ApiModelProperty(name = "工厂发货状态 工厂未发货:0 工厂部分发货:1 工厂齐套发货:2", notes = "")
+	private Integer factoryShipStatus;
+	/**
+	 * 工厂发货件数
+	 */
+	@ApiModelProperty(name = "工厂发货件数", notes = "")
+	private Integer factorySendQty;
+	/**
+	 * 仓库收货状态 仓库未收货:0 仓库部分收货:1 仓库全部收货:2
+	 */
+	@ApiModelProperty(name = "仓库收货状态 仓库未收货:0 仓库部分收货:1 仓库全部收货:2", notes = "")
+	private Integer warehouseReceiveStatus;
+	/**
+	 * 仓库收货件数
+	 */
+	@ApiModelProperty(name = "仓库收货件数", notes = "")
+	private Integer warehouseReceiveQty;
+	/**
+	 * 可预约状态 不可预约:0 可预约:1
+	 */
+	@ApiModelProperty(name = "可预约状态 不可预约:0 可预约:1", notes = "")
+	private Integer reservationStatus;
+
+	/**
+	 * 所属门店
+	 */
+	@ApiModelProperty(name = "所属门店名称", notes = "")
+	private String storeName;
+
+	/**
+	 * 所属门店
+	 */
+	@ApiModelProperty(name = "所属门店编码", notes = "")
+	private String storeCode;
+	/**
+	 * 齐套模式
+	 */
+	@ApiModelProperty(name = "齐套模式", notes = "")
+	private String matingCode;
+	/**
+	 * 是否齐套
+	 */
+	@ApiModelProperty(name = "是否齐套", notes = "")
+	private Integer isMating;
+	/**
+	 * 品类编码
+	 */
+	@ApiModelProperty(name = "品类编码", notes = "")
+	private String firstClassCode;
+	/**
+	 * 是否遗留
+	 */
+	@ApiModelProperty(name = "是否遗留", notes = "")
+	private Integer leaveStatus;
+	/**
+	 * 客户名称
+	 */
+	@ApiModelProperty(name = "客户名称", notes = "")
+	private String customer;
+	/**
+	 * 省
+	 */
+	@ApiModelProperty(name = "省", notes = "")
+	private String province;
+	/**
+	 * 市
+	 */
+	@ApiModelProperty(name = "市", notes = "")
+	private String city;
+	/**
+	 * 客户地址
+	 */
+	@ApiModelProperty(name = "客户地址", notes = "")
+	private String customerAddress;
+	/**
+	 * 客户电话
+	 */
+	@ApiModelProperty(name = "客户电话", notes = "")
+	private String customerPhone;
+	/**
+	 * 商场收货人
+	 */
+	@ApiModelProperty(name = "商场收货人", notes = "")
+	private String shopReceiver;
+	/**
+	 * 品牌编码
+	 */
+	@ApiModelProperty(name = "品牌编码", notes = "")
+	private String brandCode;
+	/**
+	 * 品牌名称
+	 */
+	@ApiModelProperty(name = "品牌名称", notes = "")
+	private String brandName;
+	/**
+	 * 首次发货时间
+	 */
+	@ApiModelProperty(name = "首次发货时间", notes = "")
+	private Date firstShipTime;
+	/**
+	 * 齐套发货时间
+	 */
+	@ApiModelProperty(name = "齐套发货时间", notes = "")
+	private Date matingShipTime;
+	/**
+	 * 首次收货时间
+	 */
+	@ApiModelProperty(name = "首次收货时间", notes = "")
+	private Date firstReceiveTime;
+	/**
+	 * 齐套收货时间
+	 */
+	@ApiModelProperty(name = "齐套收货时间", notes = "")
+	private Date matingReceiveTime;
+	/**
+	 * 冻结
+	 */
+	@ApiModelProperty(name = "冻结", notes = "")
+	private Integer freeze;
+	/**
+	 * 发运时间
+	 */
+	@ApiModelProperty(name = "发运时间", notes = "")
+	private Date outGoingTime;
+	/**
+	 * 状态
+	 */
+	@ApiModelProperty(name = "状态", notes = "")
+	private Integer status;
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(name = "预留1", notes = "")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(name = "预留2", notes = "")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(name = "预留3", notes = "")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(name = "预留4", notes = "")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(name = "预留5", notes = "")
+	private String reserve5;
+	/**
+	 * 收货单ID
+	 */
+	@ApiModelProperty(name = "收货单ID", notes = "")
+	private Long receivingId;
+	/**
+	 * 入库单状态 0正常 1作废
+	 */
+	@ApiModelProperty(name = "入库单状态 0正常 1作废", notes = "")
+	private Integer receiptStatus;
+	/**
+	 * 推送状态 1推送 0未推送
+	 */
+	@ApiModelProperty(name = "推送状态 1推送 0未推送", notes = "")
+	private Integer pushStatus;
+	/**
+	 * 转发状态 1转送 0未转送
+	 */
+	@ApiModelProperty(name = "转发状态 1转送 0未转送", notes = "")
+	private Integer turnStatus;
+}

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/FactoryPackageEntity.java

@@ -0,0 +1,126 @@
+/*
+ *      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.factory.oupai.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.math.BigDecimal;
+
+/**
+ * 欧派工厂包件 实体类
+ *
+ * @author pref
+ * @since 2023-08-23
+ */
+@Data
+@TableName("op_factory_package")
+@ApiModel(value = "FactoryPackage对象", description = "欧派工厂包件")
+@EqualsAndHashCode(callSuper = true)
+public class FactoryPackageEntity extends BaseEntity {
+
+	/** 关联订单ID */
+	@ApiModelProperty(name = "关联订单ID",notes = "")
+	private Long orderId ;
+
+	/** 包条码 */
+	@ApiModelProperty(name = "包条码",notes = "")
+	private String code ;
+	/** 一级品类编码 */
+	@ApiModelProperty(name = "一级品类编码",notes = "")
+	private String firstClassCode ;
+	/** 一级品类名称 */
+	@ApiModelProperty(name = "一级品类名称",notes = "")
+	private String firstClassName ;
+	/** 二级品类编码 */
+	@ApiModelProperty(name = "二级品类编码",notes = "")
+	private String secondClassCode ;
+	/** 二级品类名称 */
+	@ApiModelProperty(name = "二级品类名称",notes = "")
+	private String secondClassName ;
+	/** 三级品类编码 */
+	@ApiModelProperty(name = "三级品类编码",notes = "")
+	private String thirdClassCode ;
+	/** 三级品类名称 */
+	@ApiModelProperty(name = "三级品类名称",notes = "")
+	private String thirdClassName ;
+	/** 补进 */
+	@ApiModelProperty(name = "补进",notes = "")
+	private Integer buyin ;
+	/** 合包码 */
+	@ApiModelProperty(name = "合包码",notes = "")
+	private String cosourcingCode ;
+	/** 合包单位 */
+	@ApiModelProperty(name = "合包单位",notes = "")
+	private String cosourcingUnit ;
+	/** 包状态 	 未知:0  已调度:1  已装车:2  待收货:3  已收货:4  已在库:5  待理货:6  待上架:7  已上架:8  已下架:9  已发运:10  已签收:11  待返货:12  已提件:13  已拒收:14  异常:-1 */
+	@ApiModelProperty(name = "包状态 	 未知:0  已调度:1  已装车:2  待收货:3  已收货:4  已在库:5  待理货:6  待上架:7  已上架:8  已下架:9  已发运:10  已签收:11  待返货:12  已提件:13  已拒收:14  异常:-1",notes = "")
+	private Integer packageStatus ;
+	/** 长（米） */
+	@ApiModelProperty(name = "长（米）",notes = "")
+	private BigDecimal length ;
+	/** 宽（米） */
+	@ApiModelProperty(name = "宽（米）",notes = "")
+	private BigDecimal width ;
+	/** 宽（米） */
+	@ApiModelProperty(name = "宽（米）",notes = "")
+	private BigDecimal height ;
+	/** 宽（米） */
+	@ApiModelProperty(name = "宽（米）",notes = "")
+	private BigDecimal weight ;
+	/** 是否库存品包 */
+	@ApiModelProperty(name = "是否库存品包",notes = "")
+	private Integer isInventory ;
+	/** 是否冻结 */
+	@ApiModelProperty(name = "是否冻结",notes = "")
+	private Integer freeze ;
+	/** 入库单状态 0正常 1作废 */
+	@ApiModelProperty(name = "入库单状态 0正常 1作废",notes = "")
+	private Integer receiptStatus ;
+	/** 推送状态 1推送 0未推送 */
+	@ApiModelProperty(name = "推送状态 1推送 0未推送",notes = "")
+	private Integer pushStatus ;
+	/** 转发状态 1转送 0未转送 */
+	@ApiModelProperty(name = "转发状态 1转送 0未转送 2 转送失败",notes = "")
+	private Integer turnStatus ;
+	/** 车次号 */
+	@ApiModelProperty(name = "车次号",notes = "")
+	private String carNumber ;
+	/** 预留1 */
+	@ApiModelProperty(name = "预留1",notes = "")
+	private String reserve1 ;
+	/** 预留2 */
+	@ApiModelProperty(name = "预留2",notes = "")
+	private String reserve2 ;
+	/** 预留3 */
+	@ApiModelProperty(name = "预留3",notes = "")
+	private String reserve3 ;
+	/** 预留4 */
+	@ApiModelProperty(name = "预留4",notes = "")
+	private String reserve4 ;
+	/** 预留5 */
+	@ApiModelProperty(name = "预留5",notes = "")
+	private String reserve5 ;
+
+
+
+
+}

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/OpOrderStatusLogEntity.java

@@ -0,0 +1,29 @@
+package com.logpm.factory.oupai.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+@Data
+@TableName("order_status_log")
+@ApiModel(value = "OrderStatusLog对象", description = "欧派的数据")
+@EqualsAndHashCode(callSuper = true)
+public class OpOrderStatusLogEntity extends BaseEntity {
+
+	private String args;
+
+	/**
+	 * 数据用途 1. 发车数据
+	 */
+	private Integer type;
+
+	private String brand;//品牌
+
+	/**
+	 * 数据状态 0 待解析 1 解析成功 2 解析失败
+	 */
+	private Integer dataStatus;
+
+}

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/entity/ReceivingOrderEntity.java

@@ -0,0 +1,125 @@
+/*
+ *      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.factory.oupai.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.util.Date;
+
+/**
+ * 欧派工厂收货单 实体类
+ *
+ * @author pref
+ * @since 2023-08-23
+ */
+@Data
+@TableName("op_receiving_order")
+@ApiModel(value = "ReceivingOrder对象", description = "欧派工厂收货单")
+@EqualsAndHashCode(callSuper = true)
+public class ReceivingOrderEntity extends BaseEntity {
+
+	/** 单号 */
+	@ApiModelProperty(name = "单号",notes = "")
+	private String code ;
+	/** 收货类型 未知:0 中转:1 配送:2 */
+	@ApiModelProperty(name = "收货类型 未知:0 中转:1 配送:2",notes = "")
+	private Integer type ;
+	/** 收货中心编码 */
+	@ApiModelProperty(name = "收货中心编码",notes = "")
+	private String currentWarehouseCode ;
+	/** 收货中心名称 */
+	@ApiModelProperty(name = "收货中心名称",notes = "")
+	private String currentWarehouseName ;
+	/** 发货中心编码 */
+	@ApiModelProperty(name = "发货中心编码",notes = "")
+	private String fromWarehouseCode ;
+	/** 发货中心名称 */
+	@ApiModelProperty(name = "发货中心名称",notes = "")
+	private String fromWarehouseName ;
+	/** 目的站点编码 */
+	@ApiModelProperty(name = "目的站点编码",notes = "")
+	private String endWarehouseCode ;
+	/** 目的站点名称 */
+	@ApiModelProperty(name = "目的站点名称",notes = "")
+	private String endWarehouseName ;
+	/** 现存包数 */
+	@ApiModelProperty(name = "现存包数",notes = "")
+	private Integer packagesCount ;
+	/** 已收包数 */
+	@ApiModelProperty(name = "已收包数",notes = "")
+	private Integer receivePackageCount ;
+	/** 状态 待收货:0 已收货:1 收货中:2 已跳过:3 */
+	@ApiModelProperty(name = "状态 待收货:0 已收货:1 收货中:2 已跳过:3",notes = "")
+	private String factoryStatus ;
+	/** 车牌号 */
+	@ApiModelProperty(name = "车牌号",notes = "")
+	private String plate ;
+	/** 车号 */
+	@ApiModelProperty(name = "车号",notes = "")
+	private String plateNum ;
+	/** 车次号 */
+	@ApiModelProperty(name = "车次号",notes = "")
+	private String carNumber ;
+	/** 承运商编码 */
+	@ApiModelProperty(name = "承运商编码",notes = "")
+	private String carrierCode ;
+	/** 发货时间 */
+	@ApiModelProperty(name = "发货时间",notes = "")
+	private Date sendTime ;
+	/** 到货时间 */
+	@ApiModelProperty(name = "到货时间",notes = "")
+	private Date arrivalTime ;
+	/** 最后收货时间 */
+	@ApiModelProperty(name = "最后收货时间",notes = "")
+	private Date receiveTime ;
+	/** 货运回执号 */
+	@ApiModelProperty(name = "货运回执号",notes = "")
+	private String returnNumber ;
+	/** 状态 */
+	@ApiModelProperty(name = "状态",notes = "")
+	private Integer status ;
+	/** 预留1 */
+	@ApiModelProperty(name = "预留1",notes = "")
+	private String reserve1 ;
+	/** 预留2 */
+	@ApiModelProperty(name = "预留2",notes = "")
+	private String reserve2 ;
+	/** 预留3 */
+	@ApiModelProperty(name = "预留3",notes = "")
+	private String reserve3 ;
+	/** 预留4 */
+	@ApiModelProperty(name = "预留4",notes = "")
+	private String reserve4 ;
+	/** 预留5 */
+	@ApiModelProperty(name = "预留5",notes = "")
+	private String reserve5 ;
+	/** 入库单状态 0正常 1作废 */
+	@ApiModelProperty(name = "入库单状态 0正常 1作废",notes = "")
+	private Integer receiptStatus ;
+	/** 推送状态 1推送 0未推送 */
+	@ApiModelProperty(name = "推送状态 1推送 0未推送",notes = "")
+	private Integer pushStatus ;
+	/** 转发状态 1转送 0未转送 */
+	@ApiModelProperty(name = "转发状态 1转送 0未转送",notes = "")
+	private Integer turnStatus ;
+}

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/vo/DispatchNoteVO.java

@@ -0,0 +1,16 @@
+package com.logpm.factory.oupai.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 发车单数据
+ */
+@Data
+public class DispatchNoteVO {
+
+
+	@ApiModelProperty("发车单号")
+	private String dispatchNoteNum;
+
+}

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/vo/FactoryOrderVO.java

@@ -0,0 +1,34 @@
+/*
+ *      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.factory.oupai.vo;
+
+import com.logpm.factory.oupai.entity.FactoryOrderEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 欧派工厂订单 视图实体类
+ *
+ * @author pref
+ * @since 2023-08-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class FactoryOrderVO extends FactoryOrderEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/vo/FactoryPackageVO.java

@@ -0,0 +1,34 @@
+/*
+ *      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.factory.oupai.vo;
+
+import com.logpm.factory.oupai.entity.FactoryPackageEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 欧派工厂包件 视图实体类
+ *
+ * @author pref
+ * @since 2023-08-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class FactoryPackageVO extends FactoryPackageEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/oupai/vo/ReceivingOrderVO.java

@@ -0,0 +1,34 @@
+/*
+ *      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.factory.oupai.vo;
+
+import com.logpm.factory.oupai.entity.ReceivingOrderEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 欧派工厂收货单 视图实体类
+ *
+ * @author pref
+ * @since 2023-08-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ReceivingOrderVO extends ReceivingOrderEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/constant/FactoryConstant.java

@@ -10,5 +10,6 @@ public class FactoryConstant {
 	public static final String PIANO = "皮阿诺";
 	public static final String MENGT = "梦天";
 	public static final String ZHIBANG = "志邦";
+	public static final String OUPAI = "欧派";
 
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/IAsyncDataService.java

@@ -22,4 +22,7 @@ public interface IAsyncDataService {
 	 */
 	void handlerZbDataToHt(Long orderId);
 
+
+	void handlerOuPaiDataToHt(String carNum);
+
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java

@@ -12,6 +12,13 @@ import com.logpm.factory.mt.entity.MtPackageInfo;
 import com.logpm.factory.mt.service.IMtFactoryOrderMainService;
 import com.logpm.factory.mt.service.IMtFactoryOrderService;
 import com.logpm.factory.mt.service.IMtPackageInfoService;
+import com.logpm.factory.oupai.entity.FactoryOrderEntity;
+import com.logpm.factory.oupai.entity.FactoryPackageEntity;
+import com.logpm.factory.oupai.entity.ReceivingOrderEntity;
+import com.logpm.factory.oupai.service.IFactoryOrderService;
+import com.logpm.factory.oupai.service.IFactoryPackageService;
+import com.logpm.factory.oupai.service.IOuPaiFactoryService;
+import com.logpm.factory.oupai.service.IReceivingOrderService;
 import com.logpm.factory.pan.service.IPanFactoryOrderService;
 import com.logpm.factory.pan.service.IPanPackageInfoService;
 import com.logpm.factory.pan.service.IPanPackageListService;
@@ -81,6 +88,16 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 	/*缓存*/
 	private final BladeRedis bladeRedis;
 
+	// oupai
+	private final IFactoryPackageService factoryPackageService;
+
+	private final IFactoryOrderService factoryOrderService;
+
+	private final IReceivingOrderService receivingOrderService;
+
+	//工厂查询
+	private final IOuPaiFactoryService ouPaiFactoryService;
+
 
 	/**
 	 * 处理皮阿诺数据推送到汇通老库
@@ -362,6 +379,199 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 		log.info("##############handlerMtDataToHt: 处理数据完成");
 	}
 
+	@Override
+	public void handlerOuPaiDataToHt(String carNumber) {
+
+
+		// 查询需要处理的派车单 查询没有转发的shuju
+		List<ReceivingOrderEntity> list = receivingOrderService.lambdaQuery().eq(ReceivingOrderEntity::getCarNumber, carNumber).eq(ReceivingOrderEntity::getTurnStatus, 0).list();
+		for (ReceivingOrderEntity receivingOrderEntity : list) {
+			// 查询这个派车单下面的订单
+			List<FactoryOrderEntity> factoryOrderEntities = factoryOrderService.lambdaQuery().eq(FactoryOrderEntity::getReceivingId, receivingOrderEntity.getId()).eq(FactoryOrderEntity::getTurnStatus, 0).list();
+			addAdvanceEntityBtOuPai(receivingOrderEntity, factoryOrderEntities);
+		}
+
+
+//		// 需要将需要处理的数据进行查询 查询包件
+//		List<FactoryPackageEntity> list = factoryPackageService.lambdaQuery().eq(FactoryPackageEntity::getCarNumber, carNumber).list();
+//		// 将这里数据加入到老的advance
+
+
+	}
+
+	/**
+	 * 欧派数据保存到老系统
+	 *
+	 * @param receivingOrderEntity
+	 * @param factoryOrderEntities
+	 */
+	private void addAdvanceEntityBtOuPai(ReceivingOrderEntity receivingOrderEntity, List<FactoryOrderEntity> factoryOrderEntities) {
+
+		for (FactoryOrderEntity factoryOrderEntity : factoryOrderEntities) {
+
+			// 需要从老系统进行订单数据查询
+			AdvanceEntity advanceEntity = findAdvanceEntityUseCacheByOrderSelfNum(factoryOrderEntity.getSelfCode());
+			if(ObjectUtils.isNull(advanceEntity)){
+				advanceEntity = new AdvanceEntity();
+				advanceEntity.setOrderSelfNum(StringUtil.isBlank(factoryOrderEntity.getSelfCode()) ? "" : factoryOrderEntity.getSelfCode()); //订单自编号
+				advanceEntity.setSiteName(""); // 基地 TODO 需要映射
+				advanceEntity.setArea(""); // 区域
+				advanceEntity.setOrderTypeName(""); //订单类型名称 可以为空
+				advanceEntity.setOrderClassName("工厂"); //订单类型 可以为空
+				advanceEntity.setType(FactoryConstant.OUPAI);
+				advanceEntity.setTotal(factoryOrderEntity.getFactorySendQty()); //订单总数据
+				advanceEntity.setMctsTruck(receivingOrderEntity.getCarNumber()); //车次
+				advanceEntity.setMtdsNo("");// 生产单号
+				advanceEntity.setMctsTruckNo(receivingOrderEntity.getPlate());// 车牌//字段没有了
+				advanceEntity.setFirstPackName(""); //一级品类
+				advanceEntity.setFirstPackCode(""); //一级品类
+				advanceEntity.setDealerName(factoryOrderEntity.getShopReceiver()); //商场名称
+				advanceEntity.setDealerCode(""); //商场编码
+				advanceEntity.setDueDate(""); // 交期
+				advanceEntity.setIsOpai(0); //是否干仓配
+				advanceEntity.setOrderNum("");//MSCS订单号 可以为空
+				advanceEntity.setCarrierName("汇通");//承运商 可以为空
+				advanceEntity.setCustomerName(StringUtil.isBlank(factoryOrderEntity.getCustomer()) ? "" : factoryOrderEntity.getCustomer()); //顾客名称
+				advanceEntity.setCustomerPhone(StringUtil.isBlank(factoryOrderEntity.getCustomerPhone()) ? "" : factoryOrderEntity.getCustomerPhone()); // 顾客电话
+				advanceEntity.setCustomerRoad(StringUtil.isBlank(factoryOrderEntity.getCustomerAddress()) ? "" : factoryOrderEntity.getCustomerAddress());//顾客地址
+				advanceEntity.setSystemType("线上"); //订单类型
+				advanceEntity.setStoreNo(StringUtil.isBlank(factoryOrderEntity.getStoreCode()) ? "" : factoryOrderEntity.getStoreCode()); //门店编码
+				advanceEntity.setStoreName(StringUtil.isBlank(factoryOrderEntity.getStoreName()) ? "" : factoryOrderEntity.getStoreCode()); //门店名称
+				advanceEntity.setSerialKey(""); //序列号
+				advanceEntity.setServiceNum(StringUtil.isBlank(factoryOrderEntity.getServiceNumber()) ? "" : factoryOrderEntity.getServiceNumber()); //服务号
+				advanceEntity.setMatingCode("");//齐套模式 可以为空
+				advanceEntity.setContractNum("");//合同号 可以为空
+				advanceEntity.setLeaveBehind("");//遗留：Y=是，N=否
+				advanceEntity.setSenderMobile("");//发货人电话 可以为空
+				advanceEntity.setSenderAddress(""); //发货地址 可以为空
+				advanceEntity.setSenderName(""); //发货工厂名称 可以为空
+				advanceEntity.setAdministratorsId(1078);// 导入人
+				advanceEntity.setCreateTime(initTimestamp()); //添加时间
+				advanceEntity.setCarsNum(receivingOrderEntity.getCarNumber());
+				advanceEntity.setDeleteTime(0); // 删除时间
+				advanceEntity.setWaybillNo("");//运单号  可以为空
+//			Integer id = PanFactoryEnum.getId(panFactoryOrder.getPlantId());
+				advanceEntity.setWarehouseId(141); //导入人仓库id TODO 需要提供映射
+				advanceEntity.setWaybillStatus(Byte.parseByte("1"));//开单状态：1=未开单，2=已开单
+				advanceEntity.setOldId(0);//
+				advanceEntity.setFreeze(Byte.parseByte("1"));//冻结状态：1=正常，2=冻结
+				advanceEntity.setDeleteReason("");//删除原因
+				advanceEntity.setDeleteAdministratorsId(0);//删除用户
+				Integer advanceId = iAdvanceClient.addAdvanceClient(advanceEntity);
+				if (ObjectUtils.isNull(advanceId)) {
+					continue;
+				}
+				advanceEntity.setId(advanceId);
+			}else{
+				// 更新数据 对这个 advanceEntity 这个进行属性设置 调用对象的更新方法
+
+
+			}
+
+			factoryOrderEntity.setTurnStatus(1);
+
+			// 处理订单下面的包件数据
+			List<FactoryPackageEntity> list = factoryPackageService.lambdaQuery().eq(FactoryPackageEntity::getOrderId, factoryOrderEntity.getId()).eq(FactoryPackageEntity::getTurnStatus, 0).list();
+			for (FactoryPackageEntity factoryPackageEntity : list) {
+
+				addAdvanceDetailEntityByOuPai(factoryPackageEntity,factoryOrderEntity,advanceEntity);
+
+			}
+
+
+
+		}
+		factoryOrderService.updateBatchById(factoryOrderEntities);
+
+	}
+
+	/**
+	 * 保存包件数据-- 欧派
+	 * @param factoryPackageEntity
+	 * @param factoryOrderEntity
+	 * @param advanceEntity
+	 */
+	private void addAdvanceDetailEntityByOuPai(FactoryPackageEntity factoryPackageEntity, FactoryOrderEntity factoryOrderEntity, AdvanceEntity advanceEntity) {
+
+		AdvanceDetailEntity advanceDetailEntity = advanceDetailClient.getOneByUnitNo(factoryPackageEntity.getCode());
+
+		if (ObjectUtil.isNotEmpty(advanceDetailEntity)) {
+			// 一 er  san  级包件信息
+			advanceDetailEntity.setFirstPackName(factoryPackageEntity.getFirstClassName());//一级品类
+			advanceDetailEntity.setFirstPackCode(factoryPackageEntity.getFirstClassCode());//二级品类
+			advanceDetailEntity.setFirstPackCode(factoryPackageEntity.getFirstClassCode());//二级品类
+			advanceDetailEntity.setSecondPackName(factoryPackageEntity.getSecondClassName());//二级品类名称
+			advanceDetailEntity.setSecondPackCode(factoryPackageEntity.getSecondClassCode());//二级品类
+			advanceDetailEntity.setThirdPackName(factoryPackageEntity.getThirdClassName());//三级品类名称
+			advanceDetailEntity.setThirdPackCode(factoryPackageEntity.getThirdClassCode());//三级品类
+			// 更新物料
+
+			// 当这个包条存在老系统的时候
+			advanceDetailEntity.setMctsTruckNo(factoryPackageEntity.getCarNumber());
+			//更新包件
+			advanceDetailClient.updateAdvanceDetail(advanceDetailEntity);
+
+		} else {
+			advanceDetailEntity = new AdvanceDetailEntity();
+			advanceDetailEntity.setAdvanceId(advanceEntity.getId());//预仓id
+			advanceDetailEntity.setIsPay(Byte.parseByte("0"));//
+			advanceDetailEntity.setLineID("");//线下订单明细标时 可以为空
+			advanceDetailEntity.setSerialKey("");//序列号 可以为空
+			advanceDetailEntity.setArea("");//区域
+			advanceDetailEntity.setOrderSelfNum(advanceEntity.getOrderSelfNum());//订单自编号
+			advanceDetailEntity.setType(FactoryConstant.OUPAI);//订单来源
+			advanceDetailEntity.setSystemType("线上");//订单类型
+			advanceDetailEntity.setOrderNum("");//MSCS单号  可以为空
+			advanceDetailEntity.setIsOpai(0);//是否干仓配：1=是，0=否
+			advanceDetailEntity.setMtdsNo("");//MTDS单号 可以为空
+			advanceDetailEntity.setFirstPackName(factoryPackageEntity.getFirstClassName());//一级品类
+			advanceDetailEntity.setFirstPackCode(factoryPackageEntity.getFirstClassCode());//二级品类
+			advanceDetailEntity.setFirstPackCode(factoryPackageEntity.getFirstClassCode());//二级品类
+			advanceDetailEntity.setSiteName("");//基地名称  基地 TODO 需要映射
+			advanceDetailEntity.setSiteCode("");//基地编码
+			advanceDetailEntity.setProductCode("");//货品名称 可以为空
+			advanceDetailEntity.setSecondPackName(factoryPackageEntity.getSecondClassName());//二级品类名称
+			advanceDetailEntity.setSecondPackCode(factoryPackageEntity.getSecondClassCode());//二级品类
+			advanceDetailEntity.setThirdPackName(factoryPackageEntity.getThirdClassName());//三级品类名称
+			advanceDetailEntity.setThirdPackCode(factoryPackageEntity.getThirdClassCode());//三级品类
+			advanceDetailEntity.setGoodName("");//v产品类型 可以为空
+			advanceDetailEntity.setIsAddin("Y");//例放：N=正常，Y=例放
+			advanceDetailEntity.setIsThirdAddin("N");//三级例放：N=正常，Y=例放
+			advanceDetailEntity.setIsSuppin("N");//补进：N=正常，Y=例放
+			advanceDetailEntity.setMscsNum("1");//发货数量
+			advanceDetailEntity.setMtdsNum(0);//销售数量
+			advanceDetailEntity.setVolume("");//体积
+			advanceDetailEntity.setUnitNo(StringUtil.isBlank(factoryPackageEntity.getCode()) ? "" : factoryPackageEntity.getCode());//包条码
+			advanceDetailEntity.setMctsTruck(advanceEntity.getMctsTruck());//车次号
+			advanceDetailEntity.setMctsTruckNo(advanceEntity.getMctsTruckNo());//车牌号
+			advanceDetailEntity.setDate100(null);//基地发货日期
+			advanceDetailEntity.setDate2("");//预约到厂时间
+			advanceDetailEntity.setDate3("");//实际到厂时间
+			advanceDetailEntity.setDate4("");//开始装车时间
+			advanceDetailEntity.setDate5("");//完成装车时间
+			advanceDetailEntity.setDate6("");//车辆离厂时间
+			advanceDetailEntity.setCreateTime(LocalDate.now());//创建时间
+			advanceDetailEntity.setDeleteTime(0);//删除时间
+			advanceDetailEntity.setServiceNum(StringUtil.isBlank(advanceEntity.getServiceNum()) ? "" : advanceEntity.getServiceNum());//服务号
+			advanceDetailEntity.setAdmin("");//
+			advanceDetailEntity.setAdministratorsId(0);//导入人
+			advanceDetailEntity.setRemark("");//备注
+			advanceDetailEntity.setOldId(0);//
+			Integer detailId = advanceDetailClient.addAdvanceDetail(advanceDetailEntity);
+			if (detailId > 0) {
+				//修改数据状态
+				factoryPackageEntity.setTurnStatus(2);
+				factoryPackageService.saveOrUpdate(factoryPackageEntity);
+			} else {
+				factoryPackageEntity.setTurnStatus(1);
+
+				factoryPackageService.saveOrUpdate(factoryPackageEntity);
+			}
+
+		}
+
+	}
+
 
 	@Override
 	public void handlerZbDataToHt(Long id) {
@@ -579,7 +789,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 	 * @param orderSelfNum
 	 * @return
 	 */
-	private AdvanceEntity findAdvanceEntityUseCacheById(String orderSelfNum) {
+	private AdvanceEntity findAdvanceEntityUseCacheByOrderSelfNum(String orderSelfNum) {
 		String key = AdvanceEntity.class.getName() + ":" + orderSelfNum;
 		AdvanceEntity advanceEntity = bladeRedis.get(key);
 		if (ObjectUtils.isNull(advanceEntity)) {
@@ -594,7 +804,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 		log.info("#########handlerDataToHt: 当前处理的订单id={}", orderId);
 
 		// todo 这里不明确到底那个才是订单自编号
-		AdvanceEntity advanceEntity = findAdvanceEntityUseCacheById(serviceNumEntity.getCustomerCode());
+		AdvanceEntity advanceEntity = findAdvanceEntityUseCacheByOrderSelfNum(serviceNumEntity.getCustomerCode());
 		if (ObjectUtils.isNotNull(advanceEntity)) {
 			return advanceEntity;
 		}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/controller/FactoryOrderController.java

@@ -0,0 +1,135 @@
+/*
+ *      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.factory.oupai.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.factory.oupai.entity.FactoryOrderEntity;
+import com.logpm.factory.oupai.service.IFactoryOrderService;
+import com.logpm.factory.oupai.vo.FactoryOrderVO;
+import com.logpm.factory.oupai.wrapper.FactoryOrderWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.constant.BladeConstant;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 欧派工厂订单 控制器
+ *
+ * @author pref
+ * @since 2023-08-23
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("logpm-factory/factoryOrder")
+@Api(value = "欧派工厂订单", tags = "欧派工厂订单接口")
+public class FactoryOrderController extends BladeController {
+
+	private final IFactoryOrderService factoryOrderService;
+
+	/**
+	 * 欧派工厂订单 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入factoryOrder")
+	public R<FactoryOrderVO> detail(FactoryOrderEntity factoryOrder) {
+		FactoryOrderEntity detail = factoryOrderService.getOne(Condition.getQueryWrapper(factoryOrder));
+		return R.data(FactoryOrderWrapper.build().entityVO(detail));
+	}
+	/**
+	 * 欧派工厂订单 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入factoryOrder")
+	public R<IPage<FactoryOrderVO>> list(@ApiIgnore @RequestParam Map<String, Object> factoryOrder, Query query) {
+		IPage<FactoryOrderEntity> pages = factoryOrderService.page(Condition.getPage(query), Condition.getQueryWrapper(factoryOrder, FactoryOrderEntity.class));
+		return R.data(FactoryOrderWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 欧派工厂订单 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入factoryOrder")
+	public R<IPage<FactoryOrderVO>> page(FactoryOrderVO factoryOrder, Query query) {
+		IPage<FactoryOrderVO> pages = factoryOrderService.selectFactoryOrderPage(Condition.getPage(query), factoryOrder);
+		return R.data(pages);
+	}
+
+	/**
+	 * 欧派工厂订单 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入factoryOrder")
+	public R save(@Valid @RequestBody FactoryOrderEntity factoryOrder) {
+		return R.status(factoryOrderService.save(factoryOrder));
+	}
+
+	/**
+	 * 欧派工厂订单 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入factoryOrder")
+	public R update(@Valid @RequestBody FactoryOrderEntity factoryOrder) {
+		return R.status(factoryOrderService.updateById(factoryOrder));
+	}
+
+	/**
+	 * 欧派工厂订单 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入factoryOrder")
+	public R submit(@Valid @RequestBody FactoryOrderEntity factoryOrder) {
+		return R.status(factoryOrderService.saveOrUpdate(factoryOrder));
+	}
+
+	/**
+	 * 欧派工厂订单 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(factoryOrderService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/controller/FactoryPackageController.java

@@ -0,0 +1,136 @@
+/*
+ *      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.factory.oupai.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.factory.oupai.entity.FactoryPackageEntity;
+import com.logpm.factory.oupai.service.IFactoryPackageService;
+import com.logpm.factory.oupai.vo.FactoryPackageVO;
+import com.logpm.factory.oupai.wrapper.FactoryPackageWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.constant.BladeConstant;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 欧派工厂包件 控制器
+ *
+ * @author pref
+ * @since 2023-08-23
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("logpm-factory/factoryPackage")
+@Api(value = "欧派工厂包件", tags = "欧派工厂包件接口")
+public class FactoryPackageController extends BladeController {
+
+	private final IFactoryPackageService factoryPackageService;
+
+	/**
+	 * 欧派工厂包件 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入factoryPackage")
+	public R<FactoryPackageVO> detail(FactoryPackageEntity factoryPackage) {
+		FactoryPackageEntity detail = factoryPackageService.getOne(Condition.getQueryWrapper(factoryPackage));
+		return R.data(FactoryPackageWrapper.build().entityVO(detail));
+	}
+	/**
+	 * 欧派工厂包件 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入factoryPackage")
+	public R<IPage<FactoryPackageVO>> list(@ApiIgnore @RequestParam Map<String, Object> factoryPackage, Query query) {
+		IPage<FactoryPackageEntity> pages = factoryPackageService.page(Condition.getPage(query), Condition.getQueryWrapper(factoryPackage, FactoryPackageEntity.class));
+		return R.data(FactoryPackageWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 欧派工厂包件 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入factoryPackage")
+	public R<IPage<FactoryPackageVO>> page(FactoryPackageVO factoryPackage, Query query) {
+		IPage<FactoryPackageVO> pages = factoryPackageService.selectFactoryPackagePage(Condition.getPage(query), factoryPackage);
+		return R.data(pages);
+	}
+
+	/**
+	 * 欧派工厂包件 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入factoryPackage")
+	public R save(@Valid @RequestBody FactoryPackageEntity factoryPackage) {
+		return R.status(factoryPackageService.save(factoryPackage));
+	}
+
+	/**
+	 * 欧派工厂包件 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入factoryPackage")
+	public R update(@Valid @RequestBody FactoryPackageEntity factoryPackage) {
+		return R.status(factoryPackageService.updateById(factoryPackage));
+	}
+
+	/**
+	 * 欧派工厂包件 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入factoryPackage")
+	public R submit(@Valid @RequestBody FactoryPackageEntity factoryPackage) {
+		return R.status(factoryPackageService.saveOrUpdate(factoryPackage));
+	}
+
+	/**
+	 * 欧派工厂包件 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(factoryPackageService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/controller/OupaiFactoryDataController.java

@@ -0,0 +1,74 @@
+package com.logpm.factory.oupai.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.logpm.factory.comfac.service.IAsyncDataService;
+import com.logpm.factory.comfac.service.IOrderStatusLogService;
+import com.logpm.factory.oupai.entity.FactoryLogEntity;
+import com.logpm.factory.oupai.entity.FactoryOrderEntity;
+import com.logpm.factory.oupai.service.IFactoryLogService;
+import com.logpm.factory.oupai.service.IOuPaiFactoryDataService;
+import com.logpm.factory.oupai.vo.OuPaiDataPushVO;
+import com.logpm.factory.snm.entity.OrderStatusLog;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.tool.api.R;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Objects;
+
+/**
+ * 欧派工厂推送数据
+ */
+@Slf4j
+@RestController
+@AllArgsConstructor
+@RequestMapping("/factory/oupai")
+@Api(value = "欧派工厂数据", tags = "欧派工厂数据")
+public class OupaiFactoryDataController {
+
+	private final IOuPaiFactoryDataService mtFactoryDataService;
+	private final IFactoryLogService factoryLogService;
+
+	private final IAsyncDataService syncDataService;
+
+
+	@PostMapping("/data")
+	public R acceptOupaiFactoryData(@Validated @RequestBody OuPaiDataPushVO ouPaiDataPushVO, HttpServletRequest request) {
+		log.info("acceptOupaiFactoryData 参数ouPaiDataPushVO  {}",ouPaiDataPushVO.toString());
+
+		//先保存原始请求数据
+		FactoryLogEntity orderStatusLog = new FactoryLogEntity();
+		orderStatusLog.setReqArgs(JSONObject.toJSONString(ouPaiDataPushVO));
+		orderStatusLog.setStatus(1);
+		orderStatusLog.setDataStatus(0);
+		factoryLogService.save(orderStatusLog);
+		String carNum = null;
+		try {
+			carNum = mtFactoryDataService.saveData(ouPaiDataPushVO);
+			orderStatusLog.setDataStatus(1);
+
+		} catch (ServiceException  e) {
+			log.warn("############data: 保存数据失败 carNum={}",ouPaiDataPushVO.getCarNum());
+			log.error("############data: 保存数据失败",e);
+			//修改保存数据的状态
+			orderStatusLog.setDataStatus(2);
+		}
+		factoryLogService.saveOrUpdate(orderStatusLog);
+
+		//开启异步线程处理数据
+		if(ObjectUtils.isNotNull(carNum)){
+			syncDataService.handlerOuPaiDataToHt(ouPaiDataPushVO.getCarNum());
+		}
+		return R.data(ouPaiDataPushVO.getCarNum());
+
+
+
+	}
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/controller/ReceivingOrderController.java

@@ -0,0 +1,130 @@
+/*
+ *      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.factory.oupai.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.factory.oupai.entity.ReceivingOrderEntity;
+import com.logpm.factory.oupai.service.IReceivingOrderService;
+import com.logpm.factory.oupai.vo.ReceivingOrderVO;
+import com.logpm.factory.oupai.wrapper.ReceivingOrderWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 欧派工厂收货单 控制器
+ *
+ * @author pref
+ * @since 2023-08-23
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("logpm-factory/receivingOrder")
+@Api(value = "欧派工厂收货单", tags = "欧派工厂收货单接口")
+public class ReceivingOrderController extends BladeController {
+
+	private final IReceivingOrderService receivingOrderService;
+
+	/**
+	 * 欧派工厂收货单 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入receivingOrder")
+	public R<ReceivingOrderVO> detail(ReceivingOrderEntity receivingOrder) {
+		ReceivingOrderEntity detail = receivingOrderService.getOne(Condition.getQueryWrapper(receivingOrder));
+		return R.data(ReceivingOrderWrapper.build().entityVO(detail));
+	}
+	/**
+	 * 欧派工厂收货单 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入receivingOrder")
+	public R<IPage<ReceivingOrderVO>> list(@ApiIgnore @RequestParam Map<String, Object> receivingOrder, Query query) {
+		IPage<ReceivingOrderEntity> pages = receivingOrderService.page(Condition.getPage(query), Condition.getQueryWrapper(receivingOrder, ReceivingOrderEntity.class));
+		return R.data(ReceivingOrderWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 欧派工厂收货单 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入receivingOrder")
+	public R<IPage<ReceivingOrderVO>> page(ReceivingOrderVO receivingOrder, Query query) {
+		IPage<ReceivingOrderVO> pages = receivingOrderService.selectReceivingOrderPage(Condition.getPage(query), receivingOrder);
+		return R.data(pages);
+	}
+
+	/**
+	 * 欧派工厂收货单 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入receivingOrder")
+	public R save(@Valid @RequestBody ReceivingOrderEntity receivingOrder) {
+		return R.status(receivingOrderService.save(receivingOrder));
+	}
+
+	/**
+	 * 欧派工厂收货单 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入receivingOrder")
+	public R update(@Valid @RequestBody ReceivingOrderEntity receivingOrder) {
+		return R.status(receivingOrderService.updateById(receivingOrder));
+	}
+
+	/**
+	 * 欧派工厂收货单 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入receivingOrder")
+	public R submit(@Valid @RequestBody ReceivingOrderEntity receivingOrder) {
+		return R.status(receivingOrderService.saveOrUpdate(receivingOrder));
+	}
+
+	/**
+	 * 欧派工厂收货单 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(receivingOrderService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/FactoryLogMapper.java

@@ -0,0 +1,7 @@
+package com.logpm.factory.oupai.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.factory.oupai.entity.FactoryLogEntity;
+
+public interface FactoryLogMapper  extends BaseMapper<FactoryLogEntity> {
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/FactoryLogMapper.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.factory.oupai.mapper.FactoryLogMapper">
+
+
+
+
+</mapper>

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/FactoryOrderMapper.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.factory.oupai.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.factory.oupai.entity.FactoryOrderEntity;
+import com.logpm.factory.oupai.vo.FactoryOrderVO;
+import java.util.List;
+
+/**
+ * 欧派工厂订单 Mapper 接口
+ *
+ * @author pref
+ * @since 2023-08-23
+ */
+public interface FactoryOrderMapper extends BaseMapper<FactoryOrderEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param factoryOrder
+	 * @return
+	 */
+	List<FactoryOrderVO> selectFactoryOrderPage(IPage page, FactoryOrderVO factoryOrder);
+
+
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/FactoryOrderMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.factory.oupai.mapper.FactoryOrderMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="factoryOrderResultMap" type="com.logpm.factory.oupai.entity.FactoryOrderEntity">
+    </resultMap>
+
+
+    <select id="selectFactoryOrderPage" resultMap="factoryOrderResultMap">
+        select * from op_factory_order where is_deleted = 0
+    </select>
+
+
+</mapper>

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/FactoryPackageMapper.java

@@ -0,0 +1,45 @@
+/*
+ *      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.factory.oupai.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.factory.oupai.entity.FactoryPackageEntity;
+import com.logpm.factory.oupai.vo.FactoryPackageVO;
+
+import java.util.List;
+
+/**
+ * 欧派工厂包件 Mapper 接口
+ *
+ * @author pref
+ * @since 2023-08-23
+ */
+public interface FactoryPackageMapper extends BaseMapper<FactoryPackageEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param factoryPackage
+	 * @return
+	 */
+	List<FactoryPackageVO> selectFactoryPackagePage(IPage page, FactoryPackageVO factoryPackage);
+
+
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/FactoryPackageMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.factory.oupai.mapper.FactoryPackageMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="factoryPackageResultMap" type="com.logpm.factory.oupai.entity.FactoryPackageEntity">
+    </resultMap>
+
+
+    <select id="selectFactoryPackagePage" resultMap="factoryPackageResultMap">
+        select * from op_factory_package where is_deleted = 0
+    </select>
+
+
+
+</mapper>

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/OpOrderStatusLogMapper.java

@@ -0,0 +1,7 @@
+package com.logpm.factory.oupai.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.factory.oupai.entity.OpOrderStatusLogEntity;
+
+public interface OpOrderStatusLogMapper extends BaseMapper<OpOrderStatusLogEntity> {
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/OpOrderStatusLogMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.factory.oupai.mapper.OpOrderStatusLogMapper">
+
+
+
+</mapper>

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/ReceivingOrderMapper.java

@@ -0,0 +1,47 @@
+/*
+ *      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.factory.oupai.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.factory.oupai.entity.ReceivingOrderEntity;
+import com.logpm.factory.oupai.vo.ReceivingOrderVO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 欧派工厂收货单 Mapper 接口
+ *
+ * @author pref
+ * @since 2023-08-23
+ */
+@Mapper
+public interface ReceivingOrderMapper extends BaseMapper<ReceivingOrderEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param receivingOrder
+	 * @return
+	 */
+	List<ReceivingOrderVO> selectReceivingOrderPage(IPage page, ReceivingOrderVO receivingOrder);
+
+
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/ReceivingOrderMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.factory.oupai.mapper.ReceivingOrderMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="receivingOrderResultMap" type="com.logpm.factory.oupai.entity.ReceivingOrderEntity">
+    </resultMap>
+
+
+    <select id="selectReceivingOrderPage" resultMap="receivingOrderResultMap">
+        select * from op_receiving_order where is_deleted = 0
+    </select>
+
+
+
+</mapper>

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IFactoryLogService.java

@@ -0,0 +1,7 @@
+package com.logpm.factory.oupai.service;
+
+import com.logpm.factory.oupai.entity.FactoryLogEntity;
+import org.springblade.core.mp.base.BaseService;
+
+public interface IFactoryLogService extends BaseService<FactoryLogEntity> {
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IFactoryOrderService.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.factory.oupai.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.factory.oupai.entity.FactoryOrderEntity;
+import com.logpm.factory.oupai.vo.FactoryOrderVO;
+import org.springblade.core.mp.base.BaseService;
+
+
+/**
+ * 欧派工厂订单 服务类
+ *
+ * @author pref
+ * @since 2023-08-23
+ */
+public interface IFactoryOrderService extends BaseService<FactoryOrderEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param factoryOrder
+	 * @return
+	 */
+	IPage<FactoryOrderVO> selectFactoryOrderPage(IPage<FactoryOrderVO> page, FactoryOrderVO factoryOrder);
+
+
+    FactoryOrderEntity selectEntityBySelfCode(String selfCode);
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IFactoryPackageService.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.factory.oupai.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.factory.oupai.entity.FactoryPackageEntity;
+import com.logpm.factory.oupai.vo.FactoryPackageVO;
+import org.springblade.core.mp.base.BaseService;
+
+
+/**
+ * 欧派工厂包件 服务类
+ *
+ * @author pref
+ * @since 2023-08-23
+ */
+public interface IFactoryPackageService extends BaseService<FactoryPackageEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param factoryPackage
+	 * @return
+	 */
+	IPage<FactoryPackageVO> selectFactoryPackagePage(IPage<FactoryPackageVO> page, FactoryPackageVO factoryPackage);
+
+
+
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IOpOrderStatusLogService.java

@@ -0,0 +1,7 @@
+package com.logpm.factory.oupai.service;
+
+import com.logpm.factory.oupai.entity.OpOrderStatusLogEntity;
+import org.springblade.core.mp.base.BaseService;
+
+public interface IOpOrderStatusLogService extends BaseService<OpOrderStatusLogEntity> {
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IOuPaiFactoryDataService.java

@@ -0,0 +1,13 @@
+package com.logpm.factory.oupai.service;
+
+import com.logpm.factory.oupai.vo.OuPaiDataPushVO;
+
+public interface IOuPaiFactoryDataService {
+
+	/**
+	 * 保存欧派的数据推送
+	 * @param ouPaiDataPushVO
+	 * @return
+	 */
+	String saveData(OuPaiDataPushVO ouPaiDataPushVO);
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IOuPaiFactoryService.java

@@ -0,0 +1,14 @@
+package com.logpm.factory.oupai.service;
+
+public interface IOuPaiFactoryService {
+
+
+	/**
+	 * 根基欧派派车单查询订单信息
+	 * @param CarNumber
+	 * @return
+	 */
+	String saveOuPaiFactoryOrderDTOByCarCarNumber(String CarNumber);
+
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IReceivingOrderService.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.factory.oupai.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.factory.oupai.entity.ReceivingOrderEntity;
+import com.logpm.factory.oupai.vo.ReceivingOrderVO;
+import org.springblade.core.mp.base.BaseService;
+
+
+/**
+ * 欧派工厂收货单 服务类
+ *
+ * @author pref
+ * @since 2023-08-23
+ */
+public interface IReceivingOrderService extends BaseService<ReceivingOrderEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param receivingOrder
+	 * @return
+	 */
+	IPage<ReceivingOrderVO> selectReceivingOrderPage(IPage<ReceivingOrderVO> page, ReceivingOrderVO receivingOrder);
+
+
+
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/FactoryLogService.java

@@ -0,0 +1,11 @@
+package com.logpm.factory.oupai.service.impl;
+
+import com.logpm.factory.oupai.entity.FactoryLogEntity;
+import com.logpm.factory.oupai.mapper.FactoryLogMapper;
+import com.logpm.factory.oupai.service.IFactoryLogService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+public class FactoryLogService extends BaseServiceImpl<FactoryLogMapper, FactoryLogEntity> implements IFactoryLogService {
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/FactoryOrderServiceImpl.java

@@ -0,0 +1,51 @@
+/*
+ *      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.factory.oupai.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.factory.oupai.entity.FactoryOrderEntity;
+import com.logpm.factory.oupai.mapper.FactoryOrderMapper;
+import com.logpm.factory.oupai.service.IFactoryOrderService;
+import com.logpm.factory.oupai.vo.FactoryOrderVO;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 欧派工厂订单 服务实现类
+ *
+ * @author pref
+ * @since 2023-08-23
+ */
+@Service
+public class FactoryOrderServiceImpl extends BaseServiceImpl<FactoryOrderMapper, FactoryOrderEntity> implements IFactoryOrderService {
+
+	@Override
+	public IPage<FactoryOrderVO> selectFactoryOrderPage(IPage<FactoryOrderVO> page, FactoryOrderVO factoryOrder) {
+		return page.setRecords(baseMapper.selectFactoryOrderPage(page, factoryOrder));
+	}
+
+	@Override
+	public FactoryOrderEntity selectEntityBySelfCode(String selfCode) {
+		QueryWrapper<FactoryOrderEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.select("self_code","id");
+		queryWrapper.eq("self_code",selfCode);
+		return baseMapper.selectOne(queryWrapper);
+	}
+
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/FactoryPackageServiceImpl.java

@@ -0,0 +1,45 @@
+/*
+ *      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.factory.oupai.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.factory.oupai.entity.FactoryPackageEntity;
+import com.logpm.factory.oupai.mapper.FactoryPackageMapper;
+import com.logpm.factory.oupai.service.IFactoryPackageService;
+import com.logpm.factory.oupai.vo.FactoryPackageVO;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 欧派工厂包件 服务实现类
+ *
+ * @author pref
+ * @since 2023-08-23
+ */
+@Service
+public class FactoryPackageServiceImpl extends BaseServiceImpl<FactoryPackageMapper, FactoryPackageEntity> implements IFactoryPackageService {
+
+	@Override
+	public IPage<FactoryPackageVO> selectFactoryPackagePage(IPage<FactoryPackageVO> page, FactoryPackageVO factoryPackage) {
+		return page.setRecords(baseMapper.selectFactoryPackagePage(page, factoryPackage));
+	}
+
+
+
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OpOrderStatusLogServiceImpl.java

@@ -0,0 +1,11 @@
+package com.logpm.factory.oupai.service.impl;
+
+import com.logpm.factory.oupai.entity.OpOrderStatusLogEntity;
+import com.logpm.factory.oupai.mapper.OpOrderStatusLogMapper;
+import com.logpm.factory.oupai.service.IOpOrderStatusLogService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+public class OpOrderStatusLogServiceImpl extends BaseServiceImpl<OpOrderStatusLogMapper, OpOrderStatusLogEntity> implements IOpOrderStatusLogService {
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryDataServiceImpl.java

@@ -0,0 +1,30 @@
+package com.logpm.factory.oupai.service.impl;
+
+import com.logpm.factory.oupai.service.IOuPaiFactoryDataService;
+import com.logpm.factory.oupai.service.IOuPaiFactoryService;
+import com.logpm.factory.oupai.vo.OuPaiDataPushVO;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+@AllArgsConstructor
+public class OuPaiFactoryDataServiceImpl implements IOuPaiFactoryDataService {
+
+
+	//工厂查询
+	private final IOuPaiFactoryService ouPaiFactoryService;
+
+
+
+	@Override
+	public String saveData(OuPaiDataPushVO ouPaiDataPushVO) {
+
+		// 获取需要处理的数据并存入数据库
+		String carNum =ouPaiFactoryService.saveOuPaiFactoryOrderDTOByCarCarNumber(ouPaiDataPushVO.getCarNum());
+		// 将需要将数据
+
+		return carNum;
+	}
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java

@@ -0,0 +1,416 @@
+package com.logpm.factory.oupai.service.impl;
+
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.logpm.factory.oupai.entity.FactoryOrderEntity;
+import com.logpm.factory.oupai.entity.FactoryPackageEntity;
+import com.logpm.factory.oupai.entity.OpOrderStatusLogEntity;
+import com.logpm.factory.oupai.entity.ReceivingOrderEntity;
+import com.logpm.factory.oupai.mapper.ReceivingOrderMapper;
+import com.logpm.factory.oupai.service.IFactoryOrderService;
+import com.logpm.factory.oupai.service.IFactoryPackageService;
+import com.logpm.factory.oupai.service.IOpOrderStatusLogService;
+import com.logpm.factory.oupai.service.IOuPaiFactoryService;
+import com.logpm.factory.props.OuPaiProperties;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.exception.CustomerException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.Objects;
+
+@Slf4j
+@Service
+public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
+
+	@Autowired
+	private OuPaiProperties ouPaiProperties;
+
+	@Autowired
+	private ReceivingOrderMapper receivingOrderMapper;
+
+	@Autowired
+	private IFactoryOrderService factoryOrderService;
+
+	@Autowired
+	private IFactoryPackageService factoryPackageService;
+
+	@Autowired
+	private IOpOrderStatusLogService opOrderStatusLogService;
+
+	@Override
+	public String saveOuPaiFactoryOrderDTOByCarCarNumber(String carNumber) {
+
+		// 对返回i的数据进行处理 按照 发车单-->订单-->包件 完成保存
+		handleData(carNumber);
+
+		return carNumber;
+
+	}
+
+	/**
+	 * 处理返回的JSON数据
+	 *
+	 * @param carNumber
+	 */
+	private void handleData(String carNumber) {
+
+		OpOrderStatusLogEntity opOrderStatusLogEntity = findOurPaiDataByCarNumber(carNumber);
+
+		// 保存需要解析的数据
+		// 获取返回内容
+		try {
+			JSONObject jsonObject = JSONObject.parseObject(opOrderStatusLogEntity.getArgs());
+			JSONArray resultArray = jsonObject.getJSONArray("value");
+			log.info("############handleData: 数据处理开始");
+			analyzeData(resultArray);
+			opOrderStatusLogEntity.setDataStatus(1);
+		} catch (Exception e) {
+			e.printStackTrace();
+			log.error(">>>> error {}", e.getMessage());
+			opOrderStatusLogEntity.setDataStatus(2);
+
+		}
+		opOrderStatusLogService.saveOrUpdate(opOrderStatusLogEntity);
+	}
+
+	/**
+	 * 解析数据
+	 *
+	 * @param resultArray
+	 */
+	private void analyzeData(JSONArray resultArray) {
+		Date start = new Date();
+		for (int i = 0; i < resultArray.size(); i++) {
+			JSONObject valueObject = resultArray.getJSONObject(i);
+			if (Objects.isNull(valueObject)) {
+				log.warn("############handleData: value中没有数据");
+				throw new CustomerException(403, "value中没有数据");
+			}
+			JSONObject fromWarehouse = valueObject.getJSONObject("FromWarehouse");
+			JSONObject currentWarehouse = valueObject.getJSONObject("CurrentWarehouse");
+			JSONObject endWarehouse = valueObject.getJSONObject("EndWarehouse");
+			String code = valueObject.getString("Code");
+			//新发车单数据
+			ReceivingOrderEntity receivingOrderEntity = new ReceivingOrderEntity();
+			receivingOrderEntity.setCode(code);
+			String type = valueObject.getString("Type");
+			if ("中转".equals(type)) {
+				receivingOrderEntity.setType(1);
+			} else if ("配送".equals(type)) {
+				receivingOrderEntity.setType(2);
+			} else {
+				receivingOrderEntity.setType(0);
+			}
+			if (!Objects.isNull(currentWarehouse)) {
+				receivingOrderEntity.setCurrentWarehouseCode(currentWarehouse.getString("Code"));
+				receivingOrderEntity.setCurrentWarehouseName(currentWarehouse.getString("Name"));
+			}
+			if (!Objects.isNull(fromWarehouse)) {
+				receivingOrderEntity.setFromWarehouseCode(fromWarehouse.getString("Code"));
+				receivingOrderEntity.setCurrentWarehouseName(fromWarehouse.getString("Name"));
+			}
+			if (!Objects.isNull(endWarehouse)) {
+				receivingOrderEntity.setEndWarehouseCode(endWarehouse.getString("Code"));
+				receivingOrderEntity.setEndWarehouseName(endWarehouse.getString("Name"));
+			}
+
+			receivingOrderEntity.setPackagesCount(valueObject.getInteger("PackagesCount"));
+			receivingOrderEntity.setReceivePackageCount(valueObject.getInteger("ReceivePackageCount"));
+			String status = valueObject.getString("Status");
+			if ("待收货".equals(status)) {
+				receivingOrderEntity.setFactoryStatus("0");
+			} else if ("已收货".equals(status)) {
+				receivingOrderEntity.setFactoryStatus("1");
+			} else if ("收货中".equals(status)) {
+				receivingOrderEntity.setFactoryStatus("2");
+			} else if ("已跳过".equals(status)) {
+				receivingOrderEntity.setFactoryStatus("3");
+			}
+			receivingOrderEntity.setPlate(valueObject.getString("Plate"));
+			receivingOrderEntity.setPlateNum(valueObject.getString("PlateNum"));
+			receivingOrderEntity.setCarNumber(valueObject.getString("CarNumber"));
+			receivingOrderEntity.setCarrierCode(valueObject.getString("CarrierCode"));
+			receivingOrderEntity.setSendTime(valueObject.getDate("SendTime"));
+			receivingOrderEntity.setArrivalTime(valueObject.getDate("ArrivalTime"));
+			receivingOrderEntity.setReceiveTime(valueObject.getDate("ReceiveTime"));
+			receivingOrderEntity.setReturnNumber(valueObject.getString("ReturnNumber"));
+			receivingOrderEntity.setStatus(0);
+			receivingOrderEntity.setReceiptStatus(0);
+			receivingOrderEntity.setPushStatus(0);
+			receivingOrderEntity.setTurnStatus(0);
+			receivingOrderEntity.setIsDeleted(0);
+			receivingOrderEntity.setCreateTime(new Date());
+			int row = receivingOrderMapper.insert(receivingOrderEntity);
+			if (row == 1) {
+				log.info("############handleData: 保存发货单数据  成功成功成功成功 code={}", code);
+				Long receivingId = receivingOrderEntity.getId();//发货单id
+				JSONArray packages = valueObject.getJSONArray("Packages");
+				for (int j = 0; j < packages.size(); j++) {
+					JSONObject packageEntity = packages.getJSONObject(j);//包件信息
+					JSONObject orderEntity = packageEntity.getJSONObject("Order");//订单信息
+					String selfCode = orderEntity.getString("SelfCode");//订单自编码
+					//先查询是否存在订单自编码
+					FactoryOrderEntity factoryOrderEntity = factoryOrderService.selectEntityBySelfCode(selfCode);
+
+					if (Objects.isNull(factoryOrderEntity)) {
+						factoryOrderEntity = new FactoryOrderEntity();
+						factoryOrderEntity.setCode(orderEntity.getString("Code"));
+						factoryOrderEntity.setSelfCode(selfCode);
+						factoryOrderEntity.setContractNumber(orderEntity.getString("ContractNumber"));
+						factoryOrderEntity.setServiceNumber(orderEntity.getString("ServiceNumber"));
+						factoryOrderEntity.setOrderClass(orderEntity.getString("OrderClass"));
+						factoryOrderEntity.setOrderType(orderEntity.getString("OrderType"));
+						String factoryStatus = orderEntity.getString("Status");
+						if ("待送货".equals(factoryStatus)) {
+							factoryOrderEntity.setFactoryStatus(0);
+						} else if ("已签收".equals(factoryStatus)) {
+							factoryOrderEntity.setFactoryStatus(2);
+						} else if ("已取消".equals(factoryStatus)) {
+							factoryOrderEntity.setFactoryStatus(3);
+						} else if ("部分签收".equals(factoryStatus)) {
+							factoryOrderEntity.setFactoryStatus(6);
+						}
+
+						String factoryShipStatus = orderEntity.getString("FactoryShipStatus");
+						if ("工厂未发货".equals(factoryShipStatus)) {
+							factoryOrderEntity.setFactoryShipStatus(0);
+						} else if ("工厂部分发货".equals(factoryShipStatus)) {
+							factoryOrderEntity.setFactoryShipStatus(1);
+						} else if ("工厂齐套发货".equals(factoryShipStatus)) {
+							factoryOrderEntity.setFactoryShipStatus(2);
+						}
+						factoryOrderEntity.setFactorySendQty(orderEntity.getInteger("FactorySendQty"));
+
+						String warehouseReceiveStatus = orderEntity.getString("WarehouseReceiveStatus");
+						if ("仓库未收货".equals(warehouseReceiveStatus)) {
+							factoryOrderEntity.setWarehouseReceiveStatus(0);
+						} else if ("仓库部分收货".equals(warehouseReceiveStatus)) {
+							factoryOrderEntity.setWarehouseReceiveStatus(1);
+						} else if ("仓库全部收货".equals(warehouseReceiveStatus)) {
+							factoryOrderEntity.setWarehouseReceiveStatus(2);
+						}
+						factoryOrderEntity.setWarehouseReceiveQty(orderEntity.getInteger("WarehouseReceiveQty"));
+
+						String reservationStatus = orderEntity.getString("ReservationStatus");
+						if ("不可预约".equals(reservationStatus)) {
+							factoryOrderEntity.setReservationStatus(0);
+						} else if ("可预约".equals(reservationStatus)) {
+							factoryOrderEntity.setReservationStatus(1);
+						}
+
+						factoryOrderEntity.setStoreName("");//TODO 没有找到门店字段
+
+						factoryOrderEntity.setMatingCode(orderEntity.getString("MatingCode"));
+						Boolean isMating = orderEntity.getBoolean("IsMating");
+						if (isMating) {
+							factoryOrderEntity.setIsMating(1);
+						} else {
+							factoryOrderEntity.setIsMating(0);
+						}
+						factoryOrderEntity.setFirstClassCode(orderEntity.getString("FirstClassCode"));
+						Boolean leave = orderEntity.getBoolean("Leave");
+						if (leave) {
+							factoryOrderEntity.setLeaveStatus(1);
+						} else {
+							factoryOrderEntity.setLeaveStatus(0);
+						}
+						factoryOrderEntity.setCustomer(orderEntity.getString("Customer"));
+						factoryOrderEntity.setProvince(orderEntity.getString("Province"));
+						factoryOrderEntity.setCity(orderEntity.getString("City"));
+						factoryOrderEntity.setCustomerAddress(orderEntity.getString("CustomerAddress"));
+						factoryOrderEntity.setCustomerPhone(orderEntity.getString("CustomerPhone"));
+						factoryOrderEntity.setShopReceiver(orderEntity.getString("ShopReceiver"));
+						factoryOrderEntity.setBrandCode(orderEntity.getString("BrandCode"));
+						factoryOrderEntity.setBrandName(orderEntity.getString("BrandName"));
+						factoryOrderEntity.setFirstShipTime(orderEntity.getDate("FirstShipTime"));
+						factoryOrderEntity.setMatingShipTime(orderEntity.getDate("MatingShipTime"));
+						factoryOrderEntity.setFirstReceiveTime(orderEntity.getDate("FirstReceiveTime"));
+						factoryOrderEntity.setMatingReceiveTime(orderEntity.getDate("MatingReceiveTime"));
+						Boolean freeze = orderEntity.getBoolean("Freeze");
+						if (freeze) {
+							factoryOrderEntity.setFreeze(1);
+						} else {
+							factoryOrderEntity.setFreeze(0);
+						}
+						factoryOrderEntity.setOutGoingTime(orderEntity.getDate("OutGoingTime"));
+						factoryOrderEntity.setStatus(0);
+						factoryOrderEntity.setReceivingId(receivingId);
+						factoryOrderEntity.setReceiptStatus(0);
+						factoryOrderEntity.setPushStatus(0);
+						factoryOrderEntity.setTurnStatus(0);
+						boolean save = factoryOrderService.save(factoryOrderEntity);
+						if (!save) {
+							log.warn("############handleData: 保存订单失败 selfCode={}", selfCode);
+							throw new CustomerException(403, "保存订单失败");
+						}
+					}
+					//保存订单成功，继续保存包件
+					Long orderId = factoryOrderEntity.getId();
+					String packageCode = packageEntity.getString("Code");
+					QueryWrapper<FactoryPackageEntity> packageEntityQueryWrapper = new QueryWrapper<>();
+					packageEntityQueryWrapper.eq("code", packageCode);
+					FactoryPackageEntity factoryPackageEntity = factoryPackageService.getOne(packageEntityQueryWrapper);
+					if (Objects.isNull(factoryPackageEntity)) {
+						factoryPackageEntity = new FactoryPackageEntity();
+						factoryPackageEntity.setOrderId(orderId);
+						factoryPackageEntity.setCode(packageCode);
+						factoryPackageEntity.setFirstClassCode(packageEntity.getString("FirstClassCode"));
+						factoryPackageEntity.setFirstClassName(packageEntity.getString("FirstClassName"));
+						factoryPackageEntity.setSecondClassCode(packageEntity.getString("SecondClassCode"));
+						factoryPackageEntity.setSecondClassName(packageEntity.getString("SecondClassName"));
+						factoryPackageEntity.setThirdClassCode(packageEntity.getString("ThirdClassCode"));
+						factoryPackageEntity.setThirdClassName(packageEntity.getString("ThirdClassName"));
+						Boolean buyIn = packageEntity.getBoolean("BuyIn");
+						if (buyIn) {
+							factoryPackageEntity.setBuyin(1);
+						} else {
+							factoryPackageEntity.setBuyin(0);
+						}
+						factoryPackageEntity.setCosourcingCode(packageEntity.getString("CosourcingCode"));
+						factoryPackageEntity.setCosourcingUnit(packageEntity.getString("CosourcingUnit"));
+						String packageStatus = packageEntity.getString("PackageStatus");
+						//未知:0  已调度:1  已装车:2  待收货:3  已收货:4  已在库:5  待理货:6  待上架:7  已上架:8  已下架:9  已发运:10  已签收:11  待返货:12  已提件:13  已拒收:14  异常:-1
+						if ("已调度".equals(packageStatus)) {
+							factoryPackageEntity.setPackageStatus(1);
+						} else if ("已装车".equals(packageStatus)) {
+							factoryPackageEntity.setPackageStatus(2);
+						} else if ("待收货".equals(packageStatus)) {
+							factoryPackageEntity.setPackageStatus(3);
+						} else if ("已收货".equals(packageStatus)) {
+							factoryPackageEntity.setPackageStatus(4);
+						} else if ("已在库".equals(packageStatus)) {
+							factoryPackageEntity.setPackageStatus(5);
+						} else if ("待理货".equals(packageStatus)) {
+							factoryPackageEntity.setPackageStatus(6);
+						} else if ("待上架".equals(packageStatus)) {
+							factoryPackageEntity.setPackageStatus(7);
+						} else if ("已上架".equals(packageStatus)) {
+							factoryPackageEntity.setPackageStatus(8);
+						} else if ("已下架".equals(packageStatus)) {
+							factoryPackageEntity.setPackageStatus(9);
+						} else if ("已发运".equals(packageStatus)) {
+							factoryPackageEntity.setPackageStatus(10);
+						} else if ("已签收".equals(packageStatus)) {
+							factoryPackageEntity.setPackageStatus(11);
+						} else if ("待返货".equals(packageStatus)) {
+							factoryPackageEntity.setPackageStatus(12);
+						} else if ("已提件".equals(packageStatus)) {
+							factoryPackageEntity.setPackageStatus(13);
+						} else if ("已拒收".equals(packageStatus)) {
+							factoryPackageEntity.setPackageStatus(14);
+						} else if ("异常".equals(packageStatus)) {
+							factoryPackageEntity.setPackageStatus(-1);
+						} else {
+							factoryPackageEntity.setPackageStatus(0);
+						}
+						factoryPackageEntity.setLength(packageEntity.getBigDecimal("Length"));
+						factoryPackageEntity.setWidth(packageEntity.getBigDecimal("Width"));
+						factoryPackageEntity.setHeight(packageEntity.getBigDecimal("Height"));
+						factoryPackageEntity.setWeight(packageEntity.getBigDecimal("Weight"));
+						Boolean isInventory = packageEntity.getBoolean("IsInventory");
+						if (isInventory) {
+							factoryPackageEntity.setIsInventory(1);
+						} else {
+							factoryPackageEntity.setIsInventory(0);
+						}
+						Boolean packageFreeze = packageEntity.getBoolean("Freeze");
+						if (packageFreeze) {
+							factoryPackageEntity.setFreeze(1);
+						} else {
+							factoryPackageEntity.setFreeze(0);
+						}
+						//保存包件信息
+						factoryPackageEntity.setReceiptStatus(0);
+						factoryPackageEntity.setPushStatus(0);
+						factoryPackageEntity.setTurnStatus(0);
+						factoryPackageService.save(factoryPackageEntity);
+					} else {
+						log.warn("############handleData: 包件码已存在 packageCode={}", packageCode);
+						throw new CustomerException(403, "包件码已存在");
+					}
+				}
+			} else {
+				log.warn("############handleData: 保存发货单数据失败 code={}", code);
+				throw new CustomerException(403, "保存发货单数据失败");
+			}
+			Date end = new Date();
+			long startLong = start.getTime();
+			long endLong = end.getTime();
+			long l = endLong - startLong;
+			log.info("############handleData: 数据处理完成 耗时 {} 毫秒", l);
+		}
+
+	}
+
+
+	/**
+	 * 请求工厂返回的的数据
+	 *
+	 * @param carNumber
+	 * @return
+	 */
+	private OpOrderStatusLogEntity findOurPaiDataByCarNumber(String carNumber) {
+
+		String url = ouPaiProperties.getUri() + "tims_odata_api/api/odata/ReceivingOrder?$filter=CarNumber eq '" + carNumber + "'&select=Code,Type,Status,Plate,PlateNum,CarNumber,CarrierCode,PackagesCount,ReceivePackageCount,SendTime,ArrivalTime,ReceiveTime,CreateTime,ReturnNumber\n" +
+			"&$expand=Packages($select=Code,PdaNumber,FirstClassCode,FirstClassName,SecondClassCode,SecondClassName,ThirdClassCode,ThirdClassName,BuyIn,CosourcingCode,CosourcingUnit,SortingCenter,DistributionCenter,Length,Width,Height,Weight,PackageDetails,OrderDetail,Order,PathIndex,PathDetail,DeliveryOrders,ReceivingOrders,LPN,LpnSerialNum,IsEntruck,ReservationOrder,OutGoingOrderDetail,SignBill,IsInventory,Inventories,InventoryInDetails,Freeze,OutGoingOrderDetailInventoryDetail,From,Creator,CreateTime,ShipTime,CarNumber,DeliveryMethod,DeliveryReceiver,DeliveryReceiverPhone,ReturnNumber,GroupType,CarrierCode,CarrierName,PackageDetailNames,ReceivingTime,SendTime,ExceptionSignRemark,Descript,SignTime,OutOrder,IsReceiveByHand,PackageStatus;\n" +
+			"$expand=Order($select=" +
+			"Code,SelfCode,ContractNumber,ServiceNumber,OrderClass,OrderType,Status,FactoryShipStatus,FactorySendQty,WarehouseReceiveStatus,WarehouseReceiveQty,ReservationStatus,Store,MatingCode,IsMating,FirstClassCode,Leave,Customer,Province,City,CustomerAddress,CustomerPhone,ShopReceiver,BrandCode,BrandName,From,OutGoingTime,CreateTime,Freeze,FirstShipTime,MatingShipTime,FirstReceiveTime,MatingReceiveTime\n" +
+			"))&$expand=FromWarehouse($select=Name,Code)&$expand=CurrentWarehouse($select=Name,Code)&$expand=EndWarehouse($select=Name,Code)";
+
+		log.info(">>> findOurPaiDataByCarNumber url {}", url);
+
+		String token = buildToken();
+//		log.info(">>> Authorization token {}",token);
+
+		HttpResponse httpResponse = HttpRequest.get(url).header("Authorization", token).execute();
+
+		String result = httpResponse.body();
+		log.info(">>> findOurPaiDataByCarNumber result {}", result);
+
+		OpOrderStatusLogEntity orderStatusLog = new OpOrderStatusLogEntity();
+		orderStatusLog.setArgs(result);
+		orderStatusLog.setStatus(1);
+		orderStatusLog.setType(1);
+		orderStatusLog.setDataStatus(0);
+		orderStatusLog.setBrand("欧派");
+		opOrderStatusLogService.save(orderStatusLog);
+
+
+		return orderStatusLog;
+
+	}
+
+
+	/**
+	 * 获取请求签名
+	 *
+	 * @return
+	 */
+	private String buildToken() {
+
+		String url = ouPaiProperties.getUri() + "tims_odata_api/api/Authentication/Authenticate";
+
+
+		JSONObject json = new JSONObject();
+		json.put("userName", ouPaiProperties.getUserName());
+		json.put("password", ouPaiProperties.getPassword());
+
+		String data = json.toString();
+		HttpResponse httpResponse = HttpRequest.post(url).body(data).execute();
+		String result = httpResponse.body();
+		log.info(" >>> oupai buildToken token {}", result);
+		if (StringUtils.isNotEmpty(result)) {
+			return "Bearer " + result;
+		}
+		return null;
+
+
+	}
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/ReceivingOrderServiceImpl.java

@@ -0,0 +1,47 @@
+/*
+ *      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.factory.oupai.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.factory.oupai.entity.ReceivingOrderEntity;
+import com.logpm.factory.oupai.mapper.ReceivingOrderMapper;
+import com.logpm.factory.oupai.service.IReceivingOrderService;
+import com.logpm.factory.oupai.vo.ReceivingOrderVO;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 欧派工厂收货单 服务实现类
+ *
+ * @author pref
+ * @since 2023-08-23
+ */
+@Service
+public class ReceivingOrderServiceImpl extends BaseServiceImpl<ReceivingOrderMapper, ReceivingOrderEntity> implements IReceivingOrderService {
+
+	@Override
+	public IPage<ReceivingOrderVO> selectReceivingOrderPage(IPage<ReceivingOrderVO> page, ReceivingOrderVO receivingOrder) {
+		return page.setRecords(baseMapper.selectReceivingOrderPage(page, receivingOrder));
+	}
+
+
+
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/vo/OuPaiDataPushVO.java

@@ -0,0 +1,13 @@
+package com.logpm.factory.oupai.vo;
+
+import lombok.Data;
+
+@Data
+public class OuPaiDataPushVO {
+
+	/**
+	 * 发车单号
+	 */
+	private String carNum;
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/wrapper/FactoryOrderWrapper.java

@@ -0,0 +1,51 @@
+/*
+ *      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.factory.oupai.wrapper;
+
+import com.logpm.factory.oupai.entity.FactoryOrderEntity;
+import com.logpm.factory.oupai.vo.FactoryOrderVO;
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+
+import java.util.Objects;
+
+/**
+ * 欧派工厂订单 包装类,返回视图层所需的字段
+ *
+ * @author pref
+ * @since 2023-08-23
+ */
+public class FactoryOrderWrapper extends BaseEntityWrapper<FactoryOrderEntity, FactoryOrderVO>  {
+
+	public static FactoryOrderWrapper build() {
+		return new FactoryOrderWrapper();
+ 	}
+
+	@Override
+	public FactoryOrderVO entityVO(FactoryOrderEntity factoryOrder) {
+		FactoryOrderVO factoryOrderVO = Objects.requireNonNull(BeanUtil.copy(factoryOrder, FactoryOrderVO.class));
+
+		//User createUser = UserCache.getUser(factoryOrder.getCreateUser());
+		//User updateUser = UserCache.getUser(factoryOrder.getUpdateUser());
+		//factoryOrderVO.setCreateUserName(createUser.getName());
+		//factoryOrderVO.setUpdateUserName(updateUser.getName());
+
+		return factoryOrderVO;
+	}
+
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/wrapper/FactoryPackageWrapper.java

@@ -0,0 +1,51 @@
+/*
+ *      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.factory.oupai.wrapper;
+
+import com.logpm.factory.oupai.entity.FactoryPackageEntity;
+import com.logpm.factory.oupai.vo.FactoryPackageVO;
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+
+import java.util.Objects;
+
+/**
+ * 欧派工厂包件 包装类,返回视图层所需的字段
+ *
+ * @author pref
+ * @since 2023-08-23
+ */
+public class FactoryPackageWrapper extends BaseEntityWrapper<FactoryPackageEntity, FactoryPackageVO>  {
+
+	public static FactoryPackageWrapper build() {
+		return new FactoryPackageWrapper();
+ 	}
+
+	@Override
+	public FactoryPackageVO entityVO(FactoryPackageEntity factoryPackage) {
+		FactoryPackageVO factoryPackageVO = Objects.requireNonNull(BeanUtil.copy(factoryPackage, FactoryPackageVO.class));
+
+		//User createUser = UserCache.getUser(factoryPackage.getCreateUser());
+		//User updateUser = UserCache.getUser(factoryPackage.getUpdateUser());
+		//factoryPackageVO.setCreateUserName(createUser.getName());
+		//factoryPackageVO.setUpdateUserName(updateUser.getName());
+
+		return factoryPackageVO;
+	}
+
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/wrapper/ReceivingOrderWrapper.java

@@ -0,0 +1,51 @@
+/*
+ *      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.factory.oupai.wrapper;
+
+import com.logpm.factory.oupai.entity.ReceivingOrderEntity;
+import com.logpm.factory.oupai.vo.ReceivingOrderVO;
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+
+import java.util.Objects;
+
+/**
+ * 欧派工厂收货单 包装类,返回视图层所需的字段
+ *
+ * @author pref
+ * @since 2023-08-23
+ */
+public class ReceivingOrderWrapper extends BaseEntityWrapper<ReceivingOrderEntity, ReceivingOrderVO>  {
+
+	public static ReceivingOrderWrapper build() {
+		return new ReceivingOrderWrapper();
+ 	}
+
+	@Override
+	public ReceivingOrderVO entityVO(ReceivingOrderEntity receivingOrder) {
+		ReceivingOrderVO receivingOrderVO = Objects.requireNonNull(BeanUtil.copy(receivingOrder, ReceivingOrderVO.class));
+
+		//User createUser = UserCache.getUser(receivingOrder.getCreateUser());
+		//User updateUser = UserCache.getUser(receivingOrder.getUpdateUser());
+		//receivingOrderVO.setCreateUserName(createUser.getName());
+		//receivingOrderVO.setUpdateUserName(updateUser.getName());
+
+		return receivingOrderVO;
+	}
+
+
+}

blade-service/logpm-factory/src/main/java/com/logpm/factory/props/OuPaiProperties.java

@@ -0,0 +1,20 @@
+package com.logpm.factory.props;
+
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Data
+@ConfigurationProperties(prefix = "oupai")
+@Component
+public class OuPaiProperties {
+
+	private String userName;
+
+	private String password;
+
+	private String uri;
+
+
+}

blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java

@@ -1,160 +1,56 @@
-//package com.logpm.factory;
-//
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-//import com.baomidou.mybatisplus.extension.conditions.update.UpdateChainWrapper;
-//import com.fasterxml.jackson.core.JsonProcessingException;
-//import com.logpm.factory.comfac.controller.FactoryCommonController;
-//import com.logpm.factory.comfac.dto.UnloadCarDTO;
-//import com.logpm.factory.mt.entity.MtFactoryOrderMain;
-//import com.logpm.factory.mt.entity.MtPushData;
-//import com.logpm.factory.mt.service.IMtFactoryDataService;
-//import com.logpm.factory.mt.service.IMtFactoryOrderMainService;
-//import com.logpm.factory.mt.service.IMtPushDataService;
-//import com.logpm.factory.mt.service.impl.MtFactoryDataServiceImpl;
-//import com.logpm.factory.snm.vo.MTOrderPackageRelationVO;
-//import com.logpm.oldproject.entity.AdvanceDetailEntity;
-//import com.logpm.oldproject.feign.IAdvanceDetailClient;
-//import com.rabbitmq.client.Channel;
-//import org.junit.jupiter.api.Test;
-//import org.junit.jupiter.api.extension.ExtendWith;
-//import org.springblade.core.test.BladeBootTest;
-//import org.springblade.core.test.BladeSpringExtension;
-//import org.springblade.core.tool.api.R;
-//import org.springblade.core.tool.api.ResultCode;
-//import org.springblade.core.tool.utils.StringUtil;
-//import org.springframework.amqp.core.Message;
-//import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-//import org.springframework.beans.factory.annotation.Autowired;
-//
-//import java.security.NoSuchAlgorithmException;
-//import java.text.ParseException;
-//import java.text.SimpleDateFormat;
-//import java.util.Date;
-//import java.util.List;
-//import java.util.Map;
-//import java.util.Set;
-//import java.util.stream.Collectors;
-//
-//@ExtendWith(BladeSpringExtension.class)
-//@BladeBootTest(appName = "logpm-factory-pref", enableLoader = true)
-//public class TestService {
-//
-//
-//
-//	@Autowired
-//	private IAdvanceDetailClient advanceDetailClient;
-//
-//
-//	@Autowired
-//	private IMtFactoryOrderMainService mtFactoryOrderMainService;
-//
+package com.logpm.factory;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.conditions.update.UpdateChainWrapper;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.logpm.factory.comfac.controller.FactoryCommonController;
+import com.logpm.factory.comfac.dto.UnloadCarDTO;
+import com.logpm.factory.mt.entity.MtFactoryOrderMain;
+import com.logpm.factory.mt.entity.MtPushData;
+import com.logpm.factory.mt.service.IMtFactoryDataService;
+import com.logpm.factory.mt.service.IMtFactoryOrderMainService;
+import com.logpm.factory.mt.service.IMtPushDataService;
+import com.logpm.factory.mt.service.impl.MtFactoryDataServiceImpl;
+import com.logpm.factory.oupai.service.IOuPaiFactoryService;
+import com.logpm.factory.snm.vo.MTOrderPackageRelationVO;
+import com.logpm.oldproject.entity.AdvanceDetailEntity;
+import com.logpm.oldproject.feign.IAdvanceDetailClient;
+import com.rabbitmq.client.Channel;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springblade.core.test.BladeBootTest;
+import org.springblade.core.test.BladeSpringExtension;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.api.ResultCode;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.security.NoSuchAlgorithmException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@ExtendWith(BladeSpringExtension.class)
+@BladeBootTest(appName = "logpm-factory-pref", enableLoader = true)
+public class TestService {
+
+
 //	@Autowired
-//	private IMtFactoryDataService mtFactoryDataService;
-//
-//	@Autowired
-//	private IMtPushDataService mtPushDataService;
-//
-//
-//
+//	private IOuPaiFactoryService ouPaiFactoryService;
 //
 //
 //
 //	@Test
 //	public void test2() {
-//
-//		/*
-//		1.得到传递的车次
-//		2. 需要判断这个车次是否市梦天的
-//		3. 查询这个车次上的运单是否市梦天的
-//
-//		4.查询包件对应的梦天发给我们的批次号
-//		 */
-//		UnloadCarDTO unloadCarDTO = new UnloadCarDTO();
-//		unloadCarDTO.setCompleteDate("2023-08-08 15:39:40");
-//		unloadCarDTO.setUnloadCarNum("MTZX230808001");
-//
-//		/*
-//			2.通过车次查询来系统中车次绑定的运单
-//			3.通过运单查询货物上的包件
-//			4.需要过滤出来 只要梦天的
-//		 */
-//
-//		try {
-//			List<String> carNumList = advanceDetailClient.getByCarNum(unloadCarDTO.getUnloadCarNum());
-//			List<MTOrderPackageRelationVO> allMtData = mtFactoryOrderMainService.mtOrderPackageRelation();
-//			// 对这个集合内进行分组
-//			Map<String, List<MTOrderPackageRelationVO>> stringListMap = allMtData.stream().collect(Collectors.groupingBy(MTOrderPackageRelationVO::getInvoiceOrderCode));
-//			Set<String> set = stringListMap.keySet();
-//
-//			for (String s : set) {
-//				String carNum = null;
-//				// 得到某个工厂运输批次的集合
-//				List<MTOrderPackageRelationVO> t = stringListMap.get(s);
-//				//得到这个批次下面所有的包件
-//				List<String> strs = t.stream().map(MTOrderPackageRelationVO::getPackageCode).collect(Collectors.toList());
-//				// 当前批次的包件 在 这个配载计划中存在一个 则进行通知
-//				for (String mtStr : carNumList) {
-//					if (strs.contains(mtStr)) {
-//						carNum = s;
-//						break;
-//					}
-//				}
-//
-//				try {
-//					if (StringUtil.isNoneBlank(carNum)) {
-//						sendDataCarNum(carNum, unloadCarDTO.getCompleteDate());
-//					}
-//				} catch (ParseException e) {
-//					e.printStackTrace();
-//				} catch (NoSuchAlgorithmException e) {
-//					e.printStackTrace();
-//				} catch (JsonProcessingException e) {
-//					e.printStackTrace();
-//				}
-//
-//			}
-//		} catch (Exception e) {
-//			e.printStackTrace();
-//		}
-//
+//		ouPaiFactoryService.findOuPaiFactoryOrderDTOByCarCarNumber("LCD230505047");
 //
 //	}
-//
-//	/**
-//	 * 根基匹配到的发货单编号 推送梦天
-//	 *
-//	 * @param carNum
-//	 * @param completeDate
-//	 * @throws ParseException
-//	 * @throws NoSuchAlgorithmException
-//	 * @throws JsonProcessingException
-//	 */
-//	private void sendDataCarNum(String carNum, String completeDate) throws ParseException, NoSuchAlgorithmException, JsonProcessingException {
-//
-//		// 需要判断这个发货单编号是否推送过
-//		QueryWrapper<MtPushData> lambdaQueryChainWrapper = new QueryWrapper<MtPushData>();
-//		lambdaQueryChainWrapper.eq("ref_code", carNum);
-//		MtPushData ms = mtPushDataService.getOne(lambdaQueryChainWrapper);
-//		if (ObjectUtils.isNotNull(ms)) {
-//			return;
-//		}
-//		R r = mtFactoryDataService.sendUnloadCarNum(carNum, completeDate);
-//		if (r.getCode() == ResultCode.SUCCESS.getCode()) {
-//			MtPushData mtPushData = new MtPushData();
-//			mtPushData.setPushTime(new Date());
-//			mtPushData.setPushStatus(1);// 推送状态
-//			mtPushData.setRefCode(carNum);
-//			mtPushData.setRefType(1);// 订单主表
-//			// todo  这里需要查询主推送单的 ID
-//			List<MtFactoryOrderMain> mtFactoryOrderMainList = mtFactoryOrderMainService.findMtFactoryOrderMainByInvoiceOrderCode(carNum);
-//			if (mtFactoryOrderMainList.size() > 0) {
-//				mtFactoryOrderMainList.get(0);
-//				mtPushData.setRefId(mtFactoryOrderMainList.get(0).getId());
-//			}
-//			// 插入推送数据
-//			mtPushDataService.save(mtPushData);
-//		}
-//	}
-//
-//}
+
+}