1.机构信息初始化 2.仓库信息初始化 3.动态同步仓库信息 4.商品信息初始化 5.动态同步商品信息初始化 6.ERP库存信息初始化 7.动态同步E...

童刚

2022-09-07 cf1c4fcc8b19b36a29aa722608d76f80ea64f860

1.机构信息初始化
2.仓库信息初始化
3.动态同步仓库信息
4.商品信息初始化
5.动态同步商品信息初始化
6.ERP库存信息初始化
7.动态同步ERP库存信息初始化
8.生成销售开单  出库静态方法
9.生成其他出库信息 出库静态方法
10.销售开单退回申请 入库静态方法

 phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/ContentItemDto.java

File was renamed from phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/ContentItemDto.java
@@ -1,4 +1,4 @@
package com.hx.warehouse.dto;
package com.hx.phiappt.dto;


public class ContentItemDto {

 phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/Keyword.java

File was renamed from phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/Keyword.java
@@ -1,4 +1,4 @@
package com.hx.warehouse.dto;
package com.hx.phiappt.dto;

public class Keyword {
    private String value;

 phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/MpMessageDto.java

File was renamed from phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/MpMessageDto.java
@@ -1,7 +1,6 @@
package com.hx.warehouse.dto;
package com.hx.phiappt.dto;

import com.alibaba.fastjson.JSONObject;
import com.hx.util.StringUtils;
import lombok.Data;

/**小程序服务消息*/

 phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/MpTemplateMsg.java

File was renamed from phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/MpTemplateMsg.java
@@ -1,6 +1,6 @@
package com.hx.warehouse.dto;
package com.hx.phiappt.dto;

import com.hx.warehouse.dto.entity.Miniprogram;
import com.hx.phiappt.dto.entity.Miniprogram;
import lombok.Data;
import java.util.Map;


 phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/SendResultDto.java

File was renamed from phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/SendResultDto.java
@@ -1,4 +1,4 @@
package com.hx.warehouse.dto;
package com.hx.phiappt.dto;

import lombok.Data;


 phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/SmsGeneralSendDto.java

File was renamed from phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/SmsGeneralSendDto.java
@@ -1,4 +1,4 @@
package com.hx.warehouse.dto;
package com.hx.phiappt.dto;

import lombok.Data;
import java.util.Date;

 phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/SmsSendDto.java

File was renamed from phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/SmsSendDto.java
@@ -1,4 +1,4 @@
package com.hx.warehouse.dto;
package com.hx.phiappt.dto;


import lombok.Data;

 phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/TemplateMessageDto.java

File was renamed from phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/TemplateMessageDto.java
@@ -1,4 +1,4 @@
package com.hx.warehouse.dto;
package com.hx.phiappt.dto;

import lombok.Data;


 phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/TemplateMsgDto.java

File was renamed from phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/TemplateMsgDto.java
@@ -1,4 +1,4 @@
package com.hx.warehouse.dto;
package com.hx.phiappt.dto;


import java.util.List;

 phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/WeCatMessageDto.java

File was renamed from phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/WeCatMessageDto.java
@@ -1,4 +1,4 @@
package com.hx.warehouse.dto;
package com.hx.phiappt.dto;


import lombok.Data;

 phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/entity/Miniprogram.java

File was renamed from phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/entity/Miniprogram.java
@@ -1,4 +1,4 @@
package com.hx.warehouse.dto.entity;
package com.hx.phiappt.dto.entity;

import lombok.Data;


 phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/mq/CorpMessageMqDto.java

File was renamed from phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/mq/CorpMessageMqDto.java
@@ -1,6 +1,6 @@
package com.hx.warehouse.dto.mq;
package com.hx.phiappt.dto.mq;

import com.hx.warehouse.dto.TemplateMessageDto;
import com.hx.phiappt.dto.TemplateMessageDto;
import lombok.Data;

@Data

 phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/mq/MpMessageMqDto.java

File was renamed from phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/mq/MpMessageMqDto.java
@@ -1,6 +1,6 @@
package com.hx.warehouse.dto.mq;
package com.hx.phiappt.dto.mq;

import com.hx.warehouse.dto.MpMessageDto;
import com.hx.phiappt.dto.MpMessageDto;
import lombok.Data;

/**小程序服务消息*/

 phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/mq/SmsMassegeMqDto.java

File was renamed from phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/mq/SmsMassegeMqDto.java
@@ -1,7 +1,7 @@
package com.hx.warehouse.dto.mq;
package com.hx.phiappt.dto.mq;


import com.hx.warehouse.dto.SmsGeneralSendDto;
import com.hx.phiappt.dto.SmsGeneralSendDto;
import lombok.Data;

@Data

 phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/mq/WeCatMessageMqDto.java

File was renamed from phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/mq/WeCatMessageMqDto.java
@@ -1,7 +1,7 @@
package com.hx.warehouse.dto.mq;
package com.hx.phiappt.dto.mq;


import com.hx.warehouse.dto.WeCatMessageDto;
import com.hx.phiappt.dto.WeCatMessageDto;
import lombok.Data;



 phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/vo/CommodityMessageVo.java

New file
@@ -0,0 +1,38 @@
package com.hx.phiappt.dto.vo;

import com.alibaba.fastjson.JSONObject;
import lombok.Data;

import java.util.Date;

/**
 * 商品信息 查询参数拓展类
 * @author tonggang
 */
@Data
public class CommodityMessageVo {
    /** 发送方式(0:初始化 1:实时同步)*/
    private Integer sendMethod;

    /** 账套名称(必填)*/
    private String accountName;

    /** 常量:04bd473e01c0e0e0676d213172c544d6(必填)*/
    private String token;

    /** 签名:MD5(RequestData+Token)(必填)*/
    private String sign;

    /** 常量:BusinessRequest(必填)*/
    private String requestName;

    /** 业务请求JSON文本数据(必填)*/
    private JSONObject requestData;

    /** 15分钟前更新时间*/
    private Date EndTime;

    /** 商品编码*/
    private String cgoodsid;

}

 phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/vo/ERPInventoryVo.java

New file
@@ -0,0 +1,25 @@
package com.hx.phiappt.dto.vo;

import com.alibaba.fastjson.JSONObject;
import lombok.Data;

/**
 * ERP库存信息 查询参数拓展类
 * @author tonggang
 */
@Data
public class ERPInventoryVo {
    /** 发送方式(0:初始化 1:实时同步)*/
    private Integer sendMethod;
    /** 账套名称*/
    private String accountName;
    /** 常量:04bd473e01c0e0e0676d213172c544d6*/
    private String token;
    /** 签名:MD5(RequestData+Token)*/
    private String sign;
    /** 常量:BusinessRequest*/
    private String requestName;
    /** 业务请求JSON文本数据*/
    private JSONObject requestData;

}

 phi-warehouse-feign/src/main/java/com/hx/phiappt/dto/vo/ShopWarehouseMessageVo.java

New file
@@ -0,0 +1,36 @@
package com.hx.phiappt.dto.vo;

import com.alibaba.fastjson.JSONObject;
import lombok.Data;

/**
 * 仓库信息 查询参数拓展类
 * @author tonggang
 */
@Data
public class ShopWarehouseMessageVo {
    /** 发送方式(0:初始化 1:实时同步)*/
    private Integer sendMethod;
    /** 账套名称*/
    private String accountName;
    /** 常量:04bd473e01c0e0e0676d213172c544d6*/
    private String token;
    /** 签名:MD5(RequestData+Token)*/
    private String sign;
    /** 常量:BusinessRequest*/
    private String requestName;
    /** 业务请求JSON文本数据*/
    private JSONObject requestData;

    @Override
    public String toString() {
        return "ShopWarehouseMessageVo{" +
                "sendMethod=" + sendMethod +
                ", accountName='" + accountName + '\'' +
                ", token='" + token + '\'' +
                ", sign='" + sign + '\'' +
                ", requestName='" + requestName + '\'' +
                ", requestData=" + requestData +
                '}';
    }
}

 phi-warehouse-feign/src/main/java/com/hx/phiappt/feign/FSmsSendService.java

File was renamed from phi-warehouse-feign/src/main/java/com/hx/warehouse/feign/FSmsSendService.java
@@ -1,7 +1,7 @@
package com.hx.warehouse.feign;
package com.hx.phiappt.feign;

import com.hx.resultTool.Result;
import com.hx.warehouse.dto.SmsGeneralSendDto;
import com.hx.phiappt.dto.SmsGeneralSendDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

 phi-warehouse-feign/src/main/java/com/hx/phiappt/platform/FConsumablesService.java

New file
@@ -0,0 +1,22 @@
package com.hx.phiappt.platform;

import com.hx.phiappt.dto.vo.CommodityMessageVo;
import com.hx.resultTool.Result;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="phi-warehouse-user", path = "/warehouse-user",contextId = "warehouse-consumables")
public interface FConsumablesService {
    /**
     * 发送商品信息
     * @param vo 消息体
     * @return
     */
    @PostMapping(value = "/commodity/generate/message")
    Result generateCommodityMessage(@RequestBody CommodityMessageVo vo);

}

 phi-warehouse-feign/src/main/java/com/hx/phiappt/platform/FInventoryService.java

New file
@@ -0,0 +1,24 @@
package com.hx.phiappt.platform;

import com.hx.phiappt.dto.vo.ERPInventoryVo;
import com.hx.resultTool.Result;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="phi-warehouse-user", path = "/warehouse-user",contextId = "inventory")
public interface FInventoryService {

    /**
     * 发送ERP库存信息
     * @param vo 消息体
     * @return
     */
    @PostMapping(value = "/erpInventory/generate/message")
    Result erpInventoryMessage(@RequestBody ERPInventoryVo vo);


}

 phi-warehouse-feign/src/main/java/com/hx/phiappt/platform/FWarehouseService.java

New file
@@ -0,0 +1,22 @@
package com.hx.phiappt.platform;

import com.hx.phiappt.dto.vo.ShopWarehouseMessageVo;
import com.hx.resultTool.Result;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="phi-warehouse-user", path = "/warehouse-user",contextId = "warehouse")
public interface FWarehouseService {

    /**
     * 发送仓库信息
     * @param vo 消息体
     * @return
     */
    @PostMapping(value = "/shopWarehouseMessage/generate/message")
    Result generateShopWarehouse(@RequestBody ShopWarehouseMessageVo vo);
}

 phi-warehouse-feign/src/main/java/com/hx/warehouse/platform/FSmsImmediatelyService.java

File was deleted