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 42762a6..6df6bf8 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
@@ -144,11 +144,11 @@ public class KDocsServiceImpl implements IKDocsService {
// 设置查询条件
if (fields.containsKey("TID")) {
String tid = (String) fields.get("TID");
- selectTagRecord.setTId(tid);
+ selectTagRecord.setTId(tid.replace("-", ""));
}
if (fields.containsKey("EPC")) {
String epc = (String) fields.get("EPC");
- selectTagRecord.setEpc(epc);
+ selectTagRecord.setEpc(epc.replace("-", ""));
}
if (fields.containsKey("筛选日期起点")) {
String startDate = (String) fields.get("筛选日期起点");
@@ -168,23 +168,24 @@ public class KDocsServiceImpl implements IKDocsService {
// 处理查询结果
if (data != null) {
-
+ response.getFields().put("RID", data.getRId());
response.getFields().put("TID", data.getTId());
response.getFields().put("EPC", data.getEpc());
- response.getFields().put("标签序号", data.getTagSequence());
+ response.getFields().put("标签序号", data.getTagSequence() != null ? data.getTagSequence() : "");
response.getFields().put("密码", data.getPassword() != null ? data.getPassword() : "");
- response.getFields().put("RID", data.getTId());
- response.getFields().put("LOT", data.getOrderCode());
- response.getFields().put("卷编号", data.getBatchNumber());
+ response.getFields().put("LOT", data.getOrderCode() != null ? data.getOrderCode() : "");
+ response.getFields().put("卷编号", data.getBatchNumber() != null ? data.getBatchNumber() : "");
response.getFields().put("本卷数量", data.getTotalQuantity() != null ? data.getTotalQuantity() : "");
response.getFields().put("标签批次号", data.getTagBatch() != null ? data.getTagBatch() : "");
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());
+ String processingTime = data.getProcessingTime() != null ? new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").format(data.getProcessingTime()) : "";
+ response.getFields().put("加工时间", processingTime);
+ response.getFields().put("生产人员编号", data.getOperatorId() != null ? 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() : "");
+ response.getFields().put(ApiConstants.SELECT_STATUS, "搜索成功");
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 4ada4f0..1e99a55 100644
--- a/tagApi-service/src/main/resources/mapper/service/HwTagRecordMapper.xml
+++ b/tagApi-service/src/main/resources/mapper/service/HwTagRecordMapper.xml
@@ -295,7 +295,7 @@
create_time = #{createTime},
update_by = #{updateBy},
update_time = #{updateTime},
- remark = #{remark},
+ remark = #{remark},
remark = NULL,
where t_id = #{tId}