From bb479fe7c962a9827c6512262d4d859e35082fd7 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 23 九月 2022 17:00:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 22 ++++------------------
1 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 50f8bb7..dfc356e 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -15,15 +15,12 @@
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
import com.zy.common.model.DetlDto;
-import com.zy.common.model.enums.WorkNoType;
import com.zy.common.utils.NodeUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.expression.spel.ast.NullLiteral;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.tools.JavaCompiler;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -63,8 +60,6 @@
private TestMastService testMastService;
@Autowired
private LocMastService locMastService;
- @Autowired
- private WorkService workService;
@Override
@Transactional
@@ -667,33 +662,24 @@
TestMast testMast = testMastService.selectOne(wrapper);
if(null != testMast){
if (testMast.getStatus()==3){
+ Date date = new Date();
testMast.setStatus(4);
- testMast.setModiTime(new Date());
+ testMast.setModiTime(date);
if (!testMastService.update(testMast,wrapper)){
throw new CoolException("鏇存敼娴嬭瘯鐘舵�佸け璐�");
}
locMast.setPackStatus(3);
+ testMast.setModiTime(date);
if (!locMastService.update(locMast, new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
throw new CoolException("鏇存敼浜у搧鐘舵�佸け璐�");
}
}else if (Cools.isEmpty(testMast.getStatus())){
throw new CoolException("鐘舵�佸紓甯�");
}else {
- throw new CoolException("鐘舵�佷笉鏄� 2:娴嬭瘯涓�");
+ throw new CoolException("鐘舵�佷笉鏄� 3:娴嬭瘯涓�");
}
} else {
throw new CoolException("鐘舵�佸紓甯�");
- }
- //绉诲簱寮�濮嬶紝鏌ヨ鐩爣搴撲綅
- LocMast targetLocNo = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("row1",2)
- .eq("loc_sts","O")
- .eq("fire_status", 0)
- .eq("pack_status",0));
- if (targetLocNo != null){
- workService.locMove(review.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(review.getUserId()));
- }else {
- throw new CoolException("娌℃湁绌哄簱浣�");
}
return success;
}
--
Gitblit v1.9.1