From 7215f3607ef81440be5f38cfeda4f11682ab1fe2 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 12 一月 2026 12:45:34 +0800
Subject: [PATCH] 出入库流程功能优化
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 2 +-
src/main/webapp/static/js/orderPakout/out.js | 2 +-
src/main/java/com/zy/asrs/utils/OrderExcelListener.java | 5 +++--
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 4 ++++
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 8f25411..ddf62af 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -211,7 +211,7 @@
* 浣撶Н
*/
@ApiModelProperty(value= "浣撶Н")
- @ExcelProperty(value = "km/cm")
+ @ExcelProperty(value = "kg/cm")
private Double volume;
/**
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 7d19bc6..6729460 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -134,6 +134,7 @@
orderDetl.setAnfme(orderDetl.getAnfme() + detail.getAnfme());
} else {
list.add(dto);
+
orderDetlList.add(detail);
}
}
@@ -168,7 +169,10 @@
}
waitPakin.setOrderId(pakinOrder.getId());
waitPakin.setAnfme(orderDetl.getAnfme());
+ waitPakin.setUnit(orderDetl.getUnit());
waitPakin.setOrderNo(pakinOrder.getOrderNo());
+ waitPakin.setVolume(orderDetl.getVolume());
+ waitPakin.setSafeQty(orderDetl.getSafeQty());
waitPakin.setIoStatus("N");
waitPakin.setStatus("Y");
waitPakin.setAppeTime(new Date());
diff --git a/src/main/java/com/zy/asrs/utils/OrderExcelListener.java b/src/main/java/com/zy/asrs/utils/OrderExcelListener.java
index 64e184f..4a05dd6 100644
--- a/src/main/java/com/zy/asrs/utils/OrderExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/OrderExcelListener.java
@@ -102,9 +102,10 @@
detl.setMatnr(data.getMatnr());
detl.setMaktx(mat.getMaktx());
detl.setQty(data.getQty());
- detl.setBatch(data.getBatch());
+ detl.setSpecs(data.getSpecs());
+ detl.setBatch(Objects.isNull(data.getBatch()) ? "1" : data.getBatch());
detl.setVolume(data.getVolume());
- detl.setSafeQty(mat.getSafeQty());
+ detl.setSafeQty(data.getSafeQty());
detl.setAnfme(data.getAnfme());
detl.setBarcode(data.getBarcode());
detl.setUpdateTime(now);
diff --git a/src/main/webapp/static/js/orderPakout/out.js b/src/main/webapp/static/js/orderPakout/out.js
index 70132ee..4f8b535 100644
--- a/src/main/webapp/static/js/orderPakout/out.js
+++ b/src/main/webapp/static/js/orderPakout/out.js
@@ -41,7 +41,7 @@
, {field: 'enableQty', align: 'center', title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
// ,{field: 'name', align: 'center',title: '鍚嶇О'}
// ,{field: 'model', align: 'center',title: '鍨嬪彿'}
- , {field: 'unit', align: 'center', title: '鍗曚綅', hide: true}
+ , {field: 'unit', align: 'center', title: '鍗曚綅'}
, {field: 'barcode', align: 'center', title: '鍟嗗搧鏉＄爜', hide: true}
// ,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
// ,{field: 'unitPrice', align: 'center',title: '鍗曚环'}
--
Gitblit v1.9.1