From c9b270dae703ee077a4e41013d7662c5e61afd29 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 26 五月 2025 23:02:15 +0800
Subject: [PATCH] #ZH
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 233 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 205 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 0000091..64f7e78 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -30,7 +30,7 @@
@ApiModelProperty(value= "宸ヤ綔鍙�")
@TableId(value = "wrk_no", type = IdType.INPUT)
@TableField("wrk_no")
- private Integer wrkNo;
+ private Long wrkNo;
@ApiModelProperty(value= "")
@TableField("inv_wh")
@@ -74,6 +74,9 @@
@TableField("rgv_no")
private Integer rgvNo;
+ /**
+ * 寰愬伐姹変簯鎷嗗灈鏍囪 0: 鍒濆 1銆佹湭鎷嗗凡涓婃姤 2: 宸叉媶 3:宸插鐞嗗彲涓嬩竴姝ワ紙杞巻鍙叉。锛�
+ */
@ApiModelProperty(value= "")
@TableField("sheet_no")
private String sheetNo;
@@ -329,6 +332,13 @@
@TableField("full_plt")
private String fullPlt;
+ /**
+ * 浼寸敓宸ヤ綔鍙�
+ */
+ @ApiModelProperty(value= "浼寸敓宸ヤ綔鍙�")
+ @TableField("work_no_other")
+ private Integer workNoOther;
+
public String getWrkSts$(){
BasWrkStatusMapper mapper = SpringUtils.getBean(BasWrkStatusMapper.class);
BasWrkStatus entity = mapper.selectById(this.wrkSts);
@@ -354,29 +364,11 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ymd);
}
- public String getCrnNo$(){
- BasCrnpService service = SpringUtils.getBean(BasCrnpService.class);
- BasCrnp basCrnp = service.selectById(this.crnNo);
- if (!Cools.isEmpty(basCrnp)){
- return String.valueOf(basCrnp.getCrnNo());
- }
- return null;
- }
-
public String getWrkDate$(){
if (Cools.isEmpty(this.wrkDate)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.wrkDate);
- }
-
- public String getLocNo$(){
- LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.selectById(this.locNo);
- if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
- }
- return null;
}
public String getStaNo$(){
@@ -393,15 +385,6 @@
BasDevp basDevp = service.selectById(this.sourceStaNo);
if (!Cools.isEmpty(basDevp)){
return String.valueOf(basDevp.getDevNo());
- }
- return null;
- }
-
- public String getSourceLocNo$(){
- LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.selectById(this.sourceLocNo);
- if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
}
return null;
}
@@ -505,4 +488,198 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
}
+ public Integer getIoTypeMes$(){
+ if (this.ioType != 101){
+ return 3;
+ } else {
+ return 1;
+ }
+ }
+
+ public Integer getStaNoCs(int[] autoZ){
+ switch (staNo){
+ case 114:
+ case 115:
+ case 116:
+ case 117:
+ case 118:
+ return 102;
+ case 120:
+ case 121:
+ case 122:
+ return 104;
+ case 124:
+ case 125:
+ case 126:
+ return 106;
+ case 128:
+ case 129:
+ case 130:
+ return 108;
+ case 133:
+ return 111;
+ case 102:
+ switch (autoZ[0]){
+ case 0:
+ autoZ[0]++;
+ return 114;
+ case 1:
+ autoZ[0]++;
+ return 115;
+ case 2:
+ autoZ[0]++;
+ return 116;
+ case 3:
+ autoZ[0]++;
+ return 117;
+ default:
+ autoZ[0] = 0;
+ return 118;//117
+ }
+ case 104:
+ switch (autoZ[1]){
+ case 0:
+ autoZ[1]++;
+ return 120;
+ case 1:
+ autoZ[1]++;
+ return 121;
+ default:
+ autoZ[1] = 0;
+ return 122;//121
+ }
+ case 106:
+ switch (autoZ[2]){
+ case 0:
+ autoZ[2]++;
+ return 124;
+ case 1:
+ autoZ[2]++;
+ return 125;
+ default:
+ autoZ[2] = 0;
+ return 126;//125
+ }
+ case 108:
+ switch (autoZ[3]){
+ case 0:
+ autoZ[3]++;
+ return 128;
+ case 1:
+ autoZ[3]++;
+ return 129;
+ default:
+ autoZ[3] = 0;
+ return 130;
+ }
+ case 111:
+ return 133;
+ }
+ return 0;
+ }
+ public Integer getStaNoCs(){
+ switch (staNo){
+ case 114:
+ return 102;
+ case 120:
+ return 104;
+ case 124:
+ return 106;
+ case 128:
+ return 108;
+ case 133:
+ return 111;
+ case 102:
+ return 114;
+ case 104:
+ return 120;
+ case 106:
+ return 124;
+ case 108:
+ return 128;
+ case 111:
+ return 133;
+ }
+ return 0;
+ }
+
+ public Integer getSourceNoCs(int[] autoZ){
+ switch (sourceStaNo){
+ case 101:
+ switch (autoZ[4]){
+ case 0:
+ autoZ[4]++;
+ return 112;
+ default:
+ autoZ[4] = 0;
+ return 113;
+ }
+ case 103:
+ return 119;
+ case 105:
+ return 123;
+ case 107:
+ return 127;
+ case 109:
+ case 110:
+ case 111:
+ switch (autoZ[5]){
+ case 0:
+ autoZ[5]++;
+ return 131;
+ default:
+ autoZ[5] = 0;
+ return 132;
+ }
+ case 112:
+ case 113:
+ return 101;
+ case 119:
+ return 103;
+ case 123:
+ return 105;
+ case 127:
+ return 107;
+ case 131:
+ case 132:
+ switch (autoZ[6]){
+ case 0:
+ autoZ[6]++;
+ return 109;
+ case 1:
+ autoZ[6]++;
+ return 110;
+ default:
+ autoZ[6] = 0;
+ return 111;
+ }
+ }
+ return 0;
+ }
+ public Integer getSourceNoCs(){
+ switch (sourceStaNo){
+ case 101:
+ return 112;
+ case 103:
+ return 119;
+ case 105:
+ return 123;
+ case 107:
+ return 127;
+ case 109:
+ return 131;
+ case 112:
+ return 101;
+ case 119:
+ return 103;
+ case 123:
+ return 105;
+ case 127:
+ return 107;
+ case 131:
+ return 109;
+ }
+ return 0;
+ }
+
}
--
Gitblit v1.9.1