From 2f8e173048d22c5b40612c3538b9c1aa5a5397f6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 27 三月 2026 13:38:05 +0800
Subject: [PATCH] #乐观锁
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java | 72 ++++++++++++-----------------------
1 files changed, 25 insertions(+), 47 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 b861d02..8a45261 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
@@ -20,6 +20,7 @@
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 io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.vincent.rsf.framework.common.Cools;
@@ -171,6 +172,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;
/**
* 澶囨敞
@@ -345,53 +349,27 @@
}
public WkOrder(SyncOrderParams syncOrderParams) {
- this.code = code;
- this.poCode = poCode;
- this.poId = poId;
- this.type = type;
- this.wkType = wkType;
- this.checkType = checkType;
- this.anfme = anfme;
- this.workQty = workQty;
- this.qty = qty;
- this.logisNo = logisNo;
- this.waveId = waveId;
- this.arrTime = arrTime;
- this.ntyStatus = ntyStatus;
- this.reportOnce = reportOnce;
- this.rleStatus = rleStatus;
- this.exceStatus = exceStatus;
- this.status = status;
- this.deleted = deleted;
- this.tenantId = tenantId;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- this.warehouseId = warehouseId;
- this.wareAreaId = wareAreaId;
- this.businessTime = businessTime;
- this.stationId = stationId;
- this.shipperId = shipperId;
- this.orderInternalCode = orderInternalCode;
- this.stockDirect = stockDirect;
- this.customerId = customerId;
- this.customerName = customerName;
- this.supplierId = supplierId;
- this.supplierName = supplierName;
- this.stockOrgId = stockOrgId;
- this.stockOrgName = stockOrgName;
- this.purchaseOrgId = purchaseOrgId;
- this.purchaseOrgName = purchaseOrgName;
- this.purchaseUserId = purchaseUserId;
- this.purchaseUserName = purchaseUserName;
- this.prdOrgId = prdOrgId;
- this.prdOrgName = prdOrgName;
- this.saleOrgId = saleOrgId;
- this.saleOrgName = saleOrgName;
- this.saleUserId = saleUserId;
- this.saleUserName = saleUserName;
+// 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$() {
--
Gitblit v1.9.1