From 91ab1a15515c4c213b2ac4f777a7f20c3d0d59ad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 三月 2025 13:49:53 +0800
Subject: [PATCH] 一个订单在每个站点检验都需要扫码入库报检,在中间站点复核继续试验之后默认自动将样品出库,且在列表中也不需要再展示出来,到最后一步复核结束反而是需要手动去出库不能自动出库,且出库之后也不需要在页面展示
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/WarehouseServiceImpl.java | 22 +++++-----------------
1 files changed, 5 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..e37c5f2 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
@@ -190,28 +190,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 +203,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