From 2b4b495c41695a21b10c548599a0af98e984eda5 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 19 七月 2024 15:16:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/BasJarMast.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasJarMast.java b/src/main/java/com/zy/asrs/entity/BasJarMast.java
index 9689a51..29119ad 100644
--- a/src/main/java/com/zy/asrs/entity/BasJarMast.java
+++ b/src/main/java/com/zy/asrs/entity/BasJarMast.java
@@ -29,13 +29,13 @@
* ID
*/
@ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 宸ヤ綔鍙�
*/
@ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableId(value = "wrk_no", type = IdType.INPUT)
@TableField("wrk_no")
private Long wrkNo;
@@ -195,6 +195,24 @@
this.burial = jar.getBurial();
}
+ public BasJarMast(BasJar jar) {
+ Date now = new Date();
+// this.jarEnterStaNo = jarEnterStaNo;
+ this.jarOutStaNo = jar.getStaNo();
+ this.jarId = jar.getJarNo();
+ this.jarRegin = jar.getRegion();
+ this.status = 0;
+ this.enterSteNo = jar.getEnterSteNo();
+ this.outSteId = jar.getOutSteNo();
+ this.enterRgvId = jar.getEnterRgvNo();;
+ this.outRgvId = jar.getOutRgvNo();;
+ this.ioTime = now;
+ this.modiTime = now;
+ this.appeTime = now;
+ this.jarLocDigit = jarLocDigit;
+ this.burial = jar.getBurial();
+ }
+
// BasJarMast basJarMast = new BasJarMast(
// null, // 宸ヤ綔鍙穂闈炵┖]
@@ -297,5 +315,28 @@
return this.status+1;
}
+ /**
+ * ioType浠诲姟绫诲瀷
+ * 0: 鏈煡 1: 寮�杩涙枡闂� 2: 鍏宠繘鏂欓棬 3: 寮�鍑烘枡闂� 4: 鍏冲嚭鏂欓棬 5: 鍏ョ～鍖栫綈 6: 鍏ュ喎鍗存Ы
+ * 7: 绌挎杞﹁繘鍐峰嵈妲� B=>C 8: 绌挎杞︾寮�鍐峰嵈妲� C=>B 9: 鍑哄喎鍗存Ы 10锛欰=>B 11:B=>A
+ */
+ public Integer getStatusComplete(Integer ioType){
+ switch (ioType){
+ case 1:
+ return 2;
+ case 3:
+ return 8;
+ case 2:
+ return 5;
+ case 5:
+ return 4;
+ case 6:
+ return 10;
+ case 9:
+ return 17;
+ }
+ return this.status+1;
+ }
+
}
--
Gitblit v1.9.1