From 53f095a34dba25e2fe3b33ae16475bd3a4c682fc Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 22 一月 2024 12:55:30 +0800
Subject: [PATCH] 火警日志添加
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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 687ec72..0723b34 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -678,14 +678,14 @@
if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()))){
log.error("鐢宠娴嬭瘯澶辫触");
}
- //3.寮�濮嬫祴璇曚笂鎶�
- CombParam combParam = new CombParam();
- combParam.setPackNo(testMast.getBarcode());
- combParam.setLocNo(locMast.getLocNo());
- combParam.setPackSts(0);
- combParam.setStepSts(3);
- combParam.setRequestTime(DateUtils.convert(now));
- new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
+// //3.寮�濮嬫祴璇曚笂鎶�
+// CombParam combParam = new CombParam();
+// combParam.setPackNo(testMast.getBarcode());
+// combParam.setLocNo(locMast.getLocNo());
+// combParam.setPackSts(0);
+// combParam.setStepSts(3);
+// combParam.setRequestTime(DateUtils.convert(now));
+// new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
}
@Override
@@ -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();
@@ -817,7 +817,8 @@
@Override
@Transactional
public List<LocMast> packTestBasicInformation() {
- List<LocMast> locMasts=locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_type1", 1).and().ne("loc_sts","O"));
+ List<LocMast> locMasts=locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_type1", 1).and().ne("loc_sts","O")
+ .and().ne("loc_sts","X"));
for (LocMast locMast:locMasts) {
LocDetl locDetl=locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
if(Cools.isEmpty(locDetl)){
@@ -835,7 +836,7 @@
@Transactional
public List<PackUsageRate> packUsageRate() {
ArrayList<PackUsageRate> packUsageRates = new ArrayList<>();
- for (int i = 0 ;i<5;i++){
+ for (int i = 1 ;i<5;i++){
PackUsageRate packUsageRate = new PackUsageRate();
packUsageRate.setTotal(locMastService.selectCount(new EntityWrapper<LocMast>().eq("loc_type1", i)));
packUsageRate.setCurrentQuantity(locMastService.selectCount(new EntityWrapper<LocMast>().eq("loc_type1", i).and().ne("loc_sts","O")));
--
Gitblit v1.9.1