From 03c3e3cfc1262e26a218a4b8340c0a53ca3065c6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 13:37:08 +0800
Subject: [PATCH] #logo和高危修复
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java | 54 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 36 insertions(+), 18 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..1f1ed08 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;
/**
* 澶囨敞
@@ -343,6 +355,30 @@
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 "";
@@ -453,29 +489,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