From 23317ed94a5e2d9b19c16627a70f9c7b69c908a2 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 29 十月 2026 16:36:54 +0800
Subject: [PATCH] feat: 发货支持无库存批号(未启用仓储模块的租户)

---
 src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java |   25 ++++++++++--
 src/main/resources/mapper/sales/ShippingProductDetailMapper.xml         |    4 +-
 src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java         |   41 +++++++++++++++++++-
 3 files changed, 61 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java b/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java
index 6c56359..e8cd02b 100644
--- a/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java
+++ b/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java
@@ -4,9 +4,13 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.ruoyi.common.enums.ReviewStatusEnum;
+import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
 import com.ruoyi.procurementrecord.mapper.ProcurementRecordMapper;
 import com.ruoyi.procurementrecord.mapper.ProcurementRecordOutMapper;
+import com.ruoyi.sales.mapper.ShippingProductDetailMapper;
+import com.ruoyi.sales.pojo.ShippingProductDetail;
 import com.ruoyi.stock.dto.StockInventoryDto;
+import com.ruoyi.stock.dto.StockOutRecordDto;
 import com.ruoyi.stock.dto.StockUninventoryDto;
 import com.ruoyi.stock.pojo.StockInRecord;
 import com.ruoyi.stock.pojo.StockOutRecord;
@@ -31,6 +35,7 @@
     private final StockInventoryService stockInventoryService;
     private final StockInRecordService stockInRecordService;
     private final StockOutRecordService stockOutRecordService;
+    private final ShippingProductDetailMapper shippingProductDetailMapper;
 
     /**
      * 涓嶅悎鏍煎叆搴�
@@ -154,15 +159,47 @@
     }
 
     /**
-     * 鍙戣揣瀹℃壒鐘舵�佹洿鏀�
+     * 鍙櫥璁板嚭搴撴祦姘达紝涓嶆牎楠屻�佷笉鎵e噺搴撳瓨銆�
+     * 鐢ㄤ簬鏈惎鐢ㄤ粨鍌ㄦā鍧椼�佸彂璐ф病鏈夊簱瀛樻壒鍙风殑鍦烘櫙銆�
+     *
+     * @param productModelId
+     * @param quantity
+     * @param recordType
+     * @param recordId
+     * @param batchNo
+     */
+    public void recordStockOutWithoutInventory(Long productModelId, BigDecimal quantity, String recordType, Long recordId, String batchNo) {
+        StockOutRecordDto stockOutRecordDto = new StockOutRecordDto();
+        stockOutRecordDto.setRecordId(recordId);
+        stockOutRecordDto.setRecordType(String.valueOf(recordType));
+        stockOutRecordDto.setStockOutNum(quantity);
+        stockOutRecordDto.setProductModelId(productModelId);
+        stockOutRecordDto.setBatchNo(batchNo);
+        stockOutRecordDto.setType("0");
+        stockOutRecordService.add(stockOutRecordDto);
+    }
+
+    /**
+     * 鍙戣揣瀹℃壒鐘舵�佹洿鏀广��
+     * 娌℃湁搴撳瓨鎵瑰彿鐨勫彂璐э紙鏈惎鐢ㄤ粨鍌ㄦā鍧楋級娌℃湁鍑哄簱瀹℃牳鐜妭锛屽鎵归�氳繃鍗宠涓哄凡鍑哄簱锛�
+     * 鍚﹀垯鍙戣揣鏁伴噺缁熻涓嶅埌銆�
+     *
      * @param recordType
      * @param recordId
      */
     public void shipmentStatus(String recordType, Long recordId) {
+        Long inventoryBatchCount = shippingProductDetailMapper.selectCount(new LambdaQueryWrapper<ShippingProductDetail>()
+                .eq(ShippingProductDetail::getShippingInfoId, recordId)
+                .isNotNull(ShippingProductDetail::getStockInventoryId));
+        boolean withoutInventoryBatch = StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode().equals(recordType)
+                && inventoryBatchCount == 0;
+        Integer approvalStatus = withoutInventoryBatch
+                ? ReviewStatusEnum.APPROVED.getCode()
+                : ReviewStatusEnum.PENDING_REVIEW.getCode();
         LambdaQueryWrapper<StockOutRecord> queryWrapper = new LambdaQueryWrapper<StockOutRecord>().eq(StockOutRecord::getRecordType, recordType)
                 .eq(StockOutRecord::getRecordId, recordId);
         stockOutRecordService.list(queryWrapper).stream().forEach(stockOutRecord -> {
-            stockOutRecord.setApprovalStatus(0);
+            stockOutRecord.setApprovalStatus(approvalStatus);
             stockOutRecordService.updateById(stockOutRecord);
         });
     }
diff --git a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
index be34bc0..17909ec 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
@@ -85,7 +85,7 @@
                 throw new RuntimeException("鍙戣揣淇℃伅涓嶅瓨鍦�");
             }
             for (ShippingProductDetail shippingProductDetail : shippingProductDetails) {
-                stockUtils.substractStock(shippingProductDetail.getProductModelId(), shippingProductDetail.getQuantity(), StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(), req.getId(), shippingProductDetail.getBatchNo());
+                deductOrRecordStock(shippingProductDetail, req.getId());
             }
         }
         byId.setExpressNumber(req.getExpressNumber());
@@ -143,16 +143,31 @@
     @Override
     public boolean add(ShippingInfoDto req) {
         this.save(req);
-        req.getBatchNoDetailList().forEach(item -> item.setShippingInfoId(req.getId()));
-        shippingProductDetailMapper.insert(req.getBatchNoDetailList());
-        for (ShippingProductDetail shippingProductDetail : req.getBatchNoDetailList()) {
-            stockUtils.substractStock(shippingProductDetail.getProductModelId(), shippingProductDetail.getQuantity(), StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(), req.getId(), shippingProductDetail.getBatchNo());
+        List<ShippingProductDetail> detailList = req.getBatchNoDetailList();
+        if (CollectionUtils.isNotEmpty(detailList)) {
+            detailList.forEach(item -> item.setShippingInfoId(req.getId()));
+            shippingProductDetailMapper.insert(detailList);
+            for (ShippingProductDetail shippingProductDetail : detailList) {
+                deductOrRecordStock(shippingProductDetail, req.getId());
+            }
         }
         // 淇濆瓨鏂囦欢
         fileUtil.saveStorageAttachment(ApplicationTypeEnum.IMAGE, RecordTypeEnum.SHIPPING_INFO, req.getId(), req.getStorageBlobDTOs());
         return true;
     }
 
+    /**
+     * 鏈夊簱瀛樻壒鍙风殑鍙戣揣鎵e噺搴撳瓨锛涙病鏈夊簱瀛樻壒鍙凤紙鏈惎鐢ㄤ粨鍌ㄦā鍧楋級鐨勫彂璐у彧鐧昏鍑哄簱娴佹按銆�
+     */
+    private void deductOrRecordStock(ShippingProductDetail detail, Long shippingInfoId) {
+        String recordType = StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode();
+        if (detail.getStockInventoryId() == null) {
+            stockUtils.recordStockOutWithoutInventory(detail.getProductModelId(), detail.getQuantity(), recordType, shippingInfoId, detail.getBatchNo());
+        } else {
+            stockUtils.substractStock(detail.getProductModelId(), detail.getQuantity(), recordType, shippingInfoId, detail.getBatchNo());
+        }
+    }
+
     @Override
     public List<ShippingProductDetailDto> getDetail(Long id) {
         return shippingProductDetailMapper.getDetail(id);
diff --git a/src/main/resources/mapper/sales/ShippingProductDetailMapper.xml b/src/main/resources/mapper/sales/ShippingProductDetailMapper.xml
index 15a6168..43cfff7 100644
--- a/src/main/resources/mapper/sales/ShippingProductDetailMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingProductDetailMapper.xml
@@ -14,7 +14,7 @@
         select si.batch_no, pm.model as specification_model, p.product_name, spd.quantity as delivery_quantity
         from shipping_product_detail spd
                  left join stock_inventory si on si.id = spd.stock_inventory_id
-                 left join product_model pm on pm.id = si.product_model_id
+                 left join product_model pm on pm.id = IFNULL(si.product_model_id, spd.product_model_id)
                  left join product p on p.id = pm.product_id
         where spd.shipping_info_id = #{id}
     </select>
@@ -23,7 +23,7 @@
          from shipping_product_detail spd
                   left join shipping_info sp on sp.id = spd.shipping_info_id
                   left join stock_inventory si on si.id = spd.stock_inventory_id
-                  left join product_model pm on pm.id = si.product_model_id
+                  left join product_model pm on pm.id = IFNULL(si.product_model_id, spd.product_model_id)
                   left join product p on p.id = pm.product_id
          where sp.shipping_no = #{shippingNo}
     </select>

--
Gitblit v1.9.3