1.修改欧派工厂实体

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

@@ -18,10 +18,14 @@ 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;
+
 /**
  * 欧派工厂订单 实体类
  *
@@ -32,7 +36,211 @@ import org.springblade.core.tenant.mp.TenantEntity;
 @TableName("op_factory_order")
 @ApiModel(value = "FactoryOrder对象", description = "欧派工厂订单")
 @EqualsAndHashCode(callSuper = true)
-public class FactoryOrderEntity extends TenantEntity {
-
+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 String factoryStatus;
+	/**
+	 * 工厂发货状态 工厂未发货:0 工厂部分发货:1 工厂齐套发货:2
+	 */
+	@ApiModelProperty(name = "工厂发货状态 工厂未发货:0 工厂部分发货:1 工厂齐套发货:2", notes = "")
+	private String factoryShipStatus;
+	/**
+	 * 工厂发货件数
+	 */
+	@ApiModelProperty(name = "工厂发货件数", notes = "")
+	private String factorySendQty;
+	/**
+	 * 仓库收货状态 仓库未收货:0 仓库部分收货:1 仓库全部收货:2
+	 */
+	@ApiModelProperty(name = "仓库收货状态 仓库未收货:0 仓库部分收货:1 仓库全部收货:2", notes = "")
+	private String warehouseReceiveStatus;
+	/**
+	 * 仓库收货件数
+	 */
+	@ApiModelProperty(name = "仓库收货件数", notes = "")
+	private String warehouseReceiveQty;
+	/**
+	 * 可预约状态 不可预约:0 可预约:1
+	 */
+	@ApiModelProperty(name = "可预约状态 不可预约:0 可预约:1", notes = "")
+	private String reservationStatus;
+	/**
+	 * 所属门店
+	 */
+	@ApiModelProperty(name = "所属门店", notes = "")
+	private String store;
+	/**
+	 * 齐套模式
+	 */
+	@ApiModelProperty(name = "齐套模式", notes = "")
+	private String matingCode;
+	/**
+	 * 是否齐套
+	 */
+	@ApiModelProperty(name = "是否齐套", notes = "")
+	private String isMating;
+	/**
+	 * 品类编码
+	 */
+	@ApiModelProperty(name = "品类编码", notes = "")
+	private String firstClassCode;
+	/**
+	 * 是否遗留
+	 */
+	@ApiModelProperty(name = "是否遗留", notes = "")
+	private String leave;
+	/**
+	 * 客户名称
+	 */
+	@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 String firstShipTime;
+	/**
+	 * 齐套发货时间
+	 */
+	@ApiModelProperty(name = "齐套发货时间", notes = "")
+	private String matingShipTime;
+	/**
+	 * 首次收货时间
+	 */
+	@ApiModelProperty(name = "首次收货时间", notes = "")
+	private String firstReceiveTime;
+	/**
+	 * 齐套收货时间
+	 */
+	@ApiModelProperty(name = "齐套收货时间", notes = "")
+	private String matingReceiveTime;
+	/**
+	 * 冻结
+	 */
+	@ApiModelProperty(name = "冻结", notes = "")
+	private String freeze;
+	/**
+	 * 发运时间
+	 */
+	@ApiModelProperty(name = "发运时间", notes = "")
+	private String 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

@@ -18,8 +18,10 @@ 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;
 
 /**
@@ -32,7 +34,90 @@ import org.springblade.core.tenant.mp.TenantEntity;
 @TableName("op_factory_package")
 @ApiModel(value = "FactoryPackage对象", description = "欧派工厂包件")
 @EqualsAndHashCode(callSuper = true)
-public class FactoryPackageEntity extends TenantEntity {
+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 String 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 String length ;
+	/** 宽（米） */
+	@ApiModelProperty(name = "宽（米）",notes = "")
+	private String width ;
+	/** 宽（米） */
+	@ApiModelProperty(name = "宽（米）",notes = "")
+	private String height ;
+	/** 宽（米） */
+	@ApiModelProperty(name = "宽（米）",notes = "")
+	private String weight ;
+	/** 是否库存品包 */
+	@ApiModelProperty(name = "是否库存品包",notes = "")
+	private String isInventory ;
+	/** 是否冻结 */
+	@ApiModelProperty(name = "是否冻结",notes = "")
+	private String 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未转送",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/ReceivingOrderEntity.java

@@ -18,10 +18,14 @@ 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;
+
 /**
  * 欧派工厂收货单 实体类
  *
@@ -32,7 +36,90 @@ import org.springblade.core.tenant.mp.TenantEntity;
 @TableName("op_receiving_order")
 @ApiModel(value = "ReceivingOrder对象", description = "欧派工厂收货单")
 @EqualsAndHashCode(callSuper = true)
-public class ReceivingOrderEntity extends TenantEntity {
-
+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/logpm-factory/src/main/java/com/logpm/factory/oupai/controller/OupaiFactoryDataController.java

@@ -62,10 +62,10 @@ public class OupaiFactoryDataController {
 		}
 		orderStatusLogService.saveOrUpdate(orderStatusLog);
 
-		//开启异步线程处理数据
-		if(!Objects.isNull(id)){
-			syncDataService.handlerOuPaiDataToHt(id);
-		}
+//		//开启异步线程处理数据
+//		if(!Objects.isNull(id)){
+//			syncDataService.handlerOuPaiDataToHt(id);
+//		}
 		return R.data(ouPaiDataPushVO.getCarNum());
 
 

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

@@ -22,10 +22,14 @@ public class OuPaiFactoryDataServiceImpl implements IOuPaiFactoryDataService {
 	public Long saveData(OuPaiDataPushVO ouPaiDataPushVO) {
 
 		// 获取需要处理的数据
-
 		ouPaiFactoryService.findOuPaiFactoryOrderDTOByCarCarNumber(ouPaiDataPushVO.getCarNum());
 
 
+		// 将需要将数据
+
+
+
+
 
 		return null;
 	}

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

@@ -32,14 +32,11 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 
 		JSONArray ourPaiDataByCarNumber = findOurPaiDataByCarNumber(carNumber);
 
-		// 对返回i的数据进行处理 按照 发车单-->订单-->包件
+		// 对返回i的数据进行处理 按照 发车单-->订单-->包件 完成保存
 		handleData(ourPaiDataByCarNumber);
 
 
 
-
-
-
 		return null;
 	}
 
@@ -64,7 +61,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 
 		String url = ouPaiProperties.getUri() + "tims_odata_api/api/odata/ReceivingOrder?$filter=CarNumber eq '"+carNumber+"'&select=Code,Type,Status,Plate,PlateNum,CarNumber,CarrierCode,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=\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)";