1.皮阿诺推送订单数据接口

2.获取工厂token接口
3.中转订单信息状态的接口

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/entity/FactoryAccount.java

@@ -0,0 +1,28 @@
+package com.logpm.factory.snm.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
+
+import javax.validation.constraints.NotEmpty;
+
+@Data
+@TableName("factory_account")
+@ApiModel(value = "FactoryAccount对象", description = "工厂账户")
+public class FactoryAccount extends BaseEntity {
+
+	@ApiModelProperty("企业id")
+	@NotEmpty(message = "企业id不能为空")
+	private String corpid;
+
+	@ApiModelProperty("应用id")
+	@NotEmpty(message = "应用id不能为空")
+	private String appkey;
+
+	@ApiModelProperty("秘钥")
+	@NotEmpty(message = "秘钥不能为空")
+	private String appsecret;
+
+}

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/entity/FactoryToken.java

@@ -0,0 +1,32 @@
+package com.logpm.factory.snm.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.util.Date;
+
+@Data
+@TableName("factory_token")
+@ApiModel(value = "FactoryToken对象", description = "工厂账户token")
+public class FactoryToken extends BaseEntity {
+
+	@ApiModelProperty("token")
+	private String token;
+
+	@ApiModelProperty("token摘要")
+	private String tokenAbst;
+
+	@JsonFormat(
+		pattern = "yyyy-MM-dd HH:mm:ss"
+	)
+	@ApiModelProperty("过期时间")
+	private Date expireTime;
+
+	@ApiModelProperty("企业id")
+	private String corpid;
+
+}

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/entity/PanFactoryOrder.java

@@ -0,0 +1,140 @@
+package com.logpm.factory.snm.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 javax.validation.constraints.Min;
+import javax.validation.constraints.NotEmpty;
+import java.math.BigDecimal;
+
+@Data
+@TableName("pan_factory_order")
+@ApiModel(value = "PanFactoryOrder对象", description = "皮艾诺工厂运单")
+@EqualsAndHashCode(callSuper = true)
+public class PanFactoryOrder extends BaseEntity {
+
+	@ApiModelProperty(value = "工厂账号")
+	private String corpid;
+
+	@ApiModelProperty(value = "客户编码")
+	@NotEmpty(message = "客户编码不能为空")
+	private String userId;
+
+	@ApiModelProperty(value = "客户名称")
+	@NotEmpty(message = "客户名称不能为空")
+	private String userName;
+
+	@ApiModelProperty(value = "订单来源编码")
+	@NotEmpty(message = "订单来源编码不能为空")
+	private String sources;
+
+	@ApiModelProperty(value = "订单来源名称")
+	@NotEmpty(message = "订单来源名称不能为空")
+	private String sourceName;
+
+	@ApiModelProperty(value = "公司编码")
+	@NotEmpty(message = "公司编码不能为空")
+	private String companyCode;
+
+	@ApiModelProperty(value = "公司名称")
+	@NotEmpty(message = "公司名称不能为空")
+	private String companyName;
+
+	@ApiModelProperty(value = "服务平台编码")
+	private String siteCode;
+
+	@ApiModelProperty(value = "服务平台名称")
+	private String siteName;
+
+	//1干仓配、2干仓、3自提、4仓配
+	@ApiModelProperty(value = "服务类型")
+	private String serveType;
+
+	//1工厂结算、2商城结算
+	@ApiModelProperty(value = "结算方式")
+	private String settlementType;
+
+	@ApiModelProperty(value = "服务号")
+	@NotEmpty(message = "服务号不能为空")
+	private String serviceNum;
+
+	@ApiModelProperty(value = "装车清单编号")
+	@NotEmpty(message = "装车清单编号不能为空")
+	private String loadingList;
+
+	@ApiModelProperty(value = "生产的总件数")
+	@Min(value = 0,message = "生产的总件数不正确")
+	private Integer serviceCount;
+
+	@ApiModelProperty(value = "客户订单号")
+	@NotEmpty(message = "客户订单号不能为空")
+	private String orderNo;
+
+	@ApiModelProperty(value = "计划总数量")
+	@Min(value = 0,message = "计划总数量不正确")
+	private Integer totalQuantity;
+
+	@ApiModelProperty(value = "总重量")
+	private BigDecimal totalWeight;
+
+	@ApiModelProperty(value = "总体积")
+	private BigDecimal totalCapacity;
+
+	@ApiModelProperty(value = "发货工厂名称")
+	@NotEmpty(message = "发货工厂名称不能为空")
+	private String sendFactory;
+
+	@ApiModelProperty(value = "发货人手机号")
+	private String senderMobile;
+
+	@ApiModelProperty(value = "发货人省份")
+	private String senderProvince;
+
+	@ApiModelProperty(value = "发货人城市")
+	private String senderCity;
+
+	@ApiModelProperty(value = "发货人区县")
+	private String senderArea;
+
+	@ApiModelProperty(value = "发货人详细地址")
+	private String senderAddress;
+
+
+	@ApiModelProperty(value = "收货人")
+	@NotEmpty(message = "收货人不能为空")
+	private String receiverName;
+
+	@ApiModelProperty(value = "收货人联系方式")
+	@NotEmpty(message = "收货人联系方式不能为空")
+	private String receiverMobile;
+
+	@ApiModelProperty(value = "收货人省份")
+	@NotEmpty(message = "收货人省份不能为空")
+	private String receiverProvince;
+
+	@ApiModelProperty(value = "收货人城市")
+	@NotEmpty(message = "收货人城市不能为空")
+	private String receiverCity;
+
+	@ApiModelProperty(value = "收货人区县")
+	private String receiverArea;
+
+	@ApiModelProperty(value = "收货人详细地址")
+	@NotEmpty(message = "收货人详细地址不能为空")
+	private String receiverAddress;
+
+	@ApiModelProperty(value = "终端客户电话号码")
+	private String customerNumber;
+
+	@ApiModelProperty(value = "终端客户名称")
+	private String customerName;
+
+	@ApiModelProperty(value = "终端客户地址")
+	private String customerAddress;
+
+
+}

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/entity/PanOrderStatusLog.java

@@ -0,0 +1,17 @@
+package com.logpm.factory.snm.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("pan_order_status_log")
+@ApiModel(value = "PanOrderStatusLog对象", description = "皮艾诺订单状态日志")
+@EqualsAndHashCode(callSuper = true)
+public class PanOrderStatusLog extends BaseEntity {
+
+	private String args;
+
+}

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/entity/PanPackageInfo.java

@@ -0,0 +1,57 @@
+package com.logpm.factory.snm.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;
+
+@Data
+@TableName("pan_package_info")
+@ApiModel(value = "PanPackageInfo", description = "皮阿诺包件信息")
+@EqualsAndHashCode(callSuper = true)
+public class PanPackageInfo extends BaseEntity {
+
+	@ApiModelProperty(value = "订单id")
+	private Long orderId;
+
+	@ApiModelProperty(value = "包件码")
+	private String unitNo;
+
+	@ApiModelProperty(value = "产品编码")
+	private String productCode;
+
+	@ApiModelProperty(value = "产品名称")
+	private String productName;
+
+	@ApiModelProperty(value = "件数")
+	private Integer productNum;
+
+	@ApiModelProperty(value = "体积")
+	private BigDecimal productVolume;
+
+	@ApiModelProperty(value = "重量")
+	private BigDecimal productWeight;
+
+	@ApiModelProperty(value = "一级品类名称")
+	private String firstPackName;
+
+	@ApiModelProperty(value = "一级品类编码")
+	private String firstPackCode;
+
+	@ApiModelProperty(value = "二级品类名称")
+	private String secondPackName;
+
+	@ApiModelProperty(value = "二级品类编码")
+	private String secondPackCode;
+
+	@ApiModelProperty(value = "三级品类名称")
+	private String thirdPackName;
+
+	@ApiModelProperty(value = "三级品类编码")
+	private String thirdPackCode;
+
+}

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/entity/PanPackageList.java

@@ -0,0 +1,31 @@
+package com.logpm.factory.snm.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;
+
+@Data
+@TableName("pan_package_list")
+@ApiModel(value = "PanPackageList", description = "皮阿诺包件明细信息")
+@EqualsAndHashCode(callSuper = true)
+public class PanPackageList extends BaseEntity {
+
+	@ApiModelProperty(value = "包件id")
+	private Long packageId;
+
+	@ApiModelProperty(value = "板件条码")
+	private String prosBarcode;
+
+	@ApiModelProperty(value = "板件名称")
+	private String boardName;
+
+	@ApiModelProperty(value = "尺寸")
+	private String model;
+
+	@ApiModelProperty(value = "数量")
+	private Integer quantity;
+
+}

blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/snm/vo/FactoryTokenVO.java

@@ -0,0 +1,15 @@
+package com.logpm.factory.snm.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class FactoryTokenVO {
+
+	private String token;
+
+	private Date expireTime;
+	private Long expireTimeLong;
+
+}