From 332420e29973a6768c50558df5775554882f6be7 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 11 七月 2024 18:55:35 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java
index cf9ebf8..26f4914 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java
@@ -59,12 +59,6 @@
private Integer ioType;
/**
- * 鍫嗗灈鏈�
- */
- @ApiModelProperty(value= "鍫嗗灈鏈�")
- private Integer crnNo;
-
- /**
* 浼樺厛绾�
*/
@ApiModelProperty(value= "浼樺厛绾�")
@@ -185,14 +179,27 @@
@ApiModelProperty(value= "鎺堟潈鍟嗘埛")
private Long hostId;
+ @ApiModelProperty(value= "oveMk")
+ private String oveMk;
+
+ @ApiModelProperty(value= "invWh")
+ private String invWh;
+
+ @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
+ private Integer crnNo;
+
+ @ApiModelProperty(value= "鎷嶇収鍥剧墖")
+ private String pic;
+ @ApiModelProperty(value= "璐т富")
+ private Integer owner;
+
public WrkMastLog() {}
- public WrkMastLog(Long id,Integer wrkNo,Long wrkSts,Integer ioType,Integer crnNo,Double ioPri,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String picking,String exitMk,Integer pltType,String emptyMk,Date ioTime,Integer ctnType,String modiUser,Date modiTime,String appeUser,Date appeTime,Date errorTime,String errorMemo,String manuType,String memo,String barcode,String fullPlt,Long hostId) {
+ public WrkMastLog(Long id,Integer wrkNo,Long wrkSts,Integer ioType,Double ioPri,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String picking,String exitMk,Integer pltType,String emptyMk,Date ioTime,Integer ctnType,String modiUser,Date modiTime,String appeUser,Date appeTime,Date errorTime,String errorMemo,String manuType,String memo,String barcode,String fullPlt,Long hostId,Integer owner) {
this.id = id;
this.wrkNo = wrkNo;
this.wrkSts = wrkSts;
this.ioType = ioType;
- this.crnNo = crnNo;
this.ioPri = ioPri;
this.locNo = locNo;
this.staNo = staNo;
@@ -215,6 +222,7 @@
this.barcode = barcode;
this.fullPlt = fullPlt;
this.hostId = hostId;
+ this.owner = owner;
}
// WrkMastLog wrkMastLog = new WrkMastLog(
@@ -246,7 +254,17 @@
// null, // 婊℃澘(checkBox)
// null // 鎺堟潈鍟嗘埛
// );
-
+ public String getOwner$(){
+ if (null == this.owner){ return null; }
+ switch (this.owner){
+ case 1:
+ return "瀹佹尝";
+ case 2:
+ return "鏂版槍";
+ default:
+ return String.valueOf(this.owner);
+ }
+ }
public String getWrkSts$(){
BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
BasWrkStatus basWrkStatus = service.getById(this.wrkSts);
--
Gitblit v1.9.1