From b22ebe8fad1691b35adcf321fe2e136795b3f81d Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 29 六月 2026 17:58:00 +0800
Subject: [PATCH] 库位

---
 src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java |   43 ++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
index 7f5712d..49bd0a5 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -64,6 +64,8 @@
 import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
 import com.ruoyi.stock.pojo.StockInRecord;
 import com.ruoyi.stock.service.StockInRecordService;
+import com.ruoyi.device.mapper.DeviceLedgerMapper;
+import com.ruoyi.device.pojo.DeviceLedger;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -119,6 +121,7 @@
     private final StockUtils stockUtils;
     private final ApprovalTemplateMapper approvalTemplateMapper;
     private final SparePartsMapper sparePartsMapper;
+    private final DeviceLedgerMapper deviceLedgerMapper;
 
     @Override
     public List<PurchaseLedger> selectPurchaseLedgerList(PurchaseLedger purchaseLedger) {
@@ -421,10 +424,30 @@
         qualityInspect.setProductModelId(saleProduct.getProductModelId());
         qualityInspect.setUnit(saleProduct.getUnit());
         qualityInspect.setQuantity(saleProduct.getQuantity());
+        qualityInspect.setWarehouse(saleProduct.getStorageLocation());
         qualityInspectMapper.insert(qualityInspect);
         List<QualityTestStandard> qualityTestStandard = qualityTestStandardMapper.getQualityTestStandardByProductId(saleProduct.getProductId(), 0,null);
         if (qualityTestStandard.size()>0){
-            qualityInspect.setTestStandardId(qualityTestStandard.get(0).getId());
+            QualityTestStandard std = qualityTestStandard.get(0);
+            qualityInspect.setTestStandardId(std.getId());
+            // 鏍规嵁 inspectRule 璁剧疆鎶芥姣斾緥鍜屾娊妫�鏁伴噺榛樿鍊�
+            if (std.getInspectRule() == null || std.getInspectRule() == 0) {
+                // 鍏ㄦ
+                qualityInspect.setInspectRule(0);
+                qualityInspect.setSampleRatio(java.math.BigDecimal.valueOf(100));
+                qualityInspect.setSampleQuantity(saleProduct.getQuantity() != null ? saleProduct.getQuantity() : java.math.BigDecimal.ZERO);
+            } else {
+                // 鎶芥
+                qualityInspect.setInspectRule(1);
+                java.math.BigDecimal ratio = std.getSampleRatio() != null ? std.getSampleRatio() : java.math.BigDecimal.ZERO;
+                qualityInspect.setSampleRatio(ratio);
+                if (saleProduct.getQuantity() != null && ratio.compareTo(java.math.BigDecimal.ZERO) > 0) {
+                    qualityInspect.setSampleQuantity(saleProduct.getQuantity().multiply(ratio)
+                            .divide(java.math.BigDecimal.valueOf(100), 0, java.math.RoundingMode.CEILING));
+                } else {
+                    qualityInspect.setSampleQuantity(java.math.BigDecimal.ZERO);
+                }
+            }
             qualityInspectMapper.updateById(qualityInspect);
             qualityTestStandardParamMapper.selectList(Wrappers.<QualityTestStandardParam>lambdaQuery()
                     .eq(QualityTestStandardParam::getTestStandardId,qualityTestStandard.get(0).getId()))
@@ -476,13 +499,18 @@
         if (CollectionUtils.isEmpty(stockRecords)
                 && qualityInspect.getQualifiedQuantity() != null
                 && qualityInspect.getQualifiedQuantity().compareTo(BigDecimal.ZERO) > 0) {
+            // 浼樺厛浣跨敤璐ㄦ鍗曚腑鐨勫簱浣嶏紝濡傛灉娌℃湁鍒欎娇鐢ㄤ骇鍝佹槑缁嗕腑鐨勫簱浣�
+            String warehouse = StringUtils.hasText(qualityInspect.getWarehouse())
+                    ? qualityInspect.getWarehouse()
+                    : product.getStorageLocation();
             stockUtils.addStockWithBatchNo(
                     product.getProductModelId(),
                     qualityInspect.getQualifiedQuantity(),
                     StockInQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_OUT.getCode(),
                     qualityInspect.getId(),
                     null,
-                    purchaseInspectTime == null ? null : purchaseInspectTime.plusDays(1)
+                    purchaseInspectTime == null ? null : purchaseInspectTime.plusDays(1),
+                    warehouse
             );
             stockRecords = findQualityStockRecords(qualityInspect.getId(), product.getProductModelId());
         }
@@ -529,7 +557,8 @@
                     StockInQualifiedRecordTypeEnum.PURCHASE_STOCK_IN.getCode(),
                     purchaseLedger.getId(),
                     purchaseLedger.getPurchaseContractNumber() + "-" + product.getId(),
-                    stockCreateTime
+                    stockCreateTime,
+                    product.getStorageLocation()
             );
             stockRecords = findDirectStockRecords(purchaseLedger.getId(), purchaseLedger.getPurchaseContractNumber(), product.getProductModelId(), product.getId());
         }
@@ -716,6 +745,14 @@
                     product.setProductCategory(spareParts.getName());
                 }
             }
+
+            // 濡傛灉鏈夎澶嘔D浣嗘病鏈夊簱浣嶏紝浠庤澶囪〃鑷姩濉厖搴撲綅
+            if (product.getDeviceId() != null && StringUtils.isEmpty(product.getStorageLocation())) {
+                DeviceLedger device = deviceLedgerMapper.selectById(product.getDeviceId());
+                if (device != null && StringUtils.isNotEmpty(device.getStorageLocation())) {
+                    product.setStorageLocation(device.getStorageLocation());
+                }
+            }
         }
 
         // 鍒嗙粍澶勭悊

--
Gitblit v1.9.3