From e9e62abb618d334d6999102ec20c49d38df587e6 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期三, 15 十月 2025 13:10:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 167 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 155 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index e5bea1a..ecc99d3 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -149,7 +149,8 @@
now, // 娣诲姞鏃堕棿
getUserId(), // 淇敼浜哄憳
now, // 淇敼鏃堕棿
- null // 澶囨敞
+ null, // 澶囨敞
+ null
);
if (!orderService.insert(order)) {
throw new CoolException("淇濆瓨璁㈠崟涓绘。澶辫触");
@@ -159,9 +160,9 @@
if (orderDetl.getBatch() == null) {
orderDetl.setBatch("");
}
- DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
- if (DetlDto.has(list, dto)) {
- OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
+ DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBomCode(),orderDetl.getThreeCode());
+ if (DetlDto.has2(list, dto)) {
+ OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBomCode(),orderDetl.getThreeCode());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
@@ -175,6 +176,7 @@
orderDetl.setUpdateBy(getUserId());
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
+ orderDetl.setSource(param.getDocType().intValue());
orderDetl.setQty(0.0D);
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
@@ -212,9 +214,9 @@
// 2.閲嶇粍鏁版嵁
List<DetlDto> list = new ArrayList<>();
for (OrderDetl orderDetl : param.getOrderDetlList()) {
- DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
- if (DetlDto.has(list, dto)) {
- OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
+ DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBomCode(),orderDetl.getThreeCode());
+ if (DetlDto.has2(list, dto)) {
+ OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBomCode(),orderDetl.getThreeCode());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
@@ -228,6 +230,7 @@
orderDetl.setUpdateBy(getUserId());
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
+ orderDetl.setSource(param.getDocType().intValue());
orderDetl.setQty(0.0D);
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
@@ -395,16 +398,18 @@
String maktx = dataFormatter.formatCellValue(row.getCell(1));
// 鍟嗗搧缂栫爜
String matnr = dataFormatter.formatCellValue(row.getCell(2));
+ // 鍟嗗搧缂栫爜
+ String batch = dataFormatter.formatCellValue(row.getCell(3));
// 鏁伴噺
- Double anfme = Double.parseDouble(dataFormatter.formatCellValue(row.getCell(3)));
+ Double anfme = Double.parseDouble(dataFormatter.formatCellValue(row.getCell(4)));
// 涓嬪崟鏃堕棿
- String timeStr = dataFormatter.formatCellValue(row.getCell(4));
+ String timeStr = dataFormatter.formatCellValue(row.getCell(5));
if (Cools.isEmpty(timeStr)) {
timeStr = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(now);
}
// 鍗曟嵁绫诲瀷
- Long orderType = Long.parseLong(dataFormatter.formatCellValue(row.getCell(5)));
+ Long orderType = Long.parseLong(dataFormatter.formatCellValue(row.getCell(6)));
Date time = null;
try {
time = DateUtils.convert(timeStr, DateUtils.yyyyMMddHHmmss_F);
@@ -457,7 +462,8 @@
now, // 娣诲姞鏃堕棿
userId, // 淇敼浜哄憳
now, // 淇敼鏃堕棿
- null // 澶囨敞
+ null, // 澶囨敞
+ null
);
if (!orderService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃閲嶆柊瀵煎叆锛�");
@@ -468,7 +474,7 @@
if (orderDetl == null) {
orderDetl = new OrderDetl();
orderDetl.sync(mat);
- orderDetl.setBatch(null);
+ orderDetl.setBatch(batch);
orderDetl.setAnfme(anfme);
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
@@ -490,4 +496,141 @@
return R.ok("瀵煎叆鎴愬姛");
}
+ /**
+ * excel瀵煎叆
+ */
+ @PostMapping(value = "/order/excel/import2/auth")
+ @ManagerAuth(memo = "閿�鍞崟Excel瀵煎叆")
+ @Transactional
+ public R cstmrExcelImport2(MultipartFile file) throws IOException {
+ InputStream inStream = file.getInputStream();
+ String fileMime = file.getContentType();
+ int excelVersion = 2007;
+ if ("application/vnd.ms-excel".equals(fileMime)) {
+ excelVersion = 2003;
+ }
+ Workbook book = null;
+ try {
+ if (excelVersion == 2003) {
+ book = new HSSFWorkbook(inStream);
+ }
+ else { // 褰� excel 鏄� 2007 鏃�
+ book = new XSSFWorkbook(inStream);
+ }
+ } catch (Exception e) {
+ log.error("fail", e);
+ return R.error("瀵煎叆鏂囦欢鏍煎紡閿欒锛岃浣跨敤xls鍚庣紑鐨勬枃浠讹紒");
+ }
+
+ Sheet sheet = book.getSheetAt(0);
+ int totalRows = sheet.getLastRowNum() + 1; // 鎬�
+ Long userId = getUserId();
+ Date now = new Date();
+ DataFormatter dataFormatter = new DataFormatter();
+ for (int i = 1; i < totalRows; i++) {
+ Row row = sheet.getRow(i);
+ // 鍗曟嵁缂栧彿
+ String uuid = dataFormatter.formatCellValue(row.getCell(0));
+ // 閿�鍞崟鍙�
+ String threeCode = dataFormatter.formatCellValue(row.getCell(1));
+ // 閮ㄤ欢鍙�
+ String unitNum = dataFormatter.formatCellValue(row.getCell(2));
+ // 缁勪欢鍙�
+ String bomNum = dataFormatter.formatCellValue(row.getCell(3));
+ // 鎵瑰彿
+ String batch = dataFormatter.formatCellValue(row.getCell(4));
+ // 鍟嗗搧缂栫爜
+ String matnr = dataFormatter.formatCellValue(row.getCell(6));
+ // 鏁伴噺
+ Double anfme = Double.parseDouble(dataFormatter.formatCellValue(row.getCell(7)));
+ // 鍗曟嵁绫诲瀷
+ Long orderType = Long.parseLong(dataFormatter.formatCellValue(row.getCell(8)));
+ // 涓嬪崟鏃堕棿
+ String timeStr = dataFormatter.formatCellValue(row.getCell(9));
+
+ Date time = null;
+ try {
+ time = DateUtils.convert(timeStr, DateUtils.yyyyMMddHHmmss_F);
+ } catch (Exception e) {
+ throw new CoolException("绗�" + i + "琛屼笅鐨勯偅鏃堕棿瑙ｆ瀽澶辫触锛岃閲嶆柊瀵煎叆锛�");
+ }
+
+ Mat mat = matService.selectByMatnr(matnr);
+ if (null == mat) {
+ throw new CoolException(matnr + "鍟嗗搧缂栫爜鐨勫晢鍝佷笉瀛樺湪锛岃閲嶆柊瀵煎叆锛�");
+ }
+
+ Order order = orderService.selectByNo(uuid);
+ if (null == order) {
+ order = new Order(
+ String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ uuid, // 璁㈠崟缂栧彿
+ timeStr, // 鍗曟嵁鏃ユ湡
+ orderType, // 鍗曟嵁绫诲瀷
+ null, // 椤圭洰缂栧彿
+ null, //
+ null, // 璋冩嫧椤圭洰缂栧彿
+ null, // 鍒濆绁ㄦ嵁鍙�
+ null, // 绁ㄦ嵁鍙�
+ null, // 瀹㈡埛缂栧彿
+ null, // 瀹㈡埛
+ null, // 鑱旂郴鏂瑰紡
+ null, // 鎿嶄綔浜哄憳
+ null, // 鍚堣閲戦
+ null, // 浼樻儬鐜�
+ null, // 浼樻儬閲戦
+ null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+ null, // 瀹炰粯閲戦
+ null, // 浠樻绫诲瀷
+ null, // 涓氬姟鍛�
+ null, // 缁撶畻澶╂暟
+ null, // 閭垂鏀粯绫诲瀷
+ null, // 閭垂
+ null, // 浠樻鏃堕棿
+ null, // 鍙戣揣鏃堕棿
+ null, // 鐗╂祦鍚嶇О
+ null, // 鐗╂祦鍗曞彿
+ 1L, // 璁㈠崟鐘舵��
+ 1, // 鐘舵��
+ userId, // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ userId, // 淇敼浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 澶囨敞
+ threeCode
+ );
+ if (!orderService.insert(order)) {
+ throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃閲嶆柊瀵煎叆锛�");
+ }
+ }
+
+ OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), matnr, batch,bomNum,threeCode);
+ if (orderDetl == null) {
+ orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ orderDetl.setBatch(batch);
+ orderDetl.setAnfme(anfme);
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setCreateBy(userId);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(userId);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setSource(30);
+ orderDetl.setStatus(1);
+ orderDetl.setBomCode(bomNum);
+ orderDetl.setThreeCode(threeCode);
+ orderDetl.setQty(0.0D);
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃閲嶆柊瀵煎叆锛�");
+ }
+ } else {
+ if(!orderDetlService.increaseAnfme2(order.getId(), matnr, batch, anfme,bomNum,threeCode)) {
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃閲嶆柊瀵煎叆锛�");
+ }
+ }
+ }
+ return R.ok("瀵煎叆鎴愬姛");
+ }
+
}
--
Gitblit v1.9.1