From 0e6be9f75b84ebdf6ed3943853d514966134da34 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期五, 23 九月 2022 14:05:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 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 683ff79..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
@@ -590,20 +585,23 @@
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); // 鏁伴噺
waitPakin.setStatus("Y"); // 鐘舵��
+ waitPakin.setManuDate(requestTime.toString());
waitPakin.setAppeUser(null);
- waitPakin.setAppeTime(requestTime);
+ waitPakin.setAppeTime(new Date());
waitPakin.setModiUser(null);
- waitPakin.setModiTime(requestTime);
+ waitPakin.setModiTime(new Date());
waitPakin.setDeadWarn(param.getSettingTimes());
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
@@ -613,11 +611,14 @@
@Override
@Transactional
public void infoReview(Review review) {
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()));
+ if (!review.getBarcode().equals(locMast.getBarcode())){
+ throw new CoolException("pack鐮佷笉鍚�");
+ }
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 (null == locMast ||locMast.getPackStatus()!=1) {
throw new CoolException("浜у搧鐘舵�佷笉鏄� 1:寰呮祴璇�");
}
@@ -639,7 +640,7 @@
throw new CoolException("鐘舵�佷笉鏄� 1:鐢宠涓�");
}
} else {
- throw new CoolException("娴嬭瘯鐢宠澶辫触");
+ throw new CoolException("娴嬭瘯鐢宠澶嶆牳澶辫触");
}
}
@@ -653,30 +654,33 @@
.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){
+ if (null == locMast ||locMast.getPackStatus()!=2){
throw new CoolException("浜у搧鐘舵�佷笉鏄� 2:娴嬭瘯涓�");
+ }else if (!review.getBarcode().equals(locMast.getBarcode())){
+ throw new CoolException("pack鐮佷笉鍚�");
}
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);
- if (!locMastService.update(locMast, wrapper)){
+ 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("鐘舵�佸紓甯�");
}
-
return success;
}
--
Gitblit v1.9.1