From 691bee4229856f8bf81c2720092ecee1c9f21509 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 19:18:12 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java | 284 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 195 insertions(+), 89 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 adb5088..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;
@@ -15,11 +16,12 @@
import java.util.Date;
-
import com.baomidou.mybatisplus.annotation.IdType;
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;
@@ -117,23 +119,22 @@
private Integer reportOnce;
/**
- * 閲婃斁鐘舵�� 0: 姝ｅ父 1: 宸查噴鏀�
+ * 閲婃斁鐘舵�� 0: 姝ｅ父 1: 宸查噴鏀�
*/
@ApiModelProperty(value = "閲婃斁鐘舵�� 0: 姝ｅ父 1: 宸查噴鏀� ")
private Short rleStatus;
-
@ApiModelProperty("鎵ц鐘舵��")
private Short exceStatus;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
+ * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
*/
@ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
private Integer status;
/**
- * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value = "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
@TableLogic
@@ -151,6 +152,9 @@
@ApiModelProperty(value = "娣诲姞浜哄憳")
private Long createBy;
+ @TableField(exist = false)
+ private String createBy$;
+
/**
* 娣诲姞鏃堕棿
*/
@@ -165,6 +169,9 @@
@ApiModelProperty(value = "淇敼浜哄憳")
private Long updateBy;
+ @TableField(exist = false)
+ private String updateBy$;
+
/**
* 淇敼鏃堕棿
*/
@@ -173,16 +180,171 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
+ @Version
+ private Integer version;
+
/**
* 澶囨敞
*/
@ApiModelProperty(value = "澶囨敞")
private String memo;
+ /**
+ * 浠撳簱ID
+ */
+ @ApiModelProperty(value = "浠撳簱ID")
+ private Long warehouseId;
+
+ /**
+ * 搴撳尯ID
+ */
+ @ApiModelProperty(value = "搴撳尯ID")
+ private Long wareAreaId;
+
+ /**
+ * 涓氬姟鏃堕棿
+ */
+ @ApiModelProperty(value = "涓氬姟鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date businessTime;
+
+ /**
+ * 浣滀笟鐐�
+ */
+ @ApiModelProperty(value = "浣滀笟鐐�")
+ private String stationId;
+
+ /**
+ * 璐т富id
+ */
+ @ApiModelProperty(value = "璐т富id")
+ private Long shipperId;
+
+ /**
+ * 鍗曟嵁鍐呯爜
+ */
+ @ApiModelProperty(value = "鍗曟嵁鍐呯爜")
+ private String orderInternalCode;
+
+ /**
+ * 搴撳瓨鏂瑰悜
+ */
+ @ApiModelProperty(value = "搴撳瓨鏂瑰悜")
+ private String stockDirect;
+
+ /**
+ * 瀹㈡埛缂栫爜
+ */
+ @ApiModelProperty(value = "瀹㈡埛缂栫爜")
+ private String customerId;
+
+ /**
+ * 瀹㈡埛鍚嶇О
+ */
+ @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ private String customerName;
+
+ /**
+ * 渚涘簲鍟嗙紪鐮�
+ */
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
+ private String supplierId;
+
+ /**
+ * 渚涘簲鍟嗗悕绉�
+ */
+ @ApiModelProperty(value = "渚涘簲鍟嗗悕绉�")
+ private String supplierName;
+
+ /**
+ * 鏀舵枡/鍙戣揣缁勭粐
+ */
+ @ApiModelProperty(value = "鏀舵枡/鍙戣揣缁勭粐")
+ private String stockOrgId;
+
+ /**
+ * 鏀舵枡/鍙戣揣缁勭粐鍚嶇О
+ */
+ @ApiModelProperty(value = "鏀舵枡/鍙戣揣缁勭粐鍚嶇О")
+ private String stockOrgName;
+
+ /**
+ * 閲囪喘缁勭粐
+ */
+ @ApiModelProperty(value = "閲囪喘缁勭粐")
+ private String purchaseOrgId;
+
+ /**
+ * 閲囪喘缁勭粐鍚嶇О
+ */
+ @ApiModelProperty(value = "閲囪喘缁勭粐鍚嶇О")
+ private String purchaseOrgName;
+
+ /**
+ * 閲囪喘鍛�
+ */
+ @ApiModelProperty(value = "閲囪喘鍛�")
+ private String purchaseUserId;
+
+ /**
+ * 閲囪喘鍛樺悕绉�
+ */
+ @ApiModelProperty(value = "閲囪喘鍛樺悕绉�")
+ private String purchaseUserName;
+
+ /**
+ * 鐢熶骇缁勭粐
+ */
+ @ApiModelProperty(value = "鐢熶骇缁勭粐")
+ private String prdOrgId;
+
+ /**
+ * 鐢熶骇缁勭粐鍚嶇О
+ */
+ @ApiModelProperty(value = "鐢熶骇缁勭粐鍚嶇О")
+ private String prdOrgName;
+
+ /**
+ * 閿�鍞粍缁�
+ */
+ @ApiModelProperty(value = "閿�鍞粍缁�")
+ private String saleOrgId;
+
+ /**
+ * 閿�鍞粍缁囧悕绉�
+ */
+ @ApiModelProperty(value = "閿�鍞粍缁囧悕绉�")
+ private String saleOrgName;
+
+ /**
+ * 閿�鍞憳
+ */
+ @ApiModelProperty(value = "閿�鍞憳")
+ private String saleUserId;
+
+ /**
+ * 閿�鍞憳鍚嶇О
+ */
+ @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() {
}
- public WkOrder(String code, String poCode, Long poId, String type, String wkType, Double anfme, Double qty, String logisNo, Date arrTime, Short rleStatus, Integer status, Integer deleted, Integer tenantId, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+ public WkOrder(String code, String poCode, Long poId, String type, String wkType, Double anfme, Double qty,
+ String logisNo, Date arrTime, Short rleStatus, Integer status, Integer deleted, Integer tenantId,
+ Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.code = code;
this.poCode = poCode;
this.poId = poId;
@@ -203,82 +365,45 @@
this.memo = memo;
}
- 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();
+ 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$() {
+ 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$() {
if (Cools.isEmpty(this.arrTime)) {
@@ -315,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$() {
@@ -346,7 +453,6 @@
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
-
public Boolean getStatusBool() {
if (null == this.status) {
--
Gitblit v1.9.1