From 6d910029b6c81db0a2b66caa66952781397b153a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 29 八月 2026 13:45:52 +0800
Subject: [PATCH] feat(mes): 实现H5溯源页面与二维码内容集成
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java | 66 +++++++++++++++++++++++++++++++-
1 files changed, 63 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
index 3086782..cc2413d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
@@ -32,6 +32,7 @@
.eqIfPresent(MesWmMaterialStockDO::getLocationId, reqVO.getLocationId())
.eqIfPresent(MesWmMaterialStockDO::getAreaId, reqVO.getAreaId())
.eqIfPresent(MesWmMaterialStockDO::getVendorId, reqVO.getVendorId())
+ .eqIfPresent(MesWmMaterialStockDO::getStockState, reqVO.getStockState())
.eqIfPresent(MesWmMaterialStockDO::getFrozen, reqVO.getFrozen());
wrapper.ne(MesWmMaterialStockDO::getQuantity, BigDecimal.ZERO)
.orderByAsc(MesWmMaterialStockDO::getReceiptTime);
@@ -137,12 +138,35 @@
} else {
wrapper.isNull(MesWmMaterialStockDO::getBatchId);
}
- // vendorId=null 鏃剁簿纭尮閰� is null
+ // vendorId=null 鏃朵笉闄愬埗锛屽尮閰嶄换鎰忎緵搴斿晢鐨勫簱瀛�
+ // 锛堥伩鍏嶅洜渚涘簲鍟嗙淮搴︽媶鍒嗭紝OUT 浜嬪姟鎵句笉鍒扮湡姝ｆ湁搴撳瓨鐨勮褰曡�屾墸閿欏埌 vendor_id IS NULL 鐨勮褰曪級
if (vendorId != null) {
wrapper.eq(MesWmMaterialStockDO::getVendorId, vendorId);
- } else {
- wrapper.isNull(MesWmMaterialStockDO::getVendorId);
}
+ // 澶氳褰曟椂浼樺厛鍙栧簱瀛橀噺鏈�澶氱殑锛堥伩鍏嶆墸鍒伴浂搴撳瓨鎴栬礋搴撳瓨鐨勮褰曪級
+ wrapper.last("ORDER BY quantity DESC LIMIT 1");
+ return selectOne(wrapper);
+ }
+
+ /**
+ * 鎸夌粍鍚堥敭鏌ヨ搴撳瓨璁板綍锛堝拷鐣ヤ緵搴斿晢缁村害锛�
+ *
+ * 鐢ㄤ簬绉诲簱鍦烘櫙锛氱Щ搴撴椂灏嗗簱瀛樺悎骞跺埌鐩爣搴撲綅宸叉湁搴撳瓨锛屼笉鍖哄垎渚涘簲鍟�
+ */
+ default MesWmMaterialStockDO selectByCompositeKeyIgnoreVendor(Long itemId, Long warehouseId, Long locationId,
+ Long areaId, Long batchId) {
+ LambdaQueryWrapperX<MesWmMaterialStockDO> wrapper = new LambdaQueryWrapperX<MesWmMaterialStockDO>()
+ .eq(MesWmMaterialStockDO::getItemId, itemId)
+ .eq(MesWmMaterialStockDO::getWarehouseId, warehouseId)
+ .eq(MesWmMaterialStockDO::getLocationId, locationId)
+ .eq(MesWmMaterialStockDO::getAreaId, areaId);
+ // batchId=null 鏃剁簿纭尮閰� is null
+ if (batchId != null) {
+ wrapper.eq(MesWmMaterialStockDO::getBatchId, batchId);
+ } else {
+ wrapper.isNull(MesWmMaterialStockDO::getBatchId);
+ }
+ wrapper.last("LIMIT 1");
return selectOne(wrapper);
}
@@ -154,6 +178,7 @@
.eqIfPresent(MesWmMaterialStockDO::getItemId, reqVO.getItemId())
.eqIfPresent(MesWmMaterialStockDO::getBatchId, reqVO.getBatchId())
.eqIfPresent(MesWmMaterialStockDO::getVendorId, reqVO.getVendorId())
+ .eqIfPresent(MesWmMaterialStockDO::getStockState, reqVO.getStockState())
.likeIfPresent(MesWmMaterialStockDO::getBatchCode, reqVO.getBatchCode())
.geIfPresent(MesWmMaterialStockDO::getUpdateTime, reqVO.getStartTime())
.leIfPresent(MesWmMaterialStockDO::getUpdateTime, reqVO.getEndTime())
@@ -161,4 +186,39 @@
.orderByAsc(MesWmMaterialStockDO::getReceiptTime));
}
+ /**
+ * 鎸夌墿鏂欑紪鍙锋壒閲忔煡璇㈠簱瀛樿褰曪紙鐢ㄤ簬鐗╂枡闇�姹傚簱瀛樻牎楠岋級
+ */
+ default List<MesWmMaterialStockDO> selectListByItemAndBatch(Long itemId, Long batchId) {
+ return selectList(new LambdaQueryWrapperX<MesWmMaterialStockDO>()
+ .eq(MesWmMaterialStockDO::getItemId, itemId)
+ .eqIfPresent(MesWmMaterialStockDO::getBatchId, batchId)
+ .gt(MesWmMaterialStockDO::getQuantity, BigDecimal.ZERO)
+ .orderByAsc(MesWmMaterialStockDO::getReceiptTime));
+ }
+
+ default List<MesWmMaterialStockDO> selectListByItemIds(Collection<Long> itemIds) {
+ if (itemIds == null || itemIds.isEmpty()) {
+ return java.util.Collections.emptyList();
+ }
+ return selectList(new LambdaQueryWrapperX<MesWmMaterialStockDO>()
+ .in(MesWmMaterialStockDO::getItemId, itemIds)
+ .ne(MesWmMaterialStockDO::getQuantity, BigDecimal.ZERO));
+ }
+
+ /**
+ * 鎸夋壒娆″彿鏇存柊搴撳瓨鐘舵�侊紙鐢ㄤ簬绉嶅瓙璐ㄦ鍚堟牸鍚庯紝灏嗘殏瀛樺簱鏁存壒杞负鍚堟牸搴擄級
+ *
+ * @param batchId 浠撳簱鎵规ID
+ * @param toState 鐩爣搴撳瓨鐘舵��
+ * @param fromState 鍘熷簱瀛樼姸鎬侊紙闄愬畾鍙洿鏂拌鐘舵�佺殑璁板綍锛�
+ * @return 褰卞搷琛屾暟
+ */
+ default int updateStockStateByBatchId(Long batchId, Integer toState, Integer fromState) {
+ return update(new MesWmMaterialStockDO().setStockState(toState),
+ new LambdaUpdateWrapper<MesWmMaterialStockDO>()
+ .eq(MesWmMaterialStockDO::getBatchId, batchId)
+ .eq(MesWmMaterialStockDO::getStockState, fromState));
+ }
+
}
--
Gitblit v1.9.3