diff --git a/base-ui/src/api/kucun/hzsjxz.js b/base-ui/src/api/kucun/hzsjxz.js new file mode 100644 index 00000000..e69de29b diff --git a/base-ui/src/views/kucun/hzsjxz/index.vue b/base-ui/src/views/kucun/hzsjxz/index.vue new file mode 100644 index 00000000..c7a9dab6 --- /dev/null +++ b/base-ui/src/views/kucun/hzsjxz/index.vue @@ -0,0 +1,53 @@ + + + + diff --git a/base-ui/src/views/kucun/pfsjgl/index.vue b/base-ui/src/views/kucun/pfsjgl/index.vue new file mode 100644 index 00000000..96cfa5ba --- /dev/null +++ b/base-ui/src/views/kucun/pfsjgl/index.vue @@ -0,0 +1,224 @@ + + + + diff --git a/base-ui/src/views/kucun/xssjgl/index.vue b/base-ui/src/views/kucun/xssjgl/index.vue new file mode 100644 index 00000000..b3e61c6c --- /dev/null +++ b/base-ui/src/views/kucun/xssjgl/index.vue @@ -0,0 +1,53 @@ + + + + diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageJmd.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageJmd.java new file mode 100644 index 00000000..b327960f --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageJmd.java @@ -0,0 +1,73 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.biz.gdinstorage; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.EntityWithId; +import lombok.Data; + +/** + * Project: yxt_supervise
+ * File: GdInstorageJmd.java
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdInstorageJmd
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023/1/5 10:45
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@TableName("gd_instorage_jmd") +public class GdInstorageJmd 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; // 供货商编码统一 +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageJmdMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageJmdMapper.java new file mode 100644 index 00000000..5570a523 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageJmdMapper.java @@ -0,0 +1,50 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.biz.gdinstorage; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * Project: yxt_supervise
+ * File: GdInstorageJmdMapper.java
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdInstorageJmdMapper
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023/1/5 10:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface GdInstorageJmdMapper extends BaseMapper { + @Delete("delete from gd_instorage_jmd where orderDate=#{orderDate} ") + void clearByOrderDate(@Param("orderDate") String orderDate); +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageJmdService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageJmdService.java new file mode 100644 index 00000000..1a97ef4b --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageJmdService.java @@ -0,0 +1,50 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.biz.gdinstorage; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * Project: yxt_supervise
+ * File: GdInstorageJmdService.java
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdInstorageJmdService
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023/1/5 10:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class GdInstorageJmdService extends ServiceImpl { + + public void clearByOrderDate(String orderDate) { + baseMapper.clearByOrderDate(orderDate); + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageService.java index 22688c65..3bee2e8e 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageService.java @@ -46,7 +46,10 @@ import com.yxt.supervise.portal.api.kfpurchaserequisition.KfPurchaseRequisitionV import com.yxt.supervise.portal.biz.gdinventory.GdInventoryLog; import com.yxt.supervise.portal.biz.gdinventory.GdInventoryLogErr; import com.yxt.supervise.portal.biz.gdinventory.GdInventoryOk; +import com.yxt.supervise.portal.biz.gdinventory.GdRescategoryProdService; import com.yxt.supervise.portal.biz.gdoutstorage.GdOutstorageGd; +import com.yxt.supervise.portal.biz.storeindex.StoreIndexService; +import com.yxt.supervise.portal.biz.storeinfo.StoreInfoService; import com.yxt.supervise.portal.biz.supplierindex.SupplierIndexService; import org.apache.poi.ss.usermodel.CellStyle; import org.springframework.beans.factory.annotation.Autowired; @@ -84,6 +87,16 @@ public class GdInstorageService extends ServiceImpl toInsertListGd = new ArrayList<>(); + private List toInsertListYc = new ArrayList<>(); + private List toInsertListJmd = new ArrayList<>(); private List toInsertList = new ArrayList<>(); private List errList = new ArrayList<>(); private int x = 0, y = 0, errnum = 0; @@ -171,6 +186,15 @@ public class GdInstorageService extends ServiceImpl r) { if (rowIndex > 0) { @@ -214,6 +238,19 @@ public class GdInstorageService extends ServiceImpl p = PagerUtil.pageToVo(pagging, null); return p; } + public void clearByOrderDate(String orderDate) { baseMapper.clearByOrderDate(orderDate); } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageYc.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageYc.java new file mode 100644 index 00000000..af1247b1 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageYc.java @@ -0,0 +1,73 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.biz.gdinstorage; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.EntityWithId; +import lombok.Data; + +/** + * Project: yxt_supervise
+ * File: GdInstorageYc.java
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdInstorageYc
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023/1/5 10:34
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@TableName("gd_instorage_yc") +public class GdInstorageYc 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; // 供货商编码统一 +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageYcMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageYcMapper.java new file mode 100644 index 00000000..ba41434b --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageYcMapper.java @@ -0,0 +1,50 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.biz.gdinstorage; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * Project: yxt_supervise
+ * File: GdInstorageYcMapper.java
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdInstorageYcMapper
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023/1/5 10:36
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface GdInstorageYcMapper extends BaseMapper { + @Delete("delete from gd_instorage_yc where orderDate=#{orderDate} ") + void clearByOrderDate(@Param("orderDate") String orderDate); +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageYcService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageYcService.java new file mode 100644 index 00000000..f0f56699 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageYcService.java @@ -0,0 +1,49 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.biz.gdinstorage; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * Project: yxt_supervise
+ * File: GdInstorageYcService.java
+ * Class: com.yxt.supervise.portal.biz.gdinstorage.GdInstorageYcService
+ * Description: <描述类的功能>.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023/1/5 10:36
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class GdInstorageYcService extends ServiceImpl { + public void clearByOrderDate(String orderDate) { + baseMapper.clearByOrderDate(orderDate); + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventory.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventory.java index 95c4e11a..2329db68 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventory.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventory.java @@ -45,7 +45,7 @@ import lombok.Data; @Data @TableName("gd_inventory") public class GdInventory extends EntityWithId { - private String orgCode; // 企业组织机构代码证 + private String orgCode; // 企业组织机构代码证 private String warehouseCode; // 仓库/门店编号 private String warehouseName; // 仓库/门店名称 private String prodCode; // 商品编码 @@ -56,4 +56,9 @@ public class GdInventory extends EntityWithId { private double prodValue; // 商品货值 private String suppliderName; // 供应商 private String datadate; // 数据日期 + + private String typeCode; // 类别编号 + private String typeName; // 类别名称 + private String typeOne; // 一级类别名称 + private String typeTwo; // 二级类别名称 } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryOk.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryOk.java index 01f0bfe1..29d025bb 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryOk.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryOk.java @@ -56,4 +56,8 @@ public class GdInventoryOk extends EntityWithId { private double prodValue; // 商品货值 private String suppliderName; // 供应商 private String datadate; // 数据日期 + private String typeCode; // 类别编号 + private String typeName; // 类别名称 + private String typeOne; // 一级类别名称 + private String typeTwo; // 二级类别名称 } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryRest.java index fb361a81..ee59a035 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryRest.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryRest.java @@ -30,6 +30,9 @@ import cn.hutool.core.io.IoUtil; import cn.hutool.poi.excel.ExcelUtil; import cn.hutool.poi.excel.ExcelWriter; import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.portal.biz.storeindex.StoreIndexService; +import com.yxt.supervise.portal.biz.storeinfo.StoreInfoService; +import com.yxt.supervise.portal.biz.supplierindex.SupplierIndexService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -88,6 +91,18 @@ public class GdInventoryRest { return gdInventoryYcService.kchzyc(); } + @GetMapping("/resetAllCache") + public ResultBean resetAllCache() { + ResultBean rb = ResultBean.fireFail(); + + GdRescategoryProdService.resetCache(); + StoreInfoService.clearCacheCodeListOfYc(); + StoreIndexService.clearCache(); + SupplierIndexService.clearCache(); + + return rb.success(); + } + @GetMapping("/downloadhz") public void downloadhz(HttpServletResponse response, @RequestParam("filepath") String filepath) throws IOException { System.out.println("XXXX: " + filepath); diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryService.java index e20fac72..e138e9b2 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryService.java @@ -305,14 +305,21 @@ public class GdInventoryService extends ServiceImpl r) { if (rowIndex > 0) { - String prodCode = "" + r.get(3); + String typeCode = "" + r.get(3); + String prodCode = "" + r.get(7); String warehouseCode = "" + r.get(1); if (StrUtil.isBlank(odate)) { - odate = "" + r.get(10); + odate = "" + r.get(14); gdlog.setOrderDate(odate); } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryYc.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryYc.java index 97503351..b05a9c0a 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryYc.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryYc.java @@ -56,4 +56,8 @@ public class GdInventoryYc extends EntityWithId { private double prodValue; // 商品货值 private String suppliderName; // 供应商 private String datadate; // 数据日期 + private String typeCode; // 类别编号 + private String typeName; // 类别名称 + private String typeOne; // 一级类别名称 + private String typeTwo; // 二级类别名称 } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/storeindex/StoreIndexService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/storeindex/StoreIndexService.java index c7cdd57d..dd687f62 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/storeindex/StoreIndexService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/storeindex/StoreIndexService.java @@ -66,6 +66,7 @@ public class StoreIndexService extends ServiceImpl private static List codeList = null; private static List codeNoJmdList = null; + private static List codeJmdList = null; private static Map nameMap = null; private static Map typeMap = null; @@ -92,6 +93,15 @@ public class StoreIndexService extends ServiceImpl return res; } + public List listCodeJmd() { + List res = new ArrayList<>(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("type", "连锁外加盟（销配结算）"); + List list = super.list(qw); + list.forEach(entity -> res.add(entity.getCode().trim())); + return res; + } + public boolean containsCode(String code) { if (StringUtils.isBlank(code)) return false; @@ -107,6 +117,14 @@ public class StoreIndexService extends ServiceImpl return oneCodeList.contains(code.trim()); } + public boolean containsCodeJmd(String code) { + if (StringUtils.isBlank(code)) + return false; + if (codeJmdList == null) + codeJmdList = listCodeJmd(); + return codeJmdList.contains(code.trim()); + } + public boolean containsCodeWithOneNoJmd(String code) { if (StringUtils.isBlank(code)) return false; @@ -152,4 +170,12 @@ public class StoreIndexService extends ServiceImpl list.forEach(entity -> res.put(entity.getCode().trim(), entity.getType().trim())); return res; } + + public static void clearCache() { + codeList = null; + codeNoJmdList = null; + codeJmdList = null; + nameMap = null; + typeMap = null; + } } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/storeinfo/StoreInfoService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/storeinfo/StoreInfoService.java index 2ee01307..592af74a 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/storeinfo/StoreInfoService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/storeinfo/StoreInfoService.java @@ -276,7 +276,7 @@ public class StoreInfoService extends MybatisBaseService cacheCodeListOfYc = null; //烟草门店的门店编号列表 - public void clearCacheCodeListOfYc() { + public static void clearCacheCodeListOfYc() { cacheCodeListOfYc = null; } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierindex/SupplierIndexService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierindex/SupplierIndexService.java index a92f95ec..ccda75a7 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierindex/SupplierIndexService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierindex/SupplierIndexService.java @@ -19,7 +19,6 @@ import java.util.Map; @Service public class SupplierIndexService extends MybatisBaseService { - private static List cacheList = null; private static Map cacheCodeMap = null; public String unifiedCode(String code) { @@ -30,13 +29,12 @@ public class SupplierIndexService extends MybatisBaseService initCacheCodeMap() { Map map = new HashMap<>(); - if (cacheList == null) - cacheList = this.list(); - cacheList.forEach(entity -> map.put(entity.getCode(), entity.getCodeUnified())); + List allList = this.list(); + allList.forEach(entity -> map.put(entity.getCode(), entity.getCodeUnified())); return map; } - public SupplierIndexDetailsVo fetchDetailsVoBySid(String sid){ + public SupplierIndexDetailsVo fetchDetailsVoBySid(String sid) { SupplierIndex entity = fetchBySid(sid); SupplierIndexDetailsVo vo = new SupplierIndexDetailsVo(); BeanUtil.copyProperties(entity, vo); @@ -44,14 +42,14 @@ public class SupplierIndexService extends MybatisBaseService fetchDetailsVosBycodeUnified(String codeUnified) { - return baseMapper.fetchDetailsVosBycodeUnified(codeUnified); + return baseMapper.fetchDetailsVosBycodeUnified(codeUnified); } public SupplierIndex selectByCode(String code) { return baseMapper.selectByCode(code); } + private QueryWrapper createQueryWrapper(SupplierIndexQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -68,25 +66,25 @@ public class SupplierIndexService extends MybatisBaseService supplierIndexDto = dto.getList(); baseMapper.deleteSupplierIndexByCodeUnified(dto.getCodeUnified()); - supplierIndexDto.forEach(s->{ + supplierIndexDto.forEach(s -> { s.setPSid(dtoSid); }); - if(supplierIndexDto.size()>0){ + if (supplierIndexDto.size() > 0) { baseMapper.batchSupplierIndexs(supplierIndexDto); } } - public void insertByDto(SupplierIndexDto dto){ + public void insertByDto(SupplierIndexDto dto) { SupplierIndex entity = new SupplierIndex(); BeanUtil.copyProperties(dto, entity, "id", "sid"); baseMapper.insert(entity); } - public void updateByDto(SupplierIndexDto dto){ + public void updateByDto(SupplierIndexDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; @@ -101,6 +99,10 @@ public class SupplierIndexService extends MybatisBaseService selectByCodeAndName(String code, String name) { - return baseMapper.selectByCodeAndName(code,name); + return baseMapper.selectByCodeAndName(code, name); + } + + public static void clearCache() { + cacheCodeMap = null; } }