From c45f2e980ff53c2e0d8a0a05480d347132a6cd3c Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 29 八月 2025 16:06:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WaitPakin.java | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index e1bfb4c..4773df0 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -7,6 +7,8 @@
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasProcessProceduresService;
import com.zy.asrs.service.BasQualityTestingService;
+import com.zy.asrs.service.KcztMapService;
+import com.zy.asrs.service.StoreTypeService;
import com.zy.common.utils.Synchro;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -179,21 +181,31 @@
*/
@ApiModelProperty(value= "澶囩敤1")
@TableField("box_type1")
- private String boxType1 = "1";
+ private String boxType1 = "";
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
@TableField("box_type2")
- private String boxType2 = "1";
+ private String boxType2 = "";
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
@TableField("box_type3")
- private String boxType3 = "1";
+ private String boxType3 = "";
+
+ /**
+ * 閫�搴撴爣璁�
+ */
+ @ApiModelProperty(value= "閫�搴撴爣璁�")
+ @TableField("tk_flag")
+ private String tkFlag = "";
+
+ //搴撳瓨鐘舵��
+ private String cstateid;
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
@@ -268,6 +280,16 @@
return this.boxType1;
}
+ public String getStandby1$() {
+ StoreTypeService service = SpringUtils.getBean(StoreTypeService.class);
+ StoreType storeType = service.selectById(this.standby1);
+ if (!Cools.isEmpty(storeType)) {
+ return String.valueOf(storeType.getStoreName());
+ }
+ return null;
+ }
+
+
public String getBoxType2$(){
BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
@@ -277,6 +299,24 @@
return this.boxType1;
}
+ public String getCstateid$() {
+ KcztMapService service = SpringUtils.getBean(KcztMapService.class);
+ KcztMap kcztMap = service.selectOne(new EntityWrapper<KcztMap>().eq("cstateid", this.cstateid));
+ if (!Cools.isEmpty(kcztMap)){
+ return String.valueOf(kcztMap.getVname());
+ }
+ return String.valueOf(this.cstateid);
+ }
+
+ public String getCstateidVcode() {
+ KcztMapService service = SpringUtils.getBean(KcztMapService.class);
+ KcztMap kcztMap = service.selectOne(new EntityWrapper<KcztMap>().eq("cstateid", this.cstateid));
+ if (!Cools.isEmpty(kcztMap)){
+ return String.valueOf(kcztMap.getVcode());
+ }
+ return String.valueOf(this.cstateid);
+ }
+
public void sync(Object source) {
Synchro.Copy(source, this);
}
--
Gitblit v1.9.1