0.0
2 years ago
28 changed files with 437 additions and 72 deletions
@ -0,0 +1,70 @@
|
||||
package com.logpm.oldproject.entity; |
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType; |
||||
import com.baomidou.mybatisplus.annotation.TableId; |
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
|
||||
import java.util.Date; |
||||
|
||||
@Data |
||||
@TableName("ht_new_distribution_contact") |
||||
@ApiModel(value = "NewDistributionContact对象", description = "配送--客户商场") |
||||
public class NewDistributionContactEntity { |
||||
|
||||
@TableId( |
||||
value = "id", |
||||
type = IdType.AUTO |
||||
) |
||||
private Integer id ; |
||||
|
||||
@ApiModelProperty(value = "联系人") |
||||
private String contact; |
||||
@ApiModelProperty(value = "电话") |
||||
private String phone; |
||||
@ApiModelProperty(value = "商场名【商配】") |
||||
private String storeName; |
||||
@ApiModelProperty(value = "地址") |
||||
private String address; |
||||
|
||||
@ApiModelProperty(value = "配送id") |
||||
private Integer distributionId; |
||||
@ApiModelProperty(value = "计划数") |
||||
private Integer plan; |
||||
@ApiModelProperty(value = "实际装车数") |
||||
private Integer actualPlan; |
||||
@ApiModelProperty(value = "配送数") |
||||
private Integer delivery; |
||||
@ApiModelProperty(value = "签收数") |
||||
private Integer sign; |
||||
@ApiModelProperty(value = "签收状态：1=未签;2=已签") |
||||
private Integer state; |
||||
|
||||
@ApiModelProperty(value = "创建时间") |
||||
private Date createTime; |
||||
@ApiModelProperty(value = "更新时间") |
||||
private Date updateTime; |
||||
|
||||
@ApiModelProperty(value = "删除时间") |
||||
private Integer deleteTime; |
||||
@ApiModelProperty(value = "备货数") |
||||
private Integer makeNum; |
||||
|
||||
private Integer oldId; |
||||
@ApiModelProperty(value = "回库数量") |
||||
private Integer rollbackNum; |
||||
@ApiModelProperty(value = "配送失败原因id") |
||||
private Integer brokeId; |
||||
|
||||
@ApiModelProperty(value = "配送失败原因") |
||||
private String brokeName; |
||||
|
||||
private Date brokeTime; |
||||
@ApiModelProperty(value = "配送失败记录人id") |
||||
private Integer brokePersonId; |
||||
@ApiModelProperty(value = "配送失败记录人") |
||||
private String brokePerson; |
||||
|
||||
} |
||||
@ -0,0 +1,40 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.oldproject.feign; |
||||
|
||||
import com.logpm.oldproject.entity.NewDistributionContactEntity; |
||||
import org.springframework.cloud.openfeign.FeignClient; |
||||
import org.springframework.web.bind.annotation.GetMapping; |
||||
import org.springframework.web.bind.annotation.RequestParam; |
||||
|
||||
/** |
||||
* 配送--客户商场 Feign接口类 |
||||
* |
||||
* @author zhy |
||||
* @since 2023-06-29 |
||||
*/ |
||||
@FeignClient( |
||||
value = "logpm-old-project" |
||||
) |
||||
public interface INewDistributionContactClient { |
||||
|
||||
String API_PREFIX = "/client"; |
||||
String TOP = API_PREFIX + "/top"; |
||||
|
||||
@GetMapping(API_PREFIX + "/fingById") |
||||
NewDistributionContactEntity fingById(@RequestParam Integer NewDistributionContactId); |
||||
} |
||||
@ -0,0 +1,33 @@
|
||||
package com.logpm.factory.mt.dto; |
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty; |
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
import java.util.Date; |
||||
|
||||
/** |
||||
* 梦天 |
||||
*/ |
||||
@Data |
||||
public class MtOrderStatusDTO implements Serializable { |
||||
|
||||
@JsonProperty("发运单编号") |
||||
private String invoiceOrderCode; |
||||
|
||||
@JsonProperty("订单编号") |
||||
private String orderNo; |
||||
|
||||
@JsonProperty("包条码") |
||||
private String unitNo; |
||||
|
||||
@JsonProperty("操作时间") |
||||
private Date operationTime; |
||||
|
||||
@JsonProperty("仓库编号") |
||||
private String warehouse; |
||||
|
||||
@JsonProperty("经销商名称") |
||||
private String dealerName; |
||||
|
||||
} |
||||
@ -0,0 +1,26 @@
|
||||
package com.logpm.factory.mt.dto; |
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty; |
||||
import lombok.Data; |
||||
|
||||
import java.util.Date; |
||||
|
||||
@Data |
||||
public class MtReceiveContentDTO { |
||||
|
||||
@JsonProperty("订单编号") |
||||
private String orderCode;//订单自编码
|
||||
|
||||
@JsonProperty("包条码") |
||||
private String unitNo;//包条码
|
||||
|
||||
@JsonProperty("签收时间") |
||||
private Date operateDate;//签收时间
|
||||
|
||||
@JsonProperty("仓库编号") |
||||
private String warehouseCode;//仓库编码
|
||||
|
||||
@JsonProperty("发运单编号") |
||||
private String invoiceOrderCode;//发运单编号
|
||||
|
||||
} |
||||
@ -0,0 +1,26 @@
|
||||
package com.logpm.factory.mt.dto; |
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty; |
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
import java.util.ArrayList; |
||||
import java.util.List; |
||||
|
||||
@Data |
||||
public class MtReceiveDTO implements Serializable { |
||||
|
||||
@JsonProperty("送货任务ID") |
||||
private String sendTaskId;//送货任务ID
|
||||
|
||||
@JsonProperty("收货人") |
||||
private String receiver;//收货人
|
||||
|
||||
@JsonProperty("签收内容") |
||||
private List<MtReceiveContentDTO> receiveContentList = new ArrayList<>(); |
||||
|
||||
@JsonProperty("签收图片") |
||||
private List<MtReceiveImagesDTO> receiveImagesList = new ArrayList<>(); |
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,10 @@
|
||||
package com.logpm.factory.mt.dto; |
||||
|
||||
import lombok.Data; |
||||
|
||||
@Data |
||||
public class MtReceiveImagesDTO { |
||||
|
||||
private String image; |
||||
|
||||
} |
||||
@ -0,0 +1,20 @@
|
||||
package com.logpm.oldproject.feign; |
||||
|
||||
import com.logpm.oldproject.entity.NewDistributionContactEntity; |
||||
import com.logpm.oldproject.service.INewDistributionContactService; |
||||
import lombok.AllArgsConstructor; |
||||
import org.springframework.web.bind.annotation.RestController; |
||||
import springfox.documentation.annotations.ApiIgnore; |
||||
|
||||
@ApiIgnore() |
||||
@RestController |
||||
@AllArgsConstructor |
||||
public class NewDistributionContactClient implements INewDistributionContactClient{ |
||||
|
||||
private final INewDistributionContactService newDistributionContactService; |
||||
|
||||
@Override |
||||
public NewDistributionContactEntity fingById(Integer NewDistributionContactId) { |
||||
return newDistributionContactService.fingById(NewDistributionContactId); |
||||
} |
||||
} |
||||
@ -0,0 +1,7 @@
|
||||
package com.logpm.oldproject.mapper; |
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
import com.logpm.oldproject.entity.NewDistributionContactEntity; |
||||
|
||||
public interface NewDistributionContactMapper extends BaseMapper<NewDistributionContactEntity> { |
||||
} |
||||
@ -0,0 +1,11 @@
|
||||
<?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.oldproject.mapper.NewDistributionContactMapper"> |
||||
|
||||
<!-- 通用查询映射结果 --> |
||||
<resultMap id="resultMap" type="com.logpm.oldproject.entity.NewDistributionContactEntity"> |
||||
</resultMap> |
||||
|
||||
|
||||
|
||||
</mapper> |
||||
@ -0,0 +1,8 @@
|
||||
package com.logpm.oldproject.service; |
||||
|
||||
import com.logpm.oldproject.entity.NewDistributionContactEntity; |
||||
|
||||
public interface INewDistributionContactService { |
||||
|
||||
NewDistributionContactEntity fingById(Integer newDistributionContactId); |
||||
} |
||||
@ -0,0 +1,19 @@
|
||||
package com.logpm.oldproject.service.impl; |
||||
|
||||
import com.logpm.oldproject.entity.NewDistributionContactEntity; |
||||
import com.logpm.oldproject.mapper.NewDistributionContactMapper; |
||||
import com.logpm.oldproject.service.INewDistributionContactService; |
||||
import lombok.AllArgsConstructor; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
@Service |
||||
@AllArgsConstructor |
||||
public class NewDistributionContactServiceImpl implements INewDistributionContactService { |
||||
|
||||
private final NewDistributionContactMapper newDistributionContactMapper; |
||||
|
||||
@Override |
||||
public NewDistributionContactEntity fingById(Integer newDistributionContactId) { |
||||
return newDistributionContactMapper.selectById(newDistributionContactId); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue