From a3776853fa6ff1c4a9805615a79852d54f700e3f Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 20 七月 2024 09:21:04 +0800
Subject: [PATCH] 增加库位明细导出功能，曾加物料、单据、库存全局搜索功能
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 f328b2b..0ddea3a 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
@@ -179,9 +179,23 @@
@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 String owner;
+
public WrkMastLog() {}
- 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) {
+ 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,String owner) {
this.id = id;
this.wrkNo = wrkNo;
this.wrkSts = wrkSts;
@@ -208,6 +222,7 @@
this.barcode = barcode;
this.fullPlt = fullPlt;
this.hostId = hostId;
+ this.owner = owner;
}
// WrkMastLog wrkMastLog = new WrkMastLog(
@@ -239,7 +254,6 @@
// null, // 婊℃澘(checkBox)
// null // 鎺堟潈鍟嗘埛
// );
-
public String getWrkSts$(){
BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
BasWrkStatus basWrkStatus = service.getById(this.wrkSts);
--
Gitblit v1.9.1