From a64aaeecc264176a60c6bb0e4e348c63f929d459 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 22 六月 2024 13:52:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/BasJarMast.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 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..0f36fef 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,8 +170,32 @@
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.getOutSteId();
+ this.enterRgvId = jar.getEnterRgvId();;
+ this.outRgvId = jar.getOutRgvId();;
+ this.ioTime = wrkMast.getIoTime();
+ this.modiTime = now;
+ this.appeTime = now;
+ this.jarLocDigit = jarLocDigit;
+ this.burial = jar.getBurial();
+ }
+
+
// BasJarMast basJarMast = new BasJarMast(
// null, // 宸ヤ綔鍙穂闈炵┖]
// null, // 鍏ュ簱婧愮珯鐐筟闈炵┖]
--
Gitblit v1.9.1