From 9a6a85eecf1dd8489de45eb3ab804d3e33605be2 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期四, 18 八月 2022 09:22:19 +0800
Subject: [PATCH] Merge branch 'gzynasrs' of http://47.97.1.152:5880/r/zy-asrs into gzynasrs
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 69 ++++++++++++++++++++++++++++++----
1 files changed, 60 insertions(+), 9 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 76ede1d..17c3248 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -15,9 +15,11 @@
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;
@@ -61,6 +63,8 @@
private TestMastService testMastService;
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private WorkService workService;
@Override
@Transactional
@@ -586,12 +590,14 @@
java.sql.Date requestTime = new java.sql.Date(date1.getTime());
// 鐢熸垚鍏ュ簱閫氱煡妗�
- Mat mat = matService.selectByMatnr(param.getPackName());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(param.getPackName() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
- }
+// Mat mat = matService.selectByMatnr(param.getPackName());
+// if (Cools.isEmpty(mat)) {
+// throw new CoolException(param.getPackName() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+// }
WaitPakin waitPakin = new WaitPakin();
- waitPakin.sync(mat);
+// waitPakin.sync(mat);
+ waitPakin.setMatnr(param.getPackName());
+ waitPakin.setMaktx(param.getPackName());
waitPakin.setZpallet(param.getPackNo()); // Pack鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(1.0); // 鏁伴噺
@@ -600,6 +606,7 @@
waitPakin.setAppeTime(requestTime);
waitPakin.setModiUser(null);
waitPakin.setModiTime(requestTime);
+ waitPakin.setDeadWarn(param.getSettingTimes());
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -609,18 +616,24 @@
@Transactional
public void infoReview(Review review) {
Wrapper wrapper = new EntityWrapper<TestMast>()
- .eq("loc_no", review.getLocNo());
+ .eq("loc_no", review.getLocNo())
+ .eq("barcode", review.getBarcode())
+ .eq("user_Id", review.getUserId());
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()));
- if (locMast.getPackStatus()!=1){
+ if (null == locMast ||locMast.getPackStatus()!=1) {
throw new CoolException("浜у搧鐘舵�佷笉鏄� 1:寰呮祴璇�");
}
TestMast testMast = testMastService.selectOne(wrapper);
if(null != testMast){
if (testMast.getStatus()==1){
- testMast.setStatus(2);
+ testMast.setStatus(3);
testMast.setModiTime(new Date());
if (!testMastService.update(testMast,wrapper)){
-
+ throw new CoolException("鏇存柊娴嬭瘯鐘舵�佸け璐�");
+ }
+ locMast.setPackStatus(2);
+ if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
+ throw new CoolException("鏇存柊浜у搧鐘舵�佸け璐�");
}
}else if (Cools.isEmpty(testMast.getStatus())){
throw new CoolException("鐘舵�佸紓甯�");
@@ -631,6 +644,44 @@
throw new CoolException("娴嬭瘯鐢宠澶辫触");
}
}
+
+
+ @Override
+ @Transactional
+ public Boolean testFinish(Review review) {
+ Boolean success=true;
+ Wrapper wrapper = new EntityWrapper<TestMast>()
+ .eq("loc_no", review.getLocNo())
+ .eq("barcode", review.getBarcode())
+ .eq("user_Id", review.getUserId());
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()));
+ if (locMast.getPackStatus()!=2){
+ throw new CoolException("浜у搧鐘舵�佷笉鏄� 2:娴嬭瘯涓�");
+ }
+ TestMast testMast = testMastService.selectOne(wrapper);
+ if(null != testMast){
+ if (testMast.getStatus()==3){
+ testMast.setStatus(4);
+ testMast.setModiTime(new Date());
+ if (!testMastService.update(testMast,wrapper)){
+ throw new CoolException("鏇存敼娴嬭瘯鐘舵�佸け璐�");
+ }
+ locMast.setPackStatus(3);
+ if (!locMastService.update(locMast, wrapper)){
+ throw new CoolException("鏇存敼浜у搧鐘舵�佸け璐�");
+ }
+ }else if (Cools.isEmpty(testMast.getStatus())){
+ throw new CoolException("鐘舵�佸紓甯�");
+ }else {
+ throw new CoolException("鐘舵�佷笉鏄� 2:娴嬭瘯涓�");
+ }
+ } else {
+ throw new CoolException("鐘舵�佸紓甯�");
+ }
+
+ return success;
+ }
+
/*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
}
--
Gitblit v1.9.1