From e0f827f71f5bb9d1ed9f6414221e90eeb34632a7 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期四, 04 九月 2025 11:07:01 +0800
Subject: [PATCH] 排产工单模块设备点检涉及接口
---
src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java b/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
index 696baeb..90f6066 100644
--- a/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
@@ -148,12 +148,19 @@
public boolean addInspectionOrder(EamInspectionOrderRequest eamInspectionOrderRequest) {
EamInspectionOrder eamInspectionOrder = new EamInspectionOrder();
BeanUtils.copyProperties(eamInspectionOrderRequest, eamInspectionOrder);
- //淇敼鐘舵��
- if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())) {
- eamInspectionOrder.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name());
- } else {
- eamInspectionOrder.setInspectionStatus(InspectionStatus.WAIT_INSPECTION.name());
+ eamInspectionOrder.setInspectionDate(new Date());
+ eamInspectionOrder.setOperateTime(new Date());
+ LoginUser user = getCurrentUser();
+ if (user == null || StrUtil.isBlank(user.getId())) {
+ throw new JeecgBootException("璐﹀彿涓嶅瓨鍦�");
}
+ eamInspectionOrder.setOperator(user.getUsername());
+ ////淇敼鐘舵��
+ //if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())) {
+ // eamInspectionOrder.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name());
+ //} else {
+ // eamInspectionOrder.setInspectionStatus(InspectionStatus.WAIT_INSPECTION.name());
+ //}
save(eamInspectionOrder);
//澶勭悊鏄庣粏鏁版嵁
if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableDetailList())) {
@@ -163,20 +170,20 @@
});
eamInspectionOrderDetailService.saveBatch(eamInspectionOrderRequest.getTableDetailList());
}
- //澶勭悊闄勪欢
- if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getFileList())) {
- FileUploadResult fileUploadResult = eamInspectionOrderRequest.getFileList().get(0);
- ObjectMapper mapper = new ObjectMapper();
- try {
- String referenceFile = mapper.writeValueAsString(fileUploadResult);
- eamInspectionOrder.setImageFiles(referenceFile);
- } catch (JsonProcessingException e) {
- log.error("JSON杞崲澶辫触锛�" + e.getMessage(), e);
- }
- }
- if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())) {
- triggerProcess(eamInspectionOrder);
- }
+ ////澶勭悊闄勪欢
+ //if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getFileList())) {
+ // FileUploadResult fileUploadResult = eamInspectionOrderRequest.getFileList().get(0);
+ // ObjectMapper mapper = new ObjectMapper();
+ // try {
+ // String referenceFile = mapper.writeValueAsString(fileUploadResult);
+ // eamInspectionOrder.setImageFiles(referenceFile);
+ // } catch (JsonProcessingException e) {
+ // log.error("JSON杞崲澶辫触锛�" + e.getMessage(), e);
+ // }
+ //}
+ //if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())) {
+ // triggerProcess(eamInspectionOrder);
+ //}
return true;
}
--
Gitblit v1.9.3