From 5ec416d5886273ae2d9eed3e7ab2c1c286a361a3 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期六, 01 十一月 2025 11:22:52 +0800
Subject: [PATCH] 打开上报接口

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

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 4dcf672..1dd4ab7 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
@@ -68,6 +68,8 @@
     @Autowired
     private AsnOrderService asnOrderService;
     @Autowired
+    private AsnOrderLogService asnOrderLogService;
+    @Autowired
     private AsnOrderItemService asnOrderItemService;
     @Autowired
     private DeliveryService deliveryService;
@@ -225,11 +227,20 @@
     @Override
     public R queryOrderStatus(QueryOrderParam queryParams) {
         WkOrder wkOrders = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
-                .eq(WkOrder::getCode, queryParams.getOrderNo())
-                .eq(StringUtils.isNotBlank(queryParams.getType()), WkOrder::getType, queryParams.getType()));
+                .eq(WkOrder::getPoCode, queryParams.getOrderNo()));
         if (Objects.isNull(wkOrders)) {
-            throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+            Map<String, Object> map = new HashMap<>();
+            map.put("exceStatus", "-1");
+            return R.ok("鍗曟嵁涓嶅瓨鍦� 锛侊紒").add(map);
         }
+
+        AsnOrderLog orderLog = asnOrderLogService.getOne(new LambdaQueryWrapper<AsnOrderLog>().eq(AsnOrderLog::getCode, queryParams.getOrderNo()));
+        if (!Objects.isNull(orderLog)) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("exceStatus", "4");
+            return R.ok("鍗曟嵁宸插畬鎴� 锛侊紒").add(map);
+        }
+
         List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, wkOrders.getId()));
 
         WkOrderDto wkorderDto = new WkOrderDto();
@@ -434,6 +445,11 @@
                         .setUpdateTime(new Date())
                         .setCreateBy(loginUserId)
                         .setUpdateBy(loginUserId);
+
+                if (syncOrder.getType().equals(OrderType.ORDER_OUT.type)){
+                    wkOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val);
+                }
+
                 if (!asnOrderService.save(wkOrder)) {
                     throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒");
                 }

--
Gitblit v1.9.1