diff --git a/tagApi-service/src/main/java/hw/tagApi/service/domain/HwTagRecord.java b/tagApi-service/src/main/java/hw/tagApi/service/domain/HwTagRecord.java
index 09668b3..a4e4751 100644
--- a/tagApi-service/src/main/java/hw/tagApi/service/domain/HwTagRecord.java
+++ b/tagApi-service/src/main/java/hw/tagApi/service/domain/HwTagRecord.java
@@ -90,6 +90,22 @@ public class HwTagRecord extends BaseEntity
// @Excel(name = "导入文件名")
private String fileName;
+ /** 去向信息 */
+ @Excel(name = "去向信息")
+ private String destinationInfo;
+
+ /** 是否在库 */
+ @Excel(name = "是否在库")
+ private String libraryFlag;
+
+ /** 计划用途 */
+ @Excel(name = "计划用途")
+ private String intendedUse;
+
+ /** 备注 */
+ @Excel(name = "备注")
+ private String remark;
+
/** 数据状态标记 */
private Integer delFlag;
diff --git a/tagApi-service/src/main/java/hw/tagApi/service/service/impl/HwTagRecordServiceImpl.java b/tagApi-service/src/main/java/hw/tagApi/service/service/impl/HwTagRecordServiceImpl.java
index e1b9c75..289534e 100644
--- a/tagApi-service/src/main/java/hw/tagApi/service/service/impl/HwTagRecordServiceImpl.java
+++ b/tagApi-service/src/main/java/hw/tagApi/service/service/impl/HwTagRecordServiceImpl.java
@@ -124,6 +124,8 @@ public class HwTagRecordServiceImpl implements IHwTagRecordService {
*/
@Override
public void updateHwTagRecordByTID(HwTagRecord record) {
+
+
hwTagRecordMapper.updateHwTagRecordByTID(record);
}
@@ -207,6 +209,10 @@ public class HwTagRecordServiceImpl implements IHwTagRecordService {
String fileName = String.valueOf(fields.getOrDefault("文件名", ""));
String TIDCheck = String.valueOf(fields.getOrDefault("TID校验", ""));
String EPCCheck = String.valueOf(fields.getOrDefault("EPC校验", ""));
+ String destinationInfo = String.valueOf(fields.getOrDefault("去向信息", ""));
+ String libraryFlag = String.valueOf(fields.getOrDefault("是否在库", ""));
+ String intendedUse = String.valueOf(fields.getOrDefault("计划用途", ""));
+ String remark = String.valueOf(fields.getOrDefault("备注", ""));
String EPCNumberCheck = String.valueOf(fields.getOrDefault("EPC位数校验", "0"));
int EPCNumberCheckLength = Integer.parseInt(EPCNumberCheck);
int tidCharCount = TIDCheck.length();
@@ -299,13 +305,13 @@ public class HwTagRecordServiceImpl implements IHwTagRecordService {
continue;
}
HwTagRecord record = new HwTagRecord();
- String lot = orderInfo.get("orderNo").replace("Lot", "");
+ String lot = orderInfo.getOrDefault("orderNo","").replace("Lot", "");
record.setOrderCode(lot);
- record.setBatchNumber(orderInfo.get("batchNo"));
- record.setOperatorId(orderInfo.get("operatorId"));
+ record.setBatchNumber(orderInfo.getOrDefault("batchNo", ""));
+ record.setOperatorId(orderInfo.getOrDefault("operatorId", ""));
Date processTime = orderInfo.containsKey("processTime") ? sdf.parse(orderInfo.get("processTime")) : nowDate;
record.setProcessingTime(processTime);
- record.setTotalQuantity(Long.valueOf(orderInfo.get("totalCount")));
+ record.setTotalQuantity(Long.valueOf(orderInfo.getOrDefault("totalCount", "0")));
// 设置标签数据
record.setModelCode(model);
record.setTagSequence(tagData.get("序号"));
@@ -318,6 +324,10 @@ public class HwTagRecordServiceImpl implements IHwTagRecordService {
Date testingTime = tagData.containsKey("测试时间") ? sdf.parse(tagData.get("测试时间")) : nowDate;
record.setTestingTime(testingTime);
record.setFileName(fileName);
+ record.setDestinationInfo(destinationInfo);
+ record.setLibraryFlag(libraryFlag);
+ record.setIntendedUse(intendedUse);
+ record.setRemark(remark);
//校验tId唯一
if (tIdFlag && existingTids.contains(tid)) {
diff --git a/tagApi-service/src/main/java/hw/tagApi/service/service/impl/KDocsServiceImpl.java b/tagApi-service/src/main/java/hw/tagApi/service/service/impl/KDocsServiceImpl.java
index 6114209..9f8f2cf 100644
--- a/tagApi-service/src/main/java/hw/tagApi/service/service/impl/KDocsServiceImpl.java
+++ b/tagApi-service/src/main/java/hw/tagApi/service/service/impl/KDocsServiceImpl.java
@@ -187,6 +187,10 @@ public class KDocsServiceImpl implements IKDocsService {
response.getFields().put("型号", data.getModelCode() != null ? data.getModelCode() : "");
response.getFields().put("加工时间", new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").format(data.getProcessingTime()));
response.getFields().put("生产人员编号", data.getOperatorId());
+ response.getFields().put("去向信息", data.getDestinationInfo() != null ? data.getDestinationInfo() : "");
+ response.getFields().put("是否在库", data.getLibraryFlag() != null ? data.getLibraryFlag() : "");
+ response.getFields().put("计划用途", data.getIntendedUse() != null ? data.getIntendedUse() : "");
+ response.getFields().put("备注", data.getRemark() != null ? data.getRemark() : "");
log.debug("查询结果详情 - ID: {}, 结果: {}", queryId, response.getFields());
} else {
log.info("未找到记录 - ID: {}", queryId);
diff --git a/tagApi-service/src/main/resources/mapper/service/HwTagRecordMapper.xml b/tagApi-service/src/main/resources/mapper/service/HwTagRecordMapper.xml
index bf61c6f..fd0cc04 100644
--- a/tagApi-service/src/main/resources/mapper/service/HwTagRecordMapper.xml
+++ b/tagApi-service/src/main/resources/mapper/service/HwTagRecordMapper.xml
@@ -22,6 +22,9 @@
+
+
+
@@ -51,6 +54,9 @@
reference_value,
testing_time,
file_name,
+ destination_info,
+ library_flag,
+ intended_use,
del_flag,
fields_1,
fields_2,
@@ -81,9 +87,12 @@
and processing_time between #{params.beginProcessingTime} and #{params.endProcessingTime}
and operator_id = #{operatorId}
- and fields_1 = #{fields1}
- and fields_2 = #{fields2}
- and fields_3 = #{fields3}
+ and destination_info = #{destinationInfo}
+ and library_flag = #{libraryFlag}
+ and intended_use = #{intendedUse}
+ and fields_1 = #{fields1}
+ and fields_2 = #{fields2}
+ and fields_3 = #{fields3}
and DATE_FORMAT(processing_time, '%Y/%m/%d') >=
#{startDate}
@@ -137,6 +146,9 @@
reference_value,
testing_time,
file_name,
+ destination_info,
+ library_flag,
+ intended_use,
del_flag,
fields_1,
fields_2,
@@ -165,6 +177,9 @@
#{referenceValue},
#{testingTime},
#{fileName},
+ #{destinationInfo},
+ #{libraryFlag},
+ #{intendedUse},
#{delFlag},
#{fields1},
#{fields2},
@@ -196,6 +211,9 @@
reference_value = #{referenceValue},
testing_time = #{testingTime},
file_name = #{fileName},
+ destination_info = #{destinationInfo},
+ library_flag = #{libraryFlag},
+ intended_use = #{intendedUse},
del_flag = #{delFlag},
fields_1 = #{fields1},
fields_2 = #{fields2},
@@ -228,6 +246,9 @@
reference_value = #{referenceValue},
testing_time = #{testingTime},
file_name = #{fileName},
+ destination_info = #{destinationInfo},
+ library_flag = #{libraryFlag},
+ intended_use = #{intendedUse},
del_flag = #{delFlag},
fields_1 = #{fields1},
fields_2 = #{fields2},
@@ -261,7 +282,8 @@
tag_sequence, total_quantity, tag_batch, model_code,
processing_time, operator_id, fields_1, fields_2, fields_3,
create_by, create_time, update_by, update_time, remark,
- test_result,test_value,reference_value,testing_time,file_name
+ test_result,test_value,reference_value,testing_time,file_name,
+ destination_info,library_flag,intended_use
) values
(
@@ -270,6 +292,7 @@
#{item.processingTime}, #{item.operatorId}, #{item.fields1}, #{item.fields2}, #{item.fields3},
#{item.createBy}, sysdate(), #{item.updateBy}, sysdate(), #{item.remark},
#{item.testResult}, #{item.testValue},#{item.referenceValue}, #{item.testingTime},#{item.fileName}
+ ,#{item.destinationInfo}, #{item.libraryFlag},#{item.intendedUse}
)