From 9ac70efe81c1909d63b89f9b18c4f367c0584ceb Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 28 四月 2025 16:04:00 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 75 ++++++++++++++++++++++---------------
1 files changed, 45 insertions(+), 30 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 0b847d5..0723b34 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -37,6 +37,7 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
+import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -677,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
@@ -721,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();
@@ -801,7 +802,7 @@
default:
log.error("閫氶亾鏈夎锛岃鏌ョ湅锛�");
}
- return new PostMesDataUtils().postMesData("娴嬭瘯绯荤粺",renUrl,suspendTestPACK,review);
+ return null;
}catch (Exception e) {
log.error("fail", e);
e.printStackTrace();
@@ -816,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)){
@@ -834,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")));
@@ -863,23 +865,21 @@
@Transactional
public List<PackUsageRate2> packQualified() {
Date now = new Date();
- Date date7 = Utils.timeYesterday(now);
- Date date14 = Utils.timeYesterday(date7);
ArrayList<PackUsageRate2> packUsageRates = new ArrayList<>();
-
- PackUsageRate2 packUsageRate = new PackUsageRate2();
- packUsageRate.setTotal(packQualifiedService.selectTotal(date7,now));
- packUsageRate.setQualified(packQualifiedService.selectCurrentQuantity(true,date7,now));
- packUsageRate.setUnqualified(packQualifiedService.selectCurrentQuantity(false,date7,now));
- packUsageRate.setWeek("鏈懆");
- packUsageRates.add(packUsageRate);
-
- PackUsageRate2 packUsageRate2 = new PackUsageRate2();
- packUsageRate2.setTotal(packQualifiedService.selectTotal(date14,date7));
- packUsageRate2.setQualified(packQualifiedService.selectCurrentQuantity(true,date14,date7));
- packUsageRate2.setUnqualified(packQualifiedService.selectCurrentQuantity(false,date14,date7));
- packUsageRate2.setWeek("涓婂懆");
- packUsageRates.add(packUsageRate2);
+ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+ for(int i=1;i<8;i++){
+ Date date7 = Utils.timeYesterday(now,i);
+ PackUsageRate2 packUsageRate7 = new PackUsageRate2();
+ packUsageRate7.setTotal(packQualifiedService.selectTotal(date7,now));
+ packUsageRate7.setQualified(packQualifiedService.selectCurrentQuantity(true,date7,now));
+ packUsageRate7.setUnqualified(packQualifiedService.selectCurrentQuantity(false,date7,now));
+ String formattedDate = sdf.format(date7);
+ int month = Integer.parseInt(formattedDate.substring(5, 7));
+ int day = Integer.parseInt(formattedDate.substring(8, 10));
+ packUsageRate7.setWeek(month+"-"+day);
+ packUsageRates.add(packUsageRate7);
+ now=date7;
+ }
return packUsageRates;
}
@@ -889,8 +889,23 @@
* */
@Override
@Transactional
- public List<WorkChartAxis> chartAxisEvening() {
- return reportQueryMapper.getChartAxisEvening();
+ public List<PackUsageRate2> chartAxisEvening() {
+ Date now = new Date();
+ ArrayList<PackUsageRate2> packUsageRates = new ArrayList<>();
+ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+ for(int i=1;i<13;i++){
+ Date date7 = Utils.timeYesterday1(now,i);
+ PackUsageRate2 packUsageRate7 = new PackUsageRate2();
+ packUsageRate7.setTotal(packQualifiedService.selectTotal1(date7,now));
+ packUsageRate7.setQualified(packQualifiedService.selectCurrentQuantity1(true,date7,now));
+ packUsageRate7.setUnqualified(packQualifiedService.selectCurrentQuantity1(false,date7,now));
+ String formattedDate = sdf.format(date7);
+ int hour= date7.getHours();
+ packUsageRate7.setWeek(hour+"");
+ packUsageRates.add(packUsageRate7);
+ now=date7;
+ }
+ return packUsageRates;
}
/*
--
Gitblit v1.9.1