From d4acff72f3584fea27a9a3d8bd151187393fe9c0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 27 十一月 2025 11:38:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/BasDevp.java | 379 ++++++++++++++++++++---------------------------------
1 files changed, 146 insertions(+), 233 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index 388c3e2..3e5a10d 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -1,19 +1,20 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.alibaba.fastjson.JSON;
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
+import com.baomidou.mybatisplus.annotations.TableField;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+
+import com.zy.core.model.StationObjModel;
+import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
+import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.List;
@Data
@TableName("asr_bas_devp")
@@ -25,275 +26,187 @@
* 缂栧彿
*/
@ApiModelProperty(value= "缂栧彿")
- @TableId(value = "dev_no", type = IdType.INPUT)
- @TableField("dev_no")
- private Integer devNo;
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
/**
- * 璁惧鎻忚堪
+ * 璁惧缂栧彿
*/
- @ApiModelProperty(value= "璁惧鎻忚堪")
- @TableField("dec_desc")
- private String decDesc;
+ @ApiModelProperty(value= "璁惧缂栧彿")
+ @TableField("devp_no")
+ private Integer devpNo;
/**
- * 澶囨敞
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
- @ApiModelProperty(value= "澶囨敞")
- @TableField("dev_mk")
- private String devMk;
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Integer status;
/**
- * 鍙叆
+ * 鍒涘缓浜哄憳
*/
- @ApiModelProperty(value= "鍙叆")
- @TableField("in_enable")
- private String inEnable;
+ @ApiModelProperty(value= "鍒涘缓浜哄憳")
+ @TableField("create_by")
+ private Long createBy;
/**
- * 鍙嚭
+ * 鍒涘缓鏃堕棿
*/
- @ApiModelProperty(value= "鍙嚭")
- @TableField("out_enable")
- private String outEnable;
-
- /**
- * 鑷姩
- */
- @ApiModelProperty(value= "鑷姩")
- private String autoing;
-
- /**
- * 鏈夌墿
- */
- @ApiModelProperty(value= "鏈夌墿")
- private String loading;
-
- /**
- * 鑳藉叆
- */
- @ApiModelProperty(value= "鑳藉叆")
- private String canining;
-
- /**
- * 鑳藉嚭
- */
- @ApiModelProperty(value= "鑳藉嚭")
- private String canouting;
-
- @ApiModelProperty(value= "")
- private String fronting;
-
- @ApiModelProperty(value= "")
- private String rearing;
-
- @ApiModelProperty(value= "")
- private String uping;
-
- @ApiModelProperty(value= "")
- private String downing;
-
- /**
- * 闇�姹�1
- */
- @ApiModelProperty(value= "闇�姹�1")
- private String inreq1;
-
- /**
- * 闇�姹�2
- */
- @ApiModelProperty(value= "闇�姹�2")
- private String inreq2;
-
- /**
- * 宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableField("wrk_no")
- private Integer wrkNo;
-
- @ApiModelProperty(value= "")
- @TableField("wrk_no1")
- private Integer wrkNo1;
-
- /**
- * 瀹瑰櫒绫诲瀷
- */
- @ApiModelProperty(value= "瀹瑰櫒绫诲瀷")
- @TableField("ctn_type")
- private Integer ctnType;
-
- /**
- * 鏉″舰鐮�
- */
- @ApiModelProperty(value= "鏉″舰鐮�")
- private String barcode;
-
- @ApiModelProperty(value= "")
- @TableField("in_qty")
- private Integer inQty;
-
- @ApiModelProperty(value= "")
- private Integer row1;
-
- @ApiModelProperty(value= "")
- @TableField("io_time")
- private Date ioTime;
-
- @ApiModelProperty(value= "")
- private String area;
-
- @ApiModelProperty(value= "")
- @TableField("in_ok")
- private String inOk;
-
- @ApiModelProperty(value= "")
- @TableField("out_ok")
- private String outOk;
-
- @ApiModelProperty(value= "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿")
- @TableField("loc_type1")
- private Short locType1;
-
- @ApiModelProperty(value= "瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿")
- @TableField("loc_type2")
- private Short locType2;
-
- @ApiModelProperty(value= "杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿")
- @TableField("loc_type3")
- private Short locType3;
+ @ApiModelProperty(value= "鍒涘缓鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
/**
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
- private Long modiUser;
+ @TableField("update_by")
+ private Long updateBy;
/**
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
- private Date modiTime;
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
/**
- * 鍒涘缓鑰�
+ * 澶囨敞
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
- private Long appeUser;
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
/**
- * 娣诲姞鏃堕棿
+ * 绔欑偣鏁版嵁
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
- private Date appeTime;
-
- @ApiModelProperty(value= "")
- @TableField("std_qty")
- private Double stdQty;
-
- @ApiModelProperty(value= "")
- @TableField("min_wt")
- private Double minWt;
-
- @ApiModelProperty(value= "")
- @TableField("max_wt")
- private Double maxWt;
+ @ApiModelProperty(value= "绔欑偣鏁版嵁")
+ @TableField("station_list")
+ private String stationList;
/**
- * 閲嶉噺
+ * 鏉＄爜绔欑偣鏁版嵁
*/
- @ApiModelProperty(value= "閲嶉噺")
- @TableField("gross_wt")
- private Double grossWt;
+ @ApiModelProperty(value= "鏉＄爜绔欑偣鏁版嵁")
+ @TableField("barcode_station_list")
+ private String barcodeStationList;
- @ApiModelProperty(value= "")
- @TableField("cart_pos")
- private Integer cartPos;
+ /**
+ * 鍏ュ簱绔欑偣鏁版嵁
+ */
+ @ApiModelProperty(value= "鍏ュ簱绔欑偣鏁版嵁")
+ @TableField("in_station_list")
+ private String inStationList;
+ /**
+ * 鍑哄簱绔欑偣鏁版嵁
+ */
+ @ApiModelProperty(value= "鍑哄簱绔欑偣鏁版嵁")
+ @TableField("out_station_list")
+ private String outStationList;
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
+ public BasDevp() {}
+
+ public BasDevp(Integer devpNo,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,String stationList,String barcodeStationList,String inStationList,String outStationList) {
+ this.devpNo = devpNo;
+ this.status = status;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ this.stationList = stationList;
+ }
+
+// BasDevp basDevp = new BasDevp(
+// null, // 璁惧缂栧彿
+// null, // 鐘舵��
+// null, // 鍒涘缓浜哄憳
+// null, // 鍒涘缓鏃堕棿
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 澶囨敞
+// null // 绔欑偣鏁版嵁
+// null // 鏉＄爜绔欑偣鏁版嵁
+// );
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getLocType1$() {
- if (null == this.locType1){ return null; }
- switch (this.locType1){
- case 0:
- return "鏈煡";
- case 1:
- return "浣庡簱浣�";
- case 2:
- return "楂樺簱浣�";
- default:
- return String.valueOf(this.locType1);
- }
- }
-
- public String getLocType2$() {
- if (null == this.locType2){ return null; }
- switch (this.locType2){
- case 0:
- return "鏈煡";
- case 1:
- return "绐勫簱浣�";
- case 2:
- return "瀹藉簱浣�";
- default:
- return String.valueOf(this.locType2);
- }
- }
-
- public String getLocType3$() {
- if (null == this.locType3){ return null; }
- switch (this.locType3){
- case 0:
- return "鏈煡";
- case 1:
- return "杞诲簱浣�";
- case 2:
- return "閲嶅簱浣�";
- default:
- return String.valueOf(this.locType3);
- }
- }
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
+ public List<StationObjModel> getStationList$(){
+ List<StationObjModel> list = new ArrayList<>();
+ if (Cools.isEmpty(this.stationList)){
+ return list;
}
- return null;
+
+ List<StationObjModel> jsonList = JSON.parseArray(this.stationList, StationObjModel.class);
+ for (StationObjModel json : jsonList){
+ list.add(json);
+ }
+ return list;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
+ public List<StationObjModel> getBarcodeStationList$(){
+ List<StationObjModel> list = new ArrayList<>();
+ if (Cools.isEmpty(this.barcodeStationList)){
+ return list;
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
+
+ List<StationObjModel> jsonList = JSON.parseArray(this.barcodeStationList, StationObjModel.class);
+ for (StationObjModel json : jsonList){
+ list.add(json);
+ }
+ return list;
+ }
+
+ public List<StationObjModel> getInStationList$(){
+ List<StationObjModel> list = new ArrayList<>();
+ if (Cools.isEmpty(this.inStationList)){
+ return list;
+ }
+
+ List<StationObjModel> jsonList = JSON.parseArray(this.inStationList, StationObjModel.class);
+ for (StationObjModel json : jsonList){
+ list.add(json);
+ }
+ return list;
+ }
+
+ public List<StationObjModel> getOutStationList$(){
+ List<StationObjModel> list = new ArrayList<>();
+ if (Cools.isEmpty(this.outStationList)){
+ return list;
+ }
+
+ List<StationObjModel> jsonList = JSON.parseArray(this.outStationList, StationObjModel.class);
+ for (StationObjModel json : jsonList){
+ list.add(json);
+ }
+ return list;
}
}
--
Gitblit v1.9.1