From 72b9dd40450fa85ccc74b7c87f1631a56dd4061d Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Sun, 8 Jan 2023 22:32:02 +0800 Subject: [PATCH 1/2] 2 --- .../PurchaseRequisitionMapper.java | 6 +- .../PurchaseRequisitionService.java | 2 +- .../portal/biz/salesdata/SalesDataRest.java | 2 +- .../biz/salesdata/SalesDataService.java | 79 ++++--------------- .../biz/supplierinfo/SupplierInfoMapper.java | 9 ++- .../biz/supplierinfo/SupplierInfoMapper.xml | 4 +- .../biz/supplierinfo/SupplierInfoService.java | 4 + 7 files changed, 30 insertions(+), 76 deletions(-) diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java index b3b1f9aa..154b017d 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java @@ -31,15 +31,15 @@ public interface PurchaseRequisitionMapper extends BaseMapper selectAll(); - @Select(" SELECT sbi.codeUnified, sbi.name ,1,SUM(packageTotalPrice) billTotalPrice, " + - " (SELECT SUM(prodValue) FROM gd_instorage_count gic WHERE gic.supplierCodeUnified=pr.supplierOnlyCode and gic.prodCode in(select prodcode from gd_rescategory_prod) ) prodValue, " + + @Select(" SELECT MAX(sbi.codeUnified) codeUnified, MAX(sbi.name) name ,1,convert(SUM(packageTotalPrice),decimal(12,2)) billTotalPrice, " + + " (SELECT convert(SUM(prodValue),decimal(12,2)) FROM gd_instorage_count gic WHERE gic.supplierCodeUnified=pr.supplierOnlyCode and gic.prodCode in(select prodcode from gd_rescategory_prod) ) prodValue, " + " MAX(pr.`arrivalDate`) arrivalDate FROM `supplier_bank_info` sbi " + "LEFT JOIN `purchase_requisition` pr ON pr.supplierOnlyCode=sbi.codeUnified " + "LEFT JOIN `purchase_requisition_pro` prp ON pr.sid=prp.mainsid " + " WHERE pr.purchaseState=1 AND pr.bankState=1 AND sbi.`purchaseRequisition`=1 AND sbi.`bankState`=1 " + " GROUP BY pr.supplierOnlyCode ORDER BY sbi.name;") List> ztspglhzb(); - @Select("SELECT sbi.name,code,SUM(packageTotalPrice) billTotalPrice,purchaseDate billDate,arrivalDate FROM `purchase_requisition` pr " + + @Select("SELECT MAX(sbi.name) name,code,SUM(packageTotalPrice) billTotalPrice,MAX(purchaseDate) billDate,MAX(arrivalDate) arrivalDate FROM `purchase_requisition` pr " + "LEFT JOIN `purchase_requisition_pro` prp ON pr.sid=prp.mainsid " + "LEFT JOIN `supplier_bank_info` sbi ON sbi.codeUnified=pr.`supplierOnlyCode` " + " WHERE pr.purchaseState=1 AND pr.bankState=1 " + diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java index 7c116ded..5512128e 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java @@ -416,7 +416,7 @@ public class PurchaseRequisitionService extends MybatisBaseService objectResultBean=ResultBean.fireFail(); - SupplierInfoVo supplierInfoVo = supplierInfoService.selectByCode(pr.getSupplierCode()); + SupplierInfoVo supplierInfoVo = supplierInfoService.selectByCodeForIndex(pr.getSupplierCode()); if(supplierInfoVo==null){ return objectResultBean.setMsg("供应商不存在!"); } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataRest.java index 3af044bd..63d88db4 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataRest.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataRest.java @@ -112,7 +112,7 @@ public class SalesDataRest implements SalesDataFeign { public ResultBean importBrandSort(@RequestParam("filename") MultipartFile file ){ ResultBean rb = ResultBean.fireFail(); salesDataService.readBrandPeriodSorXls1(file); - return rb; + return rb.success().setMsg("成功"); } @ApiOperation(" ") @RequestMapping(value = "/analysisSalesData", method = RequestMethod.GET) diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataService.java index 01684cc8..f7ba1fab 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataService.java @@ -359,7 +359,7 @@ public class SalesDataService extends MybatisBaseService fub = fileUploadComponent.uploadFile(file, "salesdata"); String filePath = fub.getData().getFilePath(); String fp = fileUploadComponent.getUploadPath() + filePath; long millis = System.currentTimeMillis(); ExcelUtil.read07BySax(fp, -1, createRowHandler()); - - - /*HSSFWorkbook hssfWorkbook = null; - try { - hssfWorkbook = new HSSFWorkbook(is); - } catch (IOException e) { - e.printStackTrace(); - } - List lisss=new ArrayList<>(); - List salesDatas=new ArrayList<>(); - HSSFSheet hssfSheet = hssfWorkbook.getSheetAt(0); - // 循环行Row - for (int rowNum = 1; rowNum <= hssfSheet.getLastRowNum(); rowNum++) { - SalesData sd=new SalesData(); - HSSFRow hssfRow = hssfSheet.getRow(rowNum); - int i = 0; - try{ - sd.setType(ExcelTool.readStringFromHSSFRow(hssfRow, 1));//类型 - sd.setCode(ExcelTool.readStringFromHSSFRow(hssfRow, 2));//销售订单号 - sd.setProCode(ExcelTool.readStringFromHSSFRow(hssfRow, 3));//商品代码 - sd.setProBarCode(ExcelTool.readStringFromHSSFRow(hssfRow, 4));//商品条码 - sd.setProName(ExcelTool.readStringFromHSSFRow(hssfRow, 5));//商品名称 - sd.setBrandCode(ExcelTool.readStringFromHSSFRow(hssfRow, 6));//品牌代码 - String brandName=ExcelTool.readStringFromHSSFRow(hssfRow, 7); - sd.setBrandName(brandName);//品牌名称 - - String dalei=ExcelTool.readStringFromHSSFRow(hssfRow, 8);//大类 - - sd.setCategoryb(dalei); - - String zhonglei=ExcelTool.readStringFromHSSFRow(hssfRow, 9);//中类 - sd.setCategorym(zhonglei); - - String xiaolei=ExcelTool.readStringFromHSSFRow(hssfRow, 10);//小类 - sd.setCategorys(xiaolei); - - sd.setCustomerCode(ExcelTool.readStringFromHSSFRow(hssfRow, 11));//客户代码 - sd.setCustomerName(ExcelTool.readStringFromHSSFRow(hssfRow, 12));//客户名称 - sd.setSaleNum(ExcelTool.readStringFromHSSFRow(hssfRow, 13));//销售数量 - sd.setStoreCode(ExcelTool.readStringFromHSSFRow(hssfRow, 14));//销售渠道 - sd.setSalePrice(ExcelTool.readStringFromHSSFRow(hssfRow, 15));//销售价格 - sd.setSaleCost(ExcelTool.readStringFromHSSFRow(hssfRow, 16));//销售成本 - sd.setProfit(ExcelTool.readStringFromHSSFRow(hssfRow, 17));//利润 - sd.setDataDate(ExcelTool.readStringFromHSSFRow(hssfRow, 18));//销售日期 - salesDatas.add(sd); - }catch(Exception e){ - e.printStackTrace(); - System.err.println("i="+i+",value=null"); - } - lisss.add(rowNum+""); - - //inventoryInformationService.reduceStock(sd.getProCode(),sd.getProName(),sd.getStoreCode(),sd.getSaleNum()); - log.info("productInformation:{}", JSONObject.toJSONString(sd)); - log.info("rowNum:{}", rowNum); - } - String x = JSON.toJSONString(lisss); - System.out.println(x);*/ } @Resource private GdInstorageGdService gdInstorageGdService; @@ -479,7 +421,6 @@ public class SalesDataService extends MybatisBaseService> listss=new ArrayList<>(); - int i=0; for(SalesData s:list){ String proCode = s.getProCode(); //List storeInfos=storeInfoService.selectLimitStores(); @@ -503,14 +444,22 @@ public class SalesDataService extends MybatisBaseService>> listArray = new ArrayList>>(); + int listSize = listss.size(); + int pageSize=2000; + for (int i = 0; i < listSize; i += pageSize) { + int toIndex = Math.min(i + pageSize, listSize); + listArray.add(listss.subList(i, toIndex)); + } log.info("开始新增salestest"); - baseMapper.insertsalestest(listss); + for(List> l:listArray){ + log.info("Map-start:{}",l.size()); + baseMapper.insertsalestest(l); + log.info("Map-end:{}",l.size()); + } log.info("结束新增salestest"); log.info("开始新增jmdRkmxdOfDay"); List gdInstorageGds = gdInstorageGdService.jmdRkmxdOfDay(pc); diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierinfo/SupplierInfoMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierinfo/SupplierInfoMapper.java index 42ce0cbf..dc59b947 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierinfo/SupplierInfoMapper.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierinfo/SupplierInfoMapper.java @@ -60,13 +60,14 @@ public interface SupplierInfoMapper extends BaseMapper { List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - @Select("select * from supplier_info ") + @Select("select * from supplier_bank_info ") List selectListVo(); - @Select("select * from supplier_info where purchaseRequisition=1 and bankState=1") + @Select("select * from supplier_bank_info where purchaseRequisition=1 and bankState=1") List selectAdoptedListVo(); @Select("select supplierName name from purchase_requisition group by supplierName") List selectPurSupplier(); - @Select("select * from supplier_info where code=#{code}") + @Select("select * from supplier_bank_info where code=#{code}") SupplierInfoVo selectByCode(String code); - + @Select("select * from supplier_index where code=#{code}") + SupplierInfoVo selectByCodeForIndex(@Param("code") String supplierCode); } \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierinfo/SupplierInfoMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierinfo/SupplierInfoMapper.xml index ec74fa3d..9d06f8bd 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierinfo/SupplierInfoMapper.xml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierinfo/SupplierInfoMapper.xml @@ -4,10 +4,10 @@ \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierinfo/SupplierInfoService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierinfo/SupplierInfoService.java index a1d19969..7645ec02 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierinfo/SupplierInfoService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierinfo/SupplierInfoService.java @@ -114,4 +114,8 @@ public class SupplierInfoService extends MybatisBaseService selectAdoptedListVo() { return baseMapper.selectAdoptedListVo(); } + + public SupplierInfoVo selectByCodeForIndex(String supplierCode) { + return baseMapper.selectByCodeForIndex(supplierCode); + } } \ No newline at end of file From c6a17e48e48d3ad264a361c34388e7ae254911ed Mon Sep 17 00:00:00 2001 From: lzh Date: Sun, 8 Jan 2023 23:26:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=94=80=E5=94=AE=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base-ui/src/api/kucun/ruku.js | 12 ++ base-ui/src/views/kucun/rkmx/index.vue | 20 ++- base-ui/src/views/kucun/xssjgl/index.vue | 2 +- .../gdinstorage/GdInstorageCountMapper.java | 30 ++++ .../gdinstorage/GdInstorageCountMapper.xml | 17 +++ .../gdinstorage/GdInstorageCountService.java | 144 ++++++++++++++++++ .../biz/gdinstorage/GdInstorageRest.java | 9 ++ .../portal/biz/gdsales/GdSalesService.java | 58 ++++++- .../PurchaseRequisitionRest.java | 55 ++++--- .../在途商品汇总统计表.xlsx | Bin 0 -> 20707 bytes .../xlsx-tmpl/销售汇总日报表.xlsx | Bin 0 -> 26237 bytes 11 files changed, 319 insertions(+), 28 deletions(-) create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.xml create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/xlsx-tmpl/在途商品汇总统计表.xlsx create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/xlsx-tmpl/销售汇总日报表.xlsx diff --git a/base-ui/src/api/kucun/ruku.js b/base-ui/src/api/kucun/ruku.js index ead9b620..3908b9a5 100644 --- a/base-ui/src/api/kucun/ruku.js +++ b/base-ui/src/api/kucun/ruku.js @@ -74,3 +74,15 @@ export function jmdRkmxListDownload(data) { } }) } + +// 下采购订单、入库的数据 +export function ztsjZhengli() { + return request({ + url: '/v1/purchaserequisition/supplierAnalysis', + method: 'post' + }) +} + +export function buildExcelZaiTu() { + return request({ url: '/ruku/buildExcelZaiTu' }) +} diff --git a/base-ui/src/views/kucun/rkmx/index.vue b/base-ui/src/views/kucun/rkmx/index.vue index ef30a758..cacc5751 100644 --- a/base-ui/src/views/kucun/rkmx/index.vue +++ b/base-ui/src/views/kucun/rkmx/index.vue @@ -114,6 +114,7 @@
入库单上传 + 下载在途数据 重新统计入库信息
@@ -146,7 +147,7 @@