From f30358a20ae9a74ee7f6c604a8d102c1b9b24659 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期二, 25 六月 2024 16:24:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/BasJarMast.java | 68 +++++++++++++++++++++++++++++++++
1 files changed, 67 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 0780b72..c8ab673 100644
--- a/src/main/java/com/zy/asrs/entity/BasJarMast.java
+++ b/src/main/java/com/zy/asrs/entity/BasJarMast.java
@@ -139,9 +139,22 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date appeTime;
+ /**
+ * 搴撲綅鍙�
+ */
+ @ApiModelProperty(value= "搴撲綅鍙�")
+ @TableField("jar_loc_digit")
+ private Integer jarLocDigit;
+
+ /**
+ * 鍐峰嵈
+ */
+ @ApiModelProperty(value= "鍐峰嵈")
+ private Integer burial;
+
public BasJarMast() {}
- public BasJarMast(Long wrkNo,Integer enterStaNo,Integer outStaNo,Integer jarEnterStaNo,Integer jarOutStaNo,Integer jarId,Integer jarRegin,Integer status,Integer enterSteNo,Integer outSteId,Integer enterRgvId,Integer outRgvId,Date ioTime,Date modiTime,Date appeTime) {
+ public BasJarMast(Long wrkNo,Integer enterStaNo,Integer outStaNo,Integer jarEnterStaNo,Integer jarOutStaNo,Integer jarId,Integer jarRegin,Integer status,Integer enterSteNo,Integer outSteId,Integer enterRgvId,Integer outRgvId,Date ioTime,Date modiTime,Date appeTime,Integer jarLocDigit,Integer burial) {
this.wrkNo = wrkNo;
this.enterStaNo = enterStaNo;
this.outStaNo = outStaNo;
@@ -157,7 +170,31 @@
this.ioTime = ioTime;
this.modiTime = modiTime;
this.appeTime = appeTime;
+ this.jarLocDigit = jarLocDigit;
+ this.burial = burial;
}
+
+ public BasJarMast(BasJar jar,WrkMast wrkMast,Integer jarLocDigit) {
+ Date now = new Date();
+ this.wrkNo = wrkMast.getWrkNo().longValue();
+ this.enterStaNo = wrkMast.getSourceStaNo();
+ this.outStaNo = wrkMast.getStaNo();
+// 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 = wrkMast.getIoTime();
+ this.modiTime = now;
+ this.appeTime = now;
+ this.jarLocDigit = jarLocDigit;
+ this.burial = jar.getBurial();
+ }
+
// BasJarMast basJarMast = new BasJarMast(
// null, // 宸ヤ綔鍙穂闈炵┖]
@@ -184,6 +221,35 @@
return String.valueOf(basJarMastStatus.getId());
}
return null;
+
+ /*
+ statusList.add(15);//瀹屾垚 杈撻�佺嚎瀛樺湪宸ヤ綔鍙枫��===銆嬭浆鍘嗗彶妗ｆ
+ case 5://灏忚溅绉诲姩鑷冲喎鍗存Ы浠诲姟 //鍑哄喎鍗存Ы浠诲姟 //寮�鍑烘枡闂ㄤ换鍔�
+ statusList.add(10);//鍏ュ喎鍗存Ы瀹屾垚
+ case 4://鍑虹～鍖栫綈浠诲姟
+ statusList.add(11);//鍐峰嵈涓�
+ if (type!=5){
+ statusList.add(12);//鍐峰嵈瀹屾垚
+ }
+ statusList.add(13);//鍑哄喎鍗存Ы涓�
+ statusList.add(14);//鍑哄喎鍗存Ы瀹屾垚
+ case 3://鍏宠繘鏂欓棬浠诲姟 //鐢熸垚鍒濆浠诲姟
+ statusList.add(4);//鍏ョ～鍖栫綈瀹屾垚
+ case 2://鍏宠繘鏂欓棬浠诲姟 //鐢熸垚鍒濆浠诲姟
+ statusList.add(0);//鍒濆
+ case 1://寮�杩涙枡闂ㄤ换鍔�
+ statusList.add(2);//杩涙枡闂ㄦ墦寮�
+ case 0://鍏ョ～鍖栫綈浠诲姟
+ statusList.add(1);//寮�杩涙枡闂ㄤ腑
+ statusList.add(3);//鍏ョ～鍖栫綈涓�
+ statusList.add(5);//纭寲涓��===銆嬪叧闂ㄥ畬鎴�
+ if (type!=4){
+ statusList.add(6);//纭寲瀹屾垚
+ }
+ statusList.add(7);//寮�鍑烘枡闂ㄤ腑
+ statusList.add(8);//鍑烘枡闂ㄦ墦寮�
+ statusList.add(9);//鍑虹～鍖栫綈涓��===銆嬪叆鍐峰嵈妲戒腑
+ * */
}
public String getIoTime$(){
--
Gitblit v1.9.1