diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionFeign.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionFeign.java deleted file mode 100644 index f51d0767..00000000 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionFeign.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.yxt.supervise.customer.api.purchaserequisition; - -import io.swagger.annotations.Api; -import org.springframework.cloud.openfeign.FeignClient; - -/** - * @author wangpengfei - * @date 2023/3/30 13:47 - */ -@Api(tags = "采购订单表") -@FeignClient( - contextId = "PurchaseRequisition", - name = "yxt-supervise", - path = "v1/purchaserequisition", - fallback = PurchaseRequisitionFeignFallback.class) -public interface PurchaseRequisitionFeign { -} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionFeignFallback.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionFeignFallback.java deleted file mode 100644 index 709f9f22..00000000 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/api/purchaserequisition/PurchaseRequisitionFeignFallback.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yxt.supervise.customer.api.purchaserequisition; - -import org.springframework.stereotype.Component; - -/** - * @author wangpengfei - * @date 2023/3/30 13:47 - */ -@Component -public class PurchaseRequisitionFeignFallback implements PurchaseRequisitionFeign{ -} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageRest.java index 147f2f56..62b4451e 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageRest.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstorage/GdInstorageRest.java @@ -29,6 +29,9 @@ import cn.hutool.core.util.StrUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.customer.feign.protal.gdinstorage.*; +import com.yxt.supervise.customer.feign.protal.gdinstorage.GdInstorage; +import com.yxt.supervise.customer.feign.protal.gdinstorage.GdRukuQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -55,4 +58,63 @@ public class GdInstorageRest { @Autowired private GdInstorageService gdInstorageService; + + @Autowired + private GdInstorageFeign gdInstorageFeign; + + @GetMapping("/test") + public ResultBean test() { + return gdInstorageFeign.test(); + } + + @PostMapping("/uploadRkmxb") + public ResultBean uploadGdData(@RequestParam("file") MultipartFile file) { + return gdInstorageFeign.uploadGdData(file); + } + + @GetMapping("/recount") + public ResultBean recount() { + return gdInstorageFeign.recount(); + } + + @GetMapping("/countinfo") + public ResultBean countinfo() { + return gdInstorageFeign.countinfo(); + } + + @PostMapping("/in112PagerList") + public ResultBean> in112PagerList(@RequestBody PagerQuery pq) { + return gdInstorageFeign.in112PagerList(pq); + } + + @PostMapping("/inallPagerList") + public ResultBean> inallPagerList(@RequestBody PagerQuery pq) { + return gdInstorageFeign.inallPagerList(pq); + } + + @PostMapping("/logPagerList") + public ResultBean> logPagerList(@RequestBody PagerQuery pq) { + return gdInstorageFeign.logPagerList(pq); + } + + @PostMapping("/jmdRkmxList") + public ResultBean> jmdRkmxList(@RequestBody com.yxt.supervise.customer.feign.protal.gdinstorage.GdRukuQuery rq) { + return gdInstorageFeign.jmdRkmxList(rq); + } + + @PostMapping("/jmdRkmxListDownload") + public ResultBean jmdRkmxListDownload(@RequestBody GdRukuQuery rq) { + return gdInstorageFeign.jmdRkmxListDownload(rq); + } + + /** + * 创建在途商品的Excel + * @return + */ + @GetMapping("/buildExcelZaiTu") + public ResultBean buildExcelZaiTu() { + return gdInstorageFeign.buildExcelZaiTu(); + } + + } diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventory/GdInventoryRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventory/GdInventoryRest.java new file mode 100644 index 00000000..e1e66af8 --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventory/GdInventoryRest.java @@ -0,0 +1,93 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' /| |// '. * + * / /||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | /\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.customer.biz.gdinventory; + +import cn.hutool.core.io.FileUtil; +import cn.hutool.core.io.IoUtil; +import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.customer.feign.protal.gdinventory.GdInventoryFeign; +import com.yxt.supervise.customer.feign.protal.gdinventory.GdInventoryLog; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.*; + +/** + * Project: yxt_supervise
+ * File: GdInventoryRest.java
+ * Class: com.yxt.supervise.portal.biz.gdinventory.GdInventoryRest
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022/11/30 18:37
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@RestController("") +@RequestMapping("/kucun") +public class GdInventoryRest { + + @Autowired + private GdInventoryFeign gdInventoryFeign; + + + @GetMapping("/implgd") + public ResultBean implInventory() { + return gdInventoryFeign.implInventory(); + } + + @PostMapping("/uploadGdData") + public ResultBean uploadGdData(@RequestParam("file") MultipartFile file) { + return gdInventoryFeign.uploadGdData(file); + } + + @GetMapping("/kchz") + public ResultBean kchz() { + return gdInventoryFeign.kchz(); + } + + @GetMapping("/kchzyc") + public ResultBean kchzyc() { + return gdInventoryFeign.kchzyc(); + } + + @GetMapping("/resetAllCache") + public ResultBean resetAllCache() { + + + return gdInventoryFeign.resetAllCache(); + } + + @GetMapping("/downloadhz") + public void downloadhz(HttpServletResponse response, @RequestParam("filepath") String filepath) throws IOException { + gdInventoryFeign.downloadhz(response,filepath); + } + +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsales/SalesRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsales/SalesRest.java new file mode 100644 index 00000000..1ed17905 --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsales/SalesRest.java @@ -0,0 +1,46 @@ +package com.yxt.supervise.customer.biz.gdsales; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.customer.feign.protal.gdsales.GdSalesFeign; +import com.yxt.supervise.customer.feign.protal.gdsales.GdSalesLog; +import com.yxt.supervise.customer.feign.protal.gdsales.GdSalesQuery; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +/** + * @author wangpengfei + * @date 2024/7/3 15:51 + */ +@Api(tags = "销售数据") +@RestController +@RequestMapping("/sales") +public class SalesRest { + @Autowired + GdSalesFeign gdSalesFeign; + + + /** + * 上传配送中心批发数据 + * @param file + * @return + */ + @PostMapping("/uploadXssj") + public ResultBean uploadGdData(@RequestParam("file") MultipartFile file) { + return gdSalesFeign.uploadGdData(file); + } + + @PostMapping("/logsPagerList") + public ResultBean> logsPagerList(@RequestBody PagerQuery pq) { + + return gdSalesFeign.logsPagerList(pq); + } + + @GetMapping("/buildExcel/{logId}") + public ResultBean buildExcel(@PathVariable("logId") String logId) { + return gdSalesFeign.buildExcel(logId); + } +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdwholesale/GdWholesaleRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdwholesale/GdWholesaleRest.java new file mode 100644 index 00000000..b59244ac --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdwholesale/GdWholesaleRest.java @@ -0,0 +1,41 @@ +package com.yxt.supervise.customer.biz.gdwholesale; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.customer.feign.protal.gdwholesale.GdWholesaleFeign; +import com.yxt.supervise.customer.feign.protal.gdwholesale.GdWholesaleLog; +import com.yxt.supervise.customer.feign.protal.gdwholesale.GdWholesaleQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +@RestController("com.yxt.supervise.portal.biz.gdwholesale.GdWholesaleRest") +@RequestMapping("/wholesale") +public class GdWholesaleRest { + + @Autowired + private GdWholesaleFeign gdWholesaleFeign; + + + + /** + * 上传配送中心批发数据 + * @param file + * @return + */ + @PostMapping("/uploadPszxpfsj") + public ResultBean uploadGdData(@RequestParam("file") MultipartFile file) { + return gdWholesaleFeign.uploadGdData(file); + } + + @PostMapping("/logsPagerList") + public ResultBean> logsPagerList(@RequestBody PagerQuery pq) { + return gdWholesaleFeign.logsPagerList(pq); + } + + @GetMapping("/buildExcel/{logId}") + public ResultBean buildExcel(@PathVariable("logId") String logId) { + return gdWholesaleFeign.buildExcel(logId); + } +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionRest.java index 1caaea23..f81e2403 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionRest.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionRest.java @@ -8,6 +8,7 @@ import com.yxt.supervise.customer.api.purchaserequisition.*; import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionPro; import com.yxt.supervise.customer.api.supplierbankinfo.PurchaseRequisitionCheckVo; import com.yxt.supervise.customer.biz.supplierbankinfo.SupplierBankInfoService; +import com.yxt.supervise.customer.feign.protal.purchaserequisition.PurchaseRequisitionsFeign; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -29,12 +30,14 @@ import java.util.List; @RestController @RequestMapping("v1/purchaserequisition") @Slf4j -public class PurchaseRequisitionRest implements PurchaseRequisitionFeign { +public class PurchaseRequisitionRest { @Autowired private PurchaseRequisitionService purchaseRequisitionService; @Autowired private SupplierBankInfoService supplierBankInfoService; + @Autowired + PurchaseRequisitionsFeign purchaseRequisitionFeign; @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") @@ -112,4 +115,9 @@ public class PurchaseRequisitionRest implements PurchaseRequisitionFeign { PurchaseRequisition pr = purchaseRequisitionService.fetchBySid(sid); return rb.success().setData(pr); } + @ApiOperation(" ") + @RequestMapping(value = "/supplierAnalysis", method = RequestMethod.POST) + public ResultBean supplierAnalysis(){ + return purchaseRequisitionFeign.supplierAnalysis(); + } } diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinstorage/GdInstorage.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinstorage/GdInstorage.java new file mode 100644 index 00000000..da4e5c36 --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinstorage/GdInstorage.java @@ -0,0 +1,75 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.customer.feign.protal.gdinstorage; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.EntityWithId; +import lombok.Data; + +/** + * Project: yxt_supervise
+ * File: GdInstorage.java
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdInstorage
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022/12/3 0:57
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@TableName("gd_instorage") +public class GdInstorage extends EntityWithId { + + private String cola0; // 企业组织机构代码证 + private String colb1; // 仓库/门店编号 + private String colc2; // 仓库/门店名称 + private String cold3; // 入库时间 + private String colex; // 供应商编号 + private String cole4; // 供应商名称 + private String colf5; // 单据号 + private String colg6; // 单据类型 + private String colh7; // 货号 + private String coli8; // 商品名称 + private String colj9; // 商品生产日期 + private String colk10; // 商品保质期 + private String coll11; // 商品规格 + private String colm12; // 类别编号 + private String coln13; // 类别名称 + private String colo14; // 一级类别名称 + private String colp15; // 二级类别名称 + private String colq16; // 入库金额 + private String colr17; // 入库数量 + private String cols18; // 成本金额 + private String colt19; // 成本税额 + private String colu20; // 不含税成本 + private String colv21; // 进项税率 + private String orderDate; // 单据日期 + private String supplierCodeUnified; // 供货商编码统一 + private String inOrderNo; // 入库定单号 +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinstorage/GdInstorageCount.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinstorage/GdInstorageCount.java new file mode 100644 index 00000000..63ccabff --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinstorage/GdInstorageCount.java @@ -0,0 +1,57 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.customer.feign.protal.gdinstorage; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.EntityWithId; +import lombok.Data; + +/** + * Project: yxt_supervise
+ * File: GdInstorageCount.java
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdInstorageCount
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022/12/3 1:04
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@TableName("gd_instorage_count") +public class GdInstorageCount extends EntityWithId { + private String prodCode; //商品编码 + private String prodName; //商品名称 + private int prodNum; //'商品数量 + private double prodValue; //商品货值 + + private String supplierCode; //供货商编码 + private String supplierName; //供货商名称 + + private String supplierCodeUnified; //供货商编码统一', +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinstorage/GdInstorageCountDto.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinstorage/GdInstorageCountDto.java new file mode 100644 index 00000000..08bfeb48 --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinstorage/GdInstorageCountDto.java @@ -0,0 +1,49 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.customer.feign.protal.gdinstorage; + +import lombok.Data; + +import java.util.List; + +/** + * Project: yxt_supervise
+ * File: GdInstorageCountDto.java
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdInstorageCountDto
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022/12/10 14:26
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +public class GdInstorageCountDto { + private GdInstorageCountLog countLog; + private List countList; +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinstorage/GdInstorageCountLog.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinstorage/GdInstorageCountLog.java new file mode 100644 index 00000000..06aab54e --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinstorage/GdInstorageCountLog.java @@ -0,0 +1,61 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.customer.feign.protal.gdinstorage; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.domain.EntityWithId; +import lombok.Data; + +import java.util.Date; + +/** + * Project: yxt_supervise
+ * File: GdInstorageCountLog.java
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdInstorageCountLog
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022/12/10 11:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@TableName("gd_instorage_count_log") +public class GdInstorageCountLog extends EntityWithId { + public GdInstorageCountLog() { + } + + public GdInstorageCountLog(long durations) { + this.durations = durations; + } + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime = new Date(); // 记录创建时间/ + private long durations; // 程序运行时长/ +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinstorage/GdInstorageFeign.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinstorage/GdInstorageFeign.java new file mode 100644 index 00000000..ad357d1b --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinstorage/GdInstorageFeign.java @@ -0,0 +1,86 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0/ = /0 * + * ___/`---'/___ * + * .' /| |// '. * + * / /||| : |||// / * + * / _||||| -:- |||||- / * + * | | // - /// | | * + * | /_| ''/---/'' |_/ | * + * / .-/__ '-' ___/-. / * + * ___'. .' /--.--/ `. .'___ * + * ."" '< `.___/_<|>_/___.' >' "". * + * | | : `- /`.;`/ _ /`;.`/ - ` : | | * + * / / `_. /_ __/ /__ _/ .-` / / * + * =====`-.____`.___ /_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.customer.feign.protal.gdinstorage; + +import cn.hutool.core.util.StrUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; + +/** + * Project: yxt_supervise
+ * File: GdInstorageRest.java
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdInstorageRest
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022/12/3 1:08
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@FeignClient( + contextId = "supervise-portal-GdInstorage", + name = "supervise-portal", + path = "/ruku") +public interface GdInstorageFeign { + + @GetMapping("/test") + public ResultBean test(); + @PostMapping(value = "/uploadRkmxb",consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public ResultBean uploadGdData(@RequestPart("file") MultipartFile file); + @PostMapping("/logPagerList") + public ResultBean> logPagerList(@RequestBody PagerQuery pq); + @GetMapping("/recount") + public ResultBean recount(); + + @PostMapping("/in112PagerList") + public ResultBean> in112PagerList(@RequestBody PagerQuery pq); + @PostMapping("/inallPagerList") + public ResultBean> inallPagerList(@RequestBody PagerQuery pq); + + @GetMapping("/countinfo") + public ResultBean countinfo(); + + @PostMapping("/jmdRkmxList") + public ResultBean> jmdRkmxList(@RequestBody GdRukuQuery rq); + @PostMapping("/jmdRkmxListDownload") + public ResultBean jmdRkmxListDownload(@RequestBody GdRukuQuery rq); + /** + * 创建在途商品的Excel + * @return + */ + @GetMapping("/buildExcelZaiTu") + public ResultBean buildExcelZaiTu(); +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinstorage/GdInstorageGd.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinstorage/GdInstorageGd.java new file mode 100644 index 00000000..d05a6a30 --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinstorage/GdInstorageGd.java @@ -0,0 +1,75 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.customer.feign.protal.gdinstorage; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.EntityWithId; +import lombok.Data; + +/** + * Project: yxt_supervise
+ * File: GdInstorageGd.java
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdInstorageGd
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022/12/3 0:58
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@TableName("gd_instorage_gd") +public class GdInstorageGd extends EntityWithId { + + private String cola0; // 企业组织机构代码证 + private String colb1; // 仓库/门店编号 + private String colc2; // 仓库/门店名称 + private String cold3; // 入库时间 + private String colex; // 供应商编号 + private String cole4; // 供应商名称 + private String colf5; // 单据号 + private String colg6; // 单据类型 + private String colh7; // 货号 + private String coli8; // 商品名称 + private String colj9; // 商品生产日期 + private String colk10; // 商品保质期 + private String coll11; // 商品规格 + private String colm12; // 类别编号 + private String coln13; // 类别名称 + private String colo14; // 一级类别名称 + private String colp15; // 二级类别名称 + private String colq16; // 入库金额 + private String colr17; // 入库数量 + private String cols18; // 成本金额 + private String colt19; // 成本税额 + private String colu20; // 不含税成本 + private String colv21; // 进项税率 + private String orderDate; // 单据日期 + private String supplierCodeUnified; // 供货商编码统一 + private String inOrderNo; // 入库定单号 +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinstorage/GdInstorageLog.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinstorage/GdInstorageLog.java new file mode 100644 index 00000000..d2b292af --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinstorage/GdInstorageLog.java @@ -0,0 +1,33 @@ +package com.yxt.supervise.customer.feign.protal.gdinstorage; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.domain.EntityWithId; +import lombok.Data; + +import java.util.Date; + +@Data +@TableName("gd_instorage_log") +public class GdInstorageLog extends EntityWithId { + + public GdInstorageLog() { + } + + public GdInstorageLog(String fileFullPath) { + this.fileFullPath = fileFullPath; + } + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime = new Date(); // 记录创建时间/ + private String remarks; // 备注说明/ + private String fileFullPath; // 文件完整路径/ + private String fileUrl; //文件下载地址 + private String outFilePath; // 汇总文件路径 + // private String outfile; //输出文件名 + private int allNum; // 总记录数/ + private int validNum; // 有效记录数/ + private long durations; // 程序运行时长/ + private int errRowNum; // 出错的条数/ + private String orderDate; // 单据日期 +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinstorage/GdRukuQuery.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinstorage/GdRukuQuery.java new file mode 100644 index 00000000..7deed86a --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinstorage/GdRukuQuery.java @@ -0,0 +1,47 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.customer.feign.protal.gdinstorage; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * Project: yxt_supervise
+ * File: GdRukuQuery.java
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdRukuQuery
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022/12/10 21:15
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +public class GdRukuQuery implements Query { + private String orderDate; +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinventory/GdInventoryFeign.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinventory/GdInventoryFeign.java new file mode 100644 index 00000000..421f83ac --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinventory/GdInventoryFeign.java @@ -0,0 +1,80 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' /| |// '. * + * / /||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | /\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.customer.feign.protal.gdinventory; + +import cn.hutool.core.io.FileUtil; +import cn.hutool.core.io.IoUtil; +import com.yxt.common.core.result.ResultBean; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.*; + +/** + * Project: yxt_supervise
+ * File: GdInventoryRest.java
+ * Class: com.yxt.supervise.portal.biz.gdinventory.GdInventoryRest
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022/11/30 18:37
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@FeignClient( + contextId = "supervise-portal-GdInventory", + name = "supervise-portal", + path = "/kucun") +public interface GdInventoryFeign { + + + + @GetMapping("/implgd") + public ResultBean implInventory(); + + @PostMapping(value = "/uploadGdData",consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public ResultBean uploadGdData(@RequestPart("file") MultipartFile file); + + @GetMapping("/kchz") + public ResultBean kchz(); + + @GetMapping("/kchzyc") + public ResultBean kchzyc(); + + @GetMapping("/resetAllCache") + public ResultBean resetAllCache(); + + @GetMapping("/downloadhz") + public void downloadhz(HttpServletResponse response, @RequestParam("filepath") String filepath) throws IOException; + +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinventory/GdInventoryLog.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinventory/GdInventoryLog.java new file mode 100644 index 00000000..0e9909cc --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdinventory/GdInventoryLog.java @@ -0,0 +1,33 @@ +package com.yxt.supervise.customer.feign.protal.gdinventory; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.domain.EntityWithId; +import lombok.Data; + +import java.util.Date; + +@Data +@TableName("gd_inventory_log") +public class GdInventoryLog extends EntityWithId { + + public GdInventoryLog() { + } + + public GdInventoryLog(String fileFullPath) { + this.fileFullPath = fileFullPath; + } + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime = new Date(); // 记录创建时间/ + private String remarks; // 备注说明/ + private String fileFullPath; // 文件完整路径/ + private String outFilePath; // 汇总文件路径 +// private String outfile; //输出文件名 + private String fileUrl; //文件下载地址 + private int allNum; // 总记录数/ + private int validNum; // 有效记录数/ + private long durations; // 程序运行时长/ + private int errRowNum; // 出错的条数/ + private String orderDate; // 单据日期 +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdsales/GdSalesFeign.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdsales/GdSalesFeign.java new file mode 100644 index 00000000..ba0b8585 --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdsales/GdSalesFeign.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.customer.feign.protal.gdsales; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +/** + * Project: yxt_supervise
+ * File: GdSalesRest.java
+ * Class: com.yxt.supervise.portal.biz.gdsales.GdSalesRest
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023/1/7 16:22
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@FeignClient( + contextId = "supervise-portal-GdSales", + name = "supervise-portal", + path = "/sales") +public interface GdSalesFeign { + + /** + * 上传配送中心批发数据 + * @param file + * @return + */ + @PostMapping(value = "/uploadXssj",consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public ResultBean uploadGdData(@RequestPart("file") MultipartFile file); + + @PostMapping("/logsPagerList") + public ResultBean> logsPagerList(@RequestBody PagerQuery pq); + + @GetMapping("/buildExcel/{logId}") + public ResultBean buildExcel(@PathVariable("logId") String logId); +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdsales/GdSalesLog.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdsales/GdSalesLog.java new file mode 100644 index 00000000..cbc2cce1 --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdsales/GdSalesLog.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.customer.feign.protal.gdsales; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.domain.EntityWithId; +import lombok.Data; + +import java.util.Date; + +/** + * Project: yxt_supervise
+ * File: GdSalesLog.java
+ * Class: com.yxt.supervise.portal.biz.gdsales.GdSalesLog
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023/1/7 16:10
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@TableName("gd_sales_log") +public class GdSalesLog extends EntityWithId { + public GdSalesLog() { + } + + public GdSalesLog(String fileFullPath) { + this.fileFullPath = fileFullPath; + } + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime = new Date(); // 记录创建时间/ + private String remarks; // 备注说明', + private String fileFullPath; // 文件完整路径', + private String outFilePath; // 汇总文件路径', + private String fileUrl; // 文件下载地址', + private int allNum = 0; // 总记录数', + private int validNum = 0; // 有效记录数', + private long durations = 0; // 程序运行时长', + private int errRowNum = 0; // 出错的条数', + private String orderDate; // 单据日期', +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdsales/GdSalesQuery.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdsales/GdSalesQuery.java new file mode 100644 index 00000000..123d1515 --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdsales/GdSalesQuery.java @@ -0,0 +1,48 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.customer.feign.protal.gdsales; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * Project: yxt_supervise
+ * File: GdSalesQuery.java
+ * Class: com.yxt.supervise.portal.biz.gdsales.GdSalesQuery
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023/1/7 16:25
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +public class GdSalesQuery implements Query { + private String orderDateStart; + private String orderDateEnd; +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdwholesale/GdWholesaleFeign.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdwholesale/GdWholesaleFeign.java new file mode 100644 index 00000000..525972fc --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdwholesale/GdWholesaleFeign.java @@ -0,0 +1,31 @@ +package com.yxt.supervise.customer.feign.protal.gdwholesale; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +@FeignClient( + contextId = "supervise-portal-GdWholesale", + name = "supervise-portal", + path = "/wholesale") +public interface GdWholesaleFeign { + + + /** + * 上传配送中心批发数据 + * @param file + * @return + */ + @PostMapping(value = "/uploadPszxpfsj",consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public ResultBean uploadGdData(@RequestPart("file") MultipartFile file); + + @PostMapping("/logsPagerList") + public ResultBean> logsPagerList(@RequestBody PagerQuery pq); + + @GetMapping("/buildExcel/{logId}") + public ResultBean buildExcel(@PathVariable("logId") String logId); +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdwholesale/GdWholesaleLog.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdwholesale/GdWholesaleLog.java new file mode 100644 index 00000000..43a81028 --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdwholesale/GdWholesaleLog.java @@ -0,0 +1,31 @@ +package com.yxt.supervise.customer.feign.protal.gdwholesale; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.domain.EntityWithId; +import lombok.Data; + +import java.util.Date; + +@Data +@TableName("gd_wholesale_log") +public class GdWholesaleLog extends EntityWithId { + public GdWholesaleLog() { + } + + public GdWholesaleLog(String fileFullPath) { + this.fileFullPath = fileFullPath; + } + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime = new Date(); // 记录创建时间/ + private String remarks; // 备注说明', + private String fileFullPath; // 文件完整路径', + private String outFilePath; // 汇总文件路径', + private String fileUrl; // 文件下载地址', + private int allNum = 0; // 总记录数', + private int validNum = 0; // 有效记录数', + private long durations = 0; // 程序运行时长', + private int errRowNum = 0; // 出错的条数', + private String orderDate; // 单据日期', +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdwholesale/GdWholesaleQuery.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdwholesale/GdWholesaleQuery.java new file mode 100644 index 00000000..017d759d --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/gdwholesale/GdWholesaleQuery.java @@ -0,0 +1,10 @@ +package com.yxt.supervise.customer.feign.protal.gdwholesale; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +@Data +public class GdWholesaleQuery implements Query { + private String orderDateStart; + private String orderDateEnd; +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/purchaserequisition/PurchaseRequisitionDto.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/purchaserequisition/PurchaseRequisitionDto.java new file mode 100644 index 00000000..9aee3baa --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/purchaserequisition/PurchaseRequisitionDto.java @@ -0,0 +1,98 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.customer.feign.protal.purchaserequisition; + + +import com.yxt.common.core.dto.Dto; +import com.yxt.supervise.customer.api.purchaserequisitionpro.PurchaseRequisitionProDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: 宇信通监管(宇信通监管)
+ * File: PurchaseRequisitionDto.java
+ * Class: com.yxt.supervise.api.purchaserequisition.PurchaseRequisitionDto
+ * Description: 采购订单表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-20 16:44:10
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单表 数据传输对象", description = "采购订单表 数据传输对象") +public class PurchaseRequisitionDto implements Dto { + + private String sid; // sid + @ApiModelProperty("单号") + private String code; // 单号 + @ApiModelProperty("采购员姓名") + private String buyerName; // 采购员姓名 + @ApiModelProperty("采购员编码") + private String buyerCode; // 采购员编码 + @ApiModelProperty("采购日期") + private String purchaseDate; // 采购日期 + @ApiModelProperty("到货日期") + private String arrivalDate; // 到货日期 + @ApiModelProperty("采购组织名称") + private String purchasingOrgName; // 采购组织名称 + @ApiModelProperty("采购组织编码") + private String purchasingOrgCode; // 采购组织编码 + @ApiModelProperty("采购部门名称") + private String purchasingDeptCode; // 采购部门名称 + @ApiModelProperty("采购部门编码") + private String purchasingDeptName; // 采购部门编码 + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("供应商编码") + private String supplierCode; // 供应商编码 + @ApiModelProperty("物流公司名称") + private String logisticsCompanyName; // 物流公司名称 + @ApiModelProperty("物流公司编码") + private String logisticsCompanyCode; // 物流公司编码 + @ApiModelProperty("单据到效期") + private String expiryDate; // 单据到效期 + @ApiModelProperty("仓位") + private String warehousePosition;//仓位 + @ApiModelProperty("仓位code") + private String warehousePositionCode;// + @ApiModelProperty("新订单编号") + private String newCode;// + @ApiModelProperty("旧订单编号") + private String oldCode;// + @ApiModelProperty("完成状态") + private String completionStatus;//完成状态 + @ApiModelProperty("完成状态") + private String completionStatusKey;//完成状态 + @ApiModelProperty("商品列表") + private List pros=new ArrayList<>(); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/purchaserequisition/PurchaseRequisitionQuery.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/purchaserequisition/PurchaseRequisitionQuery.java new file mode 100644 index 00000000..1f801f52 --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/purchaserequisition/PurchaseRequisitionQuery.java @@ -0,0 +1,94 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.customer.feign.protal.purchaserequisition; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: 宇信通监管(宇信通监管)
+ * File: PurchaseRequisitionQuery.java
+ * Class: com.yxt.supervise.api.purchaserequisition.PurchaseRequisitionQuery
+ * Description: 采购订单表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-20 16:44:10
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单表 查询条件", description = "采购订单表 查询条件") +public class PurchaseRequisitionQuery implements Query { + @ApiModelProperty("单号") + private String code; // 单号 + @ApiModelProperty("采购员姓名") + private String buyerName; // 采购员姓名 + @ApiModelProperty("采购员编码") + private String buyerCode; // 采购员编码 + @ApiModelProperty("采购日期开始") + private String purchaseDateStart; // 采购日期 + @ApiModelProperty("采购日期结束") + private String purchaseDateEnd; // 采购日期 + @ApiModelProperty("到货日期开始") + private String arrivalDateStart; // 到货日期 + @ApiModelProperty("到货日期结束") + private String arrivalDateEnd; // 到货日期 + @ApiModelProperty("采购组织名称") + private String purchasingOrgName; // 采购组织名称 + @ApiModelProperty("采购组织编码") + private String purchasingOrgCode; // 采购组织编码 + @ApiModelProperty("采购部门名称") + private String purchasingDeptCode; // 采购部门名称 + @ApiModelProperty("采购部门编码") + private String purchasingDeptName; // 采购部门编码 + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("供应商编码") + private String supplierCode; // 供应商编码 + @ApiModelProperty("物流公司名称") + private String logisticsCompanyName; // 物流公司名称 + @ApiModelProperty("物流公司编码") + private String logisticsCompanyCode; // 物流公司编码 + @ApiModelProperty("单据到效期") + private String expiryDate; // 单据到效期 + @ApiModelProperty("仓位") + private String warehousePosition;//仓位 + @ApiModelProperty("仓位code") + private String warehousePositionCode;// + @ApiModelProperty("新订单编号") + private String newCode;// + @ApiModelProperty("旧订单编号") + private String oldCode;// + @ApiModelProperty("完成状态") + private String completionStatus;//完成状态 + @ApiModelProperty("完成状态") + private String completionStatusKey;//完成状态 +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/purchaserequisition/PurchaseRequisitionVo.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/purchaserequisition/PurchaseRequisitionVo.java new file mode 100644 index 00000000..9402e961 --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/purchaserequisition/PurchaseRequisitionVo.java @@ -0,0 +1,94 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.customer.feign.protal.purchaserequisition; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: 宇信通监管(宇信通监管)
+ * File: PurchaseRequisitionVo.java
+ * Class: com.yxt.supervise.api.purchaserequisition.PurchaseRequisitionVo
+ * Description: 采购订单表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-20 16:44:10
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单表 视图数据对象", description = "采购订单表 视图数据对象") +public class PurchaseRequisitionVo implements Vo { + + private String sid; // sid + @ApiModelProperty("单号") + private String code; // 单号 + @ApiModelProperty("采购员姓名") + private String buyerName; // 采购员姓名 + @ApiModelProperty("采购员编码") + private String buyerCode; // 采购员编码 + @ApiModelProperty("采购日期") + private String purchaseDate; // 采购日期 + @ApiModelProperty("到货日期") + private String arrivalDate; // 到货日期 + @ApiModelProperty("采购组织名称") + private String purchasingOrgName; // 采购组织名称 + @ApiModelProperty("采购组织编码") + private String purchasingOrgCode; // 采购组织编码 + @ApiModelProperty("采购部门名称") + private String purchasingDeptCode; // 采购部门名称 + @ApiModelProperty("采购部门编码") + private String purchasingDeptName; // 采购部门编码 + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("供应商编码") + private String supplierCode; // 供应商编码 + @ApiModelProperty("物流公司名称") + private String logisticsCompanyName; // 物流公司名称 + @ApiModelProperty("物流公司编码") + private String logisticsCompanyCode; // 物流公司编码 + @ApiModelProperty("单据到效期") + private String expiryDate; // 单据到效期 + @ApiModelProperty("仓位") + private String warehousePosition;//仓位 + @ApiModelProperty("仓位code") + private String warehousePositionCode;// + @ApiModelProperty("新订单编号") + private String newCode;// + @ApiModelProperty("旧订单编号") + private String oldCode;// + @ApiModelProperty("完成状态") + private String completionStatus;//完成状态 + @ApiModelProperty("完成状态") + private String completionStatusKey;//完成状态 + @ApiModelProperty("订单金额") + private String packageTotalPrice; +} diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/purchaserequisition/PurchaseRequisitionsFeign.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/purchaserequisition/PurchaseRequisitionsFeign.java new file mode 100644 index 00000000..89f26990 --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/feign/protal/purchaserequisition/PurchaseRequisitionsFeign.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.customer.feign.protal.purchaserequisition; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * Project: 宇信通监管(宇信通监管)
+ * File: PurchaseRequisitionFeign.java
+ * Class: com.yxt.supervise.api.purchaserequisition.PurchaseRequisitionFeign
+ * Description: 采购订单表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-20 16:44:10
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "采购订单表") +@FeignClient( + contextId = "supervise-portal-PurchaseRequisition", + name = "supervise-portal", + path = "v1/purchaserequisition") +public interface PurchaseRequisitionsFeign { + + @ApiOperation("") + @RequestMapping(value = "/supplierAnalysis", method = RequestMethod.POST) + public ResultBean supplierAnalysis(); + + +} \ No newline at end of file