Browse Source

上传数据

master
liupopo 3 years ago
parent
commit
c45cbe9b60
  1. 2
      base-ui/package.json
  2. 1
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryRest.java
  3. 18
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryService.java
  4. 2
      yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/extexcel/ExcelTool.java

2
base-ui/package.json

@ -4,7 +4,7 @@
"description": "A vue admin template with Element UI & axios & iconfont & permission control & lint",
"author": "Pan <panfree23@gmail.com>",
"scripts": {
"dev": "vue-cli-service serve",
"dev": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
"build:prod": "vue-cli-service build",
"build:stage": "vue-cli-service build --mode staging",
"preview": "node build/index.js --preview",

1
yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryRest.java

@ -66,7 +66,6 @@ public class GdInventoryRest {
@PostMapping("/upToCount")
public ResultBean upToCount(@RequestParam("file") MultipartFile file) {
System.out.println("ffffff");
ResultBean rb = gdInventoryService.importAndCount(file);
return ResultBean.fireSuccess();
}

18
yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinventory/GdInventoryService.java

@ -295,17 +295,17 @@ public class GdInventoryService extends ServiceImpl<GdInventoryMapper, GdInvento
if (l > 0) {
GdInventory gd = new GdInventory();
gd.setOrgCode((String) r.get(0)); // 企业组织机构代码证
gd.setWarehouseCode((String) r.get(1)); // 仓库/门店编号
gd.setWarehouseName((String) r.get(2)); // 仓库/门店名称
gd.setProdCode((String) r.get(3)); // 商品编码
gd.setProdBarCode((String) r.get(4)); // 商品条码
gd.setProdName((String) r.get(5)); // 商品名称
gd.setOrgCode("" + r.get(0)); // 企业组织机构代码证
gd.setWarehouseCode("" + r.get(1)); // 仓库/门店编号
gd.setWarehouseName("" + r.get(2)); // 仓库/门店名称
gd.setProdCode("" + r.get(3)); // 商品编码
gd.setProdBarCode("" + r.get(4)); // 商品条码
gd.setProdName("" + r.get(5)); // 商品名称
gd.setWarehouseType(ExcelTool.toInt(r.get(6))); // 仓库类型
gd.setProdNum(ExcelTool.toInt(r.get(7))); // 商品数量
gd.setProdValue(ExcelTool.toDouble(r.get(8))); // 商品货值
gd.setSuppliderName((String) r.get(9)); // 供应商
gd.setDatadate((String) r.get(10)); // 数据日期
gd.setSuppliderName("" + r.get(9)); // 供应商
gd.setDatadate("" + r.get(10)); // 数据日期
toInsertList.add(gd);
if (1600 == num) {
@ -337,7 +337,7 @@ public class GdInventoryService extends ServiceImpl<GdInventoryMapper, GdInvento
public ResultBean importAndCount(MultipartFile file) {
ResultBean<FileUploadResult> fub = fileUploadComponent.uploadFile(file);
ResultBean<FileUploadResult> fub = fileUploadComponent.uploadFile(file, "kcxxcx");
String filePath = fub.getData().getFilePath();
String fp = fileUploadComponent.getUploadPath() + filePath;

2
yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/extexcel/ExcelTool.java

@ -66,7 +66,7 @@ public class ExcelTool {
public static int toInt(Object obj) {
if (obj == null)
return 0;
String s = obj.toString();
String s = ""+ obj;
if (StringUtils.isBlank(s))
return 0;
int rs = 0;

Loading…
Cancel
Save