From 67f0be5a1d634ba3274fa9366ceacc3580f056b7 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 28 十一月 2025 13:10:42 +0800
Subject: [PATCH] 提交
---
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/cutmanage/task.jsp | 24 +-
河北望美项目/MES_11/src/main/java/com/northglass/web/cutmanage/CutManageController.java | 24 +-
河北望美项目/MES_11/target/maven-archiver/pom.properties | 2
河北望美项目/MES_11/src/main/java/com/northglass/service/device/DeviceService.java | 6
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/cutmanage/gettask.jsp | 4
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/ReportForm.jsp | 273 ++++++++++++++++++++++++++++++++++++++
/dev/null | 8 -
河北望美项目/MES_11/src/main/webapp/WEB-INF/views/cutmanage/gettask.jsp | 4
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/data/reportform_manage.jsp | 25 +++
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/GH_ShangPianWei.jsp | 9 +
河北望美项目/MES_11/target/classes/application.properties | 2
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/classes/application.properties | 2
河北望美项目/MES_11/src/main/resources/application.properties | 2
河北望美项目/MES_11/src/main/webapp/WEB-INF/views/cutmanage/task.jsp | 24 +-
14 files changed, 353 insertions(+), 56 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/device/DeviceService.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/device/DeviceService.java"
index a63814e..816339c 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/device/DeviceService.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/device/DeviceService.java"
@@ -122,10 +122,10 @@
MessageProcessor.generateReturnMessage(str,Machine);
}
public void connect() {
- /*List<Machines> shelf67=machineDao.findAll();
+ List<Machines> shelf67=machineDao.findAll();
for (Machines machines : shelf67) {
machineService.connect(machines);
- }*/
+ }
// Machines Machine=machineDao.findOne(75L);
// machineService.connect(Machine);
// Machines Machine=machineDao.findOne(38L);
@@ -243,7 +243,7 @@
public static Connection getConnection() {
//localhost:3307 192.168.200.201 192.168.2.6 10.12.0.100:3306
try {
- return DriverManager.getConnection("jdbc:mariadb://localhost:3307/gmms","root","");
+ return DriverManager.getConnection("jdbc:mariadb://10.12.0.100:3306/gmms","root","");
} catch (SQLException e) {
e.printStackTrace();
}
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/web/cutmanage/CutManageController.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/web/cutmanage/CutManageController.java"
index f9838b9..77334a8 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/web/cutmanage/CutManageController.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/web/cutmanage/CutManageController.java"
@@ -189,17 +189,19 @@
return true;
}
//鎵撴爣鍔ㄤ綔閫夋嫨
- @RequestMapping(method=RequestMethod.GET, value="/task")
- public String task(Model model){
- model.addAttribute("numberlisthtml", cutManageService.getnumberlist());
- return "cutmanage/task";
- }
- //鎵嬪姩浠诲姟娣诲姞
- @RequestMapping(method=RequestMethod.GET,value="/taskadd")
- public String taskadd(Model model,HttpServletRequest request) {
- cutManageService.taskadd(request);
- return "redirect:/cutmanage/task";
- }
+ @RequestMapping(method=RequestMethod.GET, value="/task/{line}")
+ public String task(Model model,@PathVariable("line") String line){
+ model.addAttribute("line", line);
+ model.addAttribute("numberlisthtml", cutManageService.getnumberlist());
+ return "cutmanage/task";
+ }
+ //鎵嬪姩浠诲姟娣诲姞
+ @RequestMapping(method=RequestMethod.GET,value="/taskadd")
+ public String taskadd(Model model,HttpServletRequest request) {
+ long groups=Long.parseLong(request.getParameter("groups"));
+ cutManageService.taskadd(request);
+ return "redirect:/cutmanage/task/"+groups;
+ }
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/resources/application.properties" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/resources/application.properties"
index 8efcdc4..5a39281 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/resources/application.properties"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/resources/application.properties"
@@ -16,7 +16,7 @@
#jdbc.url=jdbc:mariadb:// localhost:3307 10.12.0.100:3306/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#mysql database setting
jdbc.driver=org.mariadb.jdbc.Driver
-jdbc.url=jdbc:mariadb://localhost:3307/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
+jdbc.url=jdbc:mariadb://10.12.0.100:3306/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
jdbc.username=root
jdbc.password=
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/webapp/WEB-INF/views/cutmanage/gettask.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/cutmanage/gettask.jsp"
index 9cc74a9..6458d28 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/cutmanage/gettask.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/cutmanage/gettask.jsp"
@@ -81,8 +81,8 @@
}
function task(){
- window.location.href="${ctx}/cutmanage/task";
-
+ var groups=document.getElementsByName('groups')[0].value;
+ window.location.href="${ctx}/cutmanage/task/"+groups;
}
function updatedengluname(){
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/webapp/WEB-INF/views/cutmanage/task.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/cutmanage/task.jsp"
index 7e80208..ed56861 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/cutmanage/task.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/cutmanage/task.jsp"
@@ -59,12 +59,12 @@
<section class="content container-fluid">
<form action="${ctx }/cutmanage/taskadd" id="formid" method="get">
<div style="margin-top: 20px;">
- 瀹藉害锛�<input type="text" id="starttime" name="width" /><hr/>
- 楂樺害锛�<input type="text" id="height" name="height" /><hr/>
- 鍘氬害锛�<input type="text" id="thickness" name="thickness" /><hr/>
- 鏁伴噺锛�<input type="text" id="pices" name="pices" /><hr/>
- 绾胯矾锛�<input type="text" id="groups" name="groups" /><hr/>
- 鎵撴爣锛�<input type="text" id="marking" name="marking" readonly="readonly">
+ 瀹藉害锛�<input type="text" id="starttime" name="width" required pattern="^\d+(\.\d{1,2})?$"/><hr/>
+ 楂樺害锛�<input type="text" id="height" name="height" required pattern="^\d+(\.\d{1,2})?$"/><hr/>
+ 鍘氬害锛�<input type="text" id="thickness" name="thickness" required pattern="^\d+(\.\d{1,2})?$"/><hr/>
+ 鏁伴噺锛�<input type="number" id="pices" name="pices" required/><hr/>
+ 绾胯矾锛�<input type="text" id="groups" name="groups" readonly/ value='${line}'><hr/>
+ 鎵撴爣锛�<input type="text" id="marking" name="marking" readonly="readonly" required>
<div class="btn-group" style="margin-top: -10px">
<button class="btn btn-primary dropdown-toggle"
data-toggle="dropdown">
@@ -74,15 +74,15 @@
style="height: 320px; overflow: auto;">
<c:forEach items="${numberlisthtml}"
var="numberlisthtml2">
- <li style="font-size: 20px"><a href="#"
- onclick="$('#marking').val('${numberlisthtml2}')">${numberlisthtml2}</a></li>
+ <li style="font-size: 20px"><a href=" "
+ onclick="$('#marking').val('${numberlisthtml2}')">${numberlisthtml2}</a ></li>
</c:forEach>
</ul>
</div><hr/>
- 鏋跺彿锛�<input type="text" id="dropframe" name="dropframe" /><hr/>
- 纾ㄩ噺锛�<input type="text" id="grinding" name="grinding" /><hr/>
- 娴佺▼鍗★細<input type="text" id="processcardid" name="processcardid" /><hr/>
- 宸ョ▼鍙凤細<input type="text" id="engineeringid" name="engineeringid" /><hr/>
+ 鏋跺彿锛�<input type="text" id="dropframe" name="dropframe" required/><hr/>
+ 纾ㄩ噺锛�<input type="text" id="grinding" name="grinding" required/><hr/>
+ 娴佺▼鍗★細<input type="text" id="processcardid" name="processcardid" required/><hr/>
+ 宸ョ▼鍙凤細<input type="text" id="engineeringid" name="engineeringid" required/><hr/>
<input type="submit" class="btn btn-primary " value="鐢熸垚浠诲姟"/>
</div>
</form>
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/classes/application.properties" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/classes/application.properties"
index 8efcdc4..5a39281 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/classes/application.properties"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/classes/application.properties"
@@ -16,7 +16,7 @@
#jdbc.url=jdbc:mariadb:// localhost:3307 10.12.0.100:3306/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#mysql database setting
jdbc.driver=org.mariadb.jdbc.Driver
-jdbc.url=jdbc:mariadb://localhost:3307/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
+jdbc.url=jdbc:mariadb://10.12.0.100:3306/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
jdbc.username=root
jdbc.password=
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/classes/application.properties" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/classes/application.properties"
index 1b49ab5..5a39281 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/classes/application.properties"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/classes/application.properties"
@@ -13,7 +13,7 @@
#jdbc.url=jdbc:oracle:thin:@127.0.0.1:1521:XE
#jdbc.username=gmms2
#jdbc.password=gmms2
-#jdbc.url=jdbc:mariadb:// localhost 10.12.0.100/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
+#jdbc.url=jdbc:mariadb:// localhost:3307 10.12.0.100:3306/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#mysql database setting
jdbc.driver=org.mariadb.jdbc.Driver
jdbc.url=jdbc:mariadb://10.12.0.100:3306/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/cutmanage/gettask.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/cutmanage/gettask.jsp"
index 9cc74a9..6458d28 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/cutmanage/gettask.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/cutmanage/gettask.jsp"
@@ -81,8 +81,8 @@
}
function task(){
- window.location.href="${ctx}/cutmanage/task";
-
+ var groups=document.getElementsByName('groups')[0].value;
+ window.location.href="${ctx}/cutmanage/task/"+groups;
}
function updatedengluname(){
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/cutmanage/task.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/cutmanage/task.jsp"
index 7e80208..ed56861 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/cutmanage/task.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/cutmanage/task.jsp"
@@ -59,12 +59,12 @@
<section class="content container-fluid">
<form action="${ctx }/cutmanage/taskadd" id="formid" method="get">
<div style="margin-top: 20px;">
- 瀹藉害锛�<input type="text" id="starttime" name="width" /><hr/>
- 楂樺害锛�<input type="text" id="height" name="height" /><hr/>
- 鍘氬害锛�<input type="text" id="thickness" name="thickness" /><hr/>
- 鏁伴噺锛�<input type="text" id="pices" name="pices" /><hr/>
- 绾胯矾锛�<input type="text" id="groups" name="groups" /><hr/>
- 鎵撴爣锛�<input type="text" id="marking" name="marking" readonly="readonly">
+ 瀹藉害锛�<input type="text" id="starttime" name="width" required pattern="^\d+(\.\d{1,2})?$"/><hr/>
+ 楂樺害锛�<input type="text" id="height" name="height" required pattern="^\d+(\.\d{1,2})?$"/><hr/>
+ 鍘氬害锛�<input type="text" id="thickness" name="thickness" required pattern="^\d+(\.\d{1,2})?$"/><hr/>
+ 鏁伴噺锛�<input type="number" id="pices" name="pices" required/><hr/>
+ 绾胯矾锛�<input type="text" id="groups" name="groups" readonly/ value='${line}'><hr/>
+ 鎵撴爣锛�<input type="text" id="marking" name="marking" readonly="readonly" required>
<div class="btn-group" style="margin-top: -10px">
<button class="btn btn-primary dropdown-toggle"
data-toggle="dropdown">
@@ -74,15 +74,15 @@
style="height: 320px; overflow: auto;">
<c:forEach items="${numberlisthtml}"
var="numberlisthtml2">
- <li style="font-size: 20px"><a href="#"
- onclick="$('#marking').val('${numberlisthtml2}')">${numberlisthtml2}</a></li>
+ <li style="font-size: 20px"><a href=" "
+ onclick="$('#marking').val('${numberlisthtml2}')">${numberlisthtml2}</a ></li>
</c:forEach>
</ul>
</div><hr/>
- 鏋跺彿锛�<input type="text" id="dropframe" name="dropframe" /><hr/>
- 纾ㄩ噺锛�<input type="text" id="grinding" name="grinding" /><hr/>
- 娴佺▼鍗★細<input type="text" id="processcardid" name="processcardid" /><hr/>
- 宸ョ▼鍙凤細<input type="text" id="engineeringid" name="engineeringid" /><hr/>
+ 鏋跺彿锛�<input type="text" id="dropframe" name="dropframe" required/><hr/>
+ 纾ㄩ噺锛�<input type="text" id="grinding" name="grinding" required/><hr/>
+ 娴佺▼鍗★細<input type="text" id="processcardid" name="processcardid" required/><hr/>
+ 宸ョ▼鍙凤細<input type="text" id="engineeringid" name="engineeringid" required/><hr/>
<input type="submit" class="btn btn-primary " value="鐢熸垚浠诲姟"/>
</div>
</form>
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/data/reportform_manage.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/data/reportform_manage.jsp"
index e96eb31..bdc7ada 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/data/reportform_manage.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/data/reportform_manage.jsp"
@@ -205,6 +205,31 @@
}
strSQL += " group by operator";
}
+
+ if(gongyi.equals("淇敼鍘熺墖浣跨敤")){
+ System.out.println(11);
+ String width = request.getParameter("width");
+ String height = request.getParameter("height");
+ String thickness = request.getParameter("thickness");
+ String colour = request.getParameter("colour");
+ String batch = request.getParameter("batch");
+
+ int quantity = Integer.parseInt(request.getParameter("quantity"));
+ int groups = Integer.parseInt(request.getParameter("line"));
+ String teams = request.getParameter("teams");
+ String reportingTime = request.getParameter("reportingTime");
+ String type="鎵嬪姩鏂板";
+ if(batch==""){
+ strSQL = "insert into gmms_cutmanage(width,height,thickness,color,batch_id,pieces,groups,dengluname,BgTime,engineering_id)"+
+ "values ("+width+","+height+","+thickness+",'"+colour+"',"+null+","+quantity+","+groups+",'"+teams+"','"+reportingTime+"','"+type+"')";
+ }else{
+ strSQL = "insert into gmms_cutmanage(width,height,thickness,color,batch_id,pieces,groups,dengluname,BgTime,engineering_id)"+
+ "values ("+width+","+height+","+thickness+",'"+colour+"','"+batch+"',"+quantity+","+groups+",'"+teams+"','"+reportingTime+"','"+type+"')";
+ }
+
+
+ System.out.println(strSQL);
+ }
//2023-09-19 鏂板 缁撴潫
//System.out.println("鎶ヨ〃SQL锛�" + strSQL);
sn.createSql(strSQL);
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/GH_ShangPianWei.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/GH_ShangPianWei.jsp"
index fbecdb5..d27ad62 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/GH_ShangPianWei.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/GH_ShangPianWei.jsp"
@@ -646,12 +646,19 @@
}
+
+
var a = d[i];
a.push(s);
-
d[i][7] = d[i][4] - d[i][5] - d[i][8];
}
+
+ if(group==2){
+ d.splice(1, 1)
+ d.splice(2, 1)
+ d.splice(3, 1)
+ }
db.update(d);
for ( var r in rIndex) {
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/ReportForm.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/ReportForm.jsp"
index eba3c08..e16ae27 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/ReportForm.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/mes/view/ReportForm.jsp"
@@ -147,6 +147,135 @@
</div>
<div class="box-body no-padding" id="glass-data" style="overflow-y:scroll"></div>
+
+
+ <!-- 淇敼鍘熶娇鐢� -->
+ <div class="modal fade" id="UNum-info" tabindex="-1" role="dialog"
+ aria-labelledby="myModalLabel" aria-hidden="true">
+ <form class="form-horizontal" role="form">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal"
+ aria-hidden="true">×</button>
+ <h3 class="modal-title" id="UNum_AlertTitle">淇敼鍘熶娇鐢細</h3>
+ </div>
+ <div class="modal-body" style="text-align: left;">
+
+ <div class="form-group">
+
+ <h4>
+ <label class="col-lg-4 control-label no-padding-right"
+ style="font-weight: bolder;">瀹斤細 </label>
+ </h4>
+
+ <div class="col-lg-6 input-group">
+ <input type="text" class="form-control" style="font-size: 18px"
+ id="width">
+ </div>
+
+ <h4>
+ <label class="col-lg-4 control-label no-padding-right"
+ style="font-weight: bolder;">楂橈細 </label>
+ </h4>
+
+ <div class="col-lg-6 input-group">
+ <input type="text" class="form-control" style="font-size: 18px"
+ id="height">
+ </div>
+
+ <h4>
+ <label class="col-lg-4 control-label no-padding-right"
+ style="font-weight: bolder;">鍘氾細 </label>
+ </h4>
+
+ <div class="col-lg-6 input-group">
+ <input type="text" class="form-control" style="font-size: 18px"
+ id="thickness">
+ </div>
+
+ <h4>
+ <label class="col-lg-4 control-label no-padding-right"
+ style="font-weight: bolder;">棰滆壊锛� </label>
+ </h4>
+
+ <div class="col-lg-6 input-group">
+ <input type="text" class="form-control" style="font-size: 18px"
+ id="colour">
+ </div>
+
+ <h4>
+ <label class="col-lg-4 control-label no-padding-right"
+ style="font-weight: bolder;">鎵规锛� </label>
+ </h4>
+
+ <div class="col-lg-6 input-group">
+ <input type="text" class="form-control" style="font-size: 18px"
+ id="batch">
+ </div>
+
+ <h4>
+ <label class="col-lg-4 control-label no-padding-right"
+ style="font-weight: bolder;">鏁伴噺锛� </label>
+ </h4>
+
+ <div class="col-lg-6 input-group">
+ <input type="text" class="form-control" style="font-size: 18px"
+ id="quantity">
+ </div>
+
+ <h4>
+ <label class="col-lg-4 control-label no-padding-right"
+ style="font-weight: bolder;">绾胯矾锛� </label>
+ </h4>
+
+ <div class="col-lg-6 input-group">
+ <input type="text" class="form-control" style="font-size: 18px"
+ id="line">
+ </div>
+
+ <h4>
+ <label class="col-lg-4 control-label no-padding-right"
+ style="font-weight: bolder;">鐝粍锛� </label>
+ </h4>
+
+ <div class="col-lg-6 input-group">
+ <input type="text" class="form-control" style="font-size: 18px"
+ id="teams">
+ </div>
+
+ <h4>
+ <label class="col-lg-4 control-label no-padding-right"
+ style="font-weight: bolder;">鎶ュ伐鏃堕棿锛� </label>
+ </h4>
+
+ <div class="col-lg-6 input-group">
+ <input type="date" class="form-control" style="font-size: 18px"
+ id="reportingTime">
+ </div>
+
+ <h4 style="text-align: center">
+ <label class="control-label no-padding-right"
+ style="font-weight: bolder; color: red;" id="aMsg"> </label>
+ </h4>
+
+ </div>
+
+
+ </div>
+ <div class="modal-footer">
+
+ <button type="button" class="btn btn-primary btn-lg"
+ data-dismiss="modal">鍙栨秷</button>
+
+ <button type="button" class="btn btn-danger btn-lg"
+ id="DEL_button" onclick="UNum_Submit()">纭</button>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+
</section>
</div>
@@ -570,6 +699,11 @@
name : "鎶ュ伐鏃堕棿",
binding : 10,
filter : {}
+ }, {
+ name : "鎿嶄綔",
+ binding : 11,
+ type : "element",
+ filter : {}
} ]
};
@@ -634,6 +768,11 @@
name : "鎶ュ伐鏃堕棿",
binding : 9,
filter : {}
+ }, {
+ name : "鎿嶄綔",
+ binding : 10,
+ type : "element",
+ filter : {}
}]
};
@@ -687,6 +826,7 @@
dataType:'json',
url:rf_url,
success:function(data){
+
if($("#pc_isShow").is(':checked')){
var cDB = createTable(document.getElementById("glass-data"), cuteOpt);
var d = data;
@@ -695,11 +835,41 @@
if(d!=null && d.length>0){
total_num = d.length;
for(i=0;i<d.length;i++){
+ var s = "";
d[i][0] = i+1;
zSl+=d[i][6];
//zMj+=d[i][1]*d[i][2]*d[i][6];
d[i][7]= keepTwoDecimalFull((d[i][1]*d[i][2]*d[i][6]) / 1000000);
zMj+=parseFloat(keepTwoDecimalFull((d[i][1]*d[i][2]*d[i][6]) / 1000000));
+
+ if(!$("#fz_isShow").is(':checked')){
+ s += "<button class='btn btn-large btn-warning' onclick='updateType("
+ + d[i][1]
+ + ","
+ + d[i][2]
+ + ","
+ + d[i][3]
+ + ",\""
+ + d[i][4]
+ + "\",\""
+ + d[i][5]
+ + "\","
+ + zSl
+ + ","
+ + d[i][8]
+ + ",\""
+ + d[i][9]
+ + "\",\""
+ + d[i][10]
+ + "\")'>淇敼</button>";
+
+ var a = d[i];
+ a.push(s);
+ }else{
+ var a = d[i];
+ a.push(s);
+ }
+
}
$("#rRow").text(d.length);
@@ -721,12 +891,42 @@
if(d!=null && d.length>0){
total_num = d.length;
for(i=0;i<d.length;i++){
+ var s = "";
d[i][0] = i+1;
zSl+=d[i][5];
//zMj+=d[i][1]*d[i][2]*d[i][5];
d[i][6]= keepTwoDecimalFull((d[i][1]*d[i][2]*d[i][5]) / 1000000);
zMj+=parseFloat(keepTwoDecimalFull((d[i][1]*d[i][2]*d[i][5]) / 1000000));
+
+ if(!$("#fz_isShow").is(':checked')){
+ s += "<button class='btn btn-large btn-warning' onclick='updateType("
+ + d[i][1]
+ + ","
+ + d[i][2]
+ + ","
+ + d[i][3]
+ + ",\""
+ + d[i][4]
+ + "\","
+ + "\"\""
+ + ","
+ + zSl
+ + ","
+ + d[i][7]
+ + ",\""
+ + d[i][8]
+ + "\",\""
+ + d[i][9]
+ + "\")'>淇敼</button>";
+
+ var a = d[i];
+ a.push(s);
+ }else{
+ var a = d[i];
+ a.push(s);
+ }
+
}
$("#rRow").text(d.length);
$("#rSL").text(zSl);
@@ -822,7 +1022,7 @@
function pageShow(){
var winHeight=0;
winHeight=document.body.scrollHeight;
- document.getElementById("glass-data").style.height =(winHeight-100)+"px";
+ document.getElementById("glass-data").style.height =(winHeight-360)+"px";
}
function ChaXun() {
@@ -835,5 +1035,76 @@
pageShow();
</script>
+<script>
+function updateType(width, height, thickness, colour,batch,quantity,line,teams,reportingTime) {
+
+ document.getElementById("width").value=width;
+ document.getElementById("height").value=height;
+ document.getElementById("thickness").value=thickness;
+ document.getElementById("colour").value=colour;
+ document.getElementById("batch").value=batch;
+ document.getElementById("quantity").value=quantity;
+ document.getElementById("line").value=line;
+ document.getElementById("teams").value=teams;
+ document.getElementById("reportingTime").value=reportingTime;
+ $('#UNum-info').modal('toggle');
+
+}
+
+
+function UNum_Submit(){
+ var width = $('#width').val();
+ var height = $('#height').val();
+ var thickness = $('#thickness').val();
+ var colour = $('#colour').val();
+ var batch = $('#batch').val();
+ var quantity = $('#quantity').val();
+ var line = $('#line').val();
+ var teams = $('#teams').val();
+ var reportingTime = $('#reportingTime').val();
+
+ if(width!=""&&height!=""&&thickness!=""&&colour!=""&&quantity!=""&&line!=""&&teams!=""&&reportingTime!=""){
+ if(isNaN(quantity)){
+ $("#aMsg").html("璇疯緭鍏ユ暟閲忥紒");
+ }else{
+
+ $("#aMsg").html("");
+
+ $.ajax({
+ type:'post',
+ url:rf_url,
+ dataType:'text',
+ data:{
+ gongyi:"淇敼鍘熺墖浣跨敤",
+ width:width,
+ height:height,
+ thickness:thickness,
+ colour:colour,
+ batch:batch,
+ quantity:quantity,
+ line:line,
+ teams:teams,
+ reportingTime:reportingTime,
+ },success:function(data){
+ var d= data.trim();
+ if(d = 1){
+ $('#UNum-info').modal('hide');
+ ChaXun();
+
+ }
+ },error:function(data){
+
+ $("#aMsg").html("淇敼澶辫触,澶辫触鍘熷洜锛�"+data);
+ }
+
+ });
+ }
+ }else{
+ $("#aMsg").html("杈撳叆涓嶈兘涓虹┖锛�");
+ }
+
+}
+</script>
+
</body>
</html>
\ No newline at end of file
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/maven-archiver/pom.properties" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/maven-archiver/pom.properties"
index eb994cd..a60e08e 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/maven-archiver/pom.properties"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/maven-archiver/pom.properties"
@@ -1,5 +1,5 @@
#Generated by Maven
-#Fri Jun 13 11:06:57 CST 2025
+#Fri Nov 28 13:09:18 CST 2025
version=1.0-SNAPSHOT
groupId=com.northglass
artifactId=gmms2
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/test-classes/application.development.properties" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/test-classes/application.development.properties"
deleted file mode 100644
index f0aa1ce..0000000
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/test-classes/application.development.properties"
+++ /dev/null
@@ -1,5 +0,0 @@
-#(optional)override jdbc url for local development
-
-#log4jdbc driver
-#jdbc.driver=net.sf.log4jdbc.DriverSpy
-#jdbc.url=jdbc:log4jdbc:h2:file:~/.h2/gmms2;AUTO_SERVER=TRUE;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
\ No newline at end of file
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/test-classes/application.functional.properties" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/test-classes/application.functional.properties"
deleted file mode 100644
index b4d3a88..0000000
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/test-classes/application.functional.properties"
+++ /dev/null
@@ -1,15 +0,0 @@
-baseUrl=http://localhost:8082/gmms2
-embeddedForLocal=true
-
-#selenium settings, options include firefox,ie,chrome,remote:localhost:4444:firefox
-selenium.driver=firefox
-
-#(optional)override jdbc url for functional test
-db.type=h2
-jdbc.driver=org.h2.Driver
-jdbc.url=jdbc:h2:file:~/.h2/gmms2-test;AUTO_SERVER=TRUE;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
-jdbc.username=sa
-jdbc.password=
-
-#log4jdbc driver
-#jdbc.url=jdbc:log4jdbc:h2:file:~/.h2/gmms2-test;AUTO_SERVER=TRUE;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/test-classes/application.test.properties" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/test-classes/application.test.properties"
deleted file mode 100644
index 4cae9bc..0000000
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/test-classes/application.test.properties"
+++ /dev/null
@@ -1,8 +0,0 @@
-#(optional)override jdbc url as in-memory db for unit test
-jdbc.driver=org.h2.Driver
-jdbc.url=jdbc:h2:mem:gmms2;DB_CLOSE_DELAY=-1
-jdbc.username=sa
-jdbc.password=
-
-#log4jdbc driver
-#jdbc.url=jdbc:log4jdbc:h2:mem:gmms2;DB_CLOSE_DELAY=-1
\ No newline at end of file
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/test-classes/data/h2/cleanup-data.sql" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/test-classes/data/h2/cleanup-data.sql"
deleted file mode 100644
index 4f295b5..0000000
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/test-classes/data/h2/cleanup-data.sql"
+++ /dev/null
@@ -1,2 +0,0 @@
-delete from gmms2_task;
-delete from gmms2_user;
\ No newline at end of file
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/test-classes/data/h2/import-data.sql" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/test-classes/data/h2/import-data.sql"
deleted file mode 100644
index e36690d..0000000
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/test-classes/data/h2/import-data.sql"
+++ /dev/null
@@ -1,8 +0,0 @@
-insert into gmms2_task (id, title, description, user_id) values(1, 'Study PlayFramework 2.0','http://www.playframework.org/', 2);
-insert into gmms2_task (id, title, description, user_id) values(2, 'Study Grails 2.0','http://www.grails.org/', 2);
-insert into gmms2_task (id, title, description, user_id) values(3, 'Try SpringFuse','http://www.springfuse.com/', 2);
-insert into gmms2_task (id, title, description, user_id) values(4, 'Try Spring Roo','http://www.springsource.org/spring-roo', 2);
-insert into gmms2_task (id, title, description, user_id) values(5, 'Release SpringSide 4.0','As soon as posibble.', 2);
-
-insert into gmms2_user (id, login_name, name, password, salt, roles, register_date) values(1,'admin','Admin','691b14d79bf0fa2215f155235df5e670b64394cc','7efbd59d9741d34f','admin','2012-06-04 01:00:00');
-insert into gmms2_user (id, login_name, name, password, salt, roles, register_date) values(2,'user','Calvin','2488aa0c31c624687bd9928e0a5d29e7d1ed520b','6d65d24122c30500','user','2012-06-04 02:00:00');
\ No newline at end of file
--
Gitblit v1.8.0