From fe0653b458fbcac5a07c62e328a95c76d2b88e0e Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 27 五月 2025 11:19:09 +0800
Subject: [PATCH] 添加srm与U9订单数据的对比
---
src/main/java/com/gs/xky/service/PurchaseService.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gs/xky/service/PurchaseService.java b/src/main/java/com/gs/xky/service/PurchaseService.java
index f2c5516..5598796 100644
--- a/src/main/java/com/gs/xky/service/PurchaseService.java
+++ b/src/main/java/com/gs/xky/service/PurchaseService.java
@@ -10,6 +10,7 @@
import com.gs.xky.entity.PurchaseOrderCompare;
import com.gs.xky.entity.PurchaseOrderDetail;
import com.gs.xky.mapper.PurchaseOrderCompareMapper;
+import com.gs.xky.mapper.PurchaseOrderDetailMapper;
import lombok.RequiredArgsConstructor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -30,6 +31,7 @@
private final MesRohInDataService mesRohInDataService;
private final PurchaseOrderDetailService purchaseOrderDetailService;
private final PurchaseOrderCompareMapper purchaseOrderCompareMapper;
+ private final PurchaseOrderDetailMapper purchaseOrderDetailMapper;
/**
* 鍚屾閲囪喘璁㈠崟鏄庣粏鏁版嵁
@@ -44,6 +46,10 @@
long currentTimeMillis = System.currentTimeMillis();
// 闄愬埗璇锋眰鏃堕棿鑼冨洿涓�24灏忔椂
long startDate = currentTimeMillis - (24 * 60 * 60 * 1000L);
+
+ // 鍏堝垹闄ゅ凡鏈夋暟鎹紝閬垮厤閲嶅
+ purchaseOrderDetailMapper.deleteByPrimaryKey();
+ purchaseOrderCompareMapper.deleteByPrimaryKey();
XkyCommonParam<PurchaseParam> param = XkyCommonParam.GetInit();
PurchaseParam bodyParam = new PurchaseParam();
@@ -166,13 +172,14 @@
// 璁＄畻SRM寰呮敹鏁伴噺
Integer srmPurchaseQty = detail.getTotalAnswerQty();
- Integer srmReceivedQty = detail.getTotalReceiveQty();
+ Integer srmReceivedQty = detail.getPoWaitDeliveryQty() + detail.getReturnWaitDeliveryQty();
+ //poWaitDeliveryQty + returnWaitDeliveryQty
Integer srmWaitReceiveQty = srmPurchaseQty - srmReceivedQty;
// 璁剧疆SRM鏁版嵁
compareData.setSrmPurchaseQty(srmPurchaseQty);
- compareData.setSrmReceivedQty(srmReceivedQty);
- compareData.setSrmWaitReceiveQty(srmWaitReceiveQty);
+ compareData.setSrmReceivedQty(srmWaitReceiveQty);
+ compareData.setSrmWaitReceiveQty(srmReceivedQty);
// 璁剧疆ERP鏁版嵁鍜屽樊寮�
if (erpData == null) {
--
Gitblit v1.9.3