From b7bb549bd0abc0886d7a9fcb46cb582508de00dd Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 26 一月 2026 09:05:56 +0800
Subject: [PATCH] lsh#
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/WmsOrderItemParam.java | 4 ++--
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 28 ++++++++++++++--------------
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrdersItem.java | 17 +++++------------
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/OrderItem.java | 9 ++-------
4 files changed, 23 insertions(+), 35 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/WmsOrderItemParam.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/WmsOrderItemParam.java
index 9879233..48fe4df 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/WmsOrderItemParam.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/WmsOrderItemParam.java
@@ -63,9 +63,9 @@
// 寤鸿鐩爣浠撳簱
private String palletId;
// 璋冨嚭浠�
- private String targetWareHouseId;
+ private String targetWarehouseId;
// 涓氬姟鏃ユ湡锛屽璐︿娇鐢紝鏃堕棿鎴筹紝绮剧‘鍒扮
- private String sourceWareHouseId;
+ private String sourceWarehouseId;
// 鍏ュ簱绫诲瀷
private String inStockType;
// 璐т富绫诲瀷
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/OrderItem.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/OrderItem.java
index 3579a55..d49c20f 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/OrderItem.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/OrderItem.java
@@ -47,9 +47,9 @@
// 寤鸿鐩爣浠撳簱
private String palletId;
// 璋冨嚭浠�
- private String targetWareHouseId;
+ private String targetWarehouseId;
// 涓氬姟鏃ユ湡锛屽璐︿娇鐢紝鏃堕棿鎴筹紝绮剧‘鍒扮
- private String sourceWareHouseId;
+ private String sourceWarehouseId;
// 鍏ュ簱绫诲瀷
private String inStockType;
// 璐т富绫诲瀷
@@ -83,11 +83,6 @@
@ApiModelProperty(value = "鏁伴噺灞炴�э紝澶栬喘绛�")
private String erpClsId;
- @ApiModelProperty(value = "寤鸿鐩爣浠擄紝鍏ュ簱")
- private String targetWarehouseId;
-
- @ApiModelProperty(value = "寤鸿璋冨嚭浠擄紝鍑轰粨")
- private String sourceWarehouseId;
public void setSpec(String spec) {
this.spec = spec;
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..0f8273e 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
@@ -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);
}
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
index b0e00cc..0b01eb7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
@@ -490,20 +490,20 @@
map.put("model", orderItem.getModel());
map.put("stockUnit", orderItem.getUnit());
map.put("purUnit", orderItem.getUnit());
- map.put("baseUnit", orderItem.getUnit());
- map.put("useOrgId", orderItem.getUnit());
- map.put("useOrgName", orderItem.getUnit());
- map.put("erpClsId", orderItem.getUnit());
- map.put("priceUnitId", orderItem.getUnit());
- map.put("inStockType", orderItem.getUnit());
- map.put("ownerTypeId", orderItem.getUnit());
- map.put("ownerId", orderItem.getUnit());
- map.put("ownerName", orderItem.getUnit());
- map.put("keeperTypeId", orderItem.getUnit());
- map.put("keeperId", orderItem.getUnit());
- map.put("keeperName", orderItem.getUnit());
- map.put("targetWarehouseId", orderItem.getUnit());
- map.put("sourceWarehouseId", orderItem.getUnit());
+ map.put("baseUnit", orderItem.getBaseUnitId());
+ map.put("useOrgId", orderItem.getUseOrgId());
+ map.put("useOrgName", orderItem.getUseOrgName());
+ map.put("erpClsId", orderItem.getErpClsId());
+ map.put("priceUnitId", orderItem.getPriceUnitId());
+ map.put("inStockType", orderItem.getInStockType());
+ map.put("ownerTypeId", orderItem.getOwnerTypeId());
+ map.put("ownerId", orderItem.getOwnerId());
+ map.put("ownerName", orderItem.getOwnerName());
+ map.put("keeperTypeId", orderItem.getKeeperTypeId());
+ map.put("keeperId", orderItem.getKeeperId());
+ map.put("keeperName", orderItem.getKeeperName());
+ map.put("targetWarehouseId", orderItem.getTargetWarehouseId());
+ map.put("sourceWarehouseId", orderItem.getSourceWarehouseId());
if (!asnOrderItemService.fieldsSave(map, loginUserId)) {
throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
--
Gitblit v1.9.1