From 9b4de84e744b2f76a24103e791086c647c1c3027 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 13 九月 2023 07:58:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java | 8 ----
src/main/java/com/zy/asrs/task/handler/FireOutHandler.java | 6 +++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 4 +-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 42 ---------------------
src/main/java/com/zy/asrs/task/StandingScheduler.java | 2
5 files changed, 9 insertions(+), 53 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 3ea8ace..0723b34 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -722,7 +722,7 @@
}else if (testMast.getChannel()<=48){
renUrl=renUrl6;
}
- return new PostMesDataUtils().postMesData("娴嬭瘯绯荤粺",renUrl,startUpTestPACK,review);
+ return null;
}catch (Exception e) {
log.error("fail", e);
e.printStackTrace();
@@ -802,7 +802,7 @@
default:
log.error("閫氶亾鏈夎锛岃鏌ョ湅锛�");
}
- return new PostMesDataUtils().postMesData("娴嬭瘯绯荤粺",renUrl,suspendTestPACK,review);
+ return null;
}catch (Exception e) {
log.error("fail", e);
e.printStackTrace();
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 19a4a40..3157c1e 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -783,48 +783,6 @@
return null;
}
-
-// @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 (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();
-// locMast.setPackStatus(3);
-// locMast.setModiTime(date);
-//// CombParam combParam = new CombParam();
-//// combParam.setPackNo(locMast.getBarcode());
-//// combParam.setLocNo(locMast.getLocNo());
-//// combParam.setPackSts(3);
-//// combParam.setRequestTime(DateUtils.convert(new Date()));
-//// new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
-//
-// 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("娴嬭瘯鐘舵�佷笉鏄� 3:娴嬭瘯涓�");
-// }
-// } else {
-// throw new CoolException("鐘舵�佸紓甯�");
-// }
-// return success;
-// }
-
@Override
@Transactional
public Boolean testNG(Review review) {
diff --git a/src/main/java/com/zy/asrs/task/StandingScheduler.java b/src/main/java/com/zy/asrs/task/StandingScheduler.java
index d456e13..e038dda 100644
--- a/src/main/java/com/zy/asrs/task/StandingScheduler.java
+++ b/src/main/java/com/zy/asrs/task/StandingScheduler.java
@@ -20,7 +20,7 @@
/**
*
*/
- //@Scheduled(cron = "0/5 * * * * ? ")
+ @Scheduled(cron = "0/5 * * * * ? ")
private void execute() {
//if (confirmDeep) return;
diff --git a/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java b/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java
index 04e0a88..a629340 100644
--- a/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java
@@ -54,9 +54,15 @@
if (Cools.isEmpty(locMast)){
continue;
}
+ WrkMast wrkMast2=wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("sta_no",1000)
+ .eq("source_loc_no",locMast.getLocNo()));
+ if(!Cools.isEmpty(wrkMast2)){
+ continue;
+ }
WrkMast wrkMast1=wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no",locMast.getLocNo()));
if(!Cools.isEmpty(wrkMast1)){
wrkMastService.delete(new EntityWrapper<WrkMast>().eq("source_loc_no",locMast.getLocNo()));
+ wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("zpallet",locMast.getBarcode()));
}
// 鑾峰彇璺緞
StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), 1000);
diff --git a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
index bb752c3..77d1e17 100644
--- a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java
@@ -261,14 +261,6 @@
locMast.setLocSts("R");
locMast.setModiTime(now);
// locMast.setPackStatus(5); //5:寮�濮嬮潤缃�
-
- CombParam combParam = new CombParam();
- combParam.setPackNo(wrkDetl.getMatnr());
- combParam.setLocNo(locMast.getLocNo());
- combParam.setPackSts(locMast.getPackStatus());
- combParam.setRequestTime(DateUtils.convert(new Date()));
- new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
-
if (!locMastService.updateById(locMast)) {
log.error("棰勭害搴撲綅鐘舵�佸け璐ワ紝搴撲綅鍙凤細"+locMast.getLocNo());
return false;
--
Gitblit v1.9.1