From ec92a309b68b1e7029196d9d0ea0ac7e2badb5a7 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期日, 03 八月 2025 09:32:12 +0800
Subject: [PATCH] 设置入空桶库输送线缓存任务数
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 154 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 122 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 50f5573..2c3590c 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -4,18 +4,19 @@
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.core.exception.CoolException;
+import com.zy.asrs.service.BasProcessProceduresService;
+import com.zy.asrs.service.BasQualityTestingService;
import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.LocOwnerService;
+import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.beans.BeanInfo;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -46,7 +47,10 @@
@ExcelProperty("鍟嗗搧鍚嶇О")
private String maktx;
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value= "瑙勬牸")
+ private String specs;
+
+ @ApiModelProperty(value= "璐у搧鐗瑰緛")
@ExcelProperty("鎵瑰彿")
private String batch;
@@ -55,10 +59,8 @@
@TableField("order_no")
private String orderNo;
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
-
@ApiModelProperty(value= "鍨嬪彿")
+ @ExcelProperty("妗跺瀷")
private String model;
@ApiModelProperty(value= "棰滆壊")
@@ -90,6 +92,7 @@
@ApiModelProperty(value= "鐢熶骇鏃ユ湡")
@TableField("manu_date")
+ @ExcelProperty("鐢熶骇鏃ユ湡")
private String manuDate;
@ApiModelProperty(value= "鍝侀」鏁�")
@@ -101,12 +104,17 @@
private Double safeQty;
@ApiModelProperty(value= "閲嶉噺")
+ @ExcelProperty("鍑�閲�")
private Double weight;
@ApiModelProperty(value= "闀垮害")
- private Double length;
+ @TableField("man_length")
+ @ExcelProperty("姣涢噸")
+ private Double manLength;
@ApiModelProperty(value= "浣撶Н")
+ @TableField("volume")
+ @ExcelProperty("缃愯閲�")
private Double volume;
@ApiModelProperty(value= "涓夋柟缂栫爜")
@@ -136,7 +144,7 @@
private Integer source;
@ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer check;
+ private Integer inspect;
@ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
private Integer danger;
@@ -160,6 +168,57 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 鎷ユ湁鑰�
+ */
+ @ApiModelProperty(value= "鎷ユ湁鑰� 1: 鏉板厠 ")
+ private Integer owner;
+
+ /**
+ * 澶囩敤1
+ */
+ @ApiModelProperty(value= "澶囩敤1")
+ private String standby1 = "";
+
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value= "澶囩敤2")
+ private String standby2 = "";
+
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value= "澶囩敤3")
+ private String standby3 = "";
+
+ /**
+ * 澶囩敤1
+ */
+ @ApiModelProperty(value= "澶囩敤1")
+ @TableField("box_type1")
+ private String boxType1 = "1";
+
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value= "澶囩敤2")
+ @TableField("box_type2")
+ private String boxType2 = "1";
+
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value= "澶囩敤3")
+ @TableField("box_type3")
+ private String boxType3 = "1";
+
+ /**
+ * 鏄惁鍐荤粨
+ */
+ @ApiModelProperty(value= "鏄惁鍐荤粨,0.鏈喕缁擄紝1.宸插喕缁�")
+ private Integer frozen;
+
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
@@ -168,7 +227,14 @@
}
return null;
}
-
+ public String getOwner$(){
+ LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
+ LocOwner locOwner = service.selectById(this.owner);
+ if (!Cools.isEmpty(locOwner)){
+ return String.valueOf(locOwner.getOwner());
+ }
+ return null;
+ }
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
switch (this.beBatch){
@@ -195,15 +261,15 @@
}
}
- public String getCheck$(){
- if (null == this.check){ return null; }
- switch (this.check){
+ public String getInspect$(){
+ if (null == this.inspect){ return null; }
+ switch (this.inspect){
case 1:
return "鏄�";
case 0:
return "鍚�";
default:
- return String.valueOf(this.check);
+ return String.valueOf(this.inspect);
}
}
@@ -235,7 +301,6 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
-
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
@@ -252,23 +317,48 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
- public void sync(Object dest) {
- try {
- BeanInfo sourceBean = Introspector.getBeanInfo(this.getClass(),Object.class);
- PropertyDescriptor[] sourceProperty = sourceBean.getPropertyDescriptors();
- BeanInfo destBean = Introspector.getBeanInfo(dest.getClass(),Object.class);
- PropertyDescriptor[] destProperty = destBean.getPropertyDescriptors();
- for (PropertyDescriptor propertyDescriptor : sourceProperty) {
- for (PropertyDescriptor descriptor : destProperty) {
- if (propertyDescriptor.getName().equals(descriptor.getName()) && propertyDescriptor.getPropertyType() == descriptor.getPropertyType()) {
- descriptor.getWriteMethod().invoke(dest, propertyDescriptor.getReadMethod().invoke(this));
- break;
- }
- }
- }
- } catch (Exception e) {
- throw new CoolException("灞炴�у鍒跺け璐�:" + e.getMessage());
+ public long getStoreDate(){
+ long timeNow = new Date().getTime();
+ if (this.appeTime == null){
+ return 0;
}
+ long timeCreate = this.appeTime.getTime();
+
+ return (timeNow - timeCreate) /24/60/60/1000;
+ }
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+
+ public String getFrozen$() {
+ if (null == this.frozen){ return "鏈喕缁�"; }
+ switch (this.frozen){
+ case 0:
+ return "鏈喕缁�";
+ case 1:
+ return "宸插喕缁�";
+ default:
+ return "鏈喕缁�";
+ }
+ }
+
+ public String getBoxType1$(){
+ BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
+ BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
+ if (!Cools.isEmpty(processProcedures)){
+ return String.valueOf(processProcedures.getBoxSpecs());
+ }
+ return this.boxType1;
+ }
+
+ public String getBoxType2$(){
+ BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
+ BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
+ if (!Cools.isEmpty(basQualityTesting)){
+ return String.valueOf(basQualityTesting.getBoxSpecs());
+ }
+ return this.boxType1;
}
}
--
Gitblit v1.9.1