From 4375805e5769179d7684a3af3e9132be68c38321 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 10 九月 2024 09:21:20 +0800
Subject: [PATCH] #fs
---
src/main/java/com/zy/asrs/entity/BasJarMast.java | 65 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasJarMast.java b/src/main/java/com/zy/asrs/entity/BasJarMast.java
index 47fa406..715cd58 100644
--- a/src/main/java/com/zy/asrs/entity/BasJarMast.java
+++ b/src/main/java/com/zy/asrs/entity/BasJarMast.java
@@ -1,18 +1,14 @@
package com.zy.asrs.entity;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasJarMastStatusService;
-import com.zy.asrs.entity.BasJarMastStatus;
+
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -195,6 +191,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, // 宸ヤ綔鍙穂闈炵┖]
@@ -214,13 +228,13 @@
// null // 鏇存柊鏃堕棿
// );
- public String getStatus$(){
- BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class);
- BasJarMastStatus basJarMastStatus = service.selectById(this.status);
- if (!Cools.isEmpty(basJarMastStatus)){
- return String.valueOf(basJarMastStatus.getId());
- }
- return null;
+// public String getStatus$(){
+// BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class);
+// BasJarMastStatus basJarMastStatus = service.selectById(this.status);
+// if (!Cools.isEmpty(basJarMastStatus)){
+// return String.valueOf(basJarMastStatus.getId());
+// }
+// return null;
/*
default:
@@ -270,7 +284,7 @@
statusList.add(14);//灏忚溅鍒拌揪鍐峰嵈妲�
}
* */
- }
+// }
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
@@ -297,5 +311,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