From 1724f77c35022b643c28dd3e5547679a5edc2d49 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 17 三月 2026 14:17:26 +0800
Subject: [PATCH] Merge branch 'springboot3.5_cs' into spring3.5
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrdersItem.java | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrdersItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrdersItem.java
index 7e37b1f..c9bf70d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrdersItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrdersItem.java
@@ -7,7 +7,7 @@
import lombok.Data;
import lombok.experimental.Accessors;
-import javax.validation.constraints.*;
+import jakarta.validation.constraints.*;
import java.io.Serializable;
import java.math.BigDecimal;
@@ -117,10 +117,10 @@
private String priceUnitId;
@ApiModelProperty(value = "寤鸿鐩爣浠撳簱", example = "WH001")
- private String targetWareHouseId;
+ private String targetWarehouseId;
@ApiModelProperty(value = "璋冨嚭浠�", example = "WH002")
- private String sourceWareHouseId;
+ private String sourceWarehouseId;
@ApiModelProperty(value = "鍏ュ簱绫诲瀷", example = "purchase")
private String inStockType;
@@ -162,13 +162,6 @@
@ApiModelProperty(value = "鏁伴噺灞炴�э紝澶栬喘绛�")
private String erpClsId;
-
- @ApiModelProperty(value = "寤鸿鐩爣浠擄紝鍏ュ簱")
- private String targetWarehouseId;
-
- @ApiModelProperty(value = "寤鸿璋冨嚭浠擄紝鍑轰粨")
- private String sourceWarehouseId;
-
/**
* 鑾峰彇瀹為檯鐨勭墿鏂欑紪鐮�
* 浼樺厛浣跨敤 matnr锛屽鏋滀负绌哄垯浣跨敤 matNr
@@ -298,8 +291,8 @@
throw new IllegalArgumentException("鐢熶骇鍏ュ簱鏄庣粏蹇呴』鎻愪緵鎵樼洏鐮�");
}
- if (!Cools.isEmpty(targetWareHouseId) && !Cools.isEmpty(sourceWareHouseId)) {
- if (targetWareHouseId.equals(sourceWareHouseId)) {
+ if (!Cools.isEmpty(targetWarehouseId) && !Cools.isEmpty(sourceWarehouseId)) {
+ if (targetWarehouseId.equals(sourceWarehouseId)) {
throw new IllegalArgumentException("鐩爣浠撳簱鍜岃皟鍑轰粨搴撲笉鑳界浉鍚�");
}
}
@@ -324,7 +317,7 @@
*/
@JsonIgnore
public boolean isTransferItem() {
- return !Cools.isEmpty(sourceWareHouseId) && !Cools.isEmpty(targetWareHouseId);
+ return !Cools.isEmpty(sourceWarehouseId) && !Cools.isEmpty(targetWarehouseId);
}
/**
--
Gitblit v1.9.1