From 860493f543afddffa17ed4f30cdd8256b0a06f23 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 21 八月 2025 08:39:28 +0800
Subject: [PATCH] 单据提交同步
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OrderParams.java | 2 +
rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReceiveMsgService.java | 8 ++++
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 59 ++++++++++++++++++++++++++---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ErpQueryController.java | 4 ++
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java | 18 ++++++++-
5 files changed, 83 insertions(+), 8 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ErpQueryController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ErpQueryController.java
index 5bedb8f..3f875a4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ErpQueryController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ErpQueryController.java
@@ -4,6 +4,7 @@
import com.vincent.rsf.server.api.service.ReceiveMsgService;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.erp.params.*;
+import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.framework.common.R;
@@ -46,6 +47,7 @@
* @version 1.0
*/
@ApiOperation(value = "鏌ヨ鍒嗙被淇℃伅")
+ @OperationLog("鐗╂枡鍒嗙被鍒楄〃")
@PostMapping("/query/matnr/group")
public R syncMatGroup() {
return R.ok().add(matnrGroupService.list());
@@ -58,6 +60,7 @@
* @version 1.0
*/
@ApiOperation(value = "鏌ヨ鍗曟嵁鐘舵�佸強鏄庣粏")
+ @OperationLog("鏌ヨ璁㈠崟鐘舵�佸強鏄庣粏")
@PostMapping("/query/order")
public R queryOrderStatus(@RequestBody QueryOrderParam queryParams) {
if (Objects.isNull(queryParams)) {
@@ -75,6 +78,7 @@
*/
@PostMapping("/query/locs/detls")
@ApiOperation(value = "搴撲綅淇℃伅鏌ヨ")
+ @OperationLog("搴撲綅鏄庣粏鍒楄〃")
public R syncLocDetls(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Loc, BaseParam> pageParam = new PageParam<>(baseParam, Loc.class);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java
index 3f6da6a..f523790 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java
@@ -7,6 +7,7 @@
import com.vincent.rsf.server.api.controller.erp.params.SyncOrderParams;
import com.vincent.rsf.server.api.controller.erp.params.SyncTransferParams;
import com.vincent.rsf.server.api.service.ReceiveMsgService;
+import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.enums.OrderType;
@@ -40,7 +41,9 @@
* @return
* @time 2025/3/4 13:57
*/
+
@ApiOperation(value = "鎺ユ敹鍚屾ERP閲囪喘鍗�")
+ @OperationLog("閲囪喘鍗曞悓姝�")
@PostMapping("/sync/purchase")
public R syncPurchases(@RequestBody List<OrderParams> orders) {
if (orders.isEmpty()) {
@@ -60,6 +63,7 @@
* @version 1.0
*/
@ApiOperation(value = "鍑哄簱閫氱煡鍗�(DO鍗曞悓姝�)")
+ @OperationLog("鍑哄簱閫氱煡鍗�(DO鍗曞悓姝�)")
@PostMapping("/sync/delivery")
public R syncDelivery(@RequestBody List<OrderParams> orders) {
if (!receiveMsgService.syncPurchasee(orders)) {
@@ -77,6 +81,7 @@
* @time 2025/3/12 16:56
*/
@ApiOperation(value = "璐ㄦ缁撴灉鍚屾")
+ @OperationLog("璐ㄦ缁撴灉鍚屾")
@PostMapping("/sync/inspect")
public void syncQlyInspect(HttpServletRequest request, HttpServletResponse response) {
AsnOrderTemplate template = ExcelUtil.mockData(AsnOrderTemplate.class);
@@ -94,6 +99,7 @@
* @version 1.0
*/
@ApiOperation("鍚屾鍗曟嵁")
+ @OperationLog("鍗曟嵁鍚屾")
@PostMapping("/sync/checks")
public R syncCheckResult(@RequestBody SyncOrderParams syncOrders) {
if (Objects.isNull(syncOrders)) {
@@ -109,6 +115,7 @@
* @version 1.0
*/
@ApiOperation("璋冩嫈鍗曞悓姝�")
+ @OperationLog("璋冩嫈鍗曞悓姝�")
@PostMapping("/sync/transfers")
public R syncTransfer(@RequestBody SyncTransferParams transferParams) {
if (Objects.isNull(transferParams)) {
@@ -125,6 +132,7 @@
* @version 1.0
*/
@ApiOperation("搴撳瓨璋冩暣鍗曞悓姝�")
+ @OperationLog("搴撳瓨璋冩暣鍗曞悓姝�")
@PostMapping("/sync/revises")
public R syncRevise(@RequestBody SyncLocReviseParams reviseParams) {
if (Objects.isNull(reviseParams)) {
@@ -140,6 +148,7 @@
* @version 1.0
*/
@ApiOperation("璐ㄦ鍗曚笂鎶�")
+ @OperationLog("璐ㄦ鍗曚笂鎶�")
@PostMapping("/sync/qlyInspect")
public R syncQlyReport(@RequestBody List<OrderParams> orders) {
@@ -153,10 +162,14 @@
* @version 1.0
*/
@ApiOperation("鍗曟嵁淇敼")
+ @OperationLog("鍗曟嵁淇敼")
@PostMapping("/sync/orders/update")
- public R syncOrderUpdate(@RequestBody List<OrderParams> orders) {
+ public R syncOrderUpdate(@RequestBody SyncOrderParams orders) {
+ if (Objects.isNull(orders)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
- return R.ok();
+ return receiveMsgService.syncOrderUpdate(orders);
}
@@ -167,6 +180,7 @@
* @version 1.0
*/
@ApiOperation("鍗曟嵁鍒犻櫎")
+ @OperationLog("鍗曟嵁鍒犻櫎")
@PostMapping("/sync/orders/delete")
public R syncOrderDel(@RequestBody List<OrderParams> orders) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OrderParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OrderParams.java
index effee8b..b80b81d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OrderParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/OrderParams.java
@@ -7,6 +7,7 @@
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
+import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
@@ -30,6 +31,7 @@
private String code;
@ApiModelProperty(value = "闇�姹傛暟閲�", required = true)
+ @NotNull(message = "鏁伴噺涓嶈兘涓虹┖")
private Double anfme;
@ApiModelProperty(value = "宸叉敹璐ф暟閲�",required = true)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReceiveMsgService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReceiveMsgService.java
index e01d4e0..55209ee 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReceiveMsgService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReceiveMsgService.java
@@ -113,4 +113,12 @@
* @version 1.0
*/
R syncLocRevise(SyncLocReviseParams reviseParams);
+
+ /**
+ * @author Ryan
+ * @date 2025/8/20
+ * @description: 鍗曟嵁淇敼--鏀惰揣閫氱煡鍗�/鍑哄簱鍗�/鐩樼偣鍗�
+ * @version 1.0
+ */
+ R syncOrderUpdate(SyncOrderParams orders);
}
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 de0ec9c..f14cccb 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.R;
@@ -210,7 +211,7 @@
@Override
public R queryOrderStatus(QueryOrderParam queryParams) {
WkOrder wkOrders = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
- .eq(WkOrder::getCode, queryParams.getOrderNo())
+ .in(WkOrder::getCode, queryParams.getOrderNo())
.eq(WkOrder::getType, queryParams.getType()));
if (Objects.isNull(wkOrders)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
@@ -233,7 +234,7 @@
public R syncLocsDetl(PageParam<Loc, BaseParam> pageParam, QueryWrapper<Loc> wrapper) {
Page<Object> page = new Page<>();
page.setCurrent(pageParam.getCurrent()).setSize(pageParam.getSize());
- IPage<LocStockDto> locStocks = locService.getLocDetls(page);
+ IPage<LocStockDto> locStocks = locService.getLocDetls(page);
return R.ok().add(locStocks);
}
@@ -303,7 +304,7 @@
BeanUtils.copyProperties(param, locArea);
WarehouseAreas warehouseAreas = warehouseAreasService
.getOne(new LambdaQueryWrapper<WarehouseAreas>()
- .eq(WarehouseAreas::getName, param.getName()));
+ .eq(WarehouseAreas::getName, param.getName()));
if (!Objects.isNull(warehouseAreas)) {
locArea.setWarehouseId(warehouseAreas.getId());
}
@@ -357,7 +358,7 @@
String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_COMPANYS_CODE, null);
companys.setCode(ruleCode);
} else {
- throw new CoolException(one.getName() + "锛屼紒涓氬悕閲嶅锛侊紒");
+ throw new CoolException(one.getName() + "锛屼紒涓氬悕閲嶅锛侊紒");
}
companys.setType(CompanysType.getCustomVal(param.getType()))
.setId(null);
@@ -378,12 +379,12 @@
WkOrder wkOrder = new WkOrder();
String ruleCode = null;
if (syncOrders.getType().equals(OrderType.ORDER_CHECK.type)) {
- ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_CHECK_RULE_CODE, null);
+ ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_CHECK_RULE_CODE, null);
} else if (syncOrders.getType().equals(OrderType.ORDER_IN.type)) {
ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, null);
} else if (syncOrders.getType().equals(OrderType.ORDER_OUT.type)) {
ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, null);
- } else if (syncOrders.getType().equals(OrderType.ORDER_REVISE.type)) {
+ } else if (syncOrders.getType().equals(OrderType.ORDER_REVISE.type)) {
ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LOC_REVISE_CODE, null);
} else if (syncOrders.getType().equals(OrderType.ORDER_TRANSFER.type)) {
ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TRANSFER_ORDER_CODE, null);
@@ -532,4 +533,50 @@
return R.ok();
}
+ /**
+ * @author Ryan
+ * @date 2025/8/20
+ * @description: 鍗曟嵁淇敼--鏀惰揣閫氱煡鍗�/鍑哄簱鍗�/鐩樼偣鍗�
+ * @version 1.0
+ */
+ @Override
+ @Transactional(timeout = 60, rollbackFor = Exception.class)
+ public R syncOrderUpdate(SyncOrderParams orders) {
+ //鍏ュ簱鍗曚慨鏀�
+ if (orders.getType().equals(OrderType.ORDER_IN.type)) {
+ orders.getItems().forEach(orderItem -> {
+ WkOrder order = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getCode, orderItem.getOrderCode()));
+ if (Objects.isNull(order)) {
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+
+ if (!asnOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getOrderCode, orderItem.getOrderCode())
+ .eq(WkOrderItem::getMatnrCode, orderItem.getMatnrCode())
+ .eq(WkOrderItem::getSplrBatch, orderItem.getBatch())
+ .set(WkOrderItem::getAnfme, orderItem.getAnfme()))) {
+ throw new CoolException("鍗曟嵁淇敼澶辫触锛侊紒");
+ }
+
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getOrderId, order.getId()));
+ if (orderItems.isEmpty()) {
+ throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+
+ Double summed = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
+ order.setAnfme(summed);
+
+ if (!asnOrderService.updateById(order)) {
+ throw new CoolException("鍗曟嵁淇敼澶辫触锛侊紒");
+ }
+ //TODO 娣诲姞鎿嶄綔鏃ュ織
+ });
+ } else {
+
+ }
+ return null;
+ }
+
}
--
Gitblit v1.9.1