From d814bde01eb91d1544b718463cd31317726bbf6b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 27 十二月 2023 21:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java b/src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java
index c038160..bd2d524 100644
--- a/src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/EmptyPlateOutParam.java
@@ -19,6 +19,9 @@
// 瀹㈡埛id
private Integer ownerId;
+ //璐х墿褰㈡��
+ private Integer payment;
+
// 搴撲綅鍙烽泦鍚�
private List<String> locNos;
@@ -29,7 +32,7 @@
public static class LocDetl {
// 搴撲綅鍙�
- private String locNo;
+ private String loc_no;
// 鍟嗗搧缂栧彿
private String matnr;
@@ -41,7 +44,7 @@
private Double count;
// 璁㈠崟
- private String orderNo;
+ private String order_no;
// 缈诲寘
private String memo;
@@ -66,4 +69,13 @@
public void setLocNos(List<String> locNos) {
this.locNos = locNos;
}
+
+ public String getPayment$(Integer payment){
+ if (payment.equals(0)){
+ return "浠ｉ噰";
+ }else if (payment.equals(1)){
+ return "浠撳偍";
+ }
+ return payment.toString();
+ }
}
--
Gitblit v1.9.1