From 5a0f4ce17e31d84068bdb2f62d5bb7ef27f87d0f Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 22 六月 2024 09:33:07 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/BasJarMast.java |   32 +++++++++++++++++++++++++++++++-
 1 files changed, 31 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 f69f651..0f36fef 100644
--- a/src/main/java/com/zy/asrs/entity/BasJarMast.java
+++ b/src/main/java/com/zy/asrs/entity/BasJarMast.java
@@ -146,9 +146,15 @@
     @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;
@@ -164,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