From 3a975df5b368bc68ee7a81d34920b209f2ff607b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 26 五月 2025 16:12:08 +0800
Subject: [PATCH] 提交
---
河北望美项目/MES_11/src/main/java/com/northglass/service/reportform/ReportformService.java | 121 ++++++++++++++++++++++++++++++++-------
1 files changed, 98 insertions(+), 23 deletions(-)
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/reportform/ReportformService.java" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/reportform/ReportformService.java"
index 1e0c597..8f25f22 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/reportform/ReportformService.java"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/java/com/northglass/service/reportform/ReportformService.java"
@@ -8,6 +8,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -103,14 +104,37 @@
@Autowired
private LiuChengKaReportDao liuchengkaDao;
-
+
+ public static String subZeroAndDot(double doublestr){
+ String doubleStr=doublestr+"";
+ if(null != doubleStr && doubleStr.indexOf(".") > 0){
+ doubleStr = doubleStr.replaceAll("0+?$", "");//鍘绘帀澶氫綑鐨�0
+ doubleStr = doubleStr.replaceAll("[.]$", "");//濡傛渶鍚庝竴浣嶆槸.鍒欏幓鎺�
+ }
+ return doubleStr;
+ }
public String shelfreportformhmtl() {
-
+ List<String> RawTypes=new ArrayList<>();
+ RawTypes.add("SL");
+ RawTypes.add("DL");
StringBuffer html = new StringBuffer();// 瀹炰緥鍖栫紦瀛�
List<ShelfRack> ranks = shelfRackDao.findBystate();
for (ShelfRack rank : ranks) {
- if (rank.getState().equals(RackState.IN_WORK) || rank.getState().equals(RackState.ON_WAITING)) {
+ if (rank.getRawPackage()!=null&&(rank.getState().equals(RackState.IN_WORK) || rank.getState().equals(RackState.ON_WAITING))) {
+
+ String unit="";
+ String size="";
+ String Color=rank.getRawPackage().getColor();
+ if(Color.length()>=2&&RawTypes.contains(Color.substring(0, 2))){
+ //鑶滅幓 mm
+ unit="mm";
+ size=subZeroAndDot(rank.getRawPackage().getRawHeight())+"X"+subZeroAndDot(rank.getRawPackage().getRawWidth());
+ }else{
+ //鐧界幓 鍗曚綅 m
+ unit="m";
+ size=subZeroAndDot(rank.getRawPackage().getRawHeight()/1000)+"X"+subZeroAndDot(rank.getRawPackage().getRawWidth()/1000);
+ }
html.append("<tr>");
html.append("<td>" + rank.getNumber() + "</td>");
html.append("<td>" + (rank.getRawPackage().getBatchId()==null?"":rank.getRawPackage().getBatchId()) + "</td>");
@@ -120,10 +144,14 @@
html.append("<td>" + rank.getRawPackage().getRawThickness() + "</td>");
html.append("<td>" + rank.getRawPackage().getLeftPieces() + "</td>");
html.append("<td>" + rank.getCreateTime() + "</td>");
+ html.append("<td>" + size + "</td>");
+ html.append("<td>" + unit + "</td>");
html.append("</tr>");
} else {
html.append("<tr>");
html.append("<td>" + rank.getNumber() + "</td>");
+ html.append("<td></td>");
+ html.append("<td></td>");
html.append("<td></td>");
html.append("<td></td>");
html.append("<td></td>");
@@ -136,7 +164,13 @@
}
return html.toString();// 杩斿洖鏂欐灦淇℃伅
}
-
+ public String getData(int count){
+ SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Calendar c = Calendar.getInstance();
+ c.setTime(new Date());
+ c.add(Calendar.DATE, count); // number of days to add
+ return sdFormat.format(c.getTime());
+ }
public String shelfrankreportformhtml(HttpServletRequest request) {
SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// Long groups=Long.valueOf(request.getParameter("groups"));
@@ -147,13 +181,16 @@
try {
if ((request.getParameter("starttime") == "" || request.getParameter("findtime") == "")
&& request.getParameter("batchid") == "") {
- starttime = "1900-01-01 00:00:00";
+
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
Date aDate = sdFormat.parse(starttime);
Date aDate1 = sdFormat.parse(findtime);
} else if (request.getParameter("starttime") == null) {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
Date aDate = sdFormat.parse(starttime);
Date aDate1 = sdFormat.parse(findtime);
@@ -178,7 +215,8 @@
ranks = rankDao.findalltimebatchid(aDate, aDate1, batchid);
} else if (request.getParameter("starttime") == "" && request.getParameter("findtime") == ""
&& request.getParameter("engineeringid") != "") {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
batchid = request.getParameter("batchid");
Date aDate = sdFormat.parse(starttime);
@@ -228,7 +266,8 @@
// 鏌ヨ鍏ㄩ儴
if ((request.getParameter("starttime") == "" || request.getParameter("findtime") == "")
&& request.getParameter("engineeringid") == "" && request.getParameter("processcardid") == "") {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
Date aDate = sdFormat.parse(starttime);
Date aDate1 = sdFormat.parse(findtime);
@@ -236,7 +275,8 @@
}
// 鏌ヨ鍏ㄩ儴
else if (request.getParameter("starttime") == null) {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
Date aDate = sdFormat.parse(starttime);
Date aDate1 = sdFormat.parse(findtime);
@@ -285,7 +325,8 @@
// 宸ョ▼鏌ヨ
else if (request.getParameter("starttime") == "" && request.getParameter("findtime") == ""
&& request.getParameter("engineeringid") != "" && request.getParameter("processcardid") == "") {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
engineeringid = request.getParameter("engineeringid");
Date aDate = sdFormat.parse(starttime);
@@ -295,7 +336,8 @@
// 娴佺▼鍗℃煡璇�
else if (request.getParameter("starttime") == "" && request.getParameter("findtime") == ""
&& request.getParameter("engineeringid") == "" && request.getParameter("processcardid") != "") {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
processcardid = request.getParameter("processcardid");
Date aDate = sdFormat.parse(starttime);
@@ -305,7 +347,8 @@
// 娴佺▼鍗″伐绋嬫煡璇�
else if (request.getParameter("starttime") == "" && request.getParameter("findtime") == ""
&& request.getParameter("engineeringid") != "" && request.getParameter("processcardid") != "") {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
processcardid = request.getParameter("processcardid");
engineeringid = request.getParameter("engineeringid");
@@ -362,7 +405,8 @@
// 鏌ヨ鍏ㄩ儴
if ((request.getParameter("starttime") == "" || request.getParameter("findtime") == "")
&& request.getParameter("engineeringid") == "" && request.getParameter("processcardid") == "") {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
Date aDate = sdFormat.parse(starttime);
Date aDate1 = sdFormat.parse(findtime);
@@ -370,7 +414,8 @@
}
// 鏌ヨ鍏ㄩ儴
else if (request.getParameter("starttime") == null) {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
Date aDate = sdFormat.parse(starttime);
Date aDate1 = sdFormat.parse(findtime);
@@ -419,7 +464,8 @@
// 宸ョ▼鏌ヨ
else if (request.getParameter("starttime") == "" && request.getParameter("findtime") == ""
&& request.getParameter("engineeringid") != "" && request.getParameter("processcardid") == "") {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
engineeringid = request.getParameter("engineeringid");
Date aDate = sdFormat.parse(starttime);
@@ -429,7 +475,8 @@
// 娴佺▼鍗℃煡璇�
else if (request.getParameter("starttime") == "" && request.getParameter("findtime") == ""
&& request.getParameter("engineeringid") == "" && request.getParameter("processcardid") != "") {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
processcardid = request.getParameter("processcardid");
Date aDate = sdFormat.parse(starttime);
@@ -439,7 +486,8 @@
// 娴佺▼鍗″伐绋嬫煡璇�
else if (request.getParameter("starttime") == "" && request.getParameter("findtime") == ""
&& request.getParameter("engineeringid") != "" && request.getParameter("processcardid") != "") {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
processcardid = request.getParameter("processcardid");
engineeringid = request.getParameter("engineeringid");
@@ -493,7 +541,8 @@
if ((request.getParameter("starttime") == null || request.getParameter("findtime") == null
|| request.getParameter("starttime") == "" || request.getParameter("findtime") == "")
&&(request.getParameter("dengluname") == ""||request.getParameter("dengluname") == null)) {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
aDate = sdFormat.parse(starttime);
aDate1 = sdFormat.parse(findtime);
@@ -512,7 +561,8 @@
}else if ((request.getParameter("starttime") == null || request.getParameter("findtime") == null
|| request.getParameter("starttime") == "" || request.getParameter("findtime") == "")
&&request.getParameter("dengluname") != ""&&request.getParameter("dengluname") != null) {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
dengluname=request.getParameter("dengluname");
aDate = sdFormat.parse(starttime);
@@ -569,8 +619,11 @@
String findtime;
if (request.getParameter("starttime") == null || request.getParameter("findtime") == null
|| request.getParameter("starttime") == "" || request.getParameter("findtime") == "") {
- starttime = "1900-01-01 00:00:00";
+ /*starttime=(request.getParameter("starttime") == null||request.getParameter("starttime") =="")==true?"":"";*/
+ starttime = getData(-10);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
+ System.out.println(starttime);
} else {
starttime = request.getParameter("starttime").replace("T", " ") + ":00";
findtime = request.getParameter("findtime").replace("T", " ") + ":00";
@@ -584,12 +637,29 @@
List<Cutmanagedetailis> cutmanagedetailis = cutmanagedetailisDao.findallgroups1(aDate, aDate1);
double mianji;
+ List<String> RawTypes=new ArrayList<>();
+ RawTypes.add("SL");
+ RawTypes.add("DL");
+
for (Cutmanagedetailis cutmanagedetaili : cutmanagedetailis) {
int pieces = cutmanagedetailisDao.findallpieces1(cutmanagedetaili.getWidth(),
cutmanagedetaili.getHeight(), cutmanagedetaili.getThickness(), cutmanagedetaili.getColor(),
aDate, aDate1);
mianji = (int) cutmanagedetaili.getWidth() * cutmanagedetaili.getHeight() * pieces/1000000;
BigDecimal bg = new BigDecimal(mianji);
+ String unit="";
+ String size="";
+ String Color=cutmanagedetaili.getColor();
+ if(Color.length()>=2&&RawTypes.contains(Color.substring(0, 2))){
+ //鑶滅幓 mm
+ unit="mm";
+ size=subZeroAndDot(cutmanagedetaili.getHeight())+"X"+subZeroAndDot(cutmanagedetaili.getWidth());
+ }else{
+ //鐧界幓 鍗曚綅 m
+ unit="m";
+ size=subZeroAndDot(cutmanagedetaili.getHeight()/1000)+"X"+subZeroAndDot(cutmanagedetaili.getWidth()/1000);
+ }
+
html.append("<tr>");
html.append("<td>" + cutmanagedetaili.getWidth() + "</td>");
html.append("<td>" + cutmanagedetaili.getHeight() + "</td>");
@@ -597,6 +667,8 @@
html.append("<td>" + cutmanagedetaili.getColor() + "</td>");
html.append("<td>" + pieces + "</td>");
html.append("<td>" + mianji + "</td>");
+ html.append("<td>" + size + "</td>");
+ html.append("<td>" + unit + "</td>");
html.append("</tr>");
}
@@ -619,7 +691,8 @@
if ((request.getParameter("starttime") == null || request.getParameter("findtime") == null
|| request.getParameter("starttime") == "" || request.getParameter("findtime") == "")
&&(request.getParameter("dengluname") == ""||request.getParameter("dengluname") == null)) {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
Date aDate = sdFormat.parse(starttime);
Date aDate1 = sdFormat.parse(findtime);
@@ -638,7 +711,8 @@
}else if ((request.getParameter("starttime") == null || request.getParameter("findtime") == null
|| request.getParameter("starttime") == "" || request.getParameter("findtime") == "")
&&request.getParameter("dengluname") != ""&&request.getParameter("dengluname") != null) {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
dengluname=request.getParameter("dengluname");
Date aDate = sdFormat.parse(starttime);
@@ -694,7 +768,8 @@
String findtime;
if (request.getParameter("starttime") == null || request.getParameter("findtime") == null
|| request.getParameter("starttime") == "" || request.getParameter("findtime") == "") {
- starttime = "1900-01-01 00:00:00";
+ starttime = getData(-30);//杩�30澶╃殑鏃堕棿
+ //starttime = "1900-01-01 00:00:00";
findtime = sdFormat.format(new Date());
} else {
starttime = request.getParameter("starttime").replace("T", " ") + ":00";
--
Gitblit v1.8.0