From 3b65a5dc04be7cdac460c84ebaa38bf009405128 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 18 八月 2025 09:23:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/MES_Projects
---
河北望美项目/MES_11/src/main/webapp/WEB-INF/views/mes/view/ReportForm.jsp | 289 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 283 insertions(+), 6 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/webapp/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/src/main/webapp/WEB-INF/views/mes/view/ReportForm.jsp"
index 9920f98..e16ae27 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/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/src/main/webapp/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>
@@ -191,6 +320,7 @@
html += " <option value='4' >" + gongyi + " 4 绾�</option>";
} else if (gongyi == "鍐峰姞宸�") {
html += " <option value='3' >" + gongyi + " 3 绾�</option>";
+ html += " <option value='4' >" + gongyi + " 4 绾�</option>";
}
document.getElementById("rf_chanxian").innerHTML += html;
@@ -569,6 +699,11 @@
name : "鎶ュ伐鏃堕棿",
binding : 10,
filter : {}
+ }, {
+ name : "鎿嶄綔",
+ binding : 11,
+ type : "element",
+ filter : {}
} ]
};
@@ -633,6 +768,11 @@
name : "鎶ュ伐鏃堕棿",
binding : 9,
filter : {}
+ }, {
+ name : "鎿嶄綔",
+ binding : 10,
+ type : "element",
+ filter : {}
}]
};
@@ -686,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;
@@ -694,15 +835,47 @@
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];
+ //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+=d[i][7]=d[i][1]*d[i][2]*d[i][6];
+ 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);
$("#rSL").text(zSl);
- $("#rMJ").text(keepTwoDecimalFull(zMj/1000000));
+$("#rMJ").text(keepTwoDecimalFull(zMj));
+ //$("#rMJ").text(keepTwoDecimalFull(zMj/1000000));
}else{
$("#rRow").text(0);
$("#rSL").text(0);
@@ -718,14 +891,47 @@
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];
+ //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);
- $("#rMJ").text(keepTwoDecimalFull(zMj/1000000));
+ //$("#rMJ").text(keepTwoDecimalFull(zMj/1000000));
+$("#rMJ").text(keepTwoDecimalFull(zMj));
}else{
$("#rRow").text(0);
$("#rSL").text(0);
@@ -816,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() {
@@ -829,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
--
Gitblit v1.8.0