From 3f05596d714338347ab748df3ea1a9c83cd9abf1 Mon Sep 17 00:00:00 2001
From: LSH <brook_w@163.com>
Date: 星期三, 17 八月 2022 10:24:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 95 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 92 insertions(+), 3 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 81b1045..6aab2f9 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,6 +1,7 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -14,12 +15,15 @@
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;
@@ -55,6 +59,12 @@
private WaitPakinService waitPakinService;
@Autowired
private WrkDetlService wrkDetlService;
+ @Autowired
+ private TestMastService testMastService;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private WorkService workService;
@Override
@Transactional
@@ -551,6 +561,7 @@
}
+ /*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
@Override
@Transactional
public void combPACK(CombParam param) {
@@ -570,13 +581,13 @@
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- java.util.Date date=null;
+ java.util.Date date1=null;
try {
- date= sdf.parse(param.getRequestTime());
+ date1= sdf.parse(param.getRequestTime());
} catch (ParseException e) {
e.printStackTrace();
}
- java.sql.Date requestTime = new java.sql.Date(date.getTime());
+ java.sql.Date requestTime = new java.sql.Date(date1.getTime());
// 鐢熸垚鍏ュ簱閫氱煡妗�
Mat mat = matService.selectByMatnr(param.getPackName());
@@ -593,9 +604,87 @@
waitPakin.setAppeTime(requestTime);
waitPakin.setModiUser(null);
waitPakin.setModiTime(requestTime);
+ waitPakin.setDeadWarn(param.getSettingTimes());
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
}
+ @Override
+ @Transactional
+ public void infoReview(Review review) {
+ 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:寰呮祴璇�");
+ }
+ TestMast testMast = testMastService.selectOne(wrapper);
+ if(null != testMast){
+ if (testMast.getStatus()==1){
+ 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("鐘舵�佸紓甯�");
+ }else {
+ throw new CoolException("鐘舵�佷笉鏄� 1:鐢宠涓�");
+ }
+ } else {
+ 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("鏇存敼娴嬭瘯鐘舵�佸け璐�");
+ }
+ }else if (Cools.isEmpty(testMast.getStatus())){
+ throw new CoolException("鐘舵�佸紓甯�");
+ }else {
+ throw new CoolException("鐘舵�佷笉鏄� 2:娴嬭瘯涓�");
+ }
+ } 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