From e700e89f85e58747b57fc0d7e1fd30f3483aacca Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 14 九月 2024 16:05:57 +0800
Subject: [PATCH] 检验任务历史记录
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 216 ++++++++++++++++++++++++++----------------------------
1 files changed, 104 insertions(+), 112 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 ea2c45c..c769d0c 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
@@ -87,6 +87,8 @@
@Resource
private InsProductMapper insProductMapper;
@Resource
+ private InsOrderUserMapper insOrderUserMapper;
+ @Resource
private ShiftTimeMapper shiftTimeMapper;
@Resource
private PerformanceShiftMapper performanceShiftMapper;
@@ -179,31 +181,6 @@
public boolean claimInsOrderPlan(InsOrderPlanDTO entity) {
if (Objects.isNull(entity)) {
return false;
- }
- /*璁ら闇�瑕佸垽鏂鏍峰搧鏄惁鍦ㄥ簱*/
- //鏌ヨ鏍峰搧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)
- .eq(WarehouseHistory::getInsSampleId, samId));
- //鍑哄簱娆℃暟
- Long outCount = warehouseHistoryMapper.selectCount(Wrappers.<WarehouseHistory>lambdaQuery()
- .eq(WarehouseHistory::getState, 2)
- .eq(WarehouseHistory::getInsSampleId, samId));
- if (inCount > 0 && inCount > outCount) {
- continue;
- } else {
- throw new ErrorException("鎵�閫夌殑鏍峰搧搴撳瓨涓嶈冻,璇锋鏌ュ叆搴撳拰鍑哄簱璁板綍!");
- }
}
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
Integer userId = map1.get("userId");
@@ -359,6 +336,54 @@
.eq(InsProductResult2::getFrequency, insProductResultVo.getFrequency())
.eq(InsProductResult2::getNum, insProductResultVo.getNum())
.in(InsProductResult2::getInsProductId, insProductResultVo.getProductIds()));
+ }
+
+ //鎵爜鎶ユ
+ @Override
+ public int scanInsOrderState(String sonLaboratory, String sampleCode) {
+ //鍏堝垽鏂璁㈠崟鏄惁鏈夎繖涓珯鐐圭殑椤圭洰
+ InsSample insSample = insSampleMapper.selectOne(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getSampleCode, sampleCode));
+ List<Integer> sampleIds = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery()
+ .eq(InsSample::getInsOrderId, insSample.getInsOrderId())).stream().map(InsSample::getId).collect(Collectors.toList());
+ List<String> collect = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getState, 1)
+ .in(InsProduct::getInsSampleId, sampleIds)).stream().map(InsProduct::getSonLaboratory).collect(Collectors.toList());
+ if (!collect.contains(sonLaboratory)) {
+ throw new ErrorException("璇ヨ鍗曟病鏈�" + sonLaboratory + "绔欑偣鐨勭浉鍏抽」鐩�,璇锋煡鐪嬩笅鍗曡鎯�!");
+ }
+ //鍒ゆ柇璇ヨ鍗曟槸鍚︾珯鐐逛换鍔℃湁缁撴潫璇曢獙
+ List<InsOrderState> orderStates = insOrderStateMapper.selectList(Wrappers.<InsOrderState>lambdaQuery()
+ .eq(InsOrderState::getInsOrderId, insSample.getInsOrderId())
+ .eq(InsOrderState::getInsState, 5));
+ if (CollectionUtils.isNotEmpty(orderStates)) {
+ throw new ErrorException("璇ヨ鍗曠珯鐐圭殑浠诲姟宸茬粡缁撴潫璇曢獙,鏃犳硶鍐嶆杩涜璇曢獙!");
+ }
+ InsOrderState orderState = insOrderStateMapper.selectOne(Wrappers.<InsOrderState>lambdaQuery()
+ .eq(InsOrderState::getInsOrderId, insSample.getInsOrderId())
+ .eq(InsOrderState::getLaboratory, sonLaboratory));
+ if (ObjectUtils.isNotEmpty(orderState)) {
+ //缁х画璇曢獙
+ if (orderState.getInsState() == 6) {
+ orderState.setInsState(0);
+ orderState.setNum(orderState.getNum() + 1);//閫掑
+ insOrderStateMapper.updateById(orderState);
+ } else {
+ throw new ErrorException("璇ヨ鍗曠珯鐐圭殑浠诲姟宸插垱寤�,鏃犳硶鍐嶆鍒涘缓!");
+ }
+ } else {
+ InsOrderState insOrderState = new InsOrderState();
+ insOrderState.setInsOrderId(insSample.getInsOrderId());
+ insOrderState.setLaboratory(sonLaboratory);
+ insOrderState.setInsState(0);
+ insOrderState.setNum(1);//鍒濆鏄涓�娆�
+ insOrderStateMapper.insert(insOrderState);
+ }
+ return 1;
+ }
+
+ @Override
+ public List<InsOrderUser> getInsOrderUserList(Integer insOrderStateId) {
+ return insOrderUserMapper.getInsOrderUserList(insOrderStateId);
}
@@ -879,18 +904,22 @@
}
insUnPassService.saveBatch(insUnPasses);
/*type=0 鍐嶆璇曢獙; type=1 缁х画璇曢獙 ; type=2 缁撴潫璇曢獙*/
- switch (type) {
- case 0:
- /*鍐嶆璇曢獙:璇ュ崟瀛愰��鍥炲埌妫�楠岀姸鎬�(鎺掑簭鏀规垚褰撳墠鐨勬渶鍚�),娆℃暟閫掑(淇濈暀浠ュ墠鐨勬暟鎹�)锛�*/
- //鏇存柊鍘熸潵鐨勬楠屼换鍔�
- // 鏌ヨ鏍规嵁 id 鍊掑簭鎺掑垪鐨勭涓�鏉¤褰�
- InsOrderState record = insOrderStateMapper.selectOne(Wrappers.<InsOrderState>lambdaQuery()
- .eq(InsOrderState::getInsOrderId, orderId)
- .eq(InsOrderState::getLaboratory, laboratory)
- .orderByDesc(InsOrderState::getId)
- .last("LIMIT 1")); // 纭繚鍙彇涓�鏉¤褰�
- if (record != null) {
- // 鑾峰彇鍒扮涓�鏉¤褰曠殑 id 鍚庯紝鎵ц鏇存柊鎿嶄綔
+ // 鏌ヨ鏍规嵁 id 鍊掑簭鎺掑垪鐨勭涓�鏉¤褰�
+ InsOrderState record = insOrderStateMapper.selectOne(Wrappers.<InsOrderState>lambdaQuery()
+ .eq(InsOrderState::getInsOrderId, orderId)
+ .eq(InsOrderState::getLaboratory, laboratory)
+ .orderByDesc(InsOrderState::getId)
+ .last("LIMIT 1")); // 纭繚鍙彇涓�鏉¤褰�
+ if (record != null) {
+ //鏇存柊璁板綍
+ insOrderUserMapper.update(null, Wrappers.<InsOrderUser>lambdaUpdate()
+ .eq(InsOrderUser::getInsOrderStateId, record.getId())
+ .eq(InsOrderUser::getNum, record.getNum())
+ .set(InsOrderUser::getTell, tell));
+ switch (type) {
+ case 0:
+ /*鍐嶆璇曢獙:璇ュ崟瀛愰��鍥炲埌妫�楠岀姸鎬�(鎺掑簭鏀规垚褰撳墠鐨勬渶鍚�),娆℃暟閫掑(淇濈暀浠ュ墠鐨勬暟鎹�)锛�*/
+ //鏇存柊鍘熸潵鐨勬楠屼换鍔�
insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate()
.eq(InsOrderState::getId, record.getId())
.set(InsOrderState::getInsTime, now)
@@ -899,80 +928,34 @@
.set(InsOrderState::getVerifyUser, userId)
.set(InsOrderState::getNum, record.getNum() + 1)//娆℃暟鍔�1
.set(InsOrderState::getCreateTime, LocalDateTime.now()));
- }
- break;
- case 1:
- //缁х画璇曢獙:鍒欑户缁皢妫�楠屼换鍔¤浆鎺ヨ嚦涓嬩竴绔欑偣锛�
- insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate()
- .eq(InsOrderState::getInsOrderId, orderId)
- .eq(InsOrderState::getLaboratory, laboratory)
- .set(InsOrderState::getInsTime, now)
- .set(InsOrderState::getInsState, 6)
- .set(InsOrderState::getVerifyTell, tell)
- .set(InsOrderState::getVerifyUser, userId));
- //杞帴鑷充笅涓�绔欑偣,闇�瑕佸厛鍒ゆ柇鏄惁杩樻湁鍏朵綑璇曢獙瀹�,濡傛灉鏈夊叾浣欒瘯楠屽闇�瑕佸皢璁㈠崟涓嬪彂
- List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery()
- .eq(InsSample::getInsOrderId, orderId).select(InsSample::getId));
- List<Integer> ids = insSamples.stream().map(a -> a.getId()).collect(Collectors.toList());
- List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
- .in(InsProduct::getInsSampleId, ids)
- .eq(InsProduct::getState, 1));
- List<Integer> list = new ArrayList<>();
- list.add(4);
- list.add(5);
- list.add(6);
- List<InsOrderState> insOrderStates = insOrderStateMapper.selectList(Wrappers.<InsOrderState>lambdaQuery()
- .eq(InsOrderState::getInsOrderId, orderId)
- .in(InsOrderState::getInsState, list));
- List<String> strings = insOrderStates.stream().map(InsOrderState::getLaboratory).distinct().collect(Collectors.toList());
- //闄ゅ幓褰撳墠澶嶆牳鐨勮瘯楠屽鍜屽凡缁忓鏍哥殑璇曢獙瀹�
- List<String> collect = insProducts.stream()
- .map(InsProduct::getSonLaboratory)
- .distinct()
- .filter(s -> !s.equals(laboratory))
- .filter(s -> !strings.contains(s))
- .collect(Collectors.toList());
- if (collect.size() > 0) {
- //瑕佸垽鏂墿浣欒瘯楠屽涓摢涓渶绌洪棽灏卞畨鎺掔粰鍝釜
- Map<String, Long> dataCounts = new HashMap<>();
- for (String sonLaboratory : collect) {
- Long count = insOrderStateMapper.selectCount(Wrappers.<InsOrderState>lambdaQuery()
- .eq(InsOrderState::getLaboratory, sonLaboratory)
- .ne(InsOrderState::getInsState, 4)
- .ne(InsOrderState::getInsState, 5)
- .ne(InsOrderState::getInsState, 6));
- dataCounts.put(sonLaboratory, count);
+ break;
+ case 1:
+ //缁х画璇曢獙:鍒欑户缁皢妫�楠屼换鍔¤浆鎺ヨ嚦涓嬩竴绔欑偣锛�
+ insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate()
+ .eq(InsOrderState::getInsOrderId, orderId)
+ .eq(InsOrderState::getLaboratory, laboratory)
+ .set(InsOrderState::getInsTime, now)
+ .set(InsOrderState::getInsState, 6)
+ .set(InsOrderState::getVerifyTell, tell)
+ .set(InsOrderState::getVerifyUser, userId));
+ break;
+ case 2:
+ //缁撴潫璇曢獙:姝ゅ鎵樺崟鍋滄璇曢獙锛岀洿鎺ョ敓鎴愭渶缁堟姤鍛婂拰璐圭敤缁熻銆�
+ insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate()
+ .eq(InsOrderState::getInsOrderId, orderId)
+ .eq(InsOrderState::getLaboratory, laboratory)
+ .set(InsOrderState::getInsTime, now)
+ .set(InsOrderState::getInsState, 5)
+ .set(InsOrderState::getVerifyTell, tell)
+ .set(InsOrderState::getVerifyUser, userId));
+ //濡傛灉璁㈠崟绫诲瀷鏄師鐞嗘牱鏈�,鍒欒璁㈠崟鐩存帴闂幆
+ InsOrder insOrder = insOrderMapper.selectById(orderId);
+ if (insOrder.getFormType().equals("鍘熺悊鏍锋満")) {
+ insOrder.setState(4);
+ insOrderMapper.updateById(insOrder);
}
- // 鏌ユ壘鏁版嵁閲忔渶灏戠殑鍏冪礌
- String minElement = null;
- Long minCount = Long.MAX_VALUE;
- for (Map.Entry<String, Long> entry : dataCounts.entrySet()) {
- if (entry.getValue() < minCount) {
- minCount = entry.getValue();
- minElement = entry.getKey();
- }
- }
- InsOrderState insOrderState = new InsOrderState();
- insOrderState.setInsOrderId(orderId);
- insOrderState.setLaboratory(minElement);
- insOrderState.setInsState(0);
- insOrderState.setNum(1);//鍒濆鏄涓�娆�
- insOrderStateMapper.insert(insOrderState);
- } else {
- //濡傛灉缁х画璇曢獙娌℃湁鍏朵粬绔欑偣鐨勬楠屼换鍔￠偅灏辩粨鏉熻瘯楠�
- verifyPlan(orderId, laboratory, 2, tell);
- }
- break;
- case 2:
- //缁撴潫璇曢獙:姝ゅ鎵樺崟鍋滄璇曢獙锛岀洿鎺ョ敓鎴愭渶缁堟姤鍛婂拰璐圭敤缁熻銆�
- insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate()
- .eq(InsOrderState::getInsOrderId, orderId)
- .eq(InsOrderState::getLaboratory, laboratory)
- .set(InsOrderState::getInsTime, now)
- .set(InsOrderState::getInsState, 5)
- .set(InsOrderState::getVerifyTell, tell)
- .set(InsOrderState::getVerifyUser, userId));
- break;
+ break;
+ }
}
/*澶嶆牳瀹屾垚涔嬪悗鐢熸垚浠栬嚜宸辩殑绔欑偣鎶ュ憡(浠呴檺杈愬皠璇曢獙妫�娴�(杩戝満,杩滃満)鍜岀數璺瘯楠�)*/
/*switch (laboratory) {
@@ -992,7 +975,7 @@
}
//鐢熸垚鐢佃矾璇曢獙鐨別xcel鏂囦欢
- private MultipartFile generateExcelFile(Integer orderId, String laboratory) throws IOException{
+ private MultipartFile generateExcelFile(Integer orderId, String laboratory) throws IOException {
// 鍒涘缓涓�涓猈orkbook瀵硅薄
Workbook workbook = new XSSFWorkbook();
@@ -1048,7 +1031,7 @@
}
@Override
- public int submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode) {
+ public int submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode, String note, String term) {
List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery()
.eq(InsSample::getInsOrderId, orderId).select(InsSample::getId));
InsOrderState orderState = insOrderStateMapper.selectOne(Wrappers.<InsOrderState>lambdaQuery()
@@ -1056,6 +1039,15 @@
.eq(InsOrderState::getLaboratory, laboratory)
.orderByDesc(InsOrderState::getId)
.last("LIMIT 1"));// 纭繚鍙彇涓�鏉¤褰�
+ /*璁板綍妫�楠屼换鍔℃瘡娆＄殑澶囨敞淇℃伅*/
+ InsOrderUser insOrderUser = new InsOrderUser();
+ insOrderUser.setInsOrderStateId(orderState.getId());
+ insOrderUser.setSubmitUser(getLook.selectPowerByMethodAndUserId(null).get("userId"));
+ insOrderUser.setSubmitTime(LocalDateTime.now());
+ insOrderUser.setNum(orderState.getNum());
+ insOrderUser.setNote(ObjectUtils.isNotEmpty(note) ? note : null);
+ insOrderUser.setTerm(ObjectUtils.isNotEmpty(term) ? term : null);
+ insOrderUserMapper.insert(insOrderUser);
List<Integer> ids = insSamples.stream().map(a -> a.getId()).collect(Collectors.toList());
List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
.in(InsProduct::getInsSampleId, ids)
--
Gitblit v1.9.3