From 4bc7776bc6c063a9bfb9806e4bf6db5bf22985b1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 09 十二月 2024 16:10:01 +0800
Subject: [PATCH] 电路试验的互调报告解析
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 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 2f368f1..28d5611 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
@@ -129,6 +129,9 @@
@Resource
FuSheUtils fuSheUtils;
+ @Resource
+ DianLuUtils dianLuUtils;
+
@Override
public Map<String, Object> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO) {
Map<String, Object> map = new HashMap<>();
@@ -190,7 +193,7 @@
.eq(InsOrderState::getInsOrderId, insSample.getInsOrderId())
.eq(InsOrderState::getInsSampleId, sampleId)
.eq(InsOrderState::getLaboratory, laboratory));
- if (ObjectUtils.isEmpty(orderState.getInsTime())){
+ if (ObjectUtils.isEmpty(orderState.getInsTime())) {
//鏇存柊妫�楠屼换鍔¤〃鐨勬楠屾椂闂�
insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate()
.eq(InsOrderState::getInsOrderId, insSample.getInsOrderId())
@@ -310,7 +313,7 @@
}
@Override
- public int uploadFile(Integer orderId, MultipartFile file, String sonLaboratory, Integer sampleId) {
+ public Object uploadFile(Integer orderId, MultipartFile file, String sonLaboratory, Integer sampleId) {
String urlString;
String pathName;
String path;
@@ -346,14 +349,12 @@
insOrderFileMapper.insert(insOrderFile);
//濡傛灉鏄緪灏勮瘯楠�(杩戝満/杩滅▼涓婁紶鐨刢sv鏂囦欢)
String[] split = filename.split("\\.");
- if (ObjectUtils.isNotEmpty(sonLaboratory) && (sonLaboratory.equals("杩戝満") || sonLaboratory.equals("杩滃満")) &&
- split[split.length - 1].equals("csv")) {
- //鍒ゆ柇鏄摢绉峜sv鏂囦欢,鏄惁鏈夆�斺��
- if (sonLaboratory.equals("杩戝満")) {
- fuSheUtils.getFuSheWord1(sonLaboratory, insOrderFile);
- } else {
- fuSheUtils.getFuSheWord2(sonLaboratory, insOrderFile);
- }
+ if (ObjectUtils.isNotEmpty(sonLaboratory) && sonLaboratory.equals("杩戝満") && split[split.length - 1].equals("csv")) {
+ fuSheUtils.getFuSheWord1(sonLaboratory, insOrderFile);
+ } else if (ObjectUtils.isNotEmpty(sonLaboratory) && sonLaboratory.equals("杩滃満") && split[split.length - 1].equals("xlsx")) {
+ fuSheUtils.getFuSheWord2(sonLaboratory, insOrderFile);
+ }else if (ObjectUtils.isNotEmpty(sonLaboratory) && sonLaboratory.equals("鐢佃矾璇曢獙") && split[split.length - 1].equals("xlsx") && filename.contains("浜よ皟")) {
+ dianLuUtils.readDianLuFile1(sampleId,insOrderFile);
}
} catch (Exception e) {
System.err.println("闄勪欢涓婁紶閿欒");
@@ -380,12 +381,15 @@
//鎵爜鎶ユ
@Override
- public int scanInsOrderState(String sonLaboratory, String sampleCode, String trees) {
+ public int scanInsOrderState(String sonLaboratory, String sampleCode, String trees, String entrustCode) {
/*鏍峰搧鍏ュ簱*/
- warehouseService.inWarehouse(trees, sampleCode);
+ warehouseService.inWarehouse(trees, sampleCode, entrustCode);
/*鏂板妫�楠屼换鍔�*/
//鍏堝垽鏂鏍峰搧鏄惁鏈夎繖涓珯鐐圭殑椤圭洰
- InsSample insSample = insSampleMapper.selectOne(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getSampleCode, sampleCode));
+ List<InsOrder> insOrders = insOrderMapper.selectList(Wrappers.<InsOrder>lambdaQuery().eq(InsOrder::getEntrustCode, entrustCode));
+ InsSample insSample = insSampleMapper.selectOne(Wrappers.<InsSample>lambdaQuery()
+ .eq(InsSample::getSampleCode, sampleCode)
+ .eq(InsSample::getInsOrderId, insOrders.get(0).getId()));
List<String> collect = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
.eq(InsProduct::getState, 1)
.eq(InsProduct::getInsSampleId, insSample.getId())).stream().map(InsProduct::getSonLaboratory).collect(Collectors.toList());
@@ -424,10 +428,13 @@
//鎵爜鍑哄簱
@Override
- public int outInsOrderState(String sonLaboratory, String sampleCode) {
+ public int outInsOrderState(String sonLaboratory, String sampleCode, String entrustCode) {
//鍒ゆ柇璇ユ牱鍝佺殑妫�楠屼换鍔℃槸鍚﹀凡缁忕粨鏉�(缁х画璇曢獙鎴栬�呮槸缁撴潫璇曢獙)
//鍏堝垽鏂鏍峰搧鏄惁鏈夎繖涓珯鐐圭殑椤圭洰
- InsSample insSample = insSampleMapper.selectOne(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getSampleCode, sampleCode));
+ List<InsOrder> insOrders = insOrderMapper.selectList(Wrappers.<InsOrder>lambdaQuery().eq(InsOrder::getEntrustCode, entrustCode));
+ InsSample insSample = insSampleMapper.selectOne(Wrappers.<InsSample>lambdaQuery()
+ .eq(InsSample::getSampleCode, sampleCode)
+ .eq(InsSample::getInsOrderId, insOrders.get(0).getId()));
List<String> collect = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
.eq(InsProduct::getState, 1)
.eq(InsProduct::getInsSampleId, insSample.getId())).stream().map(InsProduct::getSonLaboratory).collect(Collectors.toList());
@@ -449,7 +456,7 @@
}
}
boolean a = true;
- warehouseService.outWarehouse(sampleCode, a);
+ warehouseService.outWarehouse(sampleCode, a, entrustCode);
return 0;
}
@@ -1040,7 +1047,10 @@
if (insOrder.getFormType().equals("鍘熺悊鏍锋満")) {
//鍑哄簱
try {
- outInsOrderState(laboratory, insSample.getSampleCode());
+ List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, insSample.getInsOrderId()));
+ for (InsSample sample : insSamples) {
+ outInsOrderState(laboratory, sample.getSampleCode(), insOrder.getEntrustCode());
+ }
} catch (Exception e) {
}
--
Gitblit v1.9.3