海尔mes项目
parent: eb0f0351 | 补丁 | 提交 | ignore whitespace
wuyouming666
2023-07-26 09a05342f4c60c834c3ee17a13529cd91c624f34 
Merge branch 'master' of http://10.153.19.150:10101/r/Haier_MES
5个文件已修改
4个文件已添加
166 ■■■■■ 已修改文件
.gitignore 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/WEB-INF/lib/fastjson-1.2.76.jar 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/WEB-INF/lib/mysql-connector-java-8.0.20.jar 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/WEB-INF/lib/nglib.jar 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/js/mixins.js 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/login/bdg.jsp 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/mysqlInsert/toPlc.jsp 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/qiegeguanli/qiegerenwu.jsp 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gmms/WebContent/yuanpiancangchu/cangchurenwuxinxi.jsp 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 .gitignore


@@ -4,7 +4,6 @@


.mtj.tmp/




# Package Files #


*.jar


*.war


*.ear






 gmms/WebContent/WEB-INF/lib/fastjson-1.2.76.jar

Binary files differ



 gmms/WebContent/WEB-INF/lib/mysql-connector-java-8.0.20.jar

Binary files differ



 gmms/WebContent/WEB-INF/lib/nglib.jar

Binary files differ



 gmms/WebContent/js/mixins.js


@@ -10,33 +10,36 @@


var mixin={


    methods:{


        connects:function(gongneng,sql,flag,num){


              $.post("../mysqlInsert/mysql.jsp",


                      {"gongneng":gongneng,"sql":sql,'flag':flag,'anquanma':json["anquanma"]},


                      function(result){


                          if(num==1){


                              result=$(result).text();


                              index = result.indexOf("[[");


                              if(index>-1){


                                  if(result.indexOf("[[anquanmaerr]]")>-1){


                                        //alert('请先登录后操作');


                                        window.parent.location.href='../login/index.jsp';


                                  }else{


                                      result=result.substring(index).trim()


                                      alert(result);


                                      window.location.reload();


                                  }


								  


                              }else{


                                  alert(gongneng+"成功！")


                                  window.location.reload();


                              }


                          }


						  


                })


                 .fail(function(response) {


                    alert('Error: ' + "服务器数据发生错误！");


                    return false;


                });


          let param = new URLSearchParams(); 


          param.append("gongneng",gongneng);


          param.append("sql",sql);


          param.append("flag",flag);


          param.append("anquanma",json["anquanma"]);


			  


          this.$http.post( '../mysqlInsert/mysql.jsp',param)


          .then(function (response) {


            if(num==1){


                  result=$(response.data).text();


                  index = result.indexOf("[[");


                  if(index>-1){


                      if(result.indexOf("[[anquanmaerr]]")>-1){


                            //alert('请先登录后操作');


                            window.parent.location.href='../login/index.jsp';


                      }else{


                          result=result.substring(index).trim()


                          alert(result);


                          window.location.reload();


                      }


                  }else{


                      alert(gongneng+"成功！")


                      window.location.reload();


                  }


              }


        })


        .catch(function (error) {


            alert('Error: ' + "服务器数据发生错误！"); 


        });


			


      },


      loadAjxss:function(gongneng,sql,flag,vals){


          let param = new URLSearchParams(); 




 gmms/WebContent/login/bdg.jsp


@@ -6,15 +6,12 @@


response.setContentType("text/html; charset=utf-8");


%>




<%-- <%@ include file="/WEB-INF/../login/check.jsp" %>


 --%>


    <c:set var="ctx" value="${pageContext.request.contextPath}"/>


<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">


<html>


<head>


<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">


<title>北玻</title>


<link rel="shortcut icon" href="../img/3.ico" />


<link rel="shortcut icon"  href="../img/3.ico" />


<style>


#top {


    background-image: linear-gradient(to right, #C6E2FF, #C6E2FF);


@@ -74,6 +71,6 @@


    }


    


%>


 <iframe id='main'  src='machinelistcontent.jsp?adminid="+adminid+"&xingming="+xingming+"&dengji="+dengji+"&anquanma="+anquanma+"&yuyan="+yuyan+"'  style="width:87%;height:90%" frameborder='0'></iframe>  


 <iframe id='main'  src='machinelistcontent.jsp?adminid="+adminid+"&xingming="+xingming+"&dengji="+dengji+"&anquanma="+anquanma+"&yuyan="+yuyan+"'  style="width:87%;height:90%" frameborder='0'></iframe>   


</body>


</html>




 gmms/WebContent/mysqlInsert/toPlc.jsp


New file


@@ -0,0 +1,18 @@


<%@page import="builder.Manager"%>


<%




String zt=request.getParameter("zt");


String peifanhao=request.getParameter("peifanhao");




int zts =Integer.valueOf(zt);


int peifanhaos =Integer.valueOf(peifanhao);




/*  Manager.sendtoPLC(76,20,4,new byte[]{0,1,0,zt},0);


 Manager.sendtoPLC(77,20,4,new byte[]{0,1,0,zt},0); */


 if(zts==2){


     Manager.sendtoPLC(76,20,4,new byte[]{0,(byte)(peifanhaos&0xff),0,0},0);


 }else if(zts==3){


     Manager.sendtoPLC(76,20,4,new byte[]{0,0,0,0},0);


 }




%>




 gmms/WebContent/qiegeguanli/qiegerenwu.jsp


@@ -1,4 +1,5 @@


<%@ page contentType="text/html;charset=UTF-8"%>


<%@page import="ng.db.DBHelper"%>


<c:set var="ctx" value="${pageContext.request.contextPath}" />




<html>


@@ -122,7 +123,7 @@


                                    


                                    <button @click="dainjishijian('结束任务',item['0_id'])" style='background-color: #5CADFE' class='btn btn-large btn-success' >结束任务</button>


                                    &nbsp;&nbsp;&nbsp;


                                    <button @click="dainjishijian('取消任务',item['0_id'])" style='background-color: #5CADFE' class='btn btn-large btn-success' >手动完成</button>


                                    <button @click="dainjishijian('取消任务',item['0_id'])" style='background-color: #5CADFE' class='btn btn-large btn-success' >取消任务</button>


                                </td>


                                <!-- <td  v-else-if="item[11]==2">


                                    <button @click="dainjishijian('重新下发',item[0])" style='background-color: #5CADFE' class='btn btn-large btn-success' >重新下发</button>


@@ -154,7 +155,7 @@


                                <button type="button" @click='renwuguanliquxiao' class="btn btn-default btn-lg"


                                    data-dismiss="modal">取消</button>




                                <button id="dianjishijian" @click='renwuguanli' type="button" class="btn btn-primary btn-lg"


                                <button id="dianjishijian" @click='getMSg' type="button" class="btn btn-primary btn-lg"


                                    id="surefinish">确认</button>


                            </div>


                        </div>


@@ -168,9 +169,11 @@


<script src="../js/jquery-3.4.1.min.js"></script>


<script type="text/javascript" src="../static/bootstrap/3.3.7/js/bootstrap.min.js"></script>


<script src="../js/vue.min.js"></script>


  <script src="../js/axios.min.js"></script>


<script src="../js/mixins.js"></script>




<script>


Vue.prototype.$http= axios


 let app = new Vue({


      el:'#app',


      mixins:[mixin],


@@ -178,6 +181,7 @@


          shuzu:[],


          shuzu1:[],


          lines:<%= request.getParameter("id") %>,


          peifanhao:[],


          subval:{


              id:'',


              type:''


@@ -198,10 +202,57 @@


              }


               this.subval.id=id


          },


          renwuguanli:function(){


              sql="{call AXJ_qiegeguanli_threelinetask_renwuguanli(?,?,?)}~"+JSON.stringify(this.subval);


              console.log(sql);


              this.connects("任务修改",sql,1,1)


          getMSg(){


              //this.getMSgs();


              this.renwuguanli();


          },


          getMSgs(){


              return new Promise((resolve, reject) => {


                  // 发送第一个请求，获取 id


                  sql="{call AXJ_qiegeguanli_threelinetask_renwuguanli(?,?,?)}~"+JSON.stringify(this.subval);


                  let param = new URLSearchParams(); 


                  param.append("gongneng",'任务修改');


                  param.append("sql",sql);


                  param.append("flag",1);


                  param.append("anquanma",json["anquanma"]);


				  


                  this.$http.post('../mysqlInsert/mysql.jsp',param).then(({ data }) => {


                     let result=$(data).text();


                     index = result.indexOf("[[");


                     if(index>-1){


                          if(result.indexOf("[[anquanmaerr]]")>-1){


                                //alert('请先登录后操作');


                                window.parent.location.href='../login/index.jsp';


                          }else{


                              result=result.substring(index).trim()


                              alert(result);


                              resolve();


                              window.location.reload();


                          }


                      }else{


                          alert("任务修改成功！")


                          window.location.reload();


						  


                      } 


                    }).catch(err => {


                      console.log(err.msg);


                    });


                })


          },


          renwuguanli(){


              this.getMSgs().then(() => {


                  let param = new URLSearchParams(); 


                  param.append("zt",this.subval.type); 


                  param.append("peifanhao",this.peifanhao[0]['0_recipe_no']);


                 this.$http.post( '../mysqlInsert/toPlc.jsp',param)


                  .then(function (response) {


                        console.log(response);


                   })


				   


                    .catch(function (error) {


                        alert('Error: ' + "服务器机器连接发生错误！"); 


                    });  


              })


          },


          renwuguanliquxiao:function(){


              this.subval='';


@@ -216,6 +267,8 @@


          let sql="{call AXJ_qiegeguanli_threelinetask_list1()}";


         let flag=2;


         loadAjxs('任务查询成功',sql,flag,"shuzu"); 


         sql="{call AXJ_qiegeguanli_peifanghao_cahxun()}";


         loadAjxs('配方号查询',sql,flag,"peifanhao"); 


      }




})




 gmms/WebContent/yuanpiancangchu/cangchurenwuxinxi.jsp


@@ -67,7 +67,7 @@


    </script>


</head>




<body style="padding: 20px;background-color:#D5EAFF;height:100%">


<body style="background-color:#D5EAFF;height:100%">


    <!-- Content Wrapper. Contains page content -->


    <div class="" id='app' style='background-color:#D5EAFF;height:100%'>


        <!-- Content Header (Page header) -->


@@ -90,13 +90,13 @@


            <div class="box box-default" style="background-color:#D5EAFF;">


                <div class="box-header with-border">


                    <h3 class="box-title">仓储</h3>


                <span :class="connect[0][1]">{{connect[0][0]}}</span> 


                <span :class="connect[0]['1_classname']">{{connect[0]['0_connect_state']}}</span> 


                </div>


                <!-- /.box-header -->


                <button type="button" @click="delAll('重新开始')" class="btn btn-primary ">重新开始</button>


                <button type="button" @click="delAll('完成')" class="btn btn-primary ">任务完成</button>


                <button type="button" @click="delAll('删除')" class="btn btn-primary ">删除任务</button>


                <div class="box-body" style="height:450px;overflow-y:auto;">


                <div class="box-body" style="height:365px;overflow-y:auto;">


                    <table class="table table-striped table-hover"


                    style="font-size: 18px;" id="example2">


                    <thead>


@@ -113,12 +113,12 @@


                    <tbody>


                        <tr v-for="items in shuzu">


                            <td><input v-model="shelftaskids" type='checkbox'  :value="items[0]"/></td>


                            <td>{{items["0"]}}</td>


                             <td>{{items[1]}}</td> 


                            <td>{{items[2]}}</td>


                            <td>{{items[8]}}</td>


                            <td>{{items[9]}}</td>


                            <td>{{items[6]}}</td> 


                            <td>{{items['0_id']}}</td>


                             <td>{{items['1_task_type']}}</td> 


                            <td>{{items['2_task_state']}}</td>


                            <td>{{items['8_raw_thickness']}}</td>


                            <td>{{items['9_color']}}</td>


                            <td>{{items['6_start_time']}}</td> 


                        </tr> 


                    </tbody>


                </table>