From 8bf55e1ac0ac6eb6c97a025f0c03b78e208f668e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 26 八月 2024 17:26:58 +0800
Subject: [PATCH] 复核确认+插队+认领判断是否在库
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
index 83eddc6..004cbf1 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -58,6 +58,7 @@
private InsOrderMapper insOrderMapper;
private InsSampleMapper insSampleMapper;
+ private WarehouseHistoryMapper warehouseHistoryMapper;
private InsProductMapper insProductMapper;
private InsProductService insProductService;
@@ -129,6 +130,7 @@
return map;
}
+ //鍒嗛厤绔欑偣
@Override
@Transactional(rollbackFor = Exception.class)
public int upInsOrder(Integer orderId, Integer sampleId, String appointed, Integer userId, String sonLaboratory) {
@@ -402,14 +404,13 @@
code2 = one.getCode2();
}
insOrder.setEntrustCode(giveCode.giveCode2("JCZX/" + code + "-" + code2 + "-", insOrder.getCompanyId(), insOrder.getLaboratory(), "ins_order", "", "yyMM"));
- /*瀹℃牳閫氳繃涔嬪悗杩橀渶瑕佸垽鏂鏍峰搧鏄惁鍦ㄥ簱*/
- //濡傛灉鍦ㄥ簱,绯荤粺鏌ヨ绔欑偣浠诲姟鍒嗗竷鎯呭喌,灏嗘楠屼换鍔′笅鍙戣嚦鏈�灏戠殑绔欏彴
+ //绯荤粺鏌ヨ绔欑偣浠诲姟鍒嗗竷鎯呭喌,灏嗘楠屼换鍔′笅鍙戣嚦鏈�灏戠殑绔欏彴
List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery()
.eq(InsSample::getInsOrderId, insOrder.getId()).select(InsSample::getId));
List<Integer> ids = insSamples.stream().map(a -> a.getId()).collect(Collectors.toList());
List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getState, 1)
- .in(InsProduct::getInsSampleId, ids));
+ .eq(InsProduct::getState, 1)
+ .in(InsProduct::getInsSampleId, ids));
List<String> collect = insProducts.stream().map(InsProduct::getSonLaboratory).distinct().collect(Collectors.toList());
//瑕佸垽鏂墿浣欒瘯楠屽涓摢涓渶绌洪棽灏卞畨鎺掔粰鍝釜
Map<String, Long> dataCounts = new HashMap<>();
@@ -431,8 +432,7 @@
}
}
int day = insProductService.selectOrderManDay(insOrder.getId());//棰勮瀹屾垚鏃堕棿
- upInsOrder(insOrder.getId(),null,LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")),null,minElement);
- //濡傛灉涓嶅湪搴�,鏆備笉涓嬪彂
+ upInsOrder(insOrder.getId(), null, LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")), null, minElement);
}
return insOrderMapper.updateById(insOrder);
}
@@ -468,16 +468,16 @@
if (order.getCheckState1() == 1 && order.getCheckState2() == 1 && order.getCheckState3() == 1) {
order.setState(1);
upInsOrderOfState(order);
- } else if (order.getCheckState1() == 2 || order.getCheckState2() == 2 || order.getCheckState3() == 2){
+ } else if (order.getCheckState1() == 2 || order.getCheckState2() == 2 || order.getCheckState3() == 2) {
order.setState(2);
upInsOrderOfState(order);
}
} else if (order.getOrderType().equals("B")) {
//濡傛灉鏄疊绫�,1鍜�2瀹℃牳閫氳繃鍚庤繖涓崟瀛愬氨瀹℃牳閫氳繃
- if (order.getCheckState1() == 1 && order.getCheckState2() == 1 ) {
+ if (order.getCheckState1() == 1 && order.getCheckState2() == 1) {
order.setState(1);
upInsOrderOfState(order);
- } else if (order.getCheckState1() == 2 || order.getCheckState2() == 2 ){
+ } else if (order.getCheckState1() == 2 || order.getCheckState2() == 2) {
order.setState(2);
upInsOrderOfState(order);
}
--
Gitblit v1.9.3