From f532f32fc3769679c3c33c7b0e91c4e33530bf92 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 30 十月 2024 13:56:18 +0800
Subject: [PATCH] #摄像头pic存储增加locNo
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java
index 02b460e..1f624ac 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java
@@ -168,11 +168,11 @@
private String pic;
@ApiModelProperty(value= "璐т富")
- private Integer owner;
+ private String owner;
public LocMast() {}
- public LocMast(String locNo,Long whsType,String locSts,Integer crnNo,Integer row1,Integer bay1,Integer lev1,String fullPlt,Short locType1,Short locType2,Short locType3,Date ioTime,Date firstTime,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Date errorTime,String errorMemo,String mk,String barcode,String memo,Long hostId, Integer owner) {
+ public LocMast(String locNo,Long whsType,String locSts,Integer crnNo,Integer row1,Integer bay1,Integer lev1,String fullPlt,Short locType1,Short locType2,Short locType3,Date ioTime,Date firstTime,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Date errorTime,String errorMemo,String mk,String barcode,String memo,Long hostId, String owner) {
this.locNo = locNo;
this.whsType = whsType;
this.locSts = locSts;
@@ -226,25 +226,16 @@
// );
public String getWhsType$(){
- BasWhsService service = SpringUtils.getBean(BasWhsService.class);
- BasWhs basWhs = service.getById(this.whsType);
- if (!Cools.isEmpty(basWhs)){
- return String.valueOf(basWhs.getWhsDesc());
+ if (Cools.isEmpty(this.whsType)) return "鏈煡";
+ switch (this.whsType.intValue()){
+ case 0:
+ return "绔嬩綋浠撳簱";
+ case 1:
+ return "骞抽潰浠撳簱";
}
- return null;
+ return "鏈煡";
}
- 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 getLocSts$(){
BasLocStsService service = SpringUtils.getBean(BasLocStsService.class);
--
Gitblit v1.9.1