From a5a094d5eb9eabb81acd714c964e51f1a99502b8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 25 三月 2026 10:37:51 +0800
Subject: [PATCH] 查询仓库---查询全部货架
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/WarehouseServiceImpl.java | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/WarehouseServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/WarehouseServiceImpl.java
index 4c41723..2927fee 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/WarehouseServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/WarehouseServiceImpl.java
@@ -65,6 +65,11 @@
}
@Override
+ public List<WarehouseDto> selectWarehouseAll() {
+ return warehouseMapper.selectWarehouseListAll();
+ }
+
+ @Override
@Transactional(rollbackFor = Exception.class)
public int addShelf(WarehouseShelf warehouseShelf) {
warehouseShelfMapper.insert(warehouseShelf);
@@ -190,28 +195,12 @@
}
List<InsSample> samples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery()
.eq(InsSample::getSampleCode, sampleCode)
- .eq(InsSample::getInsOrderId,insOrders.get(0).getId())
- .select(InsSample::getId,InsSample::getCellId));
+ .eq(InsSample::getInsOrderId,insOrders.get(0).getId()));
if(samples.size()!=1){
throw new ErrorException("鏍峰搧缂栧彿杈撳叆鏈夎");
}
if(samples.get(0).getCellId()==null){
throw new ErrorException("鏍峰搧 " + sampleCode + " 鏈叆搴�");
- }
- if (!a) {
- //鍒ゆ柇璇ヨ鍗曟槸鍚︾珯鐐逛换鍔℃湁(缁х画璇曢獙鎴栬�呮槸缁撴潫璇曢獙)
- List<InsOrderState> orderStates = insOrderStateMapper.selectList(Wrappers.<InsOrderState>lambdaQuery()
- .eq(InsOrderState::getInsOrderId, samples.get(0).getInsOrderId())
- .eq(InsOrderState::getInsState, 5));
- List<Integer> orderIds = new ArrayList<Integer>();
- orderIds.add(6);
- if (CollectionUtils.isEmpty(orderStates)) {
- List<Integer> collect = insOrderStateMapper.selectList(Wrappers.<InsOrderState>lambdaQuery()
- .eq(InsOrderState::getInsOrderId, samples.get(0).getInsOrderId())).stream().map(InsOrderState::getInsState).distinct().collect(Collectors.toList());
- if (collect.size()!=0 && !collect.containsAll(orderIds)) {
- throw new ErrorException("璇ユ牱鍝佺殑妫�楠屼换鍔¤繕娌℃湁缁撴潫璇曢獙鎴栫户缁瘯楠�,鏆傛椂鏃犳硶鍑哄簱!");
- }
- }
}
WarehouseHistory history = new WarehouseHistory();
history.setState(2);
@@ -219,6 +208,10 @@
history.setCellId(samples.get(0).getCellId());
history.setWarehouseCode(warehouseHistoryMapper.selectOne(Wrappers.<WarehouseHistory>lambdaQuery().eq(WarehouseHistory::getInsSampleId, samples.get(0).getId()).select(WarehouseHistory::getWarehouseCode).orderByDesc(WarehouseHistory::getId).last("limit 1")).getWarehouseCode());
insSampleMapper.update(null, Wrappers.<InsSample>lambdaUpdate().eq(InsSample::getId, samples.get(0).getId()).set(InsSample::getCellId, null));
+ //璇ヨ鍗曢棴鐜�
+ InsOrder insOrder = insOrders.get(0);
+ insOrder.setState(4);
+ insOrderMapper.updateById(insOrder);
return warehouseHistoryMapper.insert(history);
}
--
Gitblit v1.9.3