From 08b4403ec8d6b69528d161cfcad80b5d64dea76c Mon Sep 17 00:00:00 2001
From: Administrator <876263681@qq.com>
Date: 星期三, 02 七月 2025 15:12:43 +0800
Subject: [PATCH] #优化库位检索
---
src/main/java/com/zy/asrs/controller/OrderController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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..778663d 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -391,20 +391,22 @@
Row row = sheet.getRow(i);
// 璁㈠崟缂栧彿
String uuid = dataFormatter.formatCellValue(row.getCell(0));
- // 鍟嗗搧鍚嶇О
+ // 鍝佸悕
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);
@@ -418,7 +420,7 @@
Mat mat = matService.selectByMatnr(matnr);
if (null == mat) {
- throw new CoolException(matnr + "鍟嗗搧缂栫爜鐨勫晢鍝佷笉瀛樺湪锛岃閲嶆柊瀵煎叆锛�");
+ throw new CoolException(matnr + "鍝佸彿鐨勫晢鍝佷笉瀛樺湪锛岃閲嶆柊瀵煎叆锛�");
}
Order order = orderService.selectByNo(uuid);
@@ -468,7 +470,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());
--
Gitblit v1.9.1