34 changed files with 1591 additions and 296 deletions
@ -0,0 +1,88 @@
|
||||
package com.logpm.factorydata.jinpai.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; |
||||
|
||||
/** |
||||
* 金牌工厂订单 实体类 |
||||
* |
||||
* @author zhaoqiaobo |
||||
* @create 2024-04-26 |
||||
*/ |
||||
@Data |
||||
@TableName("jp_factory_order") |
||||
@ApiModel(value = "金牌工厂订单", description = "金牌工厂订单") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class JpFactoryOrderEntity extends BaseEntity { |
||||
|
||||
@ApiModelProperty(name = "日志id") |
||||
private String logId; |
||||
@ApiModelProperty(name = "发货单id") |
||||
private Long shipmentId; |
||||
@ApiModelProperty(name = "订单号") |
||||
private String orderCode; |
||||
@ApiModelProperty(name = "交割单号/服务号") |
||||
private String serviceNum; |
||||
@ApiModelProperty(name = "服务类型") |
||||
private String serverType; |
||||
@ApiModelProperty(name = "结算方式") |
||||
private String settlementType; |
||||
@ApiModelProperty(name = "是否补件") |
||||
private String supplement; |
||||
@ApiModelProperty(name = "发运方式") |
||||
private String shipVia; |
||||
@ApiModelProperty(name = "订单总件数") |
||||
private Integer totalQuantity; |
||||
@ApiModelProperty(name = "商场名称") |
||||
private String mallName; |
||||
@ApiModelProperty(name = "商场编码") |
||||
private String mallCode; |
||||
@ApiModelProperty(name = "商场电话") |
||||
private String mallMobile; |
||||
@ApiModelProperty(name = "商场地址") |
||||
private String mallAddress; |
||||
@ApiModelProperty(name = "商场收货人") |
||||
private String mallConsignee; |
||||
@ApiModelProperty(name = "商场收货人电话") |
||||
private String mallConsigneeMobile; |
||||
@ApiModelProperty(name = "门店名称") |
||||
private String storeName; |
||||
@ApiModelProperty(name = "门店编码") |
||||
private String storeCode; |
||||
@ApiModelProperty(name = "门店电话") |
||||
private String storeMobile; |
||||
@ApiModelProperty(name = "门店地址") |
||||
private String storeAddress; |
||||
@ApiModelProperty(name = "门店收货人") |
||||
private String storeConsignee; |
||||
@ApiModelProperty(name = "门店收货人电话") |
||||
private String storeConsigneeMobile; |
||||
@ApiModelProperty(name = "终端收货人") |
||||
private String receiverName; |
||||
@ApiModelProperty(name = "终端收货人电话") |
||||
private String receiverMobile; |
||||
@ApiModelProperty(name = "终端收货人地址") |
||||
private String receiverAddress; |
||||
@ApiModelProperty(name = "备注") |
||||
private String remark; |
||||
@ApiModelProperty(name = "是否确认") |
||||
private Boolean checked; |
||||
@ApiModelProperty(name = "租户") |
||||
private String tenantCode; |
||||
|
||||
@ApiModelProperty(name = "预留1", notes = "") |
||||
private String reserve1; |
||||
@ApiModelProperty(name = "预留2", notes = "") |
||||
private String reserve2; |
||||
@ApiModelProperty(name = "预留3", notes = "") |
||||
private String reserve3; |
||||
@ApiModelProperty(name = "预留4", notes = "") |
||||
private String reserve4; |
||||
@ApiModelProperty(name = "预留5", notes = "") |
||||
private String reserve5; |
||||
|
||||
} |
||||
@ -0,0 +1,72 @@
|
||||
package com.logpm.factorydata.jinpai.entity; |
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import com.fasterxml.jackson.annotation.JsonProperty; |
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
import org.springblade.core.mp.base.BaseEntity; |
||||
|
||||
/** |
||||
* 金牌工厂包件 实体类 |
||||
* |
||||
* @author zhaoqiaobo |
||||
* @create 2024-04-26 |
||||
*/ |
||||
@Data |
||||
@TableName("jp_factory_package") |
||||
@ApiModel(value = "金牌工厂包件", description = "金牌工厂包件") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class JpFactoryPackageEntity extends BaseEntity { |
||||
|
||||
@ApiModelProperty(name = "日志id") |
||||
private String logId; |
||||
@ApiModelProperty(name = "订单id") |
||||
private Long orderId; |
||||
@ApiModelProperty(name = "是否合包") |
||||
@JsonProperty("isConsolidation") |
||||
private String consolidation; |
||||
@ApiModelProperty(name = "合包码") |
||||
private String consolidationCode; |
||||
@ApiModelProperty(name = "包件码") |
||||
private String unitNo; |
||||
@ApiModelProperty(name = "产品编号") |
||||
private String productCode; |
||||
@ApiModelProperty(name = "产品名称") |
||||
private String productName; |
||||
@ApiModelProperty(name = "件数") |
||||
private Integer quantity; |
||||
@ApiModelProperty(name = "体积") |
||||
private Double volume; |
||||
@ApiModelProperty(name = "重量") |
||||
private Double weight; |
||||
@ApiModelProperty(name = "一级品类名称") |
||||
private String firstPackName; |
||||
@ApiModelProperty(name = "一级品类编码") |
||||
private String firstPackCode; |
||||
@ApiModelProperty(name = "二级品类名称") |
||||
private String secondPackName; |
||||
@ApiModelProperty(name = "二级品类编码") |
||||
private String secondPackCode; |
||||
@ApiModelProperty(name = "三级品类名称") |
||||
private String thirdPackName; |
||||
@ApiModelProperty(name = "三级品类编码") |
||||
private String thirdPackCode; |
||||
@ApiModelProperty(name = "是否确认") |
||||
private Boolean checked; |
||||
@ApiModelProperty(name = "租户") |
||||
private String tenantCode; |
||||
|
||||
@ApiModelProperty(name = "预留1", notes = "") |
||||
private String reserve1; |
||||
@ApiModelProperty(name = "预留2", notes = "") |
||||
private String reserve2; |
||||
@ApiModelProperty(name = "预留3", notes = "") |
||||
private String reserve3; |
||||
@ApiModelProperty(name = "预留4", notes = "") |
||||
private String reserve4; |
||||
@ApiModelProperty(name = "预留5", notes = "") |
||||
private String reserve5; |
||||
|
||||
} |
||||
@ -0,0 +1,64 @@
|
||||
package com.logpm.factorydata.jinpai.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; |
||||
|
||||
/** |
||||
* 金牌工厂发货单 实体类 |
||||
* |
||||
* @author zhaoqiaobo |
||||
* @create 2024-04-26 |
||||
*/ |
||||
@Data |
||||
@TableName("jp_factory_shipment") |
||||
@ApiModel(value = "金牌工厂发货单", description = "金牌工厂发货单") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class JpFactoryShipmentEntity extends BaseEntity { |
||||
|
||||
@ApiModelProperty(name = "日志id") |
||||
private String logId; |
||||
@ApiModelProperty(name = "发货单号") |
||||
private String shipmentId; |
||||
@ApiModelProperty(name = "物流公司编码") |
||||
private String carrierCode; |
||||
@ApiModelProperty(name = "物流公司名称") |
||||
private String carrierName; |
||||
@ApiModelProperty(name = "发货基地") |
||||
private String shipmentHub; |
||||
@ApiModelProperty(name = "计划发车时间") |
||||
private String planStartTime; |
||||
@ApiModelProperty(name = "计划到达时间") |
||||
private String planEndTime; |
||||
@ApiModelProperty(name = "司机") |
||||
private String driverName; |
||||
@ApiModelProperty(name = "司机电话") |
||||
private String driverMobile; |
||||
@ApiModelProperty(name = "车牌") |
||||
private String carNumber; |
||||
@ApiModelProperty(name = "发货人名称") |
||||
private String senderName; |
||||
@ApiModelProperty(name = "发货人电话") |
||||
private String senderMobile; |
||||
@ApiModelProperty(name = "发货人地址") |
||||
private String senderAddress; |
||||
@ApiModelProperty(name = "是否确认") |
||||
private Boolean checked; |
||||
@ApiModelProperty(name = "租户") |
||||
private String tenantCode; |
||||
|
||||
@ApiModelProperty(name = "预留1", notes = "") |
||||
private String reserve1; |
||||
@ApiModelProperty(name = "预留2", notes = "") |
||||
private String reserve2; |
||||
@ApiModelProperty(name = "预留3", notes = "") |
||||
private String reserve3; |
||||
@ApiModelProperty(name = "预留4", notes = "") |
||||
private String reserve4; |
||||
@ApiModelProperty(name = "预留5", notes = "") |
||||
private String reserve5; |
||||
|
||||
} |
||||
@ -0,0 +1,16 @@
|
||||
package com.logpm.factorydata.jinpai.mapper; |
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
import com.logpm.factorydata.jinpai.entity.JpFactoryOrderEntity; |
||||
import org.apache.ibatis.annotations.Mapper; |
||||
|
||||
/** |
||||
* 金牌工厂订单 mapper |
||||
* |
||||
* @author zqb |
||||
* @since 2024-03-26 |
||||
*/ |
||||
@Mapper |
||||
public interface JpFactoryOrderMapper extends BaseMapper<JpFactoryOrderEntity> { |
||||
|
||||
} |
||||
@ -0,0 +1,5 @@
|
||||
<?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.factorydata.jinpai.mapper.JpFactoryOrderMapper"> |
||||
|
||||
</mapper> |
||||
@ -0,0 +1,16 @@
|
||||
package com.logpm.factorydata.jinpai.mapper; |
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
import com.logpm.factorydata.jinpai.entity.JpFactoryPackageEntity; |
||||
import org.apache.ibatis.annotations.Mapper; |
||||
|
||||
/** |
||||
* 金牌工厂包件 mapper |
||||
* |
||||
* @author zqb |
||||
* @since 2024-03-26 |
||||
*/ |
||||
@Mapper |
||||
public interface JpFactoryPackageMapper extends BaseMapper<JpFactoryPackageEntity> { |
||||
|
||||
} |
||||
@ -0,0 +1,5 @@
|
||||
<?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.factorydata.jinpai.mapper.JpFactoryPackageMapper"> |
||||
|
||||
</mapper> |
||||
@ -0,0 +1,21 @@
|
||||
package com.logpm.factorydata.jinpai.mapper; |
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
import com.logpm.factorydata.jinpai.entity.JpFactoryShipmentEntity; |
||||
import com.logpm.factorydata.jinpai.vo.FactoryAuthVO; |
||||
import org.apache.ibatis.annotations.Mapper; |
||||
import org.apache.ibatis.annotations.Param; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 金牌工厂发货单 mapper |
||||
* |
||||
* @author zqb |
||||
* @since 2024-03-26 |
||||
*/ |
||||
@Mapper |
||||
public interface JpFactoryShipmentMapper extends BaseMapper<JpFactoryShipmentEntity> { |
||||
|
||||
List<FactoryAuthVO> findFactoryAuth(@Param("companyCode") String companyCode); |
||||
} |
||||
@ -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.factorydata.jinpai.mapper.JpFactoryShipmentMapper"> |
||||
|
||||
<select id="findFactoryAuth" resultType="com.logpm.factorydata.jinpai.vo.FactoryAuthVO"> |
||||
select |
||||
logistics_code, |
||||
app_key, |
||||
tenant_code, |
||||
login_account, |
||||
authorization_header |
||||
from jp_factory_auth |
||||
where |
||||
company_code = #{companyCode} |
||||
</select> |
||||
</mapper> |
||||
@ -0,0 +1,14 @@
|
||||
package com.logpm.factorydata.jinpai.service; |
||||
|
||||
import com.logpm.factorydata.jinpai.entity.JpFactoryOrderEntity; |
||||
import org.springblade.core.mp.base.BaseService; |
||||
|
||||
/** |
||||
* 金牌工厂订单 服务类 |
||||
* |
||||
* @Author zqb |
||||
* @Date 2024/4/26 |
||||
**/ |
||||
public interface JpFactoryOrderService extends BaseService<JpFactoryOrderEntity> { |
||||
|
||||
} |
||||
@ -0,0 +1,14 @@
|
||||
package com.logpm.factorydata.jinpai.service; |
||||
|
||||
import com.logpm.factorydata.jinpai.entity.JpFactoryPackageEntity; |
||||
import org.springblade.core.mp.base.BaseService; |
||||
|
||||
/** |
||||
* 金牌工厂包件 服务类 |
||||
* |
||||
* @Author zqb |
||||
* @Date 2024/4/26 |
||||
**/ |
||||
public interface JpFactoryPackageService extends BaseService<JpFactoryPackageEntity> { |
||||
|
||||
} |
||||
@ -0,0 +1,19 @@
|
||||
package com.logpm.factorydata.jinpai.service; |
||||
|
||||
import com.logpm.factorydata.jinpai.entity.JpFactoryShipmentEntity; |
||||
import com.logpm.factorydata.jinpai.vo.FactoryAuthVO; |
||||
import com.logpm.factorydata.jinpai.vo.JpFactoryShipmentVO; |
||||
import org.springblade.core.mp.base.BaseService; |
||||
|
||||
/** |
||||
* 金牌工厂发货单 服务类 |
||||
* |
||||
* @Author zqb |
||||
* @Date 2024/4/26 |
||||
**/ |
||||
public interface JpFactoryShipmentService extends BaseService<JpFactoryShipmentEntity> { |
||||
|
||||
FactoryAuthVO findFactoryAuth(String companyCode); |
||||
|
||||
String shipment(JpFactoryShipmentVO bean); |
||||
} |
||||
@ -0,0 +1,14 @@
|
||||
package com.logpm.factorydata.jinpai.service; |
||||
|
||||
/** |
||||
* 消息队列工作类 服务类 |
||||
* |
||||
* @Author zqb |
||||
* @Date 2024/4/26 |
||||
**/ |
||||
public interface MqWorkerService { |
||||
|
||||
void factoryShipment(String msg); |
||||
|
||||
void factoryOrder(String msg); |
||||
} |
||||
@ -0,0 +1,22 @@
|
||||
package com.logpm.factorydata.jinpai.service.impl; |
||||
|
||||
import com.logpm.factorydata.jinpai.entity.JpFactoryOrderEntity; |
||||
import com.logpm.factorydata.jinpai.mapper.JpFactoryOrderMapper; |
||||
import com.logpm.factorydata.jinpai.service.JpFactoryOrderService; |
||||
import lombok.AllArgsConstructor; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
import org.springblade.core.mp.base.BaseServiceImpl; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
/** |
||||
* 金牌工厂订单 业务实现类 |
||||
* |
||||
* @Author zqb |
||||
* @Date 2024/4/26 |
||||
**/ |
||||
@Slf4j |
||||
@Service |
||||
@AllArgsConstructor |
||||
public class JpFactoryOrderServiceImpl extends BaseServiceImpl<JpFactoryOrderMapper, JpFactoryOrderEntity> implements JpFactoryOrderService { |
||||
|
||||
} |
||||
@ -0,0 +1,22 @@
|
||||
package com.logpm.factorydata.jinpai.service.impl; |
||||
|
||||
import com.logpm.factorydata.jinpai.entity.JpFactoryPackageEntity; |
||||
import com.logpm.factorydata.jinpai.mapper.JpFactoryPackageMapper; |
||||
import com.logpm.factorydata.jinpai.service.JpFactoryPackageService; |
||||
import lombok.AllArgsConstructor; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
import org.springblade.core.mp.base.BaseServiceImpl; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
/** |
||||
* 金牌工厂包件 业务实现类 |
||||
* |
||||
* @Author zqb |
||||
* @Date 2024/4/26 |
||||
**/ |
||||
@Slf4j |
||||
@Service |
||||
@AllArgsConstructor |
||||
public class JpFactoryPackageServiceImpl extends BaseServiceImpl<JpFactoryPackageMapper, JpFactoryPackageEntity> implements JpFactoryPackageService { |
||||
|
||||
} |
||||
@ -0,0 +1,137 @@
|
||||
package com.logpm.factorydata.jinpai.service.impl; |
||||
|
||||
import cn.hutool.core.collection.CollUtil; |
||||
import cn.hutool.core.io.FileUtil; |
||||
import cn.hutool.core.util.StrUtil; |
||||
import cn.hutool.json.JSONUtil; |
||||
import com.logpm.factorydata.enums.SaxStatusEnums; |
||||
import com.logpm.factorydata.feign.IFactoryDataClient; |
||||
import com.logpm.factorydata.jinpai.entity.FactoryOrderLogEntity; |
||||
import com.logpm.factorydata.jinpai.entity.JpFactoryShipmentEntity; |
||||
import com.logpm.factorydata.jinpai.mapper.JpFactoryShipmentMapper; |
||||
import com.logpm.factorydata.jinpai.service.FactoryOrderLogService; |
||||
import com.logpm.factorydata.jinpai.service.JpFactoryShipmentService; |
||||
import com.logpm.factorydata.jinpai.vo.FactoryAuthVO; |
||||
import com.logpm.factorydata.jinpai.vo.JpFactoryShipmentVO; |
||||
import com.logpm.factorydata.vo.SendMsg; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
import org.apache.commons.fileupload.FileItem; |
||||
import org.apache.commons.fileupload.disk.DiskFileItemFactory; |
||||
import org.apache.commons.io.IOUtils; |
||||
import org.jetbrains.annotations.NotNull; |
||||
import org.springblade.common.constant.factorydata.FactoryDataConstants; |
||||
import org.springblade.common.utils.FileLogsUtil; |
||||
import org.springblade.core.mp.base.BaseServiceImpl; |
||||
import org.springblade.core.oss.model.BladeFile; |
||||
import org.springblade.core.redis.cache.BladeRedis; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springblade.resource.feign.IOssClient; |
||||
import org.springframework.http.MediaType; |
||||
import org.springframework.stereotype.Service; |
||||
import org.springframework.web.multipart.MultipartFile; |
||||
import org.springframework.web.multipart.commons.CommonsMultipartFile; |
||||
|
||||
import javax.annotation.Resource; |
||||
import java.io.File; |
||||
import java.io.InputStream; |
||||
import java.io.OutputStream; |
||||
import java.nio.file.Files; |
||||
import java.time.Duration; |
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 金牌工厂发货单 业务实现类 |
||||
* |
||||
* @Author zqb |
||||
* @Date 2024/4/26 |
||||
**/ |
||||
@Slf4j |
||||
@Service |
||||
public class JpFactoryShipmentServiceImpl extends BaseServiceImpl<JpFactoryShipmentMapper, JpFactoryShipmentEntity> implements JpFactoryShipmentService { |
||||
|
||||
@Resource |
||||
private BladeRedis bladeRedis; |
||||
@Resource |
||||
private IOssClient ossClient; |
||||
@Resource |
||||
private IFactoryDataClient factoryDataClient; |
||||
@Resource |
||||
private FactoryOrderLogService factoryOrderLogService; |
||||
|
||||
@Override |
||||
public FactoryAuthVO findFactoryAuth(String companyCode) { |
||||
// redis 缓存数据 缓存时间 1天
|
||||
if (StrUtil.isNotBlank(companyCode)) { |
||||
String key = "factory-data:jinpai:" + companyCode; |
||||
String json = bladeRedis.get(key); |
||||
if (StrUtil.isNotBlank(json)) { |
||||
return JSONUtil.toBean(json, FactoryAuthVO.class); |
||||
} else { |
||||
List<FactoryAuthVO> factoryAuth = baseMapper.findFactoryAuth(companyCode); |
||||
if(CollUtil.isNotEmpty(factoryAuth)){ |
||||
FactoryAuthVO authVO = factoryAuth.get(0); |
||||
bladeRedis.setEx(key, JSONUtil.toJsonStr(authVO), Duration.ofDays(1)); |
||||
return authVO; |
||||
} |
||||
} |
||||
} |
||||
return null; |
||||
|
||||
} |
||||
|
||||
@Override |
||||
public String shipment(JpFactoryShipmentVO vo) { |
||||
// 1 上传数据到 minio 获取到地址
|
||||
String url = uploadFile(JSONUtil.toJsonStr(vo)); |
||||
// 2 保存地址到数据库
|
||||
FactoryOrderLogEntity logEntity = new FactoryOrderLogEntity(); |
||||
logEntity.setType(2); |
||||
logEntity.setSaxStatus(SaxStatusEnums.NOMAL.getCode()); |
||||
logEntity.setLogUrl(url); |
||||
factoryOrderLogService.save(logEntity); |
||||
// 3 将消息发送给 mq，解析保存
|
||||
SendMsg build = SendMsg.builder().exchange(FactoryDataConstants.Mq.Exchanges.FACTORY_ORDER) |
||||
.routingKey(FactoryDataConstants.Mq.RoutingKeys.JP_FACTORY_SHIPMENT).message(JSONUtil.toJsonStr(logEntity)).build(); |
||||
factoryDataClient.sendMessage(build); |
||||
return "成功"; |
||||
|
||||
} |
||||
|
||||
private String uploadFile(String body) { |
||||
// 文本内容和保存为本地文件 并上传
|
||||
String logPath = FileLogsUtil.saveFileLogs(body); |
||||
log.info(">>> 文件路径 {}", logPath); |
||||
|
||||
MultipartFile multi = getMultipartFile(logPath); |
||||
// 上传到服务器
|
||||
R r = ossClient.fileUpload(multi, "jp-order-logs"); |
||||
if (r.isSuccess()) { |
||||
BladeFile data = (BladeFile) r.getData(); |
||||
// 删除本地文件
|
||||
FileUtil.del(logPath); |
||||
return data.getLink(); |
||||
} |
||||
return null; |
||||
} |
||||
|
||||
@NotNull |
||||
private MultipartFile getMultipartFile(String logPath) { |
||||
File file = new File(logPath); |
||||
|
||||
// File 转 MultipartFile
|
||||
FileItem item = new DiskFileItemFactory().createItem("file" |
||||
, MediaType.MULTIPART_FORM_DATA_VALUE |
||||
, true |
||||
, file.getName()); |
||||
try ( |
||||
InputStream input = Files.newInputStream(file.toPath()); |
||||
OutputStream os = item.getOutputStream()) { |
||||
// 流转移
|
||||
IOUtils.copy(input, os); |
||||
} catch (Exception e) { |
||||
throw new IllegalArgumentException("Invalid file: " + e, e); |
||||
} |
||||
|
||||
return new CommonsMultipartFile(item); |
||||
} |
||||
} |
||||
@ -0,0 +1,356 @@
|
||||
package com.logpm.factorydata.jinpai.service.impl; |
||||
|
||||
import cn.hutool.core.bean.BeanUtil; |
||||
import cn.hutool.core.collection.CollUtil; |
||||
import cn.hutool.core.io.FileUtil; |
||||
import cn.hutool.core.util.CharsetUtil; |
||||
import cn.hutool.core.util.ObjectUtil; |
||||
import cn.hutool.core.util.StrUtil; |
||||
import cn.hutool.core.util.URLUtil; |
||||
import cn.hutool.json.JSONArray; |
||||
import cn.hutool.json.JSONUtil; |
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
||||
import com.logpm.factorydata.enums.SaxStatusEnums; |
||||
import com.logpm.factorydata.jinpai.entity.DeliveryNoteEntity; |
||||
import com.logpm.factorydata.jinpai.entity.FactoryOrderLogEntity; |
||||
import com.logpm.factorydata.jinpai.entity.JpFactoryOrderEntity; |
||||
import com.logpm.factorydata.jinpai.entity.JpFactoryPackageEntity; |
||||
import com.logpm.factorydata.jinpai.entity.JpFactoryShipmentEntity; |
||||
import com.logpm.factorydata.jinpai.entity.OrderInfoEntity; |
||||
import com.logpm.factorydata.jinpai.entity.PackageInfoEntity; |
||||
import com.logpm.factorydata.jinpai.entity.PushOrderDetailEntity; |
||||
import com.logpm.factorydata.jinpai.entity.PushOrderEntity; |
||||
import com.logpm.factorydata.jinpai.enums.DimensionEnums; |
||||
import com.logpm.factorydata.jinpai.service.DeliveryNoteService; |
||||
import com.logpm.factorydata.jinpai.service.FactoryOrderLogService; |
||||
import com.logpm.factorydata.jinpai.service.JpFactoryOrderService; |
||||
import com.logpm.factorydata.jinpai.service.JpFactoryPackageService; |
||||
import com.logpm.factorydata.jinpai.service.JpFactoryShipmentService; |
||||
import com.logpm.factorydata.jinpai.service.MqWorkerService; |
||||
import com.logpm.factorydata.jinpai.service.OrderInfoService; |
||||
import com.logpm.factorydata.jinpai.service.PackageInfoService; |
||||
import com.logpm.factorydata.jinpai.service.PushOrderDetailService; |
||||
import com.logpm.factorydata.jinpai.service.PushOrderService; |
||||
import com.logpm.factorydata.jinpai.vo.DeliveryNoteVO; |
||||
import com.logpm.factorydata.jinpai.vo.JpFactoryOrderVO; |
||||
import com.logpm.factorydata.jinpai.vo.JpFactoryPackageVO; |
||||
import com.logpm.factorydata.jinpai.vo.JpFactoryShipmentVO; |
||||
import com.logpm.factorydata.jinpai.vo.OrderInfoVO; |
||||
import com.logpm.factorydata.jinpai.vo.PackageCategoryVO; |
||||
import com.logpm.factorydata.jinpai.vo.PackageInfoVO; |
||||
import com.logpm.factorydata.jinpai.vo.PushOrderDetailVO; |
||||
import com.logpm.factorydata.jinpai.vo.PushOrderVO; |
||||
import lombok.AllArgsConstructor; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
import org.springblade.core.secure.utils.AuthUtil; |
||||
import org.springframework.stereotype.Service; |
||||
import org.springframework.transaction.annotation.Transactional; |
||||
|
||||
import java.util.ArrayList; |
||||
import java.util.HashMap; |
||||
import java.util.List; |
||||
import java.util.Map; |
||||
|
||||
/** |
||||
* 消息队列工作类 业务实现类 |
||||
* |
||||
* @Author zqb |
||||
* @Date 2024/4/26 |
||||
**/ |
||||
@Slf4j |
||||
@Service |
||||
@AllArgsConstructor |
||||
public class MqWorkerServiceImpl implements MqWorkerService { |
||||
|
||||
private final PushOrderService pushOrderService; |
||||
private final PushOrderDetailService pushOrderDetailService; |
||||
private final DeliveryNoteService deliveryNoteService; |
||||
private final OrderInfoService orderInfoService; |
||||
private final PackageInfoService packageInfoService; |
||||
private final FactoryOrderLogService logService; |
||||
private final JpFactoryShipmentService jpFactoryShipmentService; |
||||
private final JpFactoryOrderService jpFactoryOrderService; |
||||
private final JpFactoryPackageService jpFactoryPackageService; |
||||
|
||||
@Override |
||||
@Transactional(rollbackFor = Exception.class) |
||||
public void factoryShipment(String msg) { |
||||
if (StrUtil.isEmpty(msg)) { |
||||
log.error("消息内容为空"); |
||||
return; |
||||
} |
||||
FactoryOrderLogEntity logEntity = JSONUtil.toBean(msg, FactoryOrderLogEntity.class); |
||||
if (ObjectUtil.isEmpty(logEntity)) { |
||||
log.error("消息内容为空"); |
||||
return; |
||||
} |
||||
// 去 minio 下载文件到本地，然后解析文件内容为实体对象
|
||||
JpFactoryShipmentVO pushOrderVO = null; |
||||
String logUrl = logEntity.getLogUrl(); |
||||
if (StrUtil.isNotEmpty(logUrl)) { |
||||
List<String> res = new ArrayList<>(); |
||||
FileUtil.readLines(URLUtil.url(logUrl), CharsetUtil.CHARSET_UTF_8, res); |
||||
if (CollUtil.isNotEmpty(res)) { |
||||
String content = res.get(0); |
||||
if (StrUtil.isNotEmpty(content)) { |
||||
pushOrderVO = JSONUtil.toBean(content, JpFactoryShipmentVO.class); |
||||
} |
||||
} |
||||
} |
||||
shipmentData(pushOrderVO, logEntity); |
||||
} |
||||
|
||||
@Override |
||||
@Transactional(rollbackFor = Exception.class) |
||||
public void factoryOrder(String msg) { |
||||
if (StrUtil.isEmpty(msg)) { |
||||
log.error("消息内容为空"); |
||||
return; |
||||
} |
||||
FactoryOrderLogEntity logEntity = JSONUtil.toBean(msg, FactoryOrderLogEntity.class); |
||||
if (ObjectUtil.isEmpty(logEntity)) { |
||||
log.error("消息内容为空"); |
||||
return; |
||||
} |
||||
// 去 minio 下载文件到本地，然后解析文件内容为实体对象
|
||||
List<DeliveryNoteVO> deliveryNoteVOS = null; |
||||
List<OrderInfoVO> orderInfoVOS = null; |
||||
List<PackageInfoVO> packageInfoVOS = null; |
||||
PushOrderVO pushOrderVO = null; |
||||
Long logId = logEntity.getId(); |
||||
String logUrl = logEntity.getLogUrl(); |
||||
// 1 订单 2 订单明细 3 包件
|
||||
Integer dimension = logEntity.getDimension(); |
||||
if (StrUtil.isNotEmpty(logUrl)) { |
||||
List<String> res = new ArrayList<>(); |
||||
FileUtil.readLines(URLUtil.url(logUrl), CharsetUtil.CHARSET_UTF_8, res); |
||||
if (CollUtil.isNotEmpty(res)) { |
||||
String content = res.get(0); |
||||
if (StrUtil.isNotEmpty(content)) { |
||||
// 拉取的数据
|
||||
if (ObjectUtil.equal(logEntity.getType(), 1)) { |
||||
if (ObjectUtil.equal(dimension, DimensionEnums.ORDER.getCode())) { |
||||
deliveryNoteVOS = new JSONArray(content).toList(DeliveryNoteVO.class); |
||||
} |
||||
if (ObjectUtil.equal(dimension, DimensionEnums.ORDER_DETAIL.getCode())) { |
||||
orderInfoVOS = new JSONArray(content).toList(OrderInfoVO.class); |
||||
} |
||||
if (ObjectUtil.equal(dimension, DimensionEnums.PACKAGE.getCode())) { |
||||
packageInfoVOS = new JSONArray(content).toList(PackageInfoVO.class); |
||||
} |
||||
} else if (ObjectUtil.equal(logEntity.getType(), 2)) { |
||||
// 推送的数据
|
||||
pushOrderVO = JSONUtil.toBean(content, PushOrderVO.class); |
||||
} |
||||
} |
||||
} |
||||
} |
||||
if (ObjectUtil.equal(logEntity.getType(), 1)) { |
||||
pullData(deliveryNoteVOS, orderInfoVOS, packageInfoVOS, logEntity); |
||||
} else if (ObjectUtil.equal(logEntity.getType(), 2)) { |
||||
pushData(pushOrderVO, logEntity); |
||||
} |
||||
} |
||||
|
||||
private void shipmentData(JpFactoryShipmentVO vo, FactoryOrderLogEntity logEntity) { |
||||
if (ObjectUtil.isNotEmpty(vo)) { |
||||
// 1 解析数据保存入库
|
||||
// 装车单号唯一
|
||||
Long logId = logEntity.getId(); |
||||
String truckNo = vo.getShipmentId(); |
||||
if (StrUtil.isEmpty(truckNo)) { |
||||
return; |
||||
} |
||||
List<JpFactoryShipmentEntity> list = jpFactoryShipmentService.list(Wrappers.<JpFactoryShipmentEntity>lambdaQuery().eq(JpFactoryShipmentEntity::getShipmentId, truckNo)); |
||||
Boolean checked = Boolean.FALSE; |
||||
if (CollUtil.isNotEmpty(list)) { |
||||
if (list.size() > 1) { |
||||
return; |
||||
} |
||||
checked = Boolean.TRUE; |
||||
} |
||||
vo.setChecked(checked); |
||||
vo.setLogId(ObjectUtil.isNotEmpty(logId) ? logId.toString() : null); |
||||
vo.setTenantCode(AuthUtil.getTenantId()); |
||||
jpFactoryShipmentService.save(vo); |
||||
List<JpFactoryOrderVO> orderVOS = vo.getOrderList(); |
||||
if (CollUtil.isNotEmpty(orderVOS)) { |
||||
List<JpFactoryPackageEntity> packageEntities = new ArrayList<>(); |
||||
for (JpFactoryOrderVO orderVO : orderVOS) { |
||||
JpFactoryOrderEntity orderEntity = new JpFactoryOrderEntity(); |
||||
BeanUtil.copyProperties(orderVO, orderEntity); |
||||
orderEntity.setLogId(ObjectUtil.isNotEmpty(logId) ? logId.toString() : null); |
||||
orderEntity.setShipmentId(vo.getId()); |
||||
orderEntity.setChecked(checked); |
||||
orderEntity.setTenantCode(AuthUtil.getTenantId()); |
||||
jpFactoryOrderService.save(orderEntity); |
||||
List<JpFactoryPackageVO> packageList = orderVO.getPackageList(); |
||||
if (CollUtil.isNotEmpty(packageList)) { |
||||
for (JpFactoryPackageVO jpFactoryPackageVO : packageList) { |
||||
JpFactoryPackageEntity packageEntity = new JpFactoryPackageEntity(); |
||||
BeanUtil.copyProperties(jpFactoryPackageVO, packageEntity); |
||||
packageEntity.setLogId(ObjectUtil.isNotEmpty(logId) ? logId.toString() : null); |
||||
packageEntity.setOrderId(orderEntity.getId()); |
||||
packageEntity.setChecked(checked); |
||||
packageEntity.setTenantCode(AuthUtil.getTenantId()); |
||||
packageEntities.add(packageEntity); |
||||
} |
||||
} |
||||
} |
||||
if (CollUtil.isNotEmpty(packageEntities)) { |
||||
jpFactoryPackageService.saveBatch(packageEntities); |
||||
} |
||||
} |
||||
// 2 构建暂存单，发送 mq 消息
|
||||
FactoryOrderLogEntity logEntity1 = new FactoryOrderLogEntity(); |
||||
logEntity1.setSaxStatus(SaxStatusEnums.SUCCESS.getCode()); |
||||
logEntity1.setId(logId); |
||||
logService.saveOrUpdate(logEntity1); |
||||
// 处理暂存单
|
||||
deliveryNoteService.buildFactoryAdvance(vo); |
||||
} |
||||
} |
||||
|
||||
private void pushData(PushOrderVO vo, FactoryOrderLogEntity logEntity) { |
||||
if (ObjectUtil.isNotEmpty(vo)) { |
||||
// 1 解析数据保存入库
|
||||
// 装车单号唯一
|
||||
Long logId = logEntity.getId(); |
||||
String truckNo = vo.getTransportNo(); |
||||
List<PushOrderEntity> list = pushOrderService.list(Wrappers.<PushOrderEntity>lambdaQuery().eq(PushOrderEntity::getTransportNo, truckNo)); |
||||
if (CollUtil.isNotEmpty(list)) { |
||||
log.error("装车单号{} 数据已经处理过了, logId: {}", truckNo, logId); |
||||
return; |
||||
} |
||||
vo.setLogId(ObjectUtil.isNotEmpty(logId) ? logId.toString() : null); |
||||
pushOrderService.save(vo); |
||||
List<PushOrderDetailVO> orderInfos = vo.getItems(); |
||||
if (CollUtil.isNotEmpty(orderInfos)) { |
||||
List<PushOrderDetailEntity> infoEntities = new ArrayList<>(); |
||||
for (PushOrderDetailVO orderInfo : orderInfos) { |
||||
PushOrderDetailEntity orderInfoEntity = new PushOrderDetailEntity(); |
||||
BeanUtil.copyProperties(orderInfo, orderInfoEntity); |
||||
orderInfoEntity.setLogId(ObjectUtil.isNotEmpty(logId) ? logId.toString() : null); |
||||
orderInfoEntity.setOrderId(vo.getId().toString()); |
||||
List<String> boxCodes = orderInfo.getBoxCodes(); |
||||
if (CollUtil.isNotEmpty(boxCodes)) { |
||||
orderInfoEntity.setBoxCodeList(JSONUtil.toJsonStr(boxCodes)); |
||||
} |
||||
List<PackageCategoryVO> boxDetails = orderInfo.getBoxDetails(); |
||||
if (CollUtil.isNotEmpty(boxDetails)) { |
||||
orderInfoEntity.setBoxDetailList(JSONUtil.toJsonStr(boxDetails)); |
||||
} |
||||
infoEntities.add(orderInfoEntity); |
||||
} |
||||
pushOrderDetailService.saveBatch(infoEntities); |
||||
} |
||||
// 2 构建暂存单，发送 mq 消息
|
||||
FactoryOrderLogEntity logEntity1 = new FactoryOrderLogEntity(); |
||||
logEntity1.setSaxStatus(SaxStatusEnums.SUCCESS.getCode()); |
||||
logEntity1.setId(logId); |
||||
logService.saveOrUpdate(logEntity1); |
||||
// 处理暂存单
|
||||
deliveryNoteService.buildAdvance(vo); |
||||
} |
||||
} |
||||
|
||||
private void pullData(List<DeliveryNoteVO> deliveryNoteVOS, List<OrderInfoVO> orderInfoVOS, List<PackageInfoVO> packageInfoVOS, FactoryOrderLogEntity logEntity) { |
||||
if (CollUtil.isNotEmpty(deliveryNoteVOS)) { |
||||
List<DeliveryNoteEntity> entities = new ArrayList<>(); |
||||
List<String> orderCodes = new ArrayList<>(); |
||||
for (DeliveryNoteVO deliveryNoteVO : deliveryNoteVOS) { |
||||
orderCodes.add(deliveryNoteVO.getOrderId()); |
||||
} |
||||
List<DeliveryNoteEntity> list = deliveryNoteService.list(Wrappers.<DeliveryNoteEntity>lambdaQuery() |
||||
.in(DeliveryNoteEntity::getOrderId, orderCodes)); |
||||
Map<String, String> map = new HashMap<>(); |
||||
if (CollUtil.isNotEmpty(list)) { |
||||
// 将list中的数据封装到map中
|
||||
list.forEach(item -> { |
||||
map.put(item.getOrderId(), item.getOrderId()); |
||||
}); |
||||
} |
||||
for (DeliveryNoteVO deliveryNoteVO : deliveryNoteVOS) { |
||||
if (map.containsKey(deliveryNoteVO.getOrderId())) { |
||||
log.error("订单号:{},已推送过了", deliveryNoteVO.getOrderId()); |
||||
continue; |
||||
} |
||||
DeliveryNoteEntity deliveryNoteEntity = new DeliveryNoteEntity(); |
||||
BeanUtil.copyProperties(deliveryNoteVO, deliveryNoteEntity); |
||||
deliveryNoteEntity.setLogId(ObjectUtil.isNotEmpty(logEntity.getId()) ? logEntity.getId().toString() : null); |
||||
entities.add(deliveryNoteEntity); |
||||
} |
||||
if (CollUtil.isNotEmpty(entities)) { |
||||
deliveryNoteService.saveBatch(entities); |
||||
} |
||||
} |
||||
if (CollUtil.isNotEmpty(orderInfoVOS)) { |
||||
List<OrderInfoEntity> entities = new ArrayList<>(); |
||||
List<String> orderCodes = new ArrayList<>(); |
||||
for (OrderInfoVO orderInfoVO : orderInfoVOS) { |
||||
orderCodes.add(orderInfoVO.getOrderId()); |
||||
} |
||||
List<OrderInfoEntity> list = orderInfoService.list(Wrappers.<OrderInfoEntity>lambdaQuery() |
||||
.in(OrderInfoEntity::getOmsExtOrderNo, orderCodes)); |
||||
Map<String, String> map = new HashMap<>(); |
||||
if (CollUtil.isNotEmpty(list)) { |
||||
// 将list中的数据封装到map中
|
||||
list.forEach(item -> { |
||||
map.put(item.getOmsExtOrderNo(), item.getOmsExtOrderNo()); |
||||
}); |
||||
} |
||||
for (OrderInfoVO vo : orderInfoVOS) { |
||||
if (map.containsKey(vo.getOmsExtOrderNo())) { |
||||
log.error("DD单号:{},已推送过了", vo.getOmsExtOrderNo()); |
||||
continue; |
||||
} |
||||
OrderInfoEntity deliveryNoteEntity = new OrderInfoEntity(); |
||||
BeanUtil.copyProperties(vo, deliveryNoteEntity); |
||||
deliveryNoteEntity.setLogId(ObjectUtil.isNotEmpty(logEntity.getId()) ? logEntity.getId().toString() : null); |
||||
entities.add(deliveryNoteEntity); |
||||
} |
||||
if (CollUtil.isNotEmpty(entities)) { |
||||
orderInfoService.saveBatch(entities); |
||||
} |
||||
} |
||||
if (CollUtil.isNotEmpty(packageInfoVOS)) { |
||||
List<PackageInfoEntity> entities = new ArrayList<>(); |
||||
List<String> orderCodes = new ArrayList<>(); |
||||
List<String> packageCodes = new ArrayList<>(); |
||||
for (PackageInfoVO orderInfoVO : packageInfoVOS) { |
||||
orderCodes.add(orderInfoVO.getOmsExtOrderNo()); |
||||
packageCodes.add(orderInfoVO.getExtBoxCode()); |
||||
} |
||||
List<PackageInfoEntity> list = packageInfoService.list(Wrappers.<PackageInfoEntity>lambdaQuery() |
||||
.in(PackageInfoEntity::getOmsExtOrderNo, orderCodes) |
||||
.in(PackageInfoEntity::getExtBoxCode, packageCodes) |
||||
); |
||||
Map<String, String> map = new HashMap<>(); |
||||
if (CollUtil.isNotEmpty(list)) { |
||||
// 将list中的数据封装到map中
|
||||
list.forEach(item -> { |
||||
map.put(item.getOmsExtOrderNo() + item.getExtBoxCode(), item.getOmsExtOrderNo()); |
||||
}); |
||||
} |
||||
for (PackageInfoVO vo : packageInfoVOS) { |
||||
if (map.containsKey(vo.getOmsExtOrderNo() + vo.getExtBoxCode())) { |
||||
log.error("DD单号:{} + 箱码:{},已推送过了", vo.getOmsExtOrderNo(), vo.getExtBoxCode()); |
||||
continue; |
||||
} |
||||
PackageInfoEntity entity = new PackageInfoEntity(); |
||||
BeanUtil.copyProperties(vo, entity); |
||||
entity.setLogId(ObjectUtil.isNotEmpty(logEntity.getId()) ? logEntity.getId().toString() : null); |
||||
entities.add(entity); |
||||
} |
||||
if (CollUtil.isNotEmpty(entities)) { |
||||
packageInfoService.saveBatch(entities); |
||||
} |
||||
} |
||||
// 处理暂存单 通过定时任务扫描的方式判定是否齐套 然后创建暂存单
|
||||
FactoryOrderLogEntity logEntity1 = new FactoryOrderLogEntity(); |
||||
logEntity1.setSaxStatus(SaxStatusEnums.SUCCESS.getCode()); |
||||
logEntity1.setId(logEntity.getId()); |
||||
logService.saveOrUpdate(logEntity1); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,28 @@
|
||||
package com.logpm.factorydata.jinpai.vo; |
||||
|
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
|
||||
/** |
||||
* 物流商认证 |
||||
* |
||||
* @author zhaoqiaobo |
||||
* @create 2024-04-26 |
||||
*/ |
||||
@Data |
||||
public class FactoryAuthVO { |
||||
|
||||
@ApiModelProperty(name = "物流编码") |
||||
private String logisticsCode; |
||||
@ApiModelProperty(name = "秘钥") |
||||
private String appKey; |
||||
@ApiModelProperty(name = "物流公司") |
||||
private String companyCode; |
||||
@ApiModelProperty(name = "租户") |
||||
private String tenantCode; |
||||
@ApiModelProperty(name = "登录账号") |
||||
private String loginAccount; |
||||
@ApiModelProperty(name = "Authorization头") |
||||
private String authorizationHeader; |
||||
|
||||
} |
||||
@ -0,0 +1,27 @@
|
||||
package com.logpm.factorydata.jinpai.vo; |
||||
|
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
|
||||
/** |
||||
* 送货单 实体类 |
||||
* |
||||
* @author zhaoqiaobo |
||||
* @create 2024-04-26 |
||||
*/ |
||||
@Data |
||||
@ApiModel(value = "发货单", description = "发货单") |
||||
public class FactoryOrderDataVO { |
||||
|
||||
@ApiModelProperty("加密后的密文") |
||||
private String digest; |
||||
@ApiModelProperty("时间戳 毫秒") |
||||
private Long timestamp; |
||||
@ApiModelProperty("公司编码") |
||||
private String companyCode; |
||||
|
||||
@ApiModelProperty("订单信息") |
||||
private String params; |
||||
|
||||
} |
||||
@ -0,0 +1,25 @@
|
||||
package com.logpm.factorydata.jinpai.vo; |
||||
|
||||
import com.logpm.factorydata.jinpai.entity.JpFactoryOrderEntity; |
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 送货单 实体类 |
||||
* |
||||
* @author zhaoqiaobo |
||||
* @create 2024-04-26 |
||||
*/ |
||||
@Data |
||||
@ApiModel(value = "发货单", description = "发货单") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class JpFactoryOrderVO extends JpFactoryOrderEntity { |
||||
|
||||
@ApiModelProperty(name = "包件明细") |
||||
private List<JpFactoryPackageVO> packageList; |
||||
|
||||
} |
||||
@ -0,0 +1,21 @@
|
||||
package com.logpm.factorydata.jinpai.vo; |
||||
|
||||
import com.logpm.factorydata.jinpai.entity.JpFactoryPackageEntity; |
||||
import io.swagger.annotations.ApiModel; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
|
||||
/** |
||||
* 送货单 实体类 |
||||
* |
||||
* @author zhaoqiaobo |
||||
* @create 2024-04-26 |
||||
*/ |
||||
@Data |
||||
@ApiModel(value = "发货单", description = "发货单") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class JpFactoryPackageVO extends JpFactoryPackageEntity { |
||||
|
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,25 @@
|
||||
package com.logpm.factorydata.jinpai.vo; |
||||
|
||||
import com.logpm.factorydata.jinpai.entity.JpFactoryShipmentEntity; |
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 送货单 实体类 |
||||
* |
||||
* @author zhaoqiaobo |
||||
* @create 2024-04-26 |
||||
*/ |
||||
@Data |
||||
@ApiModel(value = "发货单", description = "发货单") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class JpFactoryShipmentVO extends JpFactoryShipmentEntity { |
||||
|
||||
@ApiModelProperty(name = "订单明细") |
||||
private List<JpFactoryOrderVO> orderList; |
||||
|
||||
} |
||||
Loading…
Reference in new issue