From 49905f42fe0b97911b988304ba83a8c0bf098509 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 27 一月 2024 08:30:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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..a954e2d 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -395,16 +395,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);
@@ -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