From ebf0db91e09be33fcbfe97ed5b91965dc2e61dfd Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 01 八月 2024 10:54:26 +0800
Subject: [PATCH] 1. 托盘管理 2. 入库通知档导入功能 3. 工作档明细 新增来源单据类型及单据编号 4. 库存明细统计表 增加一栏ERP数量（需跟ERP确认接口实现方式）。 5. 存货档案、单据管理、库存管理可以支持模糊搜索（各个单据界面）。
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java | 15 ++-------------
1 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java
index 14ae9ee..a9cf142 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java
@@ -193,11 +193,11 @@
private String pic;
@ApiModelProperty(value= "璐т富")
- private Integer owner;
+ private String owner;
public WrkMast() {}
- public WrkMast(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 oveMk, String invWh, Integer crnNo,Integer owner) {
+ public WrkMast(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 oveMk, String invWh, Integer crnNo,String owner) {
this.wrkNo = wrkNo;
this.wrkSts = wrkSts;
this.ioType = ioType;
@@ -258,17 +258,6 @@
// 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);
--
Gitblit v1.9.1