From 25650bd51704793cf78408d28853c89fda837c4c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 14 四月 2026 12:56:30 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/JobServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/JobServiceImpl.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/JobServiceImpl.java
index 7d1124f..3c98975 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/JobServiceImpl.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/JobServiceImpl.java
@@ -6,11 +6,14 @@
import com.zy.acs.conveyor.mapper.JobLogMapper;
import com.zy.acs.conveyor.mapper.JobMapper;
import com.zy.acs.conveyor.service.JobService;
+import com.zy.acs.framework.common.Cools;
+import com.zy.acs.framework.common.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.List;
@Service
@@ -41,8 +44,8 @@
}
@Override
- public Job getJobByBarcode(String barcode, Integer jobSts) {
- return baseMapper.getJobByBarcodeAndJobSts(barcode, jobSts);
+ public Job getJobByBarcode(String barcode) {
+ return baseMapper.getJobByBarcode(barcode);
}
@Override
@@ -55,6 +58,9 @@
public void saveJobLog(Job job) {
JobLog jobLog = new JobLog();
BeanUtils.copyProperties(job, jobLog);
+ if (Cools.isEmpty(jobLog.getMemo())){
+ jobLog.setMemo(DateUtils.convert(new Date()));
+ }
jobLogMapper.insert(jobLog);
baseMapper.deleteById(job.getId());
--
Gitblit v1.9.1