From 74b0d9c5ab1dc316b29f8525dcffe45225d4c43c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 16 十月 2026 10:29:23 +0800
Subject: [PATCH] Merge branch 'dev_海西州_惠牧' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
index 7ffb1e8..dd30de9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImpl.java
@@ -312,9 +312,7 @@
@Override
public PageResult<MesQcOqcDO> getOqcPage(MesQcOqcPageReqVO pageReqVO) {
- // 鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑瀹㈡埛 ID 鍒楄〃
- List<Long> permittedClientIds = customerApi.getPermittedCustomerIds();
- return oqcMapper.selectPage(pageReqVO, permittedClientIds);
+ return oqcMapper.selectPage(pageReqVO, (List<Long>) null);
}
@Override
@@ -391,7 +389,11 @@
oqc.setCheckQuantity(BigDecimal.ZERO); // 寰呭～鍐�
oqc.setQualifiedQuantity(BigDecimal.ZERO); // 寰呭～鍐�
oqc.setUnqualifiedQuantity(BigDecimal.ZERO); // 寰呭～鍐�
- oqc.setOutDate(java.time.LocalDateTime.now());
+ MesWmProductSalesDO sales = productSalesService.getProductSales(salesId);
+ java.time.LocalDateTime businessDate = sales != null && sales.getSalesDate() != null
+ ? sales.getSalesDate() : java.time.LocalDateTime.now();
+ oqc.setOutDate(businessDate);
+ oqc.setInspectDate(businessDate);
oqc.setStatus(MesQcStatusEnum.DRAFT.getStatus());
oqcMapper.insert(oqc);
--
Gitblit v1.9.3