ºÓ±±ÍûÃÀÏîÄ¿/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(); } ºÓ±±ÍûÃÀÏîÄ¿/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; } ºÓ±±ÍûÃÀÏîÄ¿/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= ºÓ±±ÍûÃÀÏîÄ¿/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(){ ºÓ±±ÍûÃÀÏîÄ¿/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> ºÓ±±ÍûÃÀÏîÄ¿/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= ºÓ±±ÍûÃÀÏîÄ¿/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 ºÓ±±ÍûÃÀÏîÄ¿/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(){ ºÓ±±ÍûÃÀÏîÄ¿/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> ºÓ±±ÍûÃÀÏîÄ¿/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); ºÓ±±ÍûÃÀÏîÄ¿/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) { ºÓ±±ÍûÃÀÏîÄ¿/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> ºÓ±±ÍûÃÀÏîÄ¿/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 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/test-classes/application.development.properties
File was deleted ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/test-classes/application.functional.properties
File was deleted ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/test-classes/application.test.properties
File was deleted ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/test-classes/data/h2/cleanup-data.sql
File was deleted ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/test-classes/data/h2/import-data.sql
File was deleted