From 2b152a1539268209e3f9b379e19ecd287eec6f6f Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 18 十二月 2024 08:38:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 6 +++---
src/main/java/com/zy/asrs/entity/OrderDetlPakout.java | 7 ++++---
src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 6 +++---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 7 ++++---
src/main/java/com/zy/asrs/entity/WaitPakin.java | 6 +++---
src/main/java/com/zy/asrs/entity/LocDetl.java | 6 +++---
src/main/java/com/zy/asrs/entity/WrkDetl.java | 6 +++---
src/main/java/com/zy/asrs/entity/OrderDetlPakin.java | 6 +++---
8 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index da9a941..4c47234 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -169,19 +169,19 @@
* 澶囩敤1
*/
@ApiModelProperty(value= "澶囩敤1")
- private Integer standby1;
+ private String standby1;
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
- private Integer standby2;
+ private String standby2;
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
- private Integer standby3;
+ private String standby3;
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 2fa2301..e8c1229 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -314,19 +314,19 @@
* 澶囩敤1
*/
@ApiModelProperty(value= "澶囩敤1")
- private Integer standby1;
+ private String standby1;
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
- private Integer standby2;
+ private String standby2;
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
- private Integer standby3;
+ private String standby3;
public OrderDetl() {}
@@ -541,6 +541,7 @@
}
public String getPakinPakoutStatus$(){
+ if (Cools.isEmpty(this.pakinPakoutStatus)) return null;
switch (this.pakinPakoutStatus){
case 1:
return "Y";
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
index ee91692..145ce2b 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
@@ -314,19 +314,19 @@
* 澶囩敤1
*/
@ApiModelProperty(value= "澶囩敤1")
- private Integer standby1;
+ private String standby1;
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
- private Integer standby2;
+ private String standby2;
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
- private Integer standby3;
+ private String standby3;
public OrderDetlPakin() {}
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
index c91c3ab..3149f50 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
@@ -314,19 +314,19 @@
* 澶囩敤1
*/
@ApiModelProperty(value= "澶囩敤1")
- private Integer standby1;
+ private String standby1;
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
- private Integer standby2;
+ private String standby2;
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
- private Integer standby3;
+ private String standby3;
public OrderDetlPakout() {}
@@ -453,6 +453,7 @@
}
public String getPakinPakoutStatus$(){
+ if (Cools.isEmpty(this.pakinPakoutStatus)) return null;
switch (this.pakinPakoutStatus){
case 1:
return "Y";
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index ebe00f9..799833a 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -156,19 +156,19 @@
* 澶囩敤1
*/
@ApiModelProperty(value= "澶囩敤1")
- private Integer standby1;
+ private String standby1;
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
- private Integer standby2;
+ private String standby2;
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
- private Integer standby3;
+ private String standby3;
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index dc9a3c9..fb23045 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -155,19 +155,19 @@
* 澶囩敤1
*/
@ApiModelProperty(value= "澶囩敤1")
- private Integer standby1;
+ private String standby1;
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
- private Integer standby2;
+ private String standby2;
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
- private Integer standby3;
+ private String standby3;
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index e46c57a..eff9557 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -274,19 +274,19 @@
* 澶囩敤1
*/
@ApiModelProperty(value= "澶囩敤1")
- private Integer standby1;
+ private String standby1;
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
- private Integer standby2;
+ private String standby2;
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
- private Integer standby3;
+ private String standby3;
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index a6cc5fc..635c2e0 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -273,19 +273,19 @@
* 澶囩敤1
*/
@ApiModelProperty(value= "澶囩敤1")
- private Integer standby1;
+ private String standby1;
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
- private Integer standby2;
+ private String standby2;
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
- private Integer standby3;
+ private String standby3;
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
--
Gitblit v1.9.1