From ad3db22590c09649ce34189ad45d299f6c979abe Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 22 六月 2024 13:49:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WrkMastExecute.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 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..f099c91 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
@@ -142,14 +142,14 @@
/**
* 浠诲姟绫诲瀷 0: 鏈煡 1: 寮�闂� 2: 鍏抽棬 3: 鍏ョ～鍖栫綈 4: 鍏ュ喎鍗存Ы 5: 绌挎杞﹁繘鍐峰嵈妲� 6: 绌挎杞︾寮�鍐峰嵈妲� 7: 鍑哄喎鍗存Ы
*/
- @ApiModelProperty(value= "浠诲姟绫诲瀷 0: 鏈煡 1: 寮�闂� 2: 鍏抽棬 3: 鍏ョ～鍖栫綈 4: 鍏ュ喎鍗存Ы 5: 绌挎杞﹁繘鍐峰嵈妲� 6: 绌挎杞︾寮�鍐峰嵈妲� 7: 鍑哄喎鍗存Ы ")
+ @ApiModelProperty(value= "浠诲姟绫诲瀷 0: 鏈煡 1: 寮�杩涙枡闂� 2: 鍏宠繘鏂欓棬 3: 寮�鍑烘枡闂� 4: 鍏冲嚭鏂欓棬 5: 鍏ョ～鍖栫綈 6: 鍏ュ喎鍗存Ы 7: 绌挎杞﹁繘鍐峰嵈妲� 8: 绌挎杞︾寮�鍐峰嵈妲� 9: 鍑哄喎鍗存Ы ")
@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() {}
@@ -174,6 +174,28 @@
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, // 宸ヤ綔鍙穂闈炵┖]
// null, // 鍏ュ簱婧愮珯鐐筟闈炵┖]
--
Gitblit v1.9.1