From a42e0989485009e7196a8e8a7d25473b3d827cff Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 02 九月 2024 17:36:25 +0800
Subject: [PATCH] 插队操作+用户列表
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 58 ++++++++++------------------------------------------------
1 files changed, 10 insertions(+), 48 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 6e1eb12..1a6804c 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -195,10 +195,16 @@
return false;
}
/*璁ら闇�瑕佸垽鏂鏍峰搧鏄惁鍦ㄥ簱*/
- //鏌ヨ鏍峰搧id
+ //鏌ヨ鏍峰搧id(杩囨护娌℃湁妫�楠岄」鐩殑鏍峰搧)
List<Integer> sampleIds = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery()
.eq(InsSample::getInsOrderId, entity.getInsSampleId())).stream().map(InsSample::getId).collect(Collectors.toList());
for (Integer samId : sampleIds) {
+ //杩囨护娌℃湁妫�楠岄」鐩殑鏍峰搧id
+ if (ObjectUtils.isEmpty(insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getInsSampleId,samId)
+ .eq(InsProduct::getState,1)))){
+ continue;
+ }
//鍏ュ簱娆℃暟
Long inCount = warehouseHistoryMapper.selectCount(Wrappers.<WarehouseHistory>lambdaQuery()
.eq(WarehouseHistory::getState, 1)
@@ -208,7 +214,7 @@
.eq(WarehouseHistory::getState, 2)
.eq(WarehouseHistory::getInsSampleId, samId));
if (inCount > 0 && inCount > outCount) {
- //鍏ュ簱
+ continue;
} else {
throw new ErrorException("鎵�閫夌殑鏍峰搧搴撳瓨涓嶈冻,璇锋鏌ュ叆搴撳拰鍑哄簱璁板綍!");
}
@@ -636,51 +642,6 @@
result.setUpdateTime(LocalDateTime.now());
insProductResultMapper.updateById(result);
}
- /*濡傛灉鏄涓�娆￠�夋嫨璁惧淇℃伅,涓旇繕鏈夊叾浣欐牱鍝佷篃鏈夊悓涓�涓粡楠岄」鐩�,閭ｄ箞鎵�鏈夋牱鍝佺殑璇ラ」鐩兘鐢ㄨ繖涓澶囦俊鎭�*/
- /*//鍏堟煡璇㈡槸鍚﹁繕鏈夊叾浣欐牱鍝�
- Integer insSampleId = product.getInsSampleId();
- List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, insSampleMapper.selectById(insSampleId).getInsOrderId()));
- //濡傛灉鏈夊涓牱鍝佹垨鑰呬笉鏄噰闆嗙被鍨嬪氨鍚屼竴涓澶�
- if (insSamples.size() > 1 && !product.getInspectionItemType().equals("1")) {
- //瀛樺湪鍏朵綑鏍峰搧,鏌ヨ鏄惁鏈夊悓涓�绉嶆楠岄」鐩�
- for (InsSample sample : insSamples.stream().filter(insSample -> !insSample.getId().equals(insSampleId)).collect(Collectors.toList())) {
- InsProduct product1 = insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getState, 1)
- .eq(InsProduct::getInsSampleId, sample.getId())
- .eq(InsProduct::getInspectionItem, product.getInspectionItem())
- .eq(InsProduct::getInspectionItemEn, product.getInspectionItemEn())
- .eq(InsProduct::getInspectionItemSubclass, product.getInspectionItemSubclass())
- .eq(InsProduct::getInspectionItemSubclassEn, product.getInspectionItemSubclassEn())
- .eq(InsProduct::getTemplateId, product.getTemplateId())
- .eq(InsProduct::getStandardMethodListId, product.getStandardMethodListId())
- .eq(InsProduct::getInsBushId, product.getInsBushId())
- .eq(InsProduct::getInsFibersId, product.getInsFibersId())
- .eq(InsProduct::getInsFiberId, product.getInsFiberId()));
- if (ObjectUtils.isNotEmpty(product1)) {
- //濡傛灉瀛樺湪椤圭洰,鏌ヨ鏄惁鏈夎〃
- InsProductResult productResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery()
- .eq(InsProductResult::getInsProductId, product1.getId()));
- if (ObjectUtils.isEmpty(productResult)) {
- //娌℃湁琛ㄦ柊寤鸿〃
- productResult = new InsProductResult();
- productResult.setInsProductId(product1.getId());
- productResult.setEquipValue(result.getEquipValue());
- productResult.setEquipName(result.getEquipValue());
- productResult.setCreateUser(userId);
- productResult.setUpdateUser(userId);
- insProductResultMapper.insert(productResult);
- } else if (ObjectUtils.isEmpty(productResult.getEquipValue())) {
- //鏈夎〃鍒ゆ柇鏄惁鏈夎澶�
- productResult.setEquipValue(result.getEquipValue());
- productResult.setEquipName(result.getEquipValue());
- productResult.setUpdateUser(userId);
- productResult.setUpdateTime(LocalDateTime.now());
- insProductResultMapper.updateById(productResult);
- }
- }
- }
-
- }*/
insProduct.setUpdateUser(userId);
insProductMapper.updateById(insProduct);
insProductUserMapper.insert(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId()));
@@ -980,7 +941,8 @@
insOrderState.setLaboratory(minElement);
insOrderState.setInsState(0);
insOrderStateMapper.insert(insOrderState);
- } else {
+ }
+ else {
//濡傛灉缁х画璇曢獙娌℃湁鍏朵粬绔欑偣鐨勬楠屼换鍔￠偅灏辩粨鏉熻瘯楠�
verifyPlan(orderId, laboratory, 2, tell);
}
--
Gitblit v1.9.3