From 0401f1e6323ebb34f13f446713cb35082b14a0cd Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期一, 29 七月 2024 12:51:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs
---
src/main/java/com/zy/asrs/entity/CombBillQueryVo.java | 2 ++
src/main/java/com/zy/asrs/controller/MobileController.java | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 2960a75..e3c19d1 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -434,7 +434,7 @@
if (!Cools.isEmpty(waitMatins)) {
for (OrderDetl waitMatin : waitMatins) {
CombBillQueryVo vo = new CombBillQueryVo();
- vo.setMatNo(waitMatin.getMatnr());
+ vo.setMatnr(waitMatin.getMatnr());
vo.setMatName(waitMatin.getMaktx());
vo.setQty(waitMatin.getAnfme());
vo.setCount(waitMatin.getAnfme() - waitMatin.getWorkQty());
diff --git a/src/main/java/com/zy/asrs/entity/CombBillQueryVo.java b/src/main/java/com/zy/asrs/entity/CombBillQueryVo.java
index c6a32d2..c044a38 100644
--- a/src/main/java/com/zy/asrs/entity/CombBillQueryVo.java
+++ b/src/main/java/com/zy/asrs/entity/CombBillQueryVo.java
@@ -14,6 +14,8 @@
private String matNo;
+ private String matnr;
+
private String matName;
private String specs;
--
Gitblit v1.9.1