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/dto/InspectionOrderExportDto.java | 71 +++++++++++++++++++++++++++++++++--
1 files changed, 67 insertions(+), 4 deletions(-)
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;
+
}
--
Gitblit v1.9.3