From 7a8a84577894b766a95c6cbfa5ac7b51e54ac242 Mon Sep 17 00:00:00 2001
From: zhai <1528081232@qq.com>
Date: 星期三, 17 九月 2025 09:06:54 +0800
Subject: [PATCH] 1、获取文件大写修改 2、提交jdbc连接地质
---
src/main/java/com/zbooksoft/gdmis/controller/ImportExcelSuController.java | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zbooksoft/gdmis/controller/ImportExcelSuController.java b/src/main/java/com/zbooksoft/gdmis/controller/ImportExcelSuController.java
index 6f3551d..5bc7d0f 100644
--- a/src/main/java/com/zbooksoft/gdmis/controller/ImportExcelSuController.java
+++ b/src/main/java/com/zbooksoft/gdmis/controller/ImportExcelSuController.java
@@ -9,7 +9,9 @@
import com.ruili.wcp.web.common.LicenseException;
import com.ruili.wcp.web.model.AjaxResponse;
import com.ruili.wcp.web.model.ErrorInfo;
+import com.zbooksoft.gdmis.data.entity.PackingManage;
import com.zbooksoft.gdmis.service.CatSwajxxService;
+import com.zbooksoft.gdmis.service.PackingManageService;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell;
@@ -49,6 +51,8 @@
ImportColumnService importColumnService;
@Autowired
CatSwajxxService catSwajxxService;
+ @Autowired
+ PackingManageService packingManageService;
// @Autowired
// CatSwzkxxService catSwzkxxService;
// @Autowired
@@ -89,7 +93,7 @@
return new AjaxResponse(true);
} catch (Exception e) {
logger.error(e.getMessage(), e);
- return new AjaxResponse(new ErrorInfo("瀵煎叆澶辫触"), false);
+ return new AjaxResponse(new ErrorInfo(e.getMessage()), false);
}
}
@@ -103,9 +107,9 @@
if (originalFilename.matches("^.+\\.(?i)(xls)$")) {
//鍒涘缓宸ヤ綔绨垮璞�
HSSFWorkbook hssfWorkbook = new HSSFWorkbook(inputStream);
- for (int i = 0; i < 2; i++) {
- readExcel2003(hssfWorkbook, i, importTemplateIds.get(i), map);
- }
+// for (int i = 0; i < 2; i++) {
+ readExcel2003(hssfWorkbook, 1, importTemplateIds.get(1), map);
+// }
}
if (originalFilename.matches("^.+\\.(?i)(xlsx)$")) {
//鍒涘缓宸ヤ綔绨垮璞�
@@ -143,15 +147,20 @@
excelColumns.add(cellValue.toString());
}
for (int j = 1; j <= maxRow; j++) {
+ Long id = 0l;
Row rowValue = sheet.getRow(j);
Map<String, Object> map = new HashMap();
if (sheetAt == 1) {
Cell cell = rowValue.getCell(dhIndex);
Object cellValue = getExcelValue(cell);
String sql = "select id from cat_file_ajjxx where dh='" + cellValue + "'";
- Long id = jdbcTemplate.queryForObject(sql, Long.class);
- map.put("AJ_ID", id);
- map.put("YSZT", 3);
+ List<Map<String, Object>> mapList = jdbcTemplate.queryForList(sql);
+ if (mapList.size() > 0) {
+ Map<String, Object> stringObjectMap = mapList.get(0);
+ String string = stringObjectMap.get("id").toString();
+ map.put("AJ_ID", string);
+ map.put("YSZT", 3);
+ }
map.put("AJ_DH", cellValue);
}
for (int z = 0; z < columnList.size(); z++) {
@@ -163,9 +172,30 @@
map.put(column.getColumnName(), cellValue);
}
}
- iform.insert(importTemplate.getTableId(), map);
+ Long insert = iform.insert(importTemplate.getTableId(), map);
+ if (sheetAt == 1) {
+ PackingManage packingManage = new PackingManage();
+ int columnIndex = excelColumns.indexOf("琚嬪嵎鍙�");
+ if (columnIndex >= 0) {
+ Cell cell = rowValue.getCell(columnIndex);
+ Object cellValue = getExcelValue(cell);
+ packingManage.setBoxNumber(cellValue == null ? "" : cellValue.toString());
+ }
+ int columnInde = excelColumns.indexOf("妗ｅ彿");
+ if (columnIndex >= 0) {
+ Cell cell = rowValue.getCell(columnInde);
+ Object cellValue = getExcelValue(cell);
+ String itemCode = cellValue == null ? "" : cellValue.toString();
+ String newBarCode = itemCode.replace("搴�", "D").replace("娴�", "C").replace("瑙�", "G").replace("鎺�", "T").replace("鏍�", "Y").replace("璇�", "S").replace("褰�", "L").replace("鍍�", "X").replace("缁�", "Z").replace("鏂�", "W").replace("瀹�", "S").replace("鐗�", "W").replace("閽�", "Z").replace("璁�", "S").replace("鐩�", "X").replace("娌�", "Y").replace("鐢�", "D").replace("鍦�", "D");
+ packingManage.setItemNum(newBarCode + "-" + packingManage.getBoxNumber());
+ }
+ packingManage.setItemId(insert == null ? "0" : insert.toString());
+ packingManage.setAjId(id == null ? "0" : id.toString());
+ packingManage.setType(0);
+ packingManage.setCreateTime(new java.util.Date());
+ packingManageService.saveOrUpdate(packingManage);
+ }
}
-
}
// Excel2007 xlsx
--
Gitblit v1.9.1