From 1dcfa3702505f0c431757312b5304531029f90f6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 18:57:38 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java | 129 ++++++++++++++++--------------------------
1 files changed, 49 insertions(+), 80 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java
index f5d5f63..834dd45 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vincent.rsf.server.api.controller.erp.params.SyncOrderParams;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.system.constant.DictTypeCode;
@@ -19,6 +20,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.vincent.rsf.framework.common.Cools;
@@ -149,6 +152,9 @@
@ApiModelProperty(value = "娣诲姞浜哄憳")
private Long createBy;
+ @TableField(exist = false)
+ private String createBy$;
+
/**
* 娣诲姞鏃堕棿
*/
@@ -163,6 +169,9 @@
@ApiModelProperty(value = "淇敼浜哄憳")
private Long updateBy;
+ @TableField(exist = false)
+ private String updateBy$;
+
/**
* 淇敼鏃堕棿
*/
@@ -170,6 +179,9 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
+
+ @Version
+ private Integer version;
/**
* 澶囨敞
@@ -316,6 +328,16 @@
*/
@ApiModelProperty(value = "閿�鍞憳鍚嶇О")
private String saleUserName;
+ @TableField(exist = false)
+ private String exceStatus$;
+
+ @TableField(exist = false)
+ private String wkType$;
+
+ @TableField(exist = false)
+ private String checkType$;
+
+
public WkOrder() {
}
@@ -343,79 +365,44 @@
this.memo = memo;
}
+ public WkOrder(SyncOrderParams syncOrderParams) {
+// this.reportOnce = syncOrderParams.getre();
+// this.businessTime = syncOrderParams.getBusinessTime().toString();
+ this.stationId = syncOrderParams.getStationId();
+ this.orderInternalCode = syncOrderParams.getOrderInternalCode().toString();
+ this.stockDirect = syncOrderParams.getStockDirect();
+ this.customerId = syncOrderParams.getCustomerId();
+ this.customerName = syncOrderParams.getCustomerName();
+ this.supplierId = syncOrderParams.getSupplierId();
+ this.supplierName = syncOrderParams.getSupplierName();
+ this.stockOrgId = syncOrderParams.getStockOrgId();
+ this.stockOrgName = syncOrderParams.getStockOrgName();
+ this.purchaseOrgId = syncOrderParams.getPurchaseOrgId();
+ this.purchaseOrgName = syncOrderParams.getPurchaseOrgName();
+ this.purchaseUserId = syncOrderParams.getPurchaseUserId();
+ this.purchaseUserName = syncOrderParams.getPurchaseUserName();
+ this.prdOrgId = syncOrderParams.getPrdOrgId();
+ this.prdOrgName = syncOrderParams.getPrdOrgName();
+ this.saleOrgId = syncOrderParams.getSaleOrgId();
+ this.saleOrgName = syncOrderParams.getSaleOrgName();
+ this.saleUserId = syncOrderParams.getSaleUserId();
+ this.saleUserName = syncOrderParams.getSaleUserName();
+ }
+
public String getExceStatus$() {
- if (Cools.isEmpty(this.exceStatus)) {
- return "";
- }
- String exceType = DictTypeCode.DICT_ASN_EXCE_STATUS;
- if (this.type.equals(OrderType.ORDER_CHECK.type)) {
- exceType = DictTypeCode.SYS_CHECK_EXCE_STATUS;
- }
- DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
- DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
- .eq(DictData::getDictTypeCode, exceType)
- .eq(DictData::getValue, this.exceStatus));
- if (Objects.isNull(dictData)) {
- return null;
- }
- return dictData.getLabel();
+ return this.exceStatus$;
}
public String getType$() {
return OrderType.getValType(this.type);
-
- // if (this.type.equals(OrderType.ORDER_TRANSFER.type)) {
- // return OrderType.getValType(this.type);
- // } else {
- // if (Cools.isEmpty(this.type)) {
- // return "";
- // }
- // DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
- // DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
- // .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_ORDER_TYPE)
- // .eq(DictData::getValue, this.type));
- // if (Objects.isNull(dictData)) {
- // return null;
- // }
- // return dictData.getLabel();
- // }
}
public String getWkType$() {
- // if (this.type.equals(OrderType.ORDER_TRANSFER.type)) {
- return OrderWorkType.getWorkDesc(this.wkType);
- // } else {
- // String typeCode = DictTypeCode.DICT_SYS_BUSINESS_TYPE;
- // if (type.equals(OrderType.ORDER_CHECK.type)) {
- // typeCode = DictTypeCode.SYS_CHECK_ORDER_TYPE;
- // }
- // if (Cools.isEmpty(this.wkType)) {
- // return "";
- // }
- // DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
- // DictData dictData = dictDataService
- // .getOne(new LambdaQueryWrapper<DictData>()
- // .eq(DictData::getDictTypeCode, typeCode)
- // .eq(DictData::getValue, this.wkType));
- // if (Objects.isNull(dictData)) {
- // return null;
- // }
- // return dictData.getLabel();
- // }
+ return this.wkType$;
}
public String getCheckType$() {
- if (Cools.isEmpty(this.checkType)) {
- return "";
- }
- DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
- DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
- .eq(DictData::getDictTypeCode, DictTypeCode.SYS_CHECK_TYPE)
- .eq(DictData::getValue, this.checkType));
- if (Objects.isNull(dictData)) {
- return null;
- }
- return dictData.getLabel();
+ return this.checkType$;
}
public String getArrTime$() {
@@ -453,29 +440,11 @@
}
}
- public String getCreateBy$() {
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.createBy);
- if (!Cools.isEmpty(user)) {
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
public String getCreateTime$() {
if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getUpdateBy$() {
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.updateBy);
- if (!Cools.isEmpty(user)) {
- return String.valueOf(user.getNickname());
- }
- return null;
}
public String getUpdateTime$() {
--
Gitblit v1.9.1