From 5a90ac8955f198f21954a3dca0443d1c5892bf0b Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期二, 03 十一月 2026 18:08:29 +0800
Subject: [PATCH] 成品下单批量下单接口与检验委托单批次合并(batch_no),含数据库加列脚本
---
cnas-process/src/main/java/com/ruoyi/process/pojo/InspectionOrderDetail.java | 13
inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java | 2
cnas-process/src/main/resources/mapper/InspectionOrderMapper.xml | 4
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java | 3
cnas-process/src/main/java/com/ruoyi/process/dto/InspectionOrderDto.java | 27 +
cnas-process/src/main/java/com/ruoyi/process/pojo/InspectionOrder.java | 12
sql/lims_delta.sql | 3
inspect-server/src/main/java/com/ruoyi/inspect/dto/InsBatchPlaceOrderDto.java | 20 +
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 7
cnas-process/src/main/java/com/ruoyi/process/dto/InspectionOrderDetailExportDto.java | 35 ++
cnas-process/src/main/java/com/ruoyi/process/service/InspectionOrderService.java | 15
cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java | 611 +++++++++++++++++++++++++++++++++--
cnas-process/src/main/resources/mapper/InspectionOrderDetailMapper.xml | 3
inspect-server/src/main/java/com/ruoyi/inspect/dto/InsBatchSampleDto.java | 31 +
cnas-process/src/main/resources/static/inspection-order.docx | 0
cnas-process/src/main/java/com/ruoyi/process/dto/InspectionOrderExportDto.java | 71 +++
cnas-process/src/main/java/com/ruoyi/process/listener/NewJuOrderInspectionListener.java | 43 ++
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 80 ++++
cnas-process/src/main/java/com/ruoyi/process/controller/InspectionOrderController.java | 12
19 files changed, 944 insertions(+), 48 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/InspectionOrderController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/InspectionOrderController.java
index 1b9c4c3..72dd68a 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/InspectionOrderController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/InspectionOrderController.java
@@ -70,8 +70,8 @@
*/
@Operation(summary = "濮旀墭鍗曟楠屽垹闄�")
@DeleteMapping("/delInspectionOrder")
- public Result delInspectionOrder(Integer inspectionOrderId){
- return Result.success(inspectionOrderService.delInspectionOrder(inspectionOrderId));
+ public Result delInspectionOrder(Integer inspectionOrderId, String batchNo){
+ return Result.success(inspectionOrderService.delInspectionOrder(inspectionOrderId, batchNo));
}
/**
@@ -80,8 +80,8 @@
*/
@Operation(summary = "濮旀墭鍗曟楠屾煡鐪嬭鎯�")
@GetMapping("/getInspectionOrderOne")
- public Result<InspectionOrderDto> getInspectionOrderOne(Integer inspectionOrderId){
- return Result.success(inspectionOrderService.getInspectionOrderOne(inspectionOrderId));
+ public Result<InspectionOrderDto> getInspectionOrderOne(Integer inspectionOrderId, String batchNo){
+ return Result.success(inspectionOrderService.getInspectionOrderOne(inspectionOrderId, batchNo));
}
/**
@@ -120,7 +120,7 @@
*/
@Operation(summary = "瀵煎嚭妫�楠屽鎵樺崟")
@GetMapping("/exportInspectionOrder")
- public void exportInspectionOrder(Integer inspectionOrderId, HttpServletResponse response){
- inspectionOrderService.exportInspectionOrder(inspectionOrderId, response);
+ public void exportInspectionOrder(Integer inspectionOrderId, String batchNo, HttpServletResponse response){
+ inspectionOrderService.exportInspectionOrder(inspectionOrderId, batchNo, response);
}
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/dto/InspectionOrderDetailExportDto.java b/cnas-process/src/main/java/com/ruoyi/process/dto/InspectionOrderDetailExportDto.java
new file mode 100644
index 0000000..3b797ea
--- /dev/null
+++ b/cnas-process/src/main/java/com/ruoyi/process/dto/InspectionOrderDetailExportDto.java
@@ -0,0 +1,35 @@
+package com.ruoyi.process.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 瀹㈡埛妫�娴嬪鎵樹功鏍峰搧淇℃伅琛屽鍑烘暟鎹�
+ */
+@Data
+public class InspectionOrderDetailExportDto {
+
+ @Schema(description = "鏍峰搧鍚嶇О")
+ private String sampleName;
+
+ @Schema(description = "鏍峰搧缂栧彿")
+ private String sampleNumber;
+
+ @Schema(description = "妫�娴嬮」鐩�")
+ private String testItem;
+
+ @Schema(description = "鏍峰搧鏁伴噺")
+ private String quantity;
+
+ @Schema(description = "鏍峰搧鐘舵��")
+ private String sampleStatus;
+
+ @Schema(description = "妫�娴嬩緷鎹�")
+ private String testStandard;
+
+ @Schema(description = "澶囨敞淇℃伅")
+ private String remark;
+
+ @Schema(description = "濮旀墭缂栧彿")
+ private String entrustCode;
+}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/dto/InspectionOrderDto.java b/cnas-process/src/main/java/com/ruoyi/process/dto/InspectionOrderDto.java
index 3a459bc..b205a3d 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/dto/InspectionOrderDto.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/dto/InspectionOrderDto.java
@@ -16,4 +16,31 @@
@Schema(description = "濮旀墭妫�楠屽崟璇︽儏")
private List<InspectionOrderDetail> orderDetailList;
+
+ @Schema(description = "鍒嗗寘鍐呭 0鏃� 1鏈�")
+ private Integer subcontractType;
+
+ @Schema(description = "鍒嗗寘鍗曚綅淇℃伅")
+ private String subcontractCompany;
+
+ @Schema(description = "鏍峰搧澶勭疆 1濮旀墭鏂瑰彇鍥� 2妫�娴嬫柟澶勭疆")
+ private Integer sampleDisposal;
+
+ @Schema(description = "瀵圭粨鏋滆瘎浠� 0鍚� 1鏄�")
+ private Integer resultEvaluation;
+
+ @Schema(description = "鎶ュ憡浜や粯鏂瑰紡 1鑷彇 2蹇�� 3鐢靛瓙浼犻��")
+ private Integer reportDelivery;
+
+ @Schema(description = "鎶ュ憡瀵勯�佸湴鍧�")
+ private String reportAddress;
+
+ @Schema(description = "鏀朵欢浜哄強鐢佃瘽")
+ private String reportReceiver;
+
+ @Schema(description = "鏍峰搧鏄庣粏琛屾暟")
+ private Integer detailCount;
+
+ @Schema(description = "鍚屾壒娆℃牱鍝佹暟")
+ private Integer memberCount;
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/dto/InspectionOrderExportDto.java b/cnas-process/src/main/java/com/ruoyi/process/dto/InspectionOrderExportDto.java
index 90df017..cc5d2f5 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/dto/InspectionOrderExportDto.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/dto/InspectionOrderExportDto.java
@@ -17,17 +17,77 @@
@Schema(description = "鐣欐牱:0 鍚�")
private String isLeave2 = "鈻�";
- @Schema(description = "鎶ュ憡鍙戦�佹柟寮� 1锛氳嚜鍙�")
- private String send1 = "鈻�";
+ @Schema(description = "鍒嗗寘鍐呭 0鏃� 1鏈�")
+ private Integer subcontractType;
- @Schema(description = "鎶ュ憡鍙戦�佹柟寮� 0锛氬叾浠�")
- private String send0 = "鈻�";
+ @Schema(description = "鍒嗗寘鍗曚綅淇℃伅")
+ private String subcontractCompany;
+
+ @Schema(description = "鍒嗗寘鍐呭 1锛氭湁")
+ private String subcontractYes = "鈻�";
+
+ @Schema(description = "鍒嗗寘鍐呭 0锛氭棤")
+ private String subcontractNo = "鈻�";
+
+ @Schema(description = "鏍峰搧澶勭疆 1濮旀墭鏂瑰彇鍥� 2妫�娴嬫柟澶勭疆")
+ private Integer sampleDisposal;
@Schema(description = "鏍峰搧澶勭悊鏂瑰紡 1锛氬疄楠屽澶勭悊")
private String processing1 = "鈻�";
@Schema(description = "鏍峰搧澶勭悊鏂瑰紡 0锛氬鎵樺崟浣嶅彇鍥�")
private String processing0 = "鈻�";
+
+ @Schema(description = "瀵圭粨鏋滆瘎浠� 0鍚� 1鏄�")
+ private Integer resultEvaluation;
+
+ @Schema(description = "瀵圭粨鏋滆瘎浠� 1锛氭槸")
+ private String resultEvaluationYes = "鈻�";
+
+ @Schema(description = "瀵圭粨鏋滆瘎浠� 0锛氬惁")
+ private String resultEvaluationNo = "鈻�";
+
+ @Schema(description = "妫�娴嬫潵婧� 1锛氶�佹牱")
+ private String sourceSend = "鈻�";
+
+ @Schema(description = "妫�娴嬫潵婧� 2锛氶噰鏍�")
+ private String sourceSample = "鈻�";
+
+ @Schema(description = "鎺ユ敹鏍峰搧鐘舵�� 1锛氱鍚堣姹�")
+ private String receiveOk = "鈻�";
+
+ @Schema(description = "鎺ユ敹鏍峰搧鐘舵�� 2锛氭湁缂洪櫡锛屼絾涓嶅奖鍝嶆娴�")
+ private String receiveDefect = "鈻�";
+
+ @Schema(description = "鎺ユ敹鏍峰搧鐘舵�� 3锛氫笉绗﹀悎妫�娴嬭姹�")
+ private String receiveReject = "鈻�";
+
+ @Schema(description = "妫�娴嬭垂 1锛氬凡鏀�")
+ private String feeReceived = "鈻�";
+
+ @Schema(description = "妫�娴嬭垂 2锛氭湭鏀�")
+ private String feeUnpaid = "鈻�";
+
+ @Schema(description = "妫�娴嬭垂 3锛氶鏀�")
+ private String feePrepaid = "鈻�";
+
+ @Schema(description = "鎶ュ憡浜や粯鏂瑰紡 1鑷彇 2蹇�� 3鐢靛瓙浼犻��")
+ private Integer reportDelivery;
+
+ @Schema(description = "鎶ュ憡浜や粯鏂瑰紡 1锛氳嚜鍙�")
+ private String sendSelf = "鈻�";
+
+ @Schema(description = "鎶ュ憡浜や粯鏂瑰紡 2锛氬揩閫�")
+ private String sendExpress = "鈻�";
+
+ @Schema(description = "鎶ュ憡浜や粯鏂瑰紡 3锛氱數瀛愪紶閫�")
+ private String sendElectronic = "鈻�";
+
+ @Schema(description = "鎶ュ憡瀵勯�佸湴鍧�")
+ private String reportAddress;
+
+ @Schema(description = "鏀朵欢浜哄強鐢佃瘽")
+ private String reportReceiver;
@Schema(description = "鍒ゆ柇瑙勫垯 1锛氳�冭檻涓嶇‘瀹氬害")
private String criterionRule1 = "鈻�";
@@ -47,5 +107,8 @@
@Schema(description = "绾﹀畾鏃堕棿 瀛楃涓叉牸寮忥細yyyy骞碝M鏈坉d")
private String appointedString;
+ @Schema(description = "椤圭洰鍚嶇О锛圢涓牱鍝侊級")
+ private String projectName;
+
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/listener/NewJuOrderInspectionListener.java b/cnas-process/src/main/java/com/ruoyi/process/listener/NewJuOrderInspectionListener.java
index c93886d..e9eb88c 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/listener/NewJuOrderInspectionListener.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/listener/NewJuOrderInspectionListener.java
@@ -2,16 +2,24 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.inspect.event.NewJuOrderPlacedEvent;
+import com.ruoyi.inspect.mapper.InsOrderStandardTemplateMapper;
+import com.ruoyi.inspect.mapper.InsSampleMapper;
import com.ruoyi.inspect.pojo.InsOrder;
+import com.ruoyi.inspect.pojo.InsOrderStandardTemplate;
+import com.ruoyi.inspect.pojo.InsSample;
import com.ruoyi.inspect.service.InsOrderService;
+import com.ruoyi.process.mapper.InspectionOrderDetailMapper;
import com.ruoyi.process.mapper.InspectionOrderMapper;
import com.ruoyi.process.pojo.InspectionOrder;
+import com.ruoyi.process.pojo.InspectionOrderDetail;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Component;
import java.time.LocalDate;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* 鏂拌仛鎴愬搧涓嬪崟鎴愬姛鍚庯紝鑷姩鐢熸垚涓�鏉℃楠屽鎵樺崟銆�
@@ -22,6 +30,9 @@
private final InsOrderService insOrderService;
private final InspectionOrderMapper inspectionOrderMapper;
+ private final InspectionOrderDetailMapper inspectionOrderDetailMapper;
+ private final InsSampleMapper insSampleMapper;
+ private final InsOrderStandardTemplateMapper insOrderStandardTemplateMapper;
@EventListener
public void onNewJuOrderPlaced(NewJuOrderPlacedEvent event) {
@@ -34,6 +45,7 @@
.eq(InspectionOrder::getInsOrderId, order.getId()).last("limit 1"));
if (existingOrder != null) {
existingOrder.setEntrustCode(order.getEntrustCode());
+ existingOrder.setBatchNo(order.getBatchNo());
existingOrder.setSampleName(StringUtils.isNotBlank(order.getSampleView()) ? order.getSampleView() : order.getSample());
existingOrder.setProduction(order.getProduction());
existingOrder.setQuantity(order.getTestQuantity());
@@ -49,6 +61,7 @@
InspectionOrder inspectionOrder = new InspectionOrder();
inspectionOrder.setInsOrderId(order.getId());
inspectionOrder.setEntrustCode(order.getEntrustCode());
+ inspectionOrder.setBatchNo(order.getBatchNo());
// 璇曟牱鍚嶇О浼樺厛鍙栨姤鍛婂睍绀哄瓧娈�
inspectionOrder.setSampleName(StringUtils.isNotBlank(order.getSampleView())
? order.getSampleView() : order.getSample());
@@ -77,5 +90,35 @@
}
// 鎶ュ憡鏂囦欢涓庣害瀹氭椂闂寸敓鎴愭椂涓虹┖锛屽悗缁湪妫�楠屽鎵樺崟椤甸潰缂栬緫/涓婁紶
inspectionOrderMapper.insert(inspectionOrder);
+ createDetailRow(inspectionOrder, order);
+ }
+
+ /**
+ * 涓嬪崟鍗崇敓鎴愪竴琛屾牱鍝佹槑缁嗭紝鎵归噺涓嬪崟鍚庢暣鎵规牱鍝佺洿鎺ユ眹鎬诲湪鍚屼竴寮犲鎵樹功閲屻��
+ */
+ private void createDetailRow(InspectionOrder inspectionOrder, InsOrder order) {
+ InspectionOrderDetail detail = new InspectionOrderDetail();
+ detail.setInspectionOrderId(inspectionOrder.getInspectionOrderId());
+ detail.setSampleName(inspectionOrder.getSampleName());
+ detail.setQuantity(order.getTestQuantity());
+ detail.setSampleStatus(inspectionOrder.getSampleStatus());
+ detail.setTestStandard(order.getSample());
+
+ List<InsSample> samples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery()
+ .eq(InsSample::getInsOrderId, order.getId())
+ .orderByAsc(InsSample::getId));
+ if (!samples.isEmpty()) {
+ detail.setSampleNumber(samples.get(0).getSampleCode());
+ }
+ String testItem = insOrderStandardTemplateMapper.selectList(
+ Wrappers.<InsOrderStandardTemplate>lambdaQuery()
+ .eq(InsOrderStandardTemplate::getInsOrderId, order.getId())
+ .orderByAsc(InsOrderStandardTemplate::getSort, InsOrderStandardTemplate::getId))
+ .stream()
+ .map(InsOrderStandardTemplate::getName)
+ .filter(StringUtils::isNotBlank)
+ .collect(Collectors.joining("銆�"));
+ detail.setTestItem(testItem);
+ inspectionOrderDetailMapper.insert(detail);
}
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/InspectionOrder.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/InspectionOrder.java
index 3a0a6f3..648ca08 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/pojo/InspectionOrder.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/pojo/InspectionOrder.java
@@ -31,6 +31,9 @@
@Schema(description = "濮旀墭缂栧彿")
private String entrustCode;
+ @Schema(description = "鎵归噺涓嬪崟鎵规鍙�")
+ private String batchNo;
+
@Schema(description = "璇曟牱鍚嶇О")
private String sampleName;
@@ -58,6 +61,9 @@
@Schema(description = "鏍峰搧鐘舵��")
private String sampleStatus;
+ @Schema(description = "妫�娴嬫潵婧� 1閫佹牱 2閲囨牱")
+ private Integer sampleSource;
+
@Schema(description = "鏄惁鐣欐牱1: 鏄�, 2:鍚�")
private Integer isLeave;
@@ -82,6 +88,12 @@
@Schema(description = "鎺ユ敹鏃ユ湡")
private LocalDate receiptData;
+ @Schema(description = "鎺ユ敹鏍峰搧鐘舵�� 1绗﹀悎瑕佹眰 2鏈夌己闄蜂絾涓嶅奖鍝嶆娴� 3涓嶇鍚堟娴嬭姹�")
+ private Integer receiveStatus;
+
+ @Schema(description = "妫�娴嬭垂 1宸叉敹 2鏈敹 3棰勬敹")
+ private Integer feeStatus;
+
@Schema(description = "棰嗘牱浜哄憳")
private String sampleTakerUser;
diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/InspectionOrderDetail.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/InspectionOrderDetail.java
index 44c7542..6ed1d2c 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/pojo/InspectionOrderDetail.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/pojo/InspectionOrderDetail.java
@@ -27,11 +27,20 @@
@Schema(description = "濮旀墭鍗昳d")
private Integer inspectionOrderId;
+ @Schema(description = "鏍峰搧鍚嶇О")
+ private String sampleName;
+
@Schema(description = "鏍峰搧缂栧彿")
private String sampleNumber;
@Schema(description = "璇曢獙椤圭洰")
private String testItem;
+
+ @Schema(description = "鏍峰搧鏁伴噺")
+ private String quantity;
+
+ @Schema(description = "鏍峰搧鐘舵��")
+ private String sampleStatus;
@Schema(description = "璇曢獙渚濇嵁")
private String testStandard;
@@ -58,4 +67,8 @@
// 瀵煎嚭浣跨敤
@TableField(select = false, exist = false)
private Integer index;
+
+ // 鍚堝苟灞曠ず鏃舵樉绀鸿琛屽疄闄呮墍灞炲鎵樺崟鐨勫鎵樼紪鍙�
+ @TableField(select = false, exist = false)
+ private String entrustCode;
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/InspectionOrderService.java b/cnas-process/src/main/java/com/ruoyi/process/service/InspectionOrderService.java
index 92b6593..41baa35 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/InspectionOrderService.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/InspectionOrderService.java
@@ -50,11 +50,21 @@
boolean delInspectionOrder(Integer inspectionOrderId);
/**
+ * 鎸夋壒娆″垹闄ゆ暣鎵规楠屽鎵樺崟
+ */
+ boolean delInspectionOrder(Integer inspectionOrderId, String batchNo);
+
+ /**
* 妫�楠屽鎵樺崟鏌ョ湅璇︽儏
* @param inspectionOrderId
* @return
*/
InspectionOrderDto getInspectionOrderOne(Integer inspectionOrderId);
+
+ /**
+ * 鎸夋壒娆℃煡鐪嬪悎骞跺悗鐨勬楠屽鎵樺崟
+ */
+ InspectionOrderDto getInspectionOrderOne(Integer inspectionOrderId, String batchNo);
/**
* 鏍规嵁鎴愬搧璁㈠崟id鏌ヨ濮旀墭鍗曚俊鎭�
@@ -83,4 +93,9 @@
* @param response
*/
void exportInspectionOrder(Integer inspectionOrderId, HttpServletResponse response);
+
+ /**
+ * 鎸夋壒娆″鍑哄悎骞跺悗鐨勬楠屽鎵樺崟
+ */
+ void exportInspectionOrder(Integer inspectionOrderId, String batchNo, HttpServletResponse response);
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java
index a93d822..e11c031 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -20,6 +21,7 @@
import com.ruoyi.inspect.service.InsOrderService;
import com.ruoyi.inspect.service.InsReportService;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.process.dto.InspectionOrderDetailExportDto;
import com.ruoyi.process.dto.InspectionOrderDto;
import com.ruoyi.process.dto.InspectionOrderExportDto;
import com.ruoyi.process.mapper.InspectionOrderMapper;
@@ -90,14 +92,86 @@
/**
- * 妫�楠屽鎵樺崟鍒嗛〉鏌ヨ
- * @param page
- * @param InspectionOrder
- * @return
+ * 妫�楠屽鎵樺崟鍒嗛〉鏌ヨ锛氬悓涓�鎵规鐨勬牱鍝佸悎骞舵垚涓�琛屽睍绀恒��
+ * 杩囨护鏉′欢鍏堝尮閰嶈鍗曪紝鍐嶆寜鎵规琛ュ叏鎴愬憳锛屾渶鍚庡湪鍐呭瓨閲屽垎缁勫拰鍒嗛〉銆�
*/
@Override
- public IPage<InspectionOrderDto> pageInspectionOrder(Page page, InspectionOrder InspectionOrder) {
- return baseMapper.pageInspectionOrder(page, QueryWrappers.queryWrappers(InspectionOrder));
+ public IPage<InspectionOrderDto> pageInspectionOrder(Page page, InspectionOrder inspectionOrderQuery) {
+ QueryWrapper<InspectionOrder> queryWrapper = QueryWrappers.queryWrappers(inspectionOrderQuery);
+ queryWrapper.orderByDesc("create_time").orderByDesc("inspection_order_id");
+ List<InspectionOrder> matched = baseMapper.selectList(queryWrapper);
+
+ Page<InspectionOrderDto> result = new Page<>(page.getCurrent(), page.getSize(), 0);
+ if (matched.isEmpty()) {
+ result.setRecords(Collections.emptyList());
+ return result;
+ }
+
+ Set<String> batchNos = matched.stream()
+ .map(InspectionOrder::getBatchNo)
+ .filter(StrUtil::isNotBlank)
+ .collect(Collectors.toSet());
+ List<InspectionOrder> allOrders = new ArrayList<>(matched);
+ if (!batchNos.isEmpty()) {
+ Set<Integer> matchedIds = matched.stream()
+ .map(InspectionOrder::getInspectionOrderId)
+ .collect(Collectors.toSet());
+ allOrders.addAll(baseMapper.selectList(Wrappers.<InspectionOrder>lambdaQuery()
+ .in(InspectionOrder::getBatchNo, batchNos)
+ .notIn(InspectionOrder::getInspectionOrderId, matchedIds)));
+ }
+
+ Map<String, List<InspectionOrder>> membersByGroup = allOrders.stream()
+ .collect(Collectors.groupingBy(this::batchGroupKey));
+ Map<Integer, String> groupKeyById = allOrders.stream()
+ .collect(Collectors.toMap(InspectionOrder::getInspectionOrderId, this::batchGroupKey, (first, ignored) -> first));
+ Map<String, Integer> detailCountByGroup = new HashMap<>();
+ List<InspectionOrderDetail> details = inspectionOrderDetailService.list(
+ Wrappers.<InspectionOrderDetail>lambdaQuery()
+ .in(InspectionOrderDetail::getInspectionOrderId, groupKeyById.keySet())
+ .select(InspectionOrderDetail::getInspectionOrderId));
+ for (InspectionOrderDetail detail : details) {
+ String groupKey = groupKeyById.get(detail.getInspectionOrderId());
+ if (groupKey != null) {
+ detailCountByGroup.merge(groupKey, 1, Integer::sum);
+ }
+ }
+
+ // 鎸夊尮閰嶈鍗曠殑鍏堝悗椤哄簭杈撳嚭鍒嗙粍锛涗唬琛ㄥ崟鍥哄畾鍙栫粍鍐呮渶鏃╃殑璁㈠崟锛屼繚璇佺炕椤电ǔ瀹�
+ LinkedHashMap<String, InspectionOrder> orderedGroups = new LinkedHashMap<>();
+ for (InspectionOrder order : matched) {
+ orderedGroups.putIfAbsent(batchGroupKey(order), order);
+ }
+ List<InspectionOrderDto> groups = new ArrayList<>();
+ for (Map.Entry<String, InspectionOrder> entry : orderedGroups.entrySet()) {
+ List<InspectionOrder> members = membersByGroup.getOrDefault(entry.getKey(),
+ Collections.singletonList(entry.getValue()));
+ InspectionOrder representative = members.stream()
+ .min(Comparator.comparing(InspectionOrder::getInspectionOrderId))
+ .orElse(entry.getValue());
+ InspectionOrderDto dto = new InspectionOrderDto();
+ BeanUtils.copyProperties(representative, dto);
+ dto.setMemberCount(members.size());
+ dto.setDetailCount(detailCountByGroup.getOrDefault(entry.getKey(), 0));
+ groups.add(dto);
+ }
+
+ long total = groups.size();
+ int from = (int) Math.min(total, Math.max(0L, (page.getCurrent() - 1) * page.getSize()));
+ int to = (int) Math.min(total, from + page.getSize());
+ result.setTotal(total);
+ result.setRecords(from >= to ? Collections.emptyList() : new ArrayList<>(groups.subList(from, to)));
+ return result;
+ }
+
+ private String batchGroupKey(InspectionOrder order) {
+ return StrUtil.isBlank(order.getBatchNo()) ? "#" + order.getInspectionOrderId() : order.getBatchNo();
+ }
+
+ private List<InspectionOrder> listBatchMembers(String batchNo) {
+ return baseMapper.selectList(Wrappers.<InspectionOrder>lambdaQuery()
+ .eq(InspectionOrder::getBatchNo, batchNo)
+ .orderByAsc(InspectionOrder::getInspectionOrderId));
}
/**
@@ -220,6 +294,77 @@
.collect(Collectors.toSet());
}
+ private void syncHeaderSampleFields(InspectionOrderDto inspectionOrder) {
+ if (CollectionUtils.isEmpty(inspectionOrder.getOrderDetailList())) {
+ return;
+ }
+ InspectionOrderDetail first = inspectionOrder.getOrderDetailList().get(0);
+ if (StrUtil.isNotBlank(first.getSampleName())) {
+ inspectionOrder.setSampleName(first.getSampleName());
+ }
+ if (StrUtil.isNotBlank(first.getQuantity())) {
+ inspectionOrder.setQuantity(first.getQuantity());
+ }
+ if (StrUtil.isNotBlank(first.getSampleStatus())) {
+ inspectionOrder.setSampleStatus(first.getSampleStatus());
+ }
+ }
+
+ private void applyRequirementFields(InspectionOrderDto inspectionOrder) {
+ if (inspectionOrder.getSampleDisposal() != null) {
+ inspectionOrder.setProcessing(Integer.valueOf(2).equals(inspectionOrder.getSampleDisposal()) ? 1 : 0);
+ }
+ if (inspectionOrder.getReportDelivery() != null) {
+ inspectionOrder.setSend(Integer.valueOf(1).equals(inspectionOrder.getReportDelivery()) ? 1 : 0);
+ }
+ }
+
+ private void syncInsOrderRequirement(InspectionOrderDto inspectionOrder) {
+ if (inspectionOrder.getInsOrderId() == null) {
+ return;
+ }
+ InsOrder insOrder = new InsOrder();
+ insOrder.setId(inspectionOrder.getInsOrderId());
+ insOrder.setSubcontractType(inspectionOrder.getSubcontractType());
+ if (inspectionOrder.getSubcontractType() != null) {
+ insOrder.setSubcontractCompany(Integer.valueOf(1).equals(inspectionOrder.getSubcontractType())
+ ? (inspectionOrder.getSubcontractCompany() == null ? "" : inspectionOrder.getSubcontractCompany())
+ : "");
+ }
+ insOrder.setSampleDisposal(inspectionOrder.getSampleDisposal());
+ insOrder.setResultEvaluation(inspectionOrder.getResultEvaluation());
+ insOrder.setReportDelivery(inspectionOrder.getReportDelivery());
+ insOrder.setReportAddress(inspectionOrder.getReportAddress());
+ insOrder.setReportReceiver(inspectionOrder.getReportReceiver());
+ if (inspectionOrder.getSampleDisposal() != null) {
+ insOrder.setProcessing(inspectionOrder.getProcessing());
+ }
+ if (inspectionOrder.getReportDelivery() != null) {
+ insOrder.setSend(inspectionOrder.getSend());
+ }
+ insOrderService.updateById(insOrder);
+ }
+
+ private void fillRequirementFields(InspectionOrder inspectionOrder, InspectionOrderDto dto, InsOrder insOrder) {
+ Integer sampleDisposal = insOrder == null ? null : insOrder.getSampleDisposal();
+ if (sampleDisposal == null) {
+ sampleDisposal = inspectionOrder.getProcessing() != null && inspectionOrder.getProcessing() == 1 ? 2 : 1;
+ }
+ Integer reportDelivery = insOrder == null ? null : insOrder.getReportDelivery();
+ if (reportDelivery == null) {
+ reportDelivery = inspectionOrder.getSend() != null && inspectionOrder.getSend() == 1 ? 1 : 2;
+ }
+ Integer subcontractType = insOrder != null && insOrder.getSubcontractType() != null ? insOrder.getSubcontractType() : 0;
+ dto.setSubcontractType(subcontractType);
+ dto.setSubcontractCompany(subcontractType == 1 && insOrder != null && insOrder.getSubcontractCompany() != null
+ ? insOrder.getSubcontractCompany() : "");
+ dto.setSampleDisposal(sampleDisposal);
+ dto.setResultEvaluation(insOrder != null && insOrder.getResultEvaluation() != null ? insOrder.getResultEvaluation() : 0);
+ dto.setReportDelivery(reportDelivery);
+ dto.setReportAddress(insOrder != null && insOrder.getReportAddress() != null ? insOrder.getReportAddress() : "");
+ dto.setReportReceiver(insOrder != null && insOrder.getReportReceiver() != null ? insOrder.getReportReceiver() : "");
+ }
+
/**
* 妫�楠屽鎵樺崟淇敼
* @param InspectionOrder
@@ -227,32 +372,143 @@
*/
@Override
public boolean updateInspectionOrder(InspectionOrderDto InspectionOrder) {
+ if (StrUtil.isNotBlank(InspectionOrder.getBatchNo())) {
+ return updateBatchInspectionOrder(InspectionOrder);
+ }
+ applyRequirementFields(InspectionOrder);
+ syncHeaderSampleFields(InspectionOrder);
baseMapper.updateById(InspectionOrder);
- // 鍒犻櫎涔嬪墠鐨勮鎯�
- inspectionOrderDetailService.remove(Wrappers.<InspectionOrderDetail>lambdaQuery()
- .eq(InspectionOrderDetail::getInspectionOrderId, InspectionOrder.getInspectionOrderId()));
+ // 鏄庣粏涓� null 琛ㄧず鏈涓嶇淮鎶ゆ槑缁嗭紝淇濈暀鍘熸暟鎹紱绌烘暟缁勮〃绀烘竻绌�
+ if (InspectionOrder.getOrderDetailList() != null) {
+ inspectionOrderDetailService.remove(Wrappers.<InspectionOrderDetail>lambdaQuery()
+ .eq(InspectionOrderDetail::getInspectionOrderId, InspectionOrder.getInspectionOrderId()));
- // 鏂板璇︽儏
- for (InspectionOrderDetail InspectionOrderDetail : InspectionOrder.getOrderDetailList()) {
- InspectionOrderDetail.setInspectionOrderId(InspectionOrder.getInspectionOrderId());
+ if (CollectionUtils.isNotEmpty(InspectionOrder.getOrderDetailList())) {
+ for (InspectionOrderDetail InspectionOrderDetail : InspectionOrder.getOrderDetailList()) {
+ InspectionOrderDetail.setInspectionOrderId(InspectionOrder.getInspectionOrderId());
+ }
+ inspectionOrderDetailService.saveBatch(InspectionOrder.getOrderDetailList());
+ }
}
- inspectionOrderDetailService.saveBatch(InspectionOrder.getOrderDetailList());
- //淇敼7.9鎶ュ憡缁撴灉
+ syncInsOrderRequirement(InspectionOrder);
+ syncProcessReport(InspectionOrder.getInsOrderId());
+
+ return true;
+ }
+
+ /**
+ * 鍚堝苟缂栬緫锛氬叕鍏卞鎵樹俊鎭箍鎾埌鏁存壒锛屾槑缁嗘寜琛屾墍灞炲鎵樺崟鍐欏洖銆�
+ */
+ private boolean updateBatchInspectionOrder(InspectionOrderDto inspectionOrder) {
+ List<InspectionOrder> members = listBatchMembers(inspectionOrder.getBatchNo());
+ if (members.isEmpty()) {
+ throw new ErrorException("鎵规鏁版嵁涓嶅瓨鍦�");
+ }
+ Set<Integer> memberIds = members.stream()
+ .map(InspectionOrder::getInspectionOrderId)
+ .collect(Collectors.toSet());
+ Integer representativeId = inspectionOrder.getInspectionOrderId();
+ if (representativeId == null || !memberIds.contains(representativeId)) {
+ representativeId = members.get(0).getInspectionOrderId();
+ }
+ applyRequirementFields(inspectionOrder);
+
+ for (InspectionOrder member : members) {
+ copyBatchHeader(inspectionOrder, member);
+ baseMapper.updateById(member);
+ }
+
+ if (inspectionOrder.getOrderDetailList() != null) {
+ inspectionOrderDetailService.remove(Wrappers.<InspectionOrderDetail>lambdaQuery()
+ .in(InspectionOrderDetail::getInspectionOrderId, memberIds));
+ if (CollectionUtils.isNotEmpty(inspectionOrder.getOrderDetailList())) {
+ Map<Integer, List<InspectionOrderDetail>> detailsByOwner = new LinkedHashMap<>();
+ for (InspectionOrderDetail detail : inspectionOrder.getOrderDetailList()) {
+ Integer ownerId = detail.getInspectionOrderId();
+ if (ownerId == null || !memberIds.contains(ownerId)) {
+ ownerId = representativeId;
+ }
+ detail.setInspectionOrderDetailId(null);
+ detail.setInspectionOrderId(ownerId);
+ detailsByOwner.computeIfAbsent(ownerId, key -> new ArrayList<>()).add(detail);
+ }
+ final Integer fallbackOwnerId = representativeId;
+ for (Map.Entry<Integer, List<InspectionOrderDetail>> entry : detailsByOwner.entrySet()) {
+ InspectionOrder member = members.stream()
+ .filter(item -> item.getInspectionOrderId().equals(entry.getKey()))
+ .findFirst()
+ .orElse(members.stream()
+ .filter(item -> item.getInspectionOrderId().equals(fallbackOwnerId))
+ .findFirst().orElse(null));
+ InspectionOrderDetail first = entry.getValue().get(0);
+ if (member != null) {
+ if (StrUtil.isNotBlank(first.getSampleName())) {
+ member.setSampleName(first.getSampleName());
+ }
+ if (StrUtil.isNotBlank(first.getQuantity())) {
+ member.setQuantity(first.getQuantity());
+ }
+ if (StrUtil.isNotBlank(first.getSampleStatus())) {
+ member.setSampleStatus(first.getSampleStatus());
+ }
+ baseMapper.updateById(member);
+ }
+ inspectionOrderDetailService.saveBatch(entry.getValue());
+ }
+ }
+ }
+
+ for (InspectionOrder member : members) {
+ InspectionOrderDto memberDto = new InspectionOrderDto();
+ BeanUtils.copyProperties(inspectionOrder, memberDto);
+ memberDto.setInspectionOrderId(member.getInspectionOrderId());
+ memberDto.setInsOrderId(member.getInsOrderId());
+ memberDto.setEntrustCode(member.getEntrustCode());
+ memberDto.setBatchNo(member.getBatchNo());
+ syncInsOrderRequirement(memberDto);
+ syncProcessReport(member.getInsOrderId());
+ }
+ return true;
+ }
+
+ private void copyBatchHeader(InspectionOrderDto source, InspectionOrder target) {
+ target.setCommissionUnit(source.getCommissionUnit());
+ target.setCommissionDate(source.getCommissionDate());
+ target.setCommissionUser(source.getCommissionUser());
+ target.setCommissionPhone(source.getCommissionPhone());
+ target.setProduction(source.getProduction());
+ target.setIsLeave(source.getIsLeave());
+ target.setSampleSource(source.getSampleSource());
+ target.setProcessing(source.getProcessing());
+ target.setSend(source.getSend());
+ target.setCriterionRule(source.getCriterionRule());
+ target.setCriterionRuleRemark(source.getCriterionRuleRemark());
+ target.setGeneralOfficeUser(source.getGeneralOfficeUser());
+ target.setReceiptData(source.getReceiptData());
+ target.setReceiveStatus(source.getReceiveStatus());
+ target.setFeeStatus(source.getFeeStatus());
+ target.setSampleTakerUser(source.getSampleTakerUser());
+ target.setSampleData(source.getSampleData());
+ target.setAppointed(source.getAppointed());
+ }
+
+ private void syncProcessReport(Integer insOrderId) {
+ if (insOrderId == null) {
+ return;
+ }
ProcessReport processReport = processReportService.getOne(Wrappers.<ProcessReport>lambdaQuery()
- .eq(ProcessReport::getInspectionOrderId, InspectionOrder.getInsOrderId())
+ .eq(ProcessReport::getInspectionOrderId, insOrderId)
.last("limit 1"));
InsReport insReport = insReportService.getOne(Wrappers.<InsReport>lambdaQuery()
- .eq(InsReport::getInsOrderId, InspectionOrder.getInsOrderId())
+ .eq(InsReport::getInsOrderId, insOrderId)
.orderByDesc(InsReport::getId)
.last("limit 1"));
if (processReport != null && insReport != null) {
processReport.setInsReportCode(insReport.getCode());//鎶ュ憡缂栧彿浣跨敤姝e紡鎶ュ憡缂栧彿
processReportService.updateById(processReport);
}
-
- return true;
}
/**
@@ -262,12 +518,15 @@
*/
@Override
public boolean delInspectionOrder(Integer inspectionOrderId) {
+ InspectionOrder order = baseMapper.selectById(inspectionOrderId);
inspectionOrderDetailService.remove(Wrappers.<InspectionOrderDetail>lambdaQuery()
.eq(InspectionOrderDetail::getInspectionOrderId, inspectionOrderId));
baseMapper.deleteById(inspectionOrderId);
- //鍒犻櫎7.8鎶ュ憡
- processReportService.remove(Wrappers.<ProcessReport>lambdaQuery()
- .eq(ProcessReport::getInspectionOrderId, inspectionOrderId));
+ //鍒犻櫎7.8鎶ュ憡锛堣琛� inspection_order_id 瀛樼殑鏄垚鍝佽鍗昳d锛�
+ if (order != null && order.getInsOrderId() != null) {
+ processReportService.remove(Wrappers.<ProcessReport>lambdaQuery()
+ .eq(ProcessReport::getInspectionOrderId, order.getInsOrderId()));
+ }
//鍒犻櫎瀵瑰簲鐨勮澶囦娇鐢ㄨ褰�
processOrderDeviceService.remove(Wrappers.<ProcessOrderDevice>lambdaQuery()
.eq(ProcessOrderDevice::getInspectionOrderId, inspectionOrderId));
@@ -285,6 +544,21 @@
return true;
}
+ @Override
+ public boolean delInspectionOrder(Integer inspectionOrderId, String batchNo) {
+ if (StrUtil.isBlank(batchNo)) {
+ return delInspectionOrder(inspectionOrderId);
+ }
+ List<InspectionOrder> members = listBatchMembers(batchNo);
+ if (members.isEmpty()) {
+ return delInspectionOrder(inspectionOrderId);
+ }
+ for (InspectionOrder member : members) {
+ delInspectionOrder(member.getInspectionOrderId());
+ }
+ return true;
+ }
+
/**
* 妫�楠屽鎵樺崟鏌ョ湅璇︽儏
* @param inspectionOrderId
@@ -296,9 +570,81 @@
InspectionOrderDto inspectionOrderDto = new InspectionOrderDto();
BeanUtils.copyProperties(inspectionOrder, inspectionOrderDto);
+ InsOrder insOrder = inspectionOrder.getInsOrderId() == null ? null : insOrderService.getById(inspectionOrder.getInsOrderId());
+ fillRequirementFields(inspectionOrder, inspectionOrderDto, insOrder);
+ if (inspectionOrderDto.getSampleSource() == null) {
+ inspectionOrderDto.setSampleSource(1);
+ }
+ if (inspectionOrderDto.getReceiveStatus() == null) {
+ inspectionOrderDto.setReceiveStatus(1);
+ }
+ if (inspectionOrderDto.getFeeStatus() == null) {
+ inspectionOrderDto.setFeeStatus(2);
+ }
+
// 鏌ヨ璇︾粏淇℃伅
inspectionOrderDto.setOrderDetailList(inspectionOrderDetailService.list(Wrappers.<InspectionOrderDetail>lambdaQuery()
- .eq(InspectionOrderDetail::getInspectionOrderId, inspectionOrderId)));
+ .eq(InspectionOrderDetail::getInspectionOrderId, inspectionOrderId)
+ .orderByAsc(InspectionOrderDetail::getInspectionOrderDetailId)));
+ return inspectionOrderDto;
+ }
+
+ /**
+ * 鎸夋壒娆℃煡鐪嬶細澶翠俊鎭彇浠h〃鍗曪紝鏄庣粏鍚堝苟鏁存壒鏍峰搧銆�
+ */
+ @Override
+ public InspectionOrderDto getInspectionOrderOne(Integer inspectionOrderId, String batchNo) {
+ if (StrUtil.isBlank(batchNo)) {
+ return getInspectionOrderOne(inspectionOrderId);
+ }
+ List<InspectionOrder> members = listBatchMembers(batchNo);
+ if (members.isEmpty()) {
+ return getInspectionOrderOne(inspectionOrderId);
+ }
+ InspectionOrder representative = members.stream()
+ .filter(item -> item.getInspectionOrderId().equals(inspectionOrderId))
+ .findFirst()
+ .orElse(members.get(0));
+ InspectionOrderDto inspectionOrderDto = new InspectionOrderDto();
+ BeanUtils.copyProperties(representative, inspectionOrderDto);
+
+ InsOrder insOrder = representative.getInsOrderId() == null ? null
+ : insOrderService.getById(representative.getInsOrderId());
+ fillRequirementFields(representative, inspectionOrderDto, insOrder);
+ if (inspectionOrderDto.getSampleSource() == null) {
+ inspectionOrderDto.setSampleSource(1);
+ }
+ if (inspectionOrderDto.getReceiveStatus() == null) {
+ inspectionOrderDto.setReceiveStatus(1);
+ }
+ if (inspectionOrderDto.getFeeStatus() == null) {
+ inspectionOrderDto.setFeeStatus(2);
+ }
+ inspectionOrderDto.setMemberCount(members.size());
+
+ Map<Integer, String> entrustCodeById = members.stream()
+ .collect(Collectors.toMap(InspectionOrder::getInspectionOrderId,
+ item -> item.getEntrustCode() == null ? "" : item.getEntrustCode()));
+ List<InspectionOrderDetail> details = inspectionOrderDetailService.list(
+ Wrappers.<InspectionOrderDetail>lambdaQuery()
+ .in(InspectionOrderDetail::getInspectionOrderId, entrustCodeById.keySet())
+ .orderByAsc(InspectionOrderDetail::getInspectionOrderId)
+ .orderByAsc(InspectionOrderDetail::getInspectionOrderDetailId));
+ Map<Integer, List<InspectionOrderDetail>> detailsByOwner = details.stream()
+ .collect(Collectors.groupingBy(InspectionOrderDetail::getInspectionOrderId,
+ LinkedHashMap::new, Collectors.toList()));
+ for (InspectionOrder member : members) {
+ List<InspectionOrderDetail> ownerDetails = detailsByOwner.get(member.getInspectionOrderId());
+ if (CollectionUtils.isEmpty(ownerDetails)) {
+ continue;
+ }
+ List<String> codes = buildDetailEntrustCodes(member.getEntrustCode(), ownerDetails);
+ for (int index = 0; index < ownerDetails.size(); index++) {
+ ownerDetails.get(index).setEntrustCode(codes.get(index));
+ }
+ }
+ inspectionOrderDto.setOrderDetailList(details);
+ inspectionOrderDto.setDetailCount(details.size());
return inspectionOrderDto;
}
@@ -323,6 +669,27 @@
inspectionOrderDto.setAppointed(order.getAppointed());//绾﹀畾鏃堕棿
inspectionOrderDto.setSend(order.getSend());//鎶ュ憡鍙戦�佹柟寮�
inspectionOrderDto.setCommissionPhone(order.getPhone());//鎶ュ憡鍙戦�佹柟寮�
+
+ Integer subcontractType = order.getSubcontractType() == null ? 0 : order.getSubcontractType();
+ inspectionOrderDto.setSubcontractType(subcontractType);
+ inspectionOrderDto.setSubcontractCompany(subcontractType == 1 && order.getSubcontractCompany() != null
+ ? order.getSubcontractCompany() : "");
+ Integer sampleDisposal = order.getSampleDisposal();
+ if (sampleDisposal == null) {
+ sampleDisposal = order.getProcessing() != null && order.getProcessing() == 1 ? 2 : 1;
+ }
+ inspectionOrderDto.setSampleDisposal(sampleDisposal);
+ inspectionOrderDto.setResultEvaluation(order.getResultEvaluation() == null ? 0 : order.getResultEvaluation());
+ Integer reportDelivery = order.getReportDelivery();
+ if (reportDelivery == null) {
+ reportDelivery = order.getSend() != null && order.getSend() == 1 ? 1 : 2;
+ }
+ inspectionOrderDto.setReportDelivery(reportDelivery);
+ inspectionOrderDto.setReportAddress(order.getReportAddress() == null ? "" : order.getReportAddress());
+ inspectionOrderDto.setReportReceiver(order.getReportReceiver() == null ? "" : order.getReportReceiver());
+ inspectionOrderDto.setSampleSource(1);
+ inspectionOrderDto.setReceiveStatus(1);
+ inspectionOrderDto.setFeeStatus(2);
return inspectionOrderDto;
}
@@ -371,16 +738,99 @@
@Override
public void exportInspectionOrder(Integer inspectionOrderId, HttpServletResponse response) {
- InspectionOrder inspectionOrder = baseMapper.selectById(inspectionOrderId);
- InspectionOrderExportDto inspectionOrderExportDto = extracted(inspectionOrder);
- List<InspectionOrderDetail> list = inspectionOrderDetailService.list(Wrappers.<InspectionOrderDetail>lambdaQuery()
- .eq(InspectionOrderDetail::getInspectionOrderId, inspectionOrderId));
- int index = 1;
- for (InspectionOrderDetail inspectionOrderDetail : list) {
- inspectionOrderDetail.setIndex(index);
- index++;
- }
+ exportSingleInspectionOrder(inspectionOrderId, response);
+ }
+ @Override
+ public void exportInspectionOrder(Integer inspectionOrderId, String batchNo, HttpServletResponse response) {
+ if (StrUtil.isBlank(batchNo)) {
+ exportSingleInspectionOrder(inspectionOrderId, response);
+ return;
+ }
+ List<InspectionOrder> members = listBatchMembers(batchNo);
+ if (members.isEmpty()) {
+ exportSingleInspectionOrder(inspectionOrderId, response);
+ return;
+ }
+ InspectionOrder representative = members.stream()
+ .filter(item -> item.getInspectionOrderId().equals(inspectionOrderId))
+ .findFirst()
+ .orElse(members.get(0));
+ InsOrder insOrder = representative.getInsOrderId() == null ? null
+ : insOrderService.getById(representative.getInsOrderId());
+ InspectionOrderExportDto inspectionOrderExportDto = extracted(representative, insOrder);
+
+ Map<Integer, List<InspectionOrderDetail>> detailsByOwner = inspectionOrderDetailService.list(
+ Wrappers.<InspectionOrderDetail>lambdaQuery()
+ .in(InspectionOrderDetail::getInspectionOrderId, members.stream()
+ .map(InspectionOrder::getInspectionOrderId)
+ .collect(Collectors.toList()))
+ .orderByAsc(InspectionOrderDetail::getInspectionOrderId)
+ .orderByAsc(InspectionOrderDetail::getInspectionOrderDetailId))
+ .stream()
+ .collect(Collectors.groupingBy(InspectionOrderDetail::getInspectionOrderId,
+ LinkedHashMap::new, Collectors.toList()));
+
+ List<InspectionOrderDetailExportDto> detailList = new ArrayList<>();
+ for (InspectionOrder member : members) {
+ List<InspectionOrderDetail> ownerDetails = detailsByOwner.get(member.getInspectionOrderId());
+ if (CollectionUtils.isEmpty(ownerDetails)) {
+ continue;
+ }
+ List<String> detailEntrustCodes = buildDetailEntrustCodes(member.getEntrustCode(), ownerDetails);
+ for (int i = 0; i < ownerDetails.size(); i++) {
+ InspectionOrderDetail inspectionOrderDetail = ownerDetails.get(i);
+ InspectionOrderDetailExportDto row = new InspectionOrderDetailExportDto();
+ row.setSampleName(StrUtil.isNotBlank(inspectionOrderDetail.getSampleName())
+ ? inspectionOrderDetail.getSampleName() : member.getSampleName());
+ row.setSampleNumber(inspectionOrderDetail.getSampleNumber());
+ row.setTestItem(inspectionOrderDetail.getTestItem());
+ row.setQuantity(StrUtil.isNotBlank(inspectionOrderDetail.getQuantity())
+ ? inspectionOrderDetail.getQuantity() : member.getQuantity());
+ row.setSampleStatus(StrUtil.isNotBlank(inspectionOrderDetail.getSampleStatus())
+ ? inspectionOrderDetail.getSampleStatus() : member.getSampleStatus());
+ row.setTestStandard(inspectionOrderDetail.getTestStandard());
+ row.setRemark(inspectionOrderDetail.getRemark());
+ row.setEntrustCode(detailEntrustCodes.get(i));
+ detailList.add(row);
+ }
+ }
+ inspectionOrderExportDto.setProjectName(detailList.size() + "涓牱鍝�");
+ writeInspectionOrderExport(inspectionOrderExportDto, detailList, response);
+ }
+
+ private void exportSingleInspectionOrder(Integer inspectionOrderId, HttpServletResponse response) {
+ InspectionOrder inspectionOrder = baseMapper.selectById(inspectionOrderId);
+ InsOrder insOrder = inspectionOrder.getInsOrderId() == null ? null : insOrderService.getById(inspectionOrder.getInsOrderId());
+ InspectionOrderExportDto inspectionOrderExportDto = extracted(inspectionOrder, insOrder);
+ List<InspectionOrderDetail> list = inspectionOrderDetailService.list(Wrappers.<InspectionOrderDetail>lambdaQuery()
+ .eq(InspectionOrderDetail::getInspectionOrderId, inspectionOrderId)
+ .orderByAsc(InspectionOrderDetail::getInspectionOrderDetailId));
+ List<String> detailEntrustCodes = buildDetailEntrustCodes(inspectionOrder.getEntrustCode(), list);
+ List<InspectionOrderDetailExportDto> detailList = new ArrayList<>();
+ for (int i = 0; i < list.size(); i++) {
+ InspectionOrderDetail inspectionOrderDetail = list.get(i);
+ InspectionOrderDetailExportDto row = new InspectionOrderDetailExportDto();
+ row.setSampleName(StrUtil.isNotBlank(inspectionOrderDetail.getSampleName())
+ ? inspectionOrderDetail.getSampleName() : inspectionOrder.getSampleName());
+ row.setSampleNumber(inspectionOrderDetail.getSampleNumber());
+ row.setTestItem(inspectionOrderDetail.getTestItem());
+ row.setQuantity(StrUtil.isNotBlank(inspectionOrderDetail.getQuantity())
+ ? inspectionOrderDetail.getQuantity() : inspectionOrder.getQuantity());
+ row.setSampleStatus(StrUtil.isNotBlank(inspectionOrderDetail.getSampleStatus())
+ ? inspectionOrderDetail.getSampleStatus() : inspectionOrder.getSampleStatus());
+ row.setTestStandard(inspectionOrderDetail.getTestStandard());
+ row.setRemark(inspectionOrderDetail.getRemark());
+ row.setEntrustCode(detailEntrustCodes.get(i));
+ detailList.add(row);
+ }
+ inspectionOrderExportDto.setProjectName(detailList.size() + "涓牱鍝�");
+ writeInspectionOrderExport(inspectionOrderExportDto, detailList, response);
+ }
+
+ private void writeInspectionOrderExport(InspectionOrderExportDto inspectionOrderExportDto,
+ List<InspectionOrderDetailExportDto> detailList,
+ HttpServletResponse response) {
// 鑾峰彇璺緞
InputStream inputStream = this.getClass().getResourceAsStream("/static/inspection-order.docx");
Configure configure = Configure.builder()
@@ -389,13 +839,14 @@
XWPFTemplate template = XWPFTemplate.compile(inputStream, configure).render(
new HashMap<String, Object>() {{
put("inspectionOrder", inspectionOrderExportDto);
- put("inspectionOrderDetailList", list);
+ put("inspectionOrderDetailList", detailList);
}});
try {
response.setContentType("application/msword");
String fileName = URLEncoder.encode(
- inspectionOrderExportDto.getSampleName(), "UTF-8");
+ StrUtil.isBlank(inspectionOrderExportDto.getSampleName())
+ ? "瀹㈡埛妫�娴嬪鎵樹功" : inspectionOrderExportDto.getSampleName(), "UTF-8");
response.setHeader("Content-disposition",
"attachment;filename=" + fileName + ".docx");
OutputStream os = response.getOutputStream();
@@ -409,7 +860,7 @@
}
}
- private InspectionOrderExportDto extracted(InspectionOrder inspectionOrder) {
+ private InspectionOrderExportDto extracted(InspectionOrder inspectionOrder, InsOrder insOrder) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�");
InspectionOrderExportDto inspectionOrderExportDto = new InspectionOrderExportDto();
BeanUtils.copyProperties(inspectionOrder, inspectionOrderExportDto);
@@ -428,13 +879,99 @@
}
inspectionOrderExportDto.setIsLeave1(inspectionOrder.getIsLeave() != null && inspectionOrder.getIsLeave() == 1? "鈽�" : "鈻�");
- inspectionOrderExportDto.setIsLeave2(inspectionOrder.getIsLeave() != null && inspectionOrder.getIsLeave() == 0? "鈽�" : "鈻�");
- inspectionOrderExportDto.setSend0(inspectionOrder.getSend() != null && inspectionOrder.getSend() == 1? "鈽�" : "鈻�");
- inspectionOrderExportDto.setSend1(inspectionOrder.getSend() != null && inspectionOrder.getSend() == 0? "鈽�" : "鈻�");
+ inspectionOrderExportDto.setIsLeave2(inspectionOrder.getIsLeave() != null && inspectionOrder.getIsLeave() != 1? "鈽�" : "鈻�");
inspectionOrderExportDto.setProcessing0(inspectionOrder.getProcessing() != null && inspectionOrder.getProcessing() == 0? "鈽�" : "鈻�");
inspectionOrderExportDto.setProcessing1(inspectionOrder.getProcessing() != null && inspectionOrder.getProcessing() == 1? "鈽�" : "鈻�");
inspectionOrderExportDto.setCriterionRule0(inspectionOrder.getCriterionRule() != null && inspectionOrder.getCriterionRule() == 0? "鈽�" : "鈻�");
inspectionOrderExportDto.setCriterionRule1(inspectionOrder.getCriterionRule() != null && inspectionOrder.getCriterionRule() == 1? "鈽�" : "鈻�");
+
+ Integer subcontractType = insOrder != null && insOrder.getSubcontractType() != null ? insOrder.getSubcontractType() : 0;
+ Integer sampleDisposal = insOrder == null ? null : insOrder.getSampleDisposal();
+ if (sampleDisposal == null) {
+ sampleDisposal = inspectionOrder.getProcessing() != null && inspectionOrder.getProcessing() == 1 ? 2 : 1;
+ }
+ Integer resultEvaluation = insOrder != null && insOrder.getResultEvaluation() != null ? insOrder.getResultEvaluation() : 0;
+ Integer reportDelivery = insOrder == null ? null : insOrder.getReportDelivery();
+ if (reportDelivery == null) {
+ reportDelivery = inspectionOrder.getSend() != null && inspectionOrder.getSend() == 1 ? 1 : 2;
+ }
+
+ inspectionOrderExportDto.setSubcontractType(subcontractType);
+ inspectionOrderExportDto.setSubcontractCompany(subcontractType == 1 && insOrder != null && insOrder.getSubcontractCompany() != null
+ ? insOrder.getSubcontractCompany() : "");
+ inspectionOrderExportDto.setSubcontractYes(subcontractType == 1 ? "鈽�" : "鈻�");
+ inspectionOrderExportDto.setSubcontractNo(subcontractType == 0 ? "鈽�" : "鈻�");
+ inspectionOrderExportDto.setSampleDisposal(sampleDisposal);
+ inspectionOrderExportDto.setResultEvaluation(resultEvaluation);
+ inspectionOrderExportDto.setResultEvaluationYes(resultEvaluation == 1 ? "鈽�" : "鈻�");
+ inspectionOrderExportDto.setResultEvaluationNo(resultEvaluation == 0 ? "鈽�" : "鈻�");
+ inspectionOrderExportDto.setReportDelivery(reportDelivery);
+ inspectionOrderExportDto.setSendSelf(reportDelivery == 1 ? "鈽�" : "鈻�");
+ inspectionOrderExportDto.setSendExpress(reportDelivery == 2 ? "鈽�" : "鈻�");
+ inspectionOrderExportDto.setSendElectronic(reportDelivery == 3 ? "鈽�" : "鈻�");
+ boolean express = reportDelivery == 2;
+ inspectionOrderExportDto.setReportAddress(express && insOrder != null && insOrder.getReportAddress() != null
+ ? insOrder.getReportAddress() : "");
+ inspectionOrderExportDto.setReportReceiver(express && insOrder != null && insOrder.getReportReceiver() != null
+ ? insOrder.getReportReceiver() : "");
+
+ int sampleSource = inspectionOrder.getSampleSource() == null ? 1 : inspectionOrder.getSampleSource();
+ int receiveStatus = inspectionOrder.getReceiveStatus() == null ? 1 : inspectionOrder.getReceiveStatus();
+ int feeStatus = inspectionOrder.getFeeStatus() == null ? 2 : inspectionOrder.getFeeStatus();
+ inspectionOrderExportDto.setSourceSend(sampleSource == 1 ? "鈽�" : "鈻�");
+ inspectionOrderExportDto.setSourceSample(sampleSource == 2 ? "鈽�" : "鈻�");
+ inspectionOrderExportDto.setReceiveOk(receiveStatus == 1 ? "鈽�" : "鈻�");
+ inspectionOrderExportDto.setReceiveDefect(receiveStatus == 2 ? "鈽�" : "鈻�");
+ inspectionOrderExportDto.setReceiveReject(receiveStatus == 3 ? "鈽�" : "鈻�");
+ inspectionOrderExportDto.setFeeReceived(feeStatus == 1 ? "鈽�" : "鈻�");
+ inspectionOrderExportDto.setFeeUnpaid(feeStatus == 2 ? "鈽�" : "鈻�");
+ inspectionOrderExportDto.setFeePrepaid(feeStatus == 3 ? "鈽�" : "鈻�");
return inspectionOrderExportDto;
}
+
+ private static String buildDetailEntrustCode(String orderEntrustCode, String sampleNumber) {
+ if (StrUtil.isBlank(orderEntrustCode) || StrUtil.isBlank(sampleNumber)) {
+ return orderEntrustCode;
+ }
+ String trimmed = sampleNumber.trim();
+ String suffix = trimmed.length() >= 2 ? trimmed.substring(trimmed.length() - 2) : trimmed;
+ int index = orderEntrustCode.lastIndexOf('-');
+ return index < 0 ? orderEntrustCode : orderEntrustCode.substring(0, index + 1) + suffix;
+ }
+
+ /**
+ * 閫愯濮旀墭缂栧彿锛氶粯璁ゅ彇鏍峰搧缂栧彿鍚庝袱浣嶏紱鍑虹幇閲嶅鎴栦负绌烘椂鐢ㄨ鍙峰厹搴曪紝淇濊瘉涓嶉噸澶嶃��
+ */
+ private static List<String> buildDetailEntrustCodes(String orderEntrustCode, List<InspectionOrderDetail> details) {
+ List<String> bases = details.stream()
+ .map(detail -> buildDetailEntrustCode(orderEntrustCode, detail.getSampleNumber()))
+ .map(base -> base == null ? "" : base)
+ .collect(Collectors.toList());
+ Map<String, Integer> counts = new HashMap<>();
+ for (String base : bases) {
+ counts.merge(base, 1, Integer::sum);
+ }
+ String prefix = "";
+ if (StrUtil.isNotBlank(orderEntrustCode)) {
+ int index = orderEntrustCode.lastIndexOf('-');
+ prefix = index < 0 ? orderEntrustCode + "-" : orderEntrustCode.substring(0, index + 1);
+ }
+ Set<String> used = new HashSet<>();
+ List<String> result = new ArrayList<>();
+ for (int i = 0; i < bases.size(); i++) {
+ String base = bases.get(i);
+ String candidate = base;
+ if (StrUtil.isBlank(base) || counts.getOrDefault(base, 0) > 1 || used.contains(candidate)) {
+ int seq = i + 1;
+ candidate = prefix + String.format("%02d", seq);
+ while (used.contains(candidate)) {
+ seq += bases.size();
+ candidate = prefix + String.format("%02d", seq);
+ }
+ }
+ used.add(candidate);
+ result.add(candidate);
+ }
+ return result;
+ }
}
diff --git a/cnas-process/src/main/resources/mapper/InspectionOrderDetailMapper.xml b/cnas-process/src/main/resources/mapper/InspectionOrderDetailMapper.xml
index 4cd91ee..078243f 100644
--- a/cnas-process/src/main/resources/mapper/InspectionOrderDetailMapper.xml
+++ b/cnas-process/src/main/resources/mapper/InspectionOrderDetailMapper.xml
@@ -6,8 +6,11 @@
<resultMap id="BaseResultMap" type="com.ruoyi.process.pojo.InspectionOrderDetail">
<id column="inspection_order_detail_id" property="inspectionOrderDetailId" />
<result column="inspection_order_id" property="inspectionOrderId" />
+ <result column="sample_name" property="sampleName" />
<result column="sample_number" property="sampleNumber" />
<result column="test_item" property="testItem" />
+ <result column="quantity" property="quantity" />
+ <result column="sample_status" property="sampleStatus" />
<result column="test_standard" property="testStandard" />
<result column="remark" property="remark" />
<result column="create_user" property="createUser" />
diff --git a/cnas-process/src/main/resources/mapper/InspectionOrderMapper.xml b/cnas-process/src/main/resources/mapper/InspectionOrderMapper.xml
index ba0c03f..0ea77b7 100644
--- a/cnas-process/src/main/resources/mapper/InspectionOrderMapper.xml
+++ b/cnas-process/src/main/resources/mapper/InspectionOrderMapper.xml
@@ -4,7 +4,9 @@
<!--妫�楠屽鎵樺崟鍒嗛〉鏌ヨ-->
<select id="pageInspectionOrder" resultType="com.ruoyi.process.dto.InspectionOrderDto">
- select *
+ select a.*,
+ (select count(*) from cnas_inspection_order_detail d
+ where d.inspection_order_id = a.inspection_order_id) as detail_count
from (select *
from cnas_inspection_order
order by create_time desc) a
diff --git a/cnas-process/src/main/resources/static/inspection-order.docx b/cnas-process/src/main/resources/static/inspection-order.docx
index 32e08a2..60098fe 100644
--- a/cnas-process/src/main/resources/static/inspection-order.docx
+++ b/cnas-process/src/main/resources/static/inspection-order.docx
Binary files differ
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
index 086eed0..050bc5d 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
@@ -92,6 +92,13 @@
return Result.success(insOrderService.addInsOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getInsOrder()));
}
+ @Operation(summary = "鎵归噺娣诲姞鏂拌仛妫�楠屼笅鍗曟暟鎹�")
+ @PreAuthorize("@ss.hasPermi('add:insOrder')")
+ @PostMapping("/addBatchNewJuInsOrder")
+ public Result<?> addBatchNewJuInsOrder(@RequestBody InsBatchPlaceOrderDto insBatchPlaceOrderDto) {
+ return Result.success(insOrderService.addBatchNewJuInsOrder(insBatchPlaceOrderDto));
+ }
+
@Operation(summary = "淇敼鏂拌仛妫�楠屼笅鍗曟暟鎹�")
@PostMapping("/updateNewJuInsOrder")
public Result<?> updateNewJuInsOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsBatchPlaceOrderDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsBatchPlaceOrderDto.java
new file mode 100644
index 0000000..843c0e4
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsBatchPlaceOrderDto.java
@@ -0,0 +1,20 @@
+package com.ruoyi.inspect.dto;
+
+import com.ruoyi.inspect.pojo.InsOrder;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鎵归噺涓嬪崟锛氬叕鍏卞鎵樹俊鎭� + 澶氫釜鏍峰搧锛屽悗鍙版寜鏍峰搧鎷嗘垚澶氬紶濮旀墭鍗曘��
+ */
+@Data
+public class InsBatchPlaceOrderDto {
+
+ @Schema(description = "鍏叡濮旀墭淇℃伅")
+ private InsOrder insOrder;
+
+ @Schema(description = "鏍峰搧鍒楄〃锛屾瘡涓牱鍝佷竴鏉″鎵樺崟")
+ private List<InsBatchSampleDto> sampleList;
+}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsBatchSampleDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsBatchSampleDto.java
new file mode 100644
index 0000000..37401c2
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsBatchSampleDto.java
@@ -0,0 +1,31 @@
+package com.ruoyi.inspect.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鎵归噺涓嬪崟涓殑鍗曚釜鏍峰搧銆�
+ */
+@Data
+public class InsBatchSampleDto {
+
+ @Schema(description = "鏍峰搧缂栧彿")
+ private String sampleCode;
+
+ @Schema(description = "鏍峰搧鍚嶇О")
+ private String sampleView;
+
+ @Schema(description = "鏍峰搧鏁伴噺")
+ private String testQuantity;
+
+ @Schema(description = "鏍峰搧鐘舵��")
+ private String sampleStatus;
+
+ @Schema(description = "鏍囧噯搴撲簩绾ф爣鍑咺D")
+ private Integer standardTreeId;
+
+ @Schema(description = "涓嬪崟鏃朵繚鐣欑殑鍘熷璁板綍妯℃澘")
+ private List<OrderTemplateSelectionDto> templateList;
+}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java
index 4ac0ec1..40e2356 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java
@@ -31,6 +31,9 @@
@Schema(description = "濮旀墭缂栧彿")
private String entrustCode;
+ @Schema(description = "鎵归噺涓嬪崟鎵规鍙�")
+ private String batchNo;
+
@Schema(description = "澶栭儴濮旀墭缂栧彿")
private String outEntrustCode;
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java
index b10dec6..5be8665 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java
@@ -37,6 +37,8 @@
int addNewJuInsOrder(InsPlaceOrderDto insPlaceOrderDto);
+ int addBatchNewJuInsOrder(InsBatchPlaceOrderDto insBatchPlaceOrderDto);
+
int updateNewJuInsOrder(InsPlaceOrderDto insPlaceOrderDto);
Map<String, Object> getInsOrder(Integer id);
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
index db1a1d9..891bdac 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -507,6 +507,64 @@
@Override
@Transactional(rollbackFor = Exception.class)
public int addNewJuInsOrder(InsPlaceOrderDto dto) {
+ return createNewJuOrder(dto, null, false);
+ }
+
+ /**
+ * 鎵归噺涓嬪崟锛氬叕鍏卞鎵樹俊鎭彧濉竴娆★紝鍚庡彴鎸夋牱鍝侀�愭潯鎷嗘垚鐙珛濮旀墭鍗曞苟鍏变韩鎵规鍙枫��
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int addBatchNewJuInsOrder(InsBatchPlaceOrderDto dto) {
+ if (dto == null || dto.getInsOrder() == null) {
+ throw new ErrorException("涓嬪崟淇℃伅涓嶈兘涓虹┖");
+ }
+ List<InsBatchSampleDto> rows = dto.getSampleList();
+ if (CollectionUtils.isEmpty(rows)) {
+ throw new ErrorException("璇疯嚦灏戞坊鍔犱竴涓牱鍝�");
+ }
+ // 鍙湁涓�涓牱鍝佹椂鎸夋櫘閫氬崟鏍峰搧涓嬪崟澶勭悊锛屼笉浜х敓鎵规
+ if (rows.size() == 1) {
+ return createNewJuOrder(buildBatchRowOrder(dto.getInsOrder(), rows.get(0)), null, false);
+ }
+ String batchNo = "PC" + DateUtil.format(new Date(), "yyyyMMddHHmmssSSS");
+ int firstOrderId = 0;
+ for (InsBatchSampleDto row : rows) {
+ int orderId = createNewJuOrder(buildBatchRowOrder(dto.getInsOrder(), row), batchNo, true);
+ if (firstOrderId == 0) {
+ firstOrderId = orderId;
+ }
+ }
+ return firstOrderId;
+ }
+
+ private InsPlaceOrderDto buildBatchRowOrder(InsOrder common, InsBatchSampleDto row) {
+ if (common == null || row == null) {
+ throw new ErrorException("涓嬪崟淇℃伅涓嶈兘涓虹┖");
+ }
+ if (row.getStandardTreeId() == null) {
+ throw new ErrorException("璇蜂负姣忎釜鏍峰搧閫夋嫨妫�娴嬩緷鎹�");
+ }
+ if (StringUtils.isBlank(row.getSampleCode()) || row.getSampleCode().trim().length() < 2) {
+ throw new ErrorException("鏍峰搧缂栧彿涓嶈兘涓虹┖涓斾笉鑳藉皯浜�2浣�");
+ }
+ InsOrder order = new InsOrder();
+ BeanUtils.copyProperties(common, order);
+ order.setId(null);
+ order.setEntrustCode(null);
+ order.setBatchNo(null);
+ order.setSampleView(row.getSampleView());
+ order.setTestQuantity(row.getTestQuantity());
+ order.setSampleStatus(row.getSampleStatus());
+ InsPlaceOrderDto single = new InsPlaceOrderDto();
+ single.setInsOrder(order);
+ single.setStandardTreeId(row.getStandardTreeId());
+ single.setSampleCode(row.getSampleCode());
+ single.setTemplateList(row.getTemplateList());
+ return single;
+ }
+
+ private int createNewJuOrder(InsPlaceOrderDto dto, String batchNo, boolean batchEntrustFallback) {
if (dto == null || dto.getInsOrder() == null || dto.getStandardTreeId() == null) {
throw new ErrorException("涓嬪崟淇℃伅鎴栨爣鍑嗕笉鑳戒负绌�");
}
@@ -598,6 +656,7 @@
InsOrder order = dto.getInsOrder();
order.setId(null);
+ order.setBatchNo(StringUtils.isBlank(batchNo) ? null : batchNo);
// 鏂拌仛涓嬪崟鍏嶅鏍革細鐩存帴鍙楃悊锛屼笅鍗曞嵆娴佽浆鍒版牱鍝佹帴鏀�
order.setState(1);
order.setExamineTime(LocalDateTime.now());
@@ -658,6 +717,10 @@
// 涓嬪崟鏃剁敓鎴愬鎵樼紪鍙峰苟鏍¢獙鍞竴鎬э紝閲嶅鍒欐彁绀猴紝閬垮厤鐣欏埌瀹℃牳鎵嶆姤閿欍��
String entrustCode = buildEntrustCode(order, Collections.singletonList(sample));
+ if (batchEntrustFallback && isEntrustCodeUsed(entrustCode)) {
+ // 鎵归噺涓嬪崟鏃朵笉鍚屾牱鍝佺紪鍙锋湯涓や綅鍙兘鐩稿悓锛屾敼鐢ㄥ綋澶╅『寤剁紪鍙峰厹搴�
+ entrustCode = buildNextAvailableEntrustCode(order);
+ }
assertEntrustCodeUnique(entrustCode, order.getId());
insOrderMapper.update(null, Wrappers.<InsOrder>lambdaUpdate()
.eq(InsOrder::getId, order.getId())
@@ -1050,6 +1113,23 @@
}
}
+ private boolean isEntrustCodeUsed(String entrustCode) {
+ return StringUtils.isNotBlank(entrustCode) && insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery()
+ .eq(InsOrder::getEntrustCode, entrustCode)) > 0;
+ }
+
+ private String buildNextAvailableEntrustCode(InsOrder order) {
+ LocalDate entrustDate = order.getSampleDate() == null ? LocalDate.now() : order.getSampleDate();
+ String prefix = "LMSY-" + entrustDate.format(DateTimeFormatter.BASIC_ISO_DATE) + "-";
+ for (int seq = 1; seq <= 99; seq++) {
+ String candidate = prefix + String.format("%02d", seq);
+ if (!isEntrustCodeUsed(candidate)) {
+ return candidate;
+ }
+ }
+ throw new ErrorException("褰撳ぉ濮旀墭缂栧彿宸茬敤灏斤紝璇疯皟鏁存牱鍝佺紪鍙�");
+ }
+
/**
* 鐢熸垚濮旀墭缂栧彿锛氭柊鑱氱洿缁戞ā鏉胯鍗曟湯涓や綅鍙栨牱鍝佺紪鍙锋湯涓や綅锛屽叾浣欐寜閫佹牱鏃ユ湡鐢熸垚搴忓彿銆�
*/
diff --git a/sql/lims_delta.sql b/sql/lims_delta.sql
new file mode 100644
index 0000000..b89c9e7
--- /dev/null
+++ b/sql/lims_delta.sql
@@ -0,0 +1,3 @@
+-- 鎵归噺涓嬪崟鎵规鍙凤細鍚屼竴娆℃壒閲忎笅鍗曠殑鏍峰搧鍏变韩涓�涓壒娆″彿
+ALTER TABLE ins_order ADD COLUMN batch_no VARCHAR(64) NULL COMMENT '鎵归噺涓嬪崟鎵规鍙�' AFTER entrust_code;
+ALTER TABLE cnas_inspection_order ADD COLUMN batch_no VARCHAR(64) NULL COMMENT '鎵归噺涓嬪崟鎵规鍙�' AFTER entrust_code;
--
Gitblit v1.9.3