From 4149d11f06c462eed17c0b26094f35547aad58cd Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 28 十一月 2024 22:52:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WrkMastExecute.java | 71 +++++++++++++++++++++++++++++++----
1 files changed, 62 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastExecute.java b/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
index 246e53b..b71ecda 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
@@ -102,6 +102,13 @@
private Integer rgvId;
/**
+ * RGV
+ */
+ @ApiModelProperty(value= "RGV")
+ @TableField("rgv_end_id")
+ private Integer rgvEndId;
+
+ /**
* 浣滀笟鏃堕棿
*/
@ApiModelProperty(value= "浣滀笟鏃堕棿")
@@ -134,22 +141,31 @@
/**
* 宸ヤ綔鐘舵��
+ * 0:鍒濆 wrk_sts
+ * 1锛歊GV灏忚溅閬胯銆�2锛氶伩璁╁畬鎴愩��3锛氬紑闂ㄤ腑銆�4锛氬紑闂ㄥ畬鎴愩��5锛氭洿鏂板畬鎴� //io_type = 1銆�3
+ * 1锛歊GV灏忚溅閬胯銆�2锛氶伩璁╁畬鎴愩��3锛氬叧闂ㄤ腑銆�4锛氬叧闂ㄥ畬鎴愩��5锛氭洿鏂板畬鎴� //io_type = 2銆�4
+ * 1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歳gv鍙栬揣銆�4锛歳gv鍙栬揣瀹屾垚銆�5锛歋te绌挎鐗堝叆纭寲缃愩��6锛氬叆缃愬畬鎴愩��7锛氭洿鏂板畬鎴� //io_type = 5 STE A闈㈢┛姊溅
+ * 1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堝彇璐с��4锛氬彇璐у畬鎴愮瓑寰呬笅涓�姝ャ��5锛歋te绌挎鐗堟斁璐ц嚦鍐峰嵈姹犮��6锛氭斁璐у畬鎴愩��7锛氭洿鏂板畬鎴� //io_type = 6 STE B闈㈢┛姊溅
+ * 1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堢Щ鍔ㄤ腑銆�4锛氱Щ鍔ㄥ畬鎴愩��5锛氭洿鏂板畬鎴� //io_type = 7 B=>C 銆�8 C=>B
+ * 1锛歋te绌挎鐗堝彇鏀捐揣涓��2锛氭斁璐у畬鎴愮瓑寰呬笅涓�姝ャ��3锛氳緭閫佺嚎浠诲姟涓嬪彂瀹屾垚銆�4锛氭洿鏂板畬鎴� //io_type = 9 STE 鏈杈撻�佺嚎
+ * 1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堢Щ鍔ㄤ腑銆�4锛氱Щ鍔ㄥ畬鎴愩��5锛氭洿鏂板畬鎴� //io_type = 10銆�11
+ * 1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堢Щ鍔ㄤ腑銆�4锛氱Щ鍔ㄥ畬鎴愩��5锛氭洿鏂板畬鎴� //io_type = 10銆�11
*/
@ApiModelProperty(value= "宸ヤ綔鐘舵��")
@TableField("wrk_sts")
private Integer wrkSts;
/**
- * 浠诲姟绫诲瀷 0: 鏈煡 1: 寮�闂� 2: 鍏抽棬 3: 鍏ョ～鍖栫綈 4: 鍏ュ喎鍗存Ы 5: 绌挎杞﹁繘鍐峰嵈妲� 6: 绌挎杞︾寮�鍐峰嵈妲� 7: 鍑哄喎鍗存Ы
+ * 浠诲姟绫诲瀷 0: 鏈煡 1: 寮�杩涙枡闂� 2: 鍏宠繘鏂欓棬 3: 寮�鍑烘枡闂� 4: 鍏冲嚭鏂欓棬 5: 鍏ョ～鍖栫綈 6: 鍏ュ喎鍗存Ы 7: 绌挎杞﹁繘鍐峰嵈妲� B=>C 8: 绌挎杞︾寮�鍐峰嵈妲� C=>B 9: 鍑哄喎鍗存Ы 10锛欰=>B 11:B=>A
*/
- @ApiModelProperty(value= "浠诲姟绫诲瀷 0: 鏈煡 1: 寮�闂� 2: 鍏抽棬 3: 鍏ョ～鍖栫綈 4: 鍏ュ喎鍗存Ы 5: 绌挎杞﹁繘鍐峰嵈妲� 6: 绌挎杞︾寮�鍐峰嵈妲� 7: 鍑哄喎鍗存Ы ")
+ @ApiModelProperty(value= "浠诲姟绫诲瀷 0: 鏈煡 1: 寮�杩涙枡闂� 2: 鍏宠繘鏂欓棬 3: 寮�鍑烘枡闂� 4: 鍏冲嚭鏂欓棬 5: 鍏ョ～鍖栫綈 6: 鍏ュ喎鍗存Ы 7: 绌挎杞﹁繘鍐峰嵈妲� 8: 绌挎杞︾寮�鍐峰嵈妲� 9: 鍑哄喎鍗存Ы 10锛欰=>B 11:B=>A ")
@TableField("io_type")
private Integer ioType;
/**
* 璁惧 0: 鏈煡 1: 纭寲缃� 2: 鍐峰嵈妲�
*/
- @ApiModelProperty(value= "璁惧 0: 鏈煡 1: 纭寲缃� 2: 鍐峰嵈妲� ")
+ @ApiModelProperty(value= "璁惧 0: 鏈煡 1: 纭寲缃� 2: 鍐峰嵈妲� 3: 纭寲缃�==>鍐峰嵈妲� ")
private Integer type;
public WrkMastExecute() {}
@@ -173,6 +189,28 @@
this.ioType = ioType;
this.type = type;
}
+
+ public WrkMastExecute(BasJarMast basJarMast) {
+ Date now = new Date();
+ this.wrkNo = basJarMast.getWrkNo();
+ this.enterStaNo = basJarMast.getEnterStaNo(); //鍏ュ簱婧愮珯鐐�
+ this.outStaNo = basJarMast.getOutStaNo(); //鍏ュ簱鐩爣绔欑偣
+ this.jarEnterStaNo = basJarMast.getJarEnterStaNo(); //鍏ョ～鍖栫綈绔欑偣
+ this.jarOutStaNo = basJarMast.getJarOutStaNo(); //鍑虹～鍖栫綈绔欑偣
+// this.jarId = jarId;
+ this.jarRegin = basJarMast.getJarRegin();//鍖哄煙
+ this.status = 0;
+// this.steId = steId;
+// this.rgvId = rgvId;
+ this.ioTime = basJarMast.getIoTime();
+ this.modiTime = now;
+ this.appeTime = now;
+ this.wrkType = 0;
+ this.wrkSts = 0;
+// this.ioType = ioType;
+// this.type = type;
+ }
+
// WrkMastExecute wrkMastExecute = new WrkMastExecute(
// null, // 宸ヤ綔鍙穂闈炵┖]
@@ -238,25 +276,36 @@
return null;
}
+ /**
+ * 浠诲姟绫诲瀷 0: 鏈煡 1: 寮�杩涙枡闂� 2: 鍏宠繘鏂欓棬 3: 寮�鍑烘枡闂� 4: 鍏冲嚭鏂欓棬 5: 鍏ョ～鍖栫綈 6: 鍏ュ喎鍗存Ы 7: 绌挎杞﹁繘鍐峰嵈妲� B=>C 8: 绌挎杞︾寮�鍐峰嵈妲� C=>B 9: 鍑哄喎鍗存Ы 10锛欰=>B 11:B=>A
+ */
public String getIoType$(){
if (null == this.ioType){ return null; }
switch (this.ioType){
case 0:
return this.ioType+":鏈煡";
case 1:
- return this.ioType+":寮�闂�";
+ return this.ioType+":寮�杩涙枡闂�";
case 2:
- return this.ioType+":鍏抽棬";
+ return this.ioType+":鍏宠繘鏂欓棬";
case 3:
- return this.ioType+":鍏ョ～鍖栫綈";
+ return this.ioType+":寮�鍑烘枡闂�";
case 4:
- return this.ioType+":鍏ュ喎鍗存Ы";
+ return this.ioType+":鍏冲嚭鏂欓棬";
case 5:
- return this.ioType+":绌挎杞﹁繘鍐峰嵈妲�";
+ return this.ioType+":鍏ョ～鍖栫綈";
case 6:
- return this.ioType+":绌挎杞︾寮�鍐峰嵈妲�";
+ return this.ioType+":鍏ュ喎鍗存Ы";
case 7:
+ return this.ioType+":绌挎杞﹁繘鍐峰嵈妲�:B=>C";
+ case 8:
+ return this.ioType+":绌挎杞︾寮�鍐峰嵈妲�:C=>B";
+ case 9:
return this.ioType+":鍑哄喎鍗存Ы";
+ case 10:
+ return this.ioType+":A=>B";
+ case 11:
+ return this.ioType+":B=>A";
default:
return String.valueOf(this.ioType);
}
@@ -276,5 +325,9 @@
}
}
+ public Integer getWrkStsComplete(){
+ return this.wrkSts+1;
+ }
+
}
--
Gitblit v1.9.1