From 7fde09ac25f86667325e65ddcd0ad9769aa187d1 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 21 十月 2025 16:55:05 +0800
Subject: [PATCH] erp物料对接修改
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 11 +++++++----
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrderParams.java | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrderParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrderParams.java
index ae5afc5..f45e72f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrderParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrderParams.java
@@ -38,5 +38,5 @@
private Date arrTime;
@ApiModelProperty("鍗曟嵁鏄庣粏淇℃伅")
- private List<SyncOrdersItem> ordersItems;
+ private List<SyncOrdersItem> orderItems;
}
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 1f5f9cb..ca5e3aa 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
@@ -396,7 +396,7 @@
syncOrders.forEach(syncOrder -> {
WkOrder wkOrder = new WkOrder();
DictData one = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE)
- .eq(DictData::getLabel, syncOrder.getWkType()), false);
+ .eq(DictData::getValue, syncOrder.getWkType()), false);
if (Objects.isNull(one)) {
throw new CoolException("鍗曟嵁锛�" + syncOrder.getOrderNo() + ", 涓氬姟绫诲瀷涓嶅瓨鍦紒锛�");
}
@@ -424,6 +424,8 @@
.setWkType(OrderWorkType.getWorkType(syncOrder.getWkType()))
.setAnfme(syncOrder.getAnfme())
.setPoCode(syncOrder.getOrderNo())
+ .setWorkQty(0.0)
+ .setQty(0.0)
.setPoId(syncOrder.getOrderId())
.setCode(ruleCode)
.setArrTime(syncOrder.getArrTime())
@@ -436,12 +438,13 @@
throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒");
}
- syncOrder.getOrdersItems().forEach(orderItem -> {
+ syncOrder.getOrderItems().forEach(orderItem -> {
Map<String, Object> map = new ObjectMapper().convertValue(orderItem, Map.class);
map.put("orderId", wkOrder.getId());
map.put("poId", wkOrder.getPoId());
map.put("poCode", wkOrder.getPoCode());
map.put("order_code", wkOrder.getCode());
+ map.put("matnrCode", orderItem.getMatnr());
if (!asnOrderItemService.fieldsSave(map, loginUserId)) {
throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
@@ -619,7 +622,7 @@
if (Objects.isNull(wkOrder)) {
throw new CoolException("璇风‘璁ゅ崟鎹細" + order.getOrderNo() + "鏄惁宸茬粡鎵ц鎴栨槸鍚﹀悓姝ワ紒锛�");
}
- order.getOrdersItems().forEach(orderItem -> {
+ order.getOrderItems().forEach(orderItem -> {
WkOrderItem wkOrderItem = asnOrderItemService.getOne(new LambdaUpdateWrapper<WkOrderItem>()
.eq(WkOrderItem::getMatnrCode, orderItem.getMatnr())
.eq(StringUtils.isNotEmpty(orderItem.getBatch()), WkOrderItem::getSplrBatch, orderItem.getBatch())
@@ -669,7 +672,7 @@
if (Objects.isNull(wkOrder)) {
throw new CoolException("璁㈠崟锛�" + wkOrder.getCode() + "锛屽綋鍓嶇姸鎬侊紝涓嶅彲鎵ц鍒犻櫎鎿嶄綔锛侊紒");
}
- order.getOrdersItems().forEach(orderItem -> {
+ order.getOrderItems().forEach(orderItem -> {
if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
.eq(WkOrderItem::getMatnrCode, orderItem.getMatnr())
.eq(StringUtils.isNotEmpty(orderItem.getBatch()), WkOrderItem::getSplrBatch, orderItem.getBatch())
--
Gitblit v1.9.1