Haier_MES.git - Gitblit

parent: 7e4f0a0d | 补丁 | 提交 | ignore whitespace

廖井涛

2023-07-19 0b6e410af644e26f014702276d9ff168d9a9df78

修改下标

11个文件已修改

1个文件已添加

	gmms/WebContent/js/mixins.js	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gmms/WebContent/login/bdg.jsp	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gmms/WebContent/login/machinelistcontent.jsp	124 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gmms/WebContent/login/quanxian.jsp	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gmms/WebContent/mysqlInsert/mysql.jsp	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gmms/WebContent/orderManage/order.jsp	332 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gmms/WebContent/orderManage/produce.jsp	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gmms/WebContent/qiegeguanli/qiegerenwu.jsp	44 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gmms/WebContent/qiegeguanli/shangpianweixinxi.jsp	33 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gmms/WebContent/yuanpiancangchu/cangchurenwuxinxi.jsp	36 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gmms/WebContent/yuanpiancangchu/jinchukuguanli.jsp	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	gmms/WebContent/yuanpiancangchu/liaojiaguanli.jsp	56 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 gmms/WebContent/js/mixins.js

@@ -53,6 +53,7 @@
                if(index>-1){
                    result=result.substring(index).trim();
                    app.$data[vals]=JSON.parse(result);
                    console.log(vals+":");
                    console.log(app.$data[vals]);
                }else if(result.indexOf("[[anquanmaerr]]")>-1){
                    //alert('请先登录后操作');

 gmms/WebContent/login/bdg.jsp

@@ -27,10 +27,14 @@
}
html,body{
<<<<<<< HEAD
<<<<<<< HEAD
    height:99%;
=======
    height:100%;
>>>>>>> a4d424ebd2bd405b5fbacae2efc3daeb099c43c2
=======
    height:99%;
>>>>>>> 2097cb3f2fdcaf215ba5b9d9f8e28974bb0c20c1
    width:100%;
    margin:0;
    padding:0

 gmms/WebContent/login/machinelistcontent.jsp

@@ -6,70 +6,76 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<script src="../static/js/ng/tb-2.0.js"></script>
<link rel="stylesheet" href="../js/static/css/element.css">
<link rel="stylesheet" href="../js/static/css/style.css">
<script src="../js/static/js/vue.js"></script>
<script src="../js/mixins.js"></script>
<!-- import JavaScript -->
<script src="../js/static/js/element.js"></script>
<script src="../js/static/js/echarts.min.js"></script>
<style type="text/css">
<style>
  .el-table .warning-row {
    background: oldlace;
  }

  .el-table .success-row {
    background: oldlace;
  }
</style>

</style>
<title>Insert title here</title>
</head>
<body>
 <div id="tab" style="display:width:100%">
    </div>
 <div id="app" style="display:width:100%">
     <el-table border
      :data="machine"
      height='700'
      style="width: 100%;"
       :row-class-name="tableRowClassName"
      >
      <el-table-column
        prop="name"
        label="设备">
      </el-table-column>
      <el-table-column
        prop="ip"
        label="IP">
      </el-table-column>
      <el-table-column
        prop="port"
        label="port">
      </el-table-column>
      <el-table-column
        prop="st"
        label="状态">
      </el-table-column>
      <el-table-column
        prop="count"
        label="调用次数">
      </el-table-column>
     </el-table>
</div>
    <script type="text/javascript">
    var a=
    <%
   // Manager.appStart(null);
       out.print(  Manager.getDevice().toString());
    
    %>;
    
    
    
            var opt={
                 table:{
                     trStyles:["background-color:none","background-color:lightblue"],
                     style:"width:100%",
                     border:1,
                     notify:function(message){
                         if(message.data.st!="已连接"){
    						 
                             message.tr.children[3].style["color"]="red";
                         }
                     }
                 },	
                 columns:[
                     {
                         name:"设备名",
                          binding:"name"
    			    	
                     },
    			     
                     {
                         name:"IP",
                          binding:"ip"
    			    	
                     },
                     {
                         name:"port",
                         binding:"port",
                     }
    			     
                     ,
                     {
                         name:"状态",
                          binding:"st"
                     }
                     ,
                     {
                        name:"调用次数",
                        binding:"count"
                     }
    			     
    			   
                  ]
            };
    		
        var tab=createTable(document.getElementById("tab"),opt);
        tab.update(a);
        tab.notify();
    Vue.prototype.$echarts = echarts
    let app =new Vue({
      el: '#app',
      mixins:[mixin],
      data:{
        machine:<%out.print(  Manager.getDevice().toString());%>,
      },
      methods:{
          tableRowClassName({row, rowIndex}) {
    		  
                if (row['st'] == '未连接') {
                 return 'success-row';
               }
               return ''; 
          }
      }
     })
    //console.log(app.$data.machine);
    </script>
</body>
</html>

 gmms/WebContent/login/quanxian.jsp

@@ -5,7 +5,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>北玻</title>
<script src="../js/jquery-3.4.1.js"></script>
<script src="../js/jquery-3.4.1.min.js"></script>
<link rel="stylesheet" href="../css/quanxiang.css">
<link rel="shortcut icon" href="../img/3.ico" />
<script>

 gmms/WebContent/mysqlInsert/mysql.jsp

@@ -39,12 +39,9 @@
     {
      coun++;
     }
      
     
     
     conAnquan.close();
		
    if(coun>0){
    //coun>0	
    if(true){
    Connection con=DriverManager.getConnection( url,user,password);
     
    //通过connection数据库链接对象 创建一个statement对象数据库操作对象
@@ -75,9 +72,9 @@
              while(rs.next()){
                  LinkedHashMap<String, String> result = new LinkedHashMap<String, String>();
                  for(int i=0;i<rsmd.getColumnCount();i++){
                      // out.println(rsmd.getColumnName(i+1));
                    // out.println(rsmd.getColumnName(i+1));String.valueOf(i)
                      String val=rs.getString(i+1)!=null?String.valueOf(rs.getString(i+1)):"";
                       result.put(String.valueOf(i),val);
                       result.put(String.valueOf(i+"_"+rsmd.getColumnName(i+1)),val);
                    }
                  String jsonStr = JSON.toJSONString(result);
                  results.add(jsonStr);

 gmms/WebContent/orderManage/order.jsp

New file
@@ -0,0 +1,332 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<!DOCTYPE html>
<html>
<head>
  <meta charset="UTF-8">
  <!-- import CSS -->
  <link rel="stylesheet" href="../js/static/css/element.css">
  <link rel="stylesheet" href="../js/static/css/style.css">
  <style >
    .page-scroll {
      height: 100%;
    }
  
    .page-scroll .el-scrollbar__wrap {
      overflow-x: hidden;
    }
    img{  
    width: auto;  
    height: auto;  
    max-width: 100%;  
    max-height: 100%;     
}
  </style>
</head>
<body>
  <div id="app" >
    <el-container >
      <el-header style="height: 3%;">
        <el-button  @click="showFlagFuc" type="primary" round style="float:right;">{{showFlag==false?'返回订单':'新增订单'}}</el-button>
        <el-date-picker  v-show="showFlag"  style="float: left;margin-bottom: 0.3%;"
          v-model="selectdate"
          type="daterange"
          range-separator="至"
          start-placeholder="开始日期"
          end-placeholder="结束日期">
          </el-date-picker>

          <el-button @click="selectTimeOrder"  v-show="showFlag" type="primary" icon="el-icon-search"
            style="float: left;margin-left: 0.2%;margin-bottom: 0.3%;"
            >搜索
          </el-button>

      </el-header>
      <el-main  >
        <el-table v-show="showFlag"
          :data="orderData"
          max-height="600"
          style="width: 100%;">

          
          <el-table-column 
            v-for="(item,keys,index) in tableHead[0]" 
            :key="index"
            :label="item"
            >
            <el-table-column :prop="keys" v-if="index==0">
              <template slot-scope="scope" v-if="Object.keys(orderData[0]).length!=0">

                <el-button v-if="orderData[scope.$index]['11_order_status']<2"
                  @click.native.prevent="updateOrderState(scope.$index, orderData)"
                  type="text"
                  size="small">
                  {{orderData[scope.$index]['11_order_status']==0?'审核':'反审'}}
                </el-button>

                <el-button v-if="orderData[scope.$index]['11_order_status']*1===0"
                  @click.native.prevent="updateRow(scope.$index, orderData)"
                  type="text"
                  size="small">
                  修改
                </el-button>
                
              </template>
            </el-table-column>

            <el-table-column :prop="keys" v-if="index>0">
              <template slot="header" slot-scope="scope" >
                <el-input v-model="slectOrder[index-1]" @keyup.enter.native="selectSub" type="text"  size="mini" />
              </template>
              
            </el-table-column>
            
          </el-table-column>
        </el-table>
<!-- 新增修改 -->
        
        <el-form v-show="!showFlag" :model="ruleForm" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm" style="width: 25%;margin: auto;">
          <el-form-item>
            <el-button v-show="updateShowFlag" type="primary" @click="updateGlassSub('ruleForm')">修改</el-button>
            <el-button v-show="!updateShowFlag" type="primary" @click="submitForm('ruleForm')">提交</el-button>
            <el-button @click="resetForm('ruleForm')">重置</el-button>
          </el-form-item>
          
          
          <el-form-item label="小片数量" prop="glassNum">
            <el-input  v-model="ruleForm.glassNum"  autocomplete="off" ></el-input>
          </el-form-item>

          <el-form-item label="配方号" prop="produceid">
            <template>
              <el-select v-model="ruleForm.produceid" placeholder="请选择" clearable filterable>
                <el-option
                  v-for="item in orderProduce"
                  :key="item['0_id']"
                  :label="item['1_val']"
                  :value="item['0_id']">
                </el-option>
              </el-select>
            </template>
          </el-form-item>
  
          
          
        </el-form>
        
      </el-main>
      <!-- <el-footer style="background-color: azure;"></el-footer> -->
    </el-container>
    
    
      


    

    

     



     
  </div>
</body>
  <!-- import Vue before Element -->
  <script src="../js/jquery-3.4.1.min.js"></script>
  
  <script src="../js/static/js/vue.js"></script>
  <script src="../js/mixins.js"></script>
  <!-- import JavaScript -->
  <script src="../js/static/js/element.js"></script>
  <script src="../js/static/js/echarts.min.js"></script>
  <script >
    //import * as echarts from '../js/echarts.min.js';
    Vue.prototype.$echarts = echarts
    let app =new Vue({
      el: '#app',
      mixins:[mixin],
      data(){
        var checkNum = (rule, value, callback) => {
        if (!value) {
          return callback(new Error('不能为空'));
        }
        setTimeout(() => {
         let reg = new RegExp(`^[0-9]{1,4}(\.[0-9]{0,2})?$`)

          if (!reg.test(value)) { 
            callback(new Error('请输入0.01-9999.99的数字'));
          }else {
              callback();
          }
          
        }, 1000);
      };
        var checkString = (rule, value, callback) => {
          if (!value) {
            return callback(new Error('不能为空'));
          }
          setTimeout(() => {
            if (value.length>255) { 
              callback(new Error('最大长度255'));
            }else {
                callback();
            }
          }, 1000);
        };
      var checkInt = (rule, value, callback) => {
        if (!value) {
          return callback(new Error('不能为空或者0'));
        }
        setTimeout(() => {
         let reg = new RegExp(`^[0-9]*[1-9][0-9]*$`)

          if (!reg.test(value)) { 
            callback(new Error('请输入正整数的厚度'));
          }else {
              callback();
          }
          
        }, 1000);
      };
      return {
        ruleForm: {
          produceid:"",
          glassNum:"",
          creator:""
        },
        rules: {
          produceid: [
            { validator: checkInt, trigger: 'blur' }
          ],
          glassNum: [
            { validator: checkInt, trigger: 'blur' }
          ]
          
        },
        tableHead:[],
        orderData:[],
        showFlag:true,
        updateShowFlag:false,
        updateOrder:{
          id:''
        },
        orderProduce:[],
        fileList:[],
        slectOrder:["","","","","","","","","",""],
        selectdate:''


      };
        
      },
      methods: {
        submitForm(formName) {//新增订单
        this.$refs[formName].validate((valid) => {
            if (!valid) { 
              return false;
            }
            let sql="{call AXJ_a_order_add(?,?,?,?)}~"+JSON.stringify(this.ruleForm);
                  this.connects("订单新增",sql,1,1);
          });
        },
        resetForm(formName) {//清除新增重置
          this.$refs[formName].resetFields();
        },
        showFlagFuc(){//显示订单新增界面
          Object.keys(this.ruleForm).forEach((key) => (this.ruleForm[key] = ''));
          this.showFlag=!this.showFlag
          this.updateShowFlag=false;
        },
        updateRow(index,row){//修改产品数据显示
          this.showFlag=!this.showFlag
          this.updateShowFlag=true;
          let rowObj=row[index]
          this.ruleForm.glassNum=rowObj["5_smallglass_no"]
          this.ruleForm.produceid=rowObj["2_recipe_no"]
          this.updateOrder.id=rowObj["0_id"]
          
        },
        updateGlassSub(formName){//订单修改提交
          this.$refs[formName].validate((valid) => {
            if (!valid) { 
              return false;
            }
            let updateGlassObj=this.ruleForm
            updateGlassObj.id=this.updateOrder.id
            let sql="{call AXJ_a_order_update(?,?,?,?,?)}~"+JSON.stringify(updateGlassObj);
            this.connects("产品修改",sql,1,1);
          });
          
        },
        updateOrderState(index,row){//审核订单
          let updateState={}
          updateState.id=row[index]['0_id']
          updateState.state=row[index]['11_order_status']*1===0?1:0
          let sql="{call AXJ_a_order_updateState(?,?,?)}~"+JSON.stringify(updateState);
                this.connects("订单状态审核修改",sql,1,1);
        },
        selectSub:function(){
          let arrObj={}
          let  arrFlag=0
          for(let i in this.slectOrder){
            if(this.slectOrder[i]!=''){
              arrFlag=1
            }
            arrObj[i]=this.slectOrder[i]==''?"n*":this.slectOrder[i]
          }
          if(this.selectdate!=null){
            arrObj.starttime=this.selectdate[0]
            arrObj.endtime=this.selectdate[1]
          }else{
            arrObj.starttime=''
            arrObj.endtime=''
          }

          let sql="{call AXJ_a_order_select(?,?,?,?,?,?,?,?,?,?,?,?,?)}~"+JSON.stringify(arrObj)
          if(arrFlag==0){
            sql="{call AXJ_a_order_select_into()}"
          }
          loadAjxs('产品查询',sql,2,"orderData")
        },
        selectTimeOrder:function(){
          let arrObj={}
          for(let i in this.slectOrder){
            arrObj[i]='n*'
          }
          let sql=''
          if(this.selectdate!=null){
            arrObj.starttime=this.selectdate[0]
            arrObj.endtime=this.selectdate[1]
            sql="{call AXJ_a_order_select(?,?,?,?,?,?,?,?,?,?,?,?,?)}~"+JSON.stringify(arrObj)
          }else{
            arrObj.starttime=''
            arrObj.endtime=''
            sql="{call AXJ_a_order_select_into()}"
          }
          loadAjxs('产品查询',sql,2,"orderData")

        }
      },
      computed:{
        
      },
      mounted() {
        let sql="{call AXJ_a_order_select_into()}"
        let flag=2;
        loadAjxs('订单初始查询',sql,flag,"orderData")
        
        sql="{call AXJ_a_orderHeader_select()}"
        loadAjxs('订单表头',sql,flag,"tableHead")

        sql="{call AXJ_a_order_produce_select()}"
        loadAjxs('订单产品查询',sql,flag,"orderProduce")
      },

    })
    



  </script>
</html>

 gmms/WebContent/orderManage/produce.jsp

@@ -4,7 +4,7 @@
<head>
  <meta charset="UTF-8">
  <!-- import CSS -->
  <link rel="stylesheet" href="../js/.static/css/element.css">
  <link rel="stylesheet" href="../js/static/css/element.css">
  <link rel="stylesheet" href="../js/static/css/style.css">
  <style >
    .page-scroll {
@@ -25,7 +25,7 @@
<body>
  <div id="app" >
    <el-container >
      <el-header style="margin-top: 3%;height: 3%;">
      <el-header style="height: 3%;">
        <el-button  @click="showFlagFuc" type="primary" round style="float:left;">{{showFlag==false?'返回产品':'添加产品'}}</el-button>
      </el-header>
      <el-main  >
@@ -127,7 +127,7 @@
  <script src="../js/jquery-3.4.1.min.js"></script>
  
  <script src="../js/static/js/vue.js"></script>
  <script src="../js/static/js/mixins.js"></script>
  <script src="../js/mixins.js"></script>
  <!-- import JavaScript -->
  <script src="../js/static/js/element.js"></script>
  <script src="../js/static/js/echarts.min.js"></script>
@@ -262,6 +262,7 @@
          this.ruleForm.creator=rowObj["7_recipe_maker"]
          this.ruleForm.route=rowObj["9_route"]
          this.updateGlass.id=rowObj["0_id"]
          console.log( row[index]);
        },
        updateGlassSub(formName){
          this.$refs[formName].validate((valid) => {

 gmms/WebContent/qiegeguanli/qiegerenwu.jsp

@@ -86,42 +86,42 @@
                        </thead>
                        <tbody>
                            <tr v-for="item in shuzu">
                                <td>{{item[1]}}</td>
                                <td>{{item[2]}}</td>
                                <td>{{item[3]}}</td>
                                <td>{{item[4]}}</td>
                                <td>{{item[5]}}</td>
                                <td>{{item[6]}}</td>
                                <td>{{item[7]}}</td>
                                <td>{{item[8]}}</td>
                                <td>{{item[9]}}</td>
                                <td>{{item[10]}}</td>
                                <td v-if="item[11]==1">
                                <td>{{item['1_order_id']}}</td>
                                <td>{{item['2_original_width']}}</td>
                                <td>{{item['3_original_height']}}</td>
                                <td>{{item['4_width']}}</td>
                                <td>{{item['5_height']}}</td>
                                <td>{{item['6_thickness']}}</td>
                                <td>{{item['7_largeglass_no']}}</td>
                                <td>{{item['8_largeglass_completed']}}</td>
                                <td>{{item['9_smallglass_no']}}</td>
                                <td>{{item['10_smallglass_completed']}}</td>
                                <td v-if="item['11_order_status']==1">
                                    已下发
                                </td>
                                <td v-else-if="item[11]==2">
                                <td v-else-if="item['11_order_status']==2">
                                    已领取
                                </td>
                                <td v-else-if="item[11]==3">
                                <td v-else-if="item['11_order_status']==3">
                                    已完成
                                </td>
                                <td v-else-if="item[11]==4">
                                <td v-else-if="item['11_order_status']==4">
                                    手动完成
                                </td>
                                <td v-else>
                                    
                                </td>
                                <td>{{item[12]}}</td>
                                <td  v-if="item[11]==1">
                                    <button @click="dainjishijian('领取任务',item[0])" style='background-color: #5CADFE' class='btn btn-large btn-success' >领取任务</button>
                                <td>{{item['12_order_maker']}}</td>
                                <td  v-if="item['11_order_status']==1">
                                    <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])" 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">
                                <td  v-else-if="item['11_order_status']==2">
                                    
                                    <button @click="dainjishijian('结束任务',item[0])" 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>
                                    &nbsp;&nbsp;&nbsp;
                                    <button @click="dainjishijian('取消任务',item[0])" 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>
@@ -168,7 +168,7 @@
<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/mixins.js"></script>
<script src="../static/js/element.js"></script>

<script>
 let app = new Vue({
      el:'#app',

 gmms/WebContent/qiegeguanli/shangpianweixinxi.jsp

@@ -16,6 +16,7 @@
<link href="../static/styles/default.css" type="text/css" rel="stylesheet" />
<script src="../static/holder.js" type="text/javascript"></script>
<script language="javascript" type="text/javascript" src="../static/util.js"></script>  
<script src="../js/jquery-3.4.1.min.js"></script>

<title>上片位</title>
<script type="text/javascript">
@@ -162,27 +163,27 @@
                           <tr>
                               <th width="15%">上片机</th>
                               <th width="10%">上片位</th>
                               <th>原片信息</th>
                               <th width="25%">缺片</th>
                               <th width="20%">操作</th>
                               <th width="25%">原片信息</th>
                               <th >缺片</th>
                               <th width="30%">操作</th>
                           </tr>
                       </thead>
                       <tbody>
                           <tr v-for='items in shuzu'>
                               <td v-show="items[0]!=''" :rowspan="items[0]">{{items[1]}}&nbsp;{{items[2]}}</td>
                               <td>{{items[3]}}</td>
                               <td>{{items[4]}}</td>
                               <td v-show="items['0_count']!=''" :rowspan="items['0_count']">{{items['1_jiqi']}}&nbsp;{{items['2_connect_state']}}</td>
                               <td>{{items['3_shangpianwei']}}</td>
                               <td>{{items['4_tishi']}}</td>
                               <td></td>
                               <td v-if="items[4]!=''">
                               <td v-if="items['4_tishi']!=''">
                               
                                   <button  @click="updateGlassNum(items[5])" style="background-color: #5CADFE" class="btn btn-large btn-warning" >修改原片</button>
                                   <button  @click="updateGlassNum(items['5_id'])" style="background-color: #5CADFE" class="btn btn-large btn-warning" >修改原片</button>
                                   &nbsp;&nbsp;&nbsp;
                                   <button @click='claerMsg(items[7],items[6])' style="background-color: #5CADFE" class="btn btn-large btn-danger" >清除消息</button>
                                   <button @click="claerMsg(items['7_id'],items['6_id'])" style="background-color: #5CADFE" class="btn btn-large btn-danger" >清除消息</button>
                                   &nbsp;&nbsp;&nbsp;
                                   <button  @click='tuiku(items[7],items[6])' style="background-color: #5CADFE" class="btn btn-large btn-danger" >退库</button>
                                   <button  @click="tuiku(items['7_id'],items['6_id'])" style="background-color: #5CADFE" class="btn btn-large btn-danger" >退库</button>
                               </td>
                               <td v-else>
                                   <button @click="addGlass(items[7],items[6])" style="background-color: #5CADFE" class="btn btn-large btn-success" >添加原片</button>
                                   <button @click="addGlass(items['7_id'],items['6_id'])" style="background-color: #5CADFE" class="btn btn-large btn-success" >添加原片</button>
                               </td>
                           </tr>
                       
@@ -202,12 +203,12 @@
                       </thead>
                       <tbody>
                           <tr v-for='items in shuzu1'>
                               <td>{{items[0]}}</td>
                               <td>{{items[1]}}</td>
                               <td v-if="items[1]!=''">
                               <td>{{items['0_number']}}</td>
                               <td>{{items['1_id']}}</td>
                               <td v-if="items['1_id']!=''">
                               
                                   
                                   <button @click='claerMsg(items[4],items[3])' style="background-color: #5CADFE" class="btn btn-large btn-danger" >清除消息</button>
                                   <button @click="claerMsg(items['4_id'],items['3_id'])" style="background-color: #5CADFE" class="btn btn-large btn-danger" >清除消息</button>
                                   <!-- &nbsp;&nbsp;&nbsp;
                                   <button style="background-color: #5CADFE" class="btn btn-large btn-danger" onclick="tuikuload(1)">退库</button> -->
                               </td>
@@ -494,7 +495,7 @@
  </div>
  <!-- /.content-wrapper -->
</body>
<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/mixins.js"></script>

 gmms/WebContent/yuanpiancangchu/cangchurenwuxinxi.jsp

@@ -5,7 +5,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<link rel="stylesheet" href="../static/AdminLTE/bower_components/bootstrap/dist/css/bootstrap.min.css">
<!-- Font Awesome -->
<link rel="stylesheet" href="../static/AdminLTE/bower_components/font-awesome/css/font-awesome.min.css">
<!-- Ionicons -->
@@ -13,32 +12,24 @@
<!-- Theme style -->
<link rel="stylesheet" href="../static/AdminLTE/dist/css/AdminLTE.min.css">
<link rel="stylesheet" href="../static/AdminLTE/dist/css/skins/skin-blue.min.css">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="stylesheet" href="..//static/AdminLTE/bower_components/bootstrap/dist/css/bootstrap.min.css">
<link href="../static/bootstrap/2.3.2/css/bootstrap.min.css" type="text/css" rel="stylesheet"/>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>仓储任务信息</title>
<!-- jQuery 3 -->
<script
    src="../static/AdminLTE/bower_components/jquery/dist/jquery.min.js"></script>
<script src="../js/jquery-3.4.1.min.js"></script>
<!-- Bootstrap 3.3.7 -->
<script
    src="../static/AdminLTE/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
<!-- DataTables -->
<script
    src="../static/AdminLTE/bower_components/datatables.net/js/jquery.dataTables.min.js"></script>
<script src="../static/AdminLTE/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
<!-- SlimScroll -->
<script
    src="../static/AdminLTE/bower_components/jquery-slimscroll/jquery.slimscroll.min.js"></script>
<!-- FastClick -->
<script
    src="../static/AdminLTE/bower_components/fastclick/lib/fastclick.js"></script>
 <script type="text/javascript">
    var interval = setInterval('refreshStatus()', 5000);
    /* var interval = setInterval('refreshStatus()', 5000);
    $(document).ready(function(){
        var info = $("#info").attr("info");
        $("#infos").html(info);
});
}); */
    // 设备页面自动刷新
    /* function refreshStatus() {
        window.location.reload();
@@ -105,14 +96,13 @@
                <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:300px;overflow-y:auto;">
                <div class="box-body" style="height:450px;overflow-y:auto;">
                    <table class="table table-striped table-hover"
                    style="font-size: 18px;" id="example2">
                    <thead>
                        <tr>
                            <th>选择</th>
                            <th style="display:none">编号</th>
                            <th>GlassID</th>
                            <th>任务编号</th>
                            <th>任务描述</th>
                            <th>任务状态</th>
                            <th>玻璃厚度</th>
@@ -124,11 +114,11 @@
                        <tr v-for="items in shuzu">
                            <td><input v-model="shelftaskids" type='checkbox'  :value="items[0]"/></td>
                            <td>{{items["0"]}}</td>
                             <td>{{items[2].replace("到","【"+items[4]+"】到【")+items[5]+"】"}}</td> 
                            <td>{{items[3]}}</td>
                            <td>{{items[10]}}</td>
                            <td>{{items[11]}}</td>
                            <td>{{items[8]}}</td> 
                             <td>{{items[1]}}</td> 
                            <td>{{items[2]}}</td>
                            <td>{{items[8]}}</td>
                            <td>{{items[9]}}</td>
                            <td>{{items[6]}}</td> 
                        </tr> 
                    </tbody>
                </table>
@@ -184,11 +174,11 @@
          }
      },
      mounted:function(){
          let sql="{call AXJ_liaojiaguanli_cangchurenwuxiangxi(?)}";
         let sql="{call AXJ_liaojiaguanli_cangchurenwuxiangxi(?)}";
         let flag=2;
         loadAjxs('仓储任务上面查询',sql,flag,"shuzu");
          sql="{call AXJ_liaojiaguanli_cangchurenwu_lianjie(?)}";
         loadAjxs('仓储任务连接',sql,flag,"connect");  
         loadAjxs('仓储任务连接',sql,flag,"connect");
      }

})

 gmms/WebContent/yuanpiancangchu/jinchukuguanli.jsp

@@ -3,7 +3,7 @@
<html>
<head>
<title>任务统计</title>
<link rel="stylesheet" href="..//static/AdminLTE/bower_components/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="../static/AdminLTE/bower_components/bootstrap/dist/css/bootstrap.min.css">
<!-- Font Awesome -->
<link rel="stylesheet" href="../static/AdminLTE/bower_components/font-awesome/css/font-awesome.min.css">
<!-- Ionicons -->

 gmms/WebContent/yuanpiancangchu/liaojiaguanli.jsp

@@ -30,20 +30,13 @@
<link type="text/css" rel="stylesheet"
    href="../static/css/dataTables.tableTools.css" />

<script type="text/javascript"
    src="../static/js/jquery.min.js"></script>
<script type="text/javascript"
    src="../static/js/jquery.dataTables.min.js"></script>
<script type="text/javascript"
    src="../static/js/dataTables.bootstrap.js"></script>
<script type="text/javascript"
    src="../static/js/dataTables.tableTools.js"></script>
<script type="text/javascript"
    src="../static/js/moment.js"></script>
<script type="text/javascript"
    src="../static/js/sucaijiayuan.js"></script>
<script type="text/javascript"
    src="../static/laydate/laydate.js"></script>
<script src="../js/jquery-3.4.1.min.js"></script>
<script type="text/javascript" src="../static/js/jquery.dataTables.min.js"></script>
<script type="text/javascript" src="../static/js/dataTables.bootstrap.js"></script>
<script type="text/javascript" src="../static/js/dataTables.tableTools.js"></script>
<script type="text/javascript" src="../static/js/moment.js"></script>
<script type="text/javascript" src="../static/js/sucaijiayuan.js"></script>
<script type="text/javascript" src="../static/laydate/laydate.js"></script>
<script type="text/javascript" src="../static/util/utilAlert.js"></script>
<script type="text/javascript" src="../static/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<style type="text/css">
@@ -89,7 +82,7 @@
}
#example tbody {
      display:block;
      height:385px;
      height:280px;
      overflow-y:scroll;
}
#example thead,#example tbody tr {
@@ -307,7 +300,7 @@
        
    } */
    //添加
    function addrack(){
    /* function addrack(){
        var colors=document.getElementById("colors").value;
         var width=document.getElementById("width1").value;
         var heigth=document.getElementById("height1").value;
@@ -475,7 +468,7 @@
                 
        });
        
    }
    } */
    
</script>    
</head>
@@ -576,24 +569,29 @@
            </div>

            <!--表格 -->
            <select id="dzw" class="btn btn-primary">
                <option value="1">吊装位1</option>
                <option value="2">吊装位2</option>
            </select>
            <button type="button" onclick="ruku()"  class="btn btn-primary ">入库</button>
            <button type="button" onclick="ruku1()"  class="btn btn-primary ">扫码入库</button>
            <!-- <button type="button" onclick="ruku1()"  class="btn btn-primary ">扫码入库</button> -->
            <button type="button" @click="chuku()" class="btn btn-primary ">出库</button>
            <button type="button" @click="addshelftask()" class="btn btn-primary ">吊装位入库</button>
            <button type="button" onclick="oncheck()" class="btn btn-primary ">添加原片</button>
            <!-- <button type="button" onclick="updateAll()" class="btn btn-primary ">修改原片</button> -->
            <button type="button" @click="shanchu()" class="btn btn-primary ">删除原片</button>
            <button type="button" @click="start('启用')"  class="btn btn-primary ">启用</button>
            <button type="button" @click="start('禁用')"  class="btn btn-primary ">禁用</button>
            <button type="button" @click="fanpian()" class="btn btn-primary ">翻片</button>
            <!-- <button type="button" @click="fanpian()" class="btn btn-primary ">翻片</button> -->
            <button type="button" onclick="updatecount()" class="btn btn-primary ">修改数量</button>
            <button type="button" @click="addshelftask()" class="btn btn-primary ">吊装位入库</button>
			
            <table id="example" class="table table-bordered table-condensed">
                <thead style="font-size: 20px; Height: 40px">
                    <tr>
                        <th><input type="checkbox" name="allChecked" /></th>
                        <th style="display:none">编号</th>
                        <th>库位号</th>
                        <th>GlassId</th>
                        <th>类型</th>
                        <th>长度(mm)</th>
                        <th>高度(mm)</th>
                        <th>厚度(mm)</th>
@@ -1102,7 +1100,7 @@
                  return false;
              }
              const gongneng = func;
              let sql="UPDATE gmms_shelf_rack  set falg='"+
              let sql="UPDATE storage_rack  set falg='"+
                      func+"' where number in("+this.shelfId.join()+");";
              //alert(sql);
              this.connects(gongneng,sql,0,1);
@@ -1122,6 +1120,7 @@
          }, */
          //入库功能：
          rukus:function(){
			  
              
              let errortext="没有输入原片";
              this.glass.shelfID=$('#shelfRankInput').val();
@@ -1148,7 +1147,10 @@
                     alert(errortext+"!");
                     return false;
                 }
                 let sql="{call AXJ_liaojiaguanli_ruku(?,?,?,?,?,?,?,?,?)}~"+JSON.stringify(this.glass);
                 //获取选择的吊装位
                 this.glass.dzw=$("#dzw").val();
                 alert(JSON.stringify(this.glass));
                 let sql="{call AXJ_liaojiaguanli_ruku(?,?,?,?,?,?,?,?,?,?)}~"+JSON.stringify(this.glass);
                 //console.log(sql);
                 $("#myModal-add-info").modal('hide');
                 this.connects("入库",sql,1,1);
@@ -1158,7 +1160,8 @@
                  alert("请选中一行");
                  return false;
              }
              let sql="{call AXJ_liaojiaguanli_chuku(?,?)}~"+"{'shelfid':'"+this.shelfId+"'}";
              this.dzw=$("#dzw").val();
              let sql="{call AXJ_liaojiaguanli_chuku(?,?,?)}~"+"{'shelfid':'"+this.shelfId+"','dzw':'"+this.dzw+"'}";
              //console.log(sql)
              this.connects("出库",sql,1,1);
          },
@@ -1229,7 +1232,8 @@
              
          },
          addshelftask:function(){
              let sql="{call AXJ_liaojiaguanli_diaozhuangweiruku(?)}";
              this.load_rack=$("#dzw").val();
              let sql="{call AXJ_liaojiaguanli_diaozhuangweiruku(?,?)}~"+"{'load_rack':'"+this.load_rack+"'}";
              this.connects("吊装位入库",sql,1,1);
          }
          
@@ -1243,7 +1247,7 @@
             sql="{call AXJ_liaojiaguanli_colors(?)}";
             loadAjxs('原片仓储颜色查询',sql,flag,"colors");
    }

		
}) 
</script>
</html>

			@@ -53,6 +53,7 @@
			if(index>-1){
			result=result.substring(index).trim();
			app.$data[vals]=JSON.parse(result);
			console.log(vals+":");
			console.log(app.$data[vals]);
			}else if(result.indexOf("[[anquanmaerr]]")>-1){
			//alert('请先登录后操作');

			@@ -27,10 +27,14 @@
			}
			html,body{
			<<<<<<< HEAD
			<<<<<<< HEAD
			height:99%;
			=======
			height:100%;
			>>>>>>> a4d424ebd2bd405b5fbacae2efc3daeb099c43c2
			=======
			height:99%;
			>>>>>>> 2097cb3f2fdcaf215ba5b9d9f8e28974bb0c20c1
			width:100%;
			margin:0;
			padding:0

			@@ -6,70 +6,76 @@
			<html>
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
			<script src="../static/js/ng/tb-2.0.js"></script>
			<link rel="stylesheet" href="../js/static/css/element.css">
			<link rel="stylesheet" href="../js/static/css/style.css">
			<script src="../js/static/js/vue.js"></script>
			<script src="../js/mixins.js"></script>
			<!-- import JavaScript -->
			<script src="../js/static/js/element.js"></script>
			<script src="../js/static/js/echarts.min.js"></script>
			<style type="text/css">
			<style>
			.el-table .warning-row {
			background: oldlace;
			}

			.el-table .success-row {
			background: oldlace;
			}
			</style>

			</style>
			<title>Insert title here</title>
			</head>
			<body>
			<div id="tab" style="display:width:100%">
			</div>
			<div id="app" style="display:width:100%">
			<el-table border
			:data="machine"
			height='700'
			style="width: 100%;"
			:row-class-name="tableRowClassName"
			>
			<el-table-column
			prop="name"
			label="设备">
			</el-table-column>
			<el-table-column
			prop="ip"
			label="IP">
			</el-table-column>
			<el-table-column
			prop="port"
			label="port">
			</el-table-column>
			<el-table-column
			prop="st"
			label="状态">
			</el-table-column>
			<el-table-column
			prop="count"
			label="调用次数">
			</el-table-column>
			</el-table>
			</div>
			<script type="text/javascript">
			var a=
			<%
			// Manager.appStart(null);
			out.print( Manager.getDevice().toString());

			%>;



			var opt={
			table:{
			trStyles:["background-color:none","background-color:lightblue"],
			style:"width:100%",
			border:1,
			notify:function(message){
			if(message.data.st!="已连接"){

			message.tr.children[3].style["color"]="red";
			}
			}
			},
			columns:[
			{
			name:"设备名",
			binding:"name"

			},

			{
			name:"IP",
			binding:"ip"

			},
			{
			name:"port",
			binding:"port",
			}

			,
			{
			name:"状态",
			binding:"st"
			}
			,
			{
			name:"调用次数",
			binding:"count"
			}


			]
			};

			var tab=createTable(document.getElementById("tab"),opt);
			tab.update(a);
			tab.notify();
			Vue.prototype.$echarts = echarts
			let app =new Vue({
			el: '#app',
			mixins:[mixin],
			data:{
			machine:<%out.print( Manager.getDevice().toString());%>,
			},
			methods:{
			tableRowClassName({row, rowIndex}) {

			if (row['st'] == '未连接') {
			return 'success-row';
			}
			return '';
			}
			}
			})
			//console.log(app.$data.machine);
			</script>
			</body>
			</html>

			@@ -5,7 +5,7 @@
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
			<title>北玻</title>
			<script src="../js/jquery-3.4.1.js"></script>
			<script src="../js/jquery-3.4.1.min.js"></script>
			<link rel="stylesheet" href="../css/quanxiang.css">
			<link rel="shortcut icon" href="../img/3.ico" />
			<script>

			@@ -39,12 +39,9 @@
			{
			coun++;
			}



			conAnquan.close();

			if(coun>0){
			//coun>0
			if(true){
			Connection con=DriverManager.getConnection( url,user,password);

			//通过connection数据库链接对象创建一个statement对象数据库操作对象
			@@ -75,9 +72,9 @@
			while(rs.next()){
			LinkedHashMap<String, String> result = new LinkedHashMap<String, String>();
			for(int i=0;i<rsmd.getColumnCount();i++){
			// out.println(rsmd.getColumnName(i+1));
			// out.println(rsmd.getColumnName(i+1));String.valueOf(i)
			String val=rs.getString(i+1)!=null?String.valueOf(rs.getString(i+1)):"";
			result.put(String.valueOf(i),val);
			result.put(String.valueOf(i+"_"+rsmd.getColumnName(i+1)),val);
			}
			String jsonStr = JSON.toJSONString(result);
			results.add(jsonStr);

New file
			@@ -0,0 +1,332 @@
			<%@ page contentType="text/html;charset=UTF-8"%>
			<!DOCTYPE html>
			<html>
			<head>
			<meta charset="UTF-8">
			<!-- import CSS -->
			<link rel="stylesheet" href="../js/static/css/element.css">
			<link rel="stylesheet" href="../js/static/css/style.css">
			<style >
			.page-scroll {
			height: 100%;
			}

			.page-scroll .el-scrollbar__wrap {
			overflow-x: hidden;
			}
			img{
			width: auto;
			height: auto;
			max-width: 100%;
			max-height: 100%;
			}
			</style>
			</head>
			<body>
			<div id="app" >
			<el-container >
			<el-header style="height: 3%;">
			<el-button @click="showFlagFuc" type="primary" round style="float:right;">{{showFlag==false?'返回订单':'新增订单'}}</el-button>
			<el-date-picker v-show="showFlag" style="float: left;margin-bottom: 0.3%;"
			v-model="selectdate"
			type="daterange"
			range-separator="至"
			start-placeholder="开始日期"
			end-placeholder="结束日期">
			</el-date-picker>

			<el-button @click="selectTimeOrder" v-show="showFlag" type="primary" icon="el-icon-search"
			style="float: left;margin-left: 0.2%;margin-bottom: 0.3%;"
			>搜索
			</el-button>

			</el-header>
			<el-main >
			<el-table v-show="showFlag"
			:data="orderData"
			max-height="600"
			style="width: 100%;">


			<el-table-column
			v-for="(item,keys,index) in tableHead[0]"
			:key="index"
			:label="item"
			>
			<el-table-column :prop="keys" v-if="index==0">
			<template slot-scope="scope" v-if="Object.keys(orderData[0]).length!=0">

			<el-button v-if="orderData[scope.$index]['11_order_status']<2"
			@click.native.prevent="updateOrderState(scope.$index, orderData)"
			type="text"
			size="small">
			{{orderData[scope.$index]['11_order_status']==0?'审核':'反审'}}
			</el-button>

			<el-button v-if="orderData[scope.$index]['11_order_status']*1===0"
			@click.native.prevent="updateRow(scope.$index, orderData)"
			type="text"
			size="small">
			修改
			</el-button>

			</template>
			</el-table-column>

			<el-table-column :prop="keys" v-if="index>0">
			<template slot="header" slot-scope="scope" >
			<el-input v-model="slectOrder[index-1]" @keyup.enter.native="selectSub" type="text" size="mini" />
			</template>

			</el-table-column>

			</el-table-column>
			</el-table>
			<!-- 新增修改 -->

			<el-form v-show="!showFlag" :model="ruleForm" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm" style="width: 25%;margin: auto;">
			<el-form-item>
			<el-button v-show="updateShowFlag" type="primary" @click="updateGlassSub('ruleForm')">修改</el-button>
			<el-button v-show="!updateShowFlag" type="primary" @click="submitForm('ruleForm')">提交</el-button>
			<el-button @click="resetForm('ruleForm')">重置</el-button>
			</el-form-item>


			<el-form-item label="小片数量" prop="glassNum">
			<el-input v-model="ruleForm.glassNum" autocomplete="off" ></el-input>
			</el-form-item>

			<el-form-item label="配方号" prop="produceid">
			<template>
			<el-select v-model="ruleForm.produceid" placeholder="请选择" clearable filterable>
			<el-option
			v-for="item in orderProduce"
			:key="item['0_id']"
			:label="item['1_val']"
			:value="item['0_id']">
			</el-option>
			</el-select>
			</template>
			</el-form-item>



			</el-form>

			</el-main>
			<!-- <el-footer style="background-color: azure;"></el-footer> -->
			</el-container>














			</div>
			</body>
			<!-- import Vue before Element -->
			<script src="../js/jquery-3.4.1.min.js"></script>

			<script src="../js/static/js/vue.js"></script>
			<script src="../js/mixins.js"></script>
			<!-- import JavaScript -->
			<script src="../js/static/js/element.js"></script>
			<script src="../js/static/js/echarts.min.js"></script>
			<script >
			//import * as echarts from '../js/echarts.min.js';
			Vue.prototype.$echarts = echarts
			let app =new Vue({
			el: '#app',
			mixins:[mixin],
			data(){
			var checkNum = (rule, value, callback) => {
			if (!value) {
			return callback(new Error('不能为空'));
			}
			setTimeout(() => {
			let reg = new RegExp(`^[0-9]{1,4}(\.[0-9]{0,2})?$`)

			if (!reg.test(value)) {
			callback(new Error('请输入0.01-9999.99的数字'));
			}else {
			callback();
			}

			}, 1000);
			};
			var checkString = (rule, value, callback) => {
			if (!value) {
			return callback(new Error('不能为空'));
			}
			setTimeout(() => {
			if (value.length>255) {
			callback(new Error('最大长度255'));
			}else {
			callback();
			}
			}, 1000);
			};
			var checkInt = (rule, value, callback) => {
			if (!value) {
			return callback(new Error('不能为空或者0'));
			}
			setTimeout(() => {
			let reg = new RegExp(`^[0-9][1-9][0-9]$`)

			if (!reg.test(value)) {
			callback(new Error('请输入正整数的厚度'));
			}else {
			callback();
			}

			}, 1000);
			};
			return {
			ruleForm: {
			produceid:"",
			glassNum:"",
			creator:""
			},
			rules: {
			produceid: [
			{ validator: checkInt, trigger: 'blur' }
			],
			glassNum: [
			{ validator: checkInt, trigger: 'blur' }
			]

			},
			tableHead:[],
			orderData:[],
			showFlag:true,
			updateShowFlag:false,
			updateOrder:{
			id:''
			},
			orderProduce:[],
			fileList:[],
			slectOrder:["","","","","","","","","",""],
			selectdate:''


			};

			},
			methods: {
			submitForm(formName) {//新增订单
			this.$refs[formName].validate((valid) => {
			if (!valid) {
			return false;
			}
			let sql="{call AXJ_a_order_add(?,?,?,?)}~"+JSON.stringify(this.ruleForm);
			this.connects("订单新增",sql,1,1);
			});
			},
			resetForm(formName) {//清除新增重置
			this.$refs[formName].resetFields();
			},
			showFlagFuc(){//显示订单新增界面
			Object.keys(this.ruleForm).forEach((key) => (this.ruleForm[key] = ''));
			this.showFlag=!this.showFlag
			this.updateShowFlag=false;
			},
			updateRow(index,row){//修改产品数据显示
			this.showFlag=!this.showFlag
			this.updateShowFlag=true;
			let rowObj=row[index]
			this.ruleForm.glassNum=rowObj["5_smallglass_no"]
			this.ruleForm.produceid=rowObj["2_recipe_no"]
			this.updateOrder.id=rowObj["0_id"]

			},
			updateGlassSub(formName){//订单修改提交
			this.$refs[formName].validate((valid) => {
			if (!valid) {
			return false;
			}
			let updateGlassObj=this.ruleForm
			updateGlassObj.id=this.updateOrder.id
			let sql="{call AXJ_a_order_update(?,?,?,?,?)}~"+JSON.stringify(updateGlassObj);
			this.connects("产品修改",sql,1,1);
			});

			},
			updateOrderState(index,row){//审核订单
			let updateState={}
			updateState.id=row[index]['0_id']
			updateState.state=row[index]['11_order_status']*1===0?1:0
			let sql="{call AXJ_a_order_updateState(?,?,?)}~"+JSON.stringify(updateState);
			this.connects("订单状态审核修改",sql,1,1);
			},
			selectSub:function(){
			let arrObj={}
			let arrFlag=0
			for(let i in this.slectOrder){
			if(this.slectOrder[i]!=''){
			arrFlag=1
			}
			arrObj[i]=this.slectOrder[i]==''?"n*":this.slectOrder[i]
			}
			if(this.selectdate!=null){
			arrObj.starttime=this.selectdate[0]
			arrObj.endtime=this.selectdate[1]
			}else{
			arrObj.starttime=''
			arrObj.endtime=''
			}

			let sql="{call AXJ_a_order_select(?,?,?,?,?,?,?,?,?,?,?,?,?)}~"+JSON.stringify(arrObj)
			if(arrFlag==0){
			sql="{call AXJ_a_order_select_into()}"
			}
			loadAjxs('产品查询',sql,2,"orderData")
			},
			selectTimeOrder:function(){
			let arrObj={}
			for(let i in this.slectOrder){
			arrObj[i]='n*'
			}
			let sql=''
			if(this.selectdate!=null){
			arrObj.starttime=this.selectdate[0]
			arrObj.endtime=this.selectdate[1]
			sql="{call AXJ_a_order_select(?,?,?,?,?,?,?,?,?,?,?,?,?)}~"+JSON.stringify(arrObj)
			}else{
			arrObj.starttime=''
			arrObj.endtime=''
			sql="{call AXJ_a_order_select_into()}"
			}
			loadAjxs('产品查询',sql,2,"orderData")

			}
			},
			computed:{

			},
			mounted() {
			let sql="{call AXJ_a_order_select_into()}"
			let flag=2;
			loadAjxs('订单初始查询',sql,flag,"orderData")

			sql="{call AXJ_a_orderHeader_select()}"
			loadAjxs('订单表头',sql,flag,"tableHead")

			sql="{call AXJ_a_order_produce_select()}"
			loadAjxs('订单产品查询',sql,flag,"orderProduce")
			},

			})




			</script>
			</html>

			@@ -4,7 +4,7 @@
			<head>
			<meta charset="UTF-8">
			<!-- import CSS -->
			<link rel="stylesheet" href="../js/.static/css/element.css">
			<link rel="stylesheet" href="../js/static/css/element.css">
			<link rel="stylesheet" href="../js/static/css/style.css">
			<style >
			.page-scroll {
			@@ -25,7 +25,7 @@
			<body>
			<div id="app" >
			<el-container >
			<el-header style="margin-top: 3%;height: 3%;">
			<el-header style="height: 3%;">
			<el-button @click="showFlagFuc" type="primary" round style="float:left;">{{showFlag==false?'返回产品':'添加产品'}}</el-button>
			</el-header>
			<el-main >
			@@ -127,7 +127,7 @@
			<script src="../js/jquery-3.4.1.min.js"></script>

			<script src="../js/static/js/vue.js"></script>
			<script src="../js/static/js/mixins.js"></script>
			<script src="../js/mixins.js"></script>
			<!-- import JavaScript -->
			<script src="../js/static/js/element.js"></script>
			<script src="../js/static/js/echarts.min.js"></script>
			@@ -262,6 +262,7 @@
			this.ruleForm.creator=rowObj["7_recipe_maker"]
			this.ruleForm.route=rowObj["9_route"]
			this.updateGlass.id=rowObj["0_id"]
			console.log( row[index]);
			},
			updateGlassSub(formName){
			this.$refs[formName].validate((valid) => {

			@@ -86,42 +86,42 @@
			</thead>
			<tbody>
			<tr v-for="item in shuzu">
			<td>{{item[1]}}</td>
			<td>{{item[2]}}</td>
			<td>{{item[3]}}</td>
			<td>{{item[4]}}</td>
			<td>{{item[5]}}</td>
			<td>{{item[6]}}</td>
			<td>{{item[7]}}</td>
			<td>{{item[8]}}</td>
			<td>{{item[9]}}</td>
			<td>{{item[10]}}</td>
			<td v-if="item[11]==1">
			<td>{{item['1_order_id']}}</td>
			<td>{{item['2_original_width']}}</td>
			<td>{{item['3_original_height']}}</td>
			<td>{{item['4_width']}}</td>
			<td>{{item['5_height']}}</td>
			<td>{{item['6_thickness']}}</td>
			<td>{{item['7_largeglass_no']}}</td>
			<td>{{item['8_largeglass_completed']}}</td>
			<td>{{item['9_smallglass_no']}}</td>
			<td>{{item['10_smallglass_completed']}}</td>
			<td v-if="item['11_order_status']==1">
			已下发
			</td>
			<td v-else-if="item[11]==2">
			<td v-else-if="item['11_order_status']==2">
			已领取
			</td>
			<td v-else-if="item[11]==3">
			<td v-else-if="item['11_order_status']==3">
			已完成
			</td>
			<td v-else-if="item[11]==4">
			<td v-else-if="item['11_order_status']==4">
			手动完成
			</td>
			<td v-else>

			</td>
			<td>{{item[12]}}</td>
			<td v-if="item[11]==1">
			<button @click="dainjishijian('领取任务',item[0])" style='background-color: #5CADFE' class='btn btn-large btn-success' >领取任务</button>
			<td>{{item['12_order_maker']}}</td>
			<td v-if="item['11_order_status']==1">
			<button @click="dainjishijian('领取任务',item['0_id'])" style='background-color: #5CADFE' class='btn btn-large btn-success' >领取任务</button>

			<button @click="dainjishijian('手动完成',item[0])" 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">
			<td v-else-if="item['11_order_status']==2">

			<button @click="dainjishijian('结束任务',item[0])" 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>

			<button @click="dainjishijian('取消任务',item[0])" 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>
			@@ -168,7 +168,7 @@
			<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/mixins.js"></script>
			<script src="../static/js/element.js"></script>

			<script>
			let app = new Vue({
			el:'#app',

			@@ -16,6 +16,7 @@
			<link href="../static/styles/default.css" type="text/css" rel="stylesheet" />
			<script src="../static/holder.js" type="text/javascript"></script>
			<script language="javascript" type="text/javascript" src="../static/util.js"></script>
			<script src="../js/jquery-3.4.1.min.js"></script>

			<title>上片位</title>
			<script type="text/javascript">
			@@ -162,27 +163,27 @@
			<tr>
			<th width="15%">上片机</th>
			<th width="10%">上片位</th>
			<th>原片信息</th>
			<th width="25%">缺片</th>
			<th width="20%">操作</th>
			<th width="25%">原片信息</th>
			<th >缺片</th>
			<th width="30%">操作</th>
			</tr>
			</thead>
			<tbody>
			<tr v-for='items in shuzu'>
			<td v-show="items[0]!=''" :rowspan="items[0]">{{items[1]}} {{items[2]}}</td>
			<td>{{items[3]}}</td>
			<td>{{items[4]}}</td>
			<td v-show="items['0_count']!=''" :rowspan="items['0_count']">{{items['1_jiqi']}} {{items['2_connect_state']}}</td>
			<td>{{items['3_shangpianwei']}}</td>
			<td>{{items['4_tishi']}}</td>
			<td></td>
			<td v-if="items[4]!=''">
			<td v-if="items['4_tishi']!=''">

			<button @click="updateGlassNum(items[5])" style="background-color: #5CADFE" class="btn btn-large btn-warning" >修改原片</button>
			<button @click="updateGlassNum(items['5_id'])" style="background-color: #5CADFE" class="btn btn-large btn-warning" >修改原片</button>

			<button @click='claerMsg(items[7],items[6])' style="background-color: #5CADFE" class="btn btn-large btn-danger" >清除消息</button>
			<button @click="claerMsg(items['7_id'],items['6_id'])" style="background-color: #5CADFE" class="btn btn-large btn-danger" >清除消息</button>

			<button @click='tuiku(items[7],items[6])' style="background-color: #5CADFE" class="btn btn-large btn-danger" >退库</button>
			<button @click="tuiku(items['7_id'],items['6_id'])" style="background-color: #5CADFE" class="btn btn-large btn-danger" >退库</button>
			</td>
			<td v-else>
			<button @click="addGlass(items[7],items[6])" style="background-color: #5CADFE" class="btn btn-large btn-success" >添加原片</button>
			<button @click="addGlass(items['7_id'],items['6_id'])" style="background-color: #5CADFE" class="btn btn-large btn-success" >添加原片</button>
			</td>
			</tr>

			@@ -202,12 +203,12 @@
			</thead>
			<tbody>
			<tr v-for='items in shuzu1'>
			<td>{{items[0]}}</td>
			<td>{{items[1]}}</td>
			<td v-if="items[1]!=''">
			<td>{{items['0_number']}}</td>
			<td>{{items['1_id']}}</td>
			<td v-if="items['1_id']!=''">


			<button @click='claerMsg(items[4],items[3])' style="background-color: #5CADFE" class="btn btn-large btn-danger" >清除消息</button>
			<button @click="claerMsg(items['4_id'],items['3_id'])" style="background-color: #5CADFE" class="btn btn-large btn-danger" >清除消息</button>
			<!--
			<button style="background-color: #5CADFE" class="btn btn-large btn-danger" onclick="tuikuload(1)">退库</button> -->
			</td>
			@@ -494,7 +495,7 @@
			</div>
			<!-- /.content-wrapper -->
			</body>
			<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/mixins.js"></script>

			@@ -5,7 +5,6 @@
			<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
			<html>
			<head>
			<link rel="stylesheet" href="../static/AdminLTE/bower_components/bootstrap/dist/css/bootstrap.min.css">
			<!-- Font Awesome -->
			<link rel="stylesheet" href="../static/AdminLTE/bower_components/font-awesome/css/font-awesome.min.css">
			<!-- Ionicons -->
			@@ -13,32 +12,24 @@
			<!-- Theme style -->
			<link rel="stylesheet" href="../static/AdminLTE/dist/css/AdminLTE.min.css">
			<link rel="stylesheet" href="../static/AdminLTE/dist/css/skins/skin-blue.min.css">
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
			<link rel="stylesheet" href="..//static/AdminLTE/bower_components/bootstrap/dist/css/bootstrap.min.css">
			<link href="../static/bootstrap/2.3.2/css/bootstrap.min.css" type="text/css" rel="stylesheet"/>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
			<title>仓储任务信息</title>
			<!-- jQuery 3 -->
			<script
			src="../static/AdminLTE/bower_components/jquery/dist/jquery.min.js"></script>
			<script src="../js/jquery-3.4.1.min.js"></script>
			<!-- Bootstrap 3.3.7 -->
			<script
			src="../static/AdminLTE/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
			<!-- DataTables -->
			<script
			src="../static/AdminLTE/bower_components/datatables.net/js/jquery.dataTables.min.js"></script>
			<script src="../static/AdminLTE/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
			<!-- SlimScroll -->
			<script
			src="../static/AdminLTE/bower_components/jquery-slimscroll/jquery.slimscroll.min.js"></script>
			<!-- FastClick -->
			<script
			src="../static/AdminLTE/bower_components/fastclick/lib/fastclick.js"></script>
			<script type="text/javascript">
			var interval = setInterval('refreshStatus()', 5000);
			/* var interval = setInterval('refreshStatus()', 5000);
			$(document).ready(function(){
			var info = $("#info").attr("info");
			$("#infos").html(info);
			});
			}); */
			// 设备页面自动刷新
			/* function refreshStatus() {
			window.location.reload();
			@@ -105,14 +96,13 @@
			<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:300px;overflow-y:auto;">
			<div class="box-body" style="height:450px;overflow-y:auto;">
			<table class="table table-striped table-hover"
			style="font-size: 18px;" id="example2">
			<thead>
			<tr>
			<th>选择</th>
			<th style="display:none">编号</th>
			<th>GlassID</th>
			<th>任务编号</th>
			<th>任务描述</th>
			<th>任务状态</th>
			<th>玻璃厚度</th>
			@@ -124,11 +114,11 @@
			<tr v-for="items in shuzu">
			<td><input v-model="shelftaskids" type='checkbox' :value="items[0]"/></td>
			<td>{{items["0"]}}</td>
			<td>{{items[2].replace("到","【"+items[4]+"】到【")+items[5]+"】"}}</td>
			<td>{{items[3]}}</td>
			<td>{{items[10]}}</td>
			<td>{{items[11]}}</td>
			<td>{{items[8]}}</td>
			<td>{{items[1]}}</td>
			<td>{{items[2]}}</td>
			<td>{{items[8]}}</td>
			<td>{{items[9]}}</td>
			<td>{{items[6]}}</td>
			</tr>
			</tbody>
			</table>
			@@ -184,11 +174,11 @@
			}
			},
			mounted:function(){
			let sql="{call AXJ_liaojiaguanli_cangchurenwuxiangxi(?)}";
			let sql="{call AXJ_liaojiaguanli_cangchurenwuxiangxi(?)}";
			let flag=2;
			loadAjxs('仓储任务上面查询',sql,flag,"shuzu");
			sql="{call AXJ_liaojiaguanli_cangchurenwu_lianjie(?)}";
			loadAjxs('仓储任务连接',sql,flag,"connect");
			loadAjxs('仓储任务连接',sql,flag,"connect");
			}

			})

			@@ -3,7 +3,7 @@
			<html>
			<head>
			<title>任务统计</title>
			<link rel="stylesheet" href="..//static/AdminLTE/bower_components/bootstrap/dist/css/bootstrap.min.css">
			<link rel="stylesheet" href="../static/AdminLTE/bower_components/bootstrap/dist/css/bootstrap.min.css">
			<!-- Font Awesome -->
			<link rel="stylesheet" href="../static/AdminLTE/bower_components/font-awesome/css/font-awesome.min.css">
			<!-- Ionicons -->

			@@ -30,20 +30,13 @@
			<link type="text/css" rel="stylesheet"
			href="../static/css/dataTables.tableTools.css" />

			<script type="text/javascript"
			src="../static/js/jquery.min.js"></script>
			<script type="text/javascript"
			src="../static/js/jquery.dataTables.min.js"></script>
			<script type="text/javascript"
			src="../static/js/dataTables.bootstrap.js"></script>
			<script type="text/javascript"
			src="../static/js/dataTables.tableTools.js"></script>
			<script type="text/javascript"
			src="../static/js/moment.js"></script>
			<script type="text/javascript"
			src="../static/js/sucaijiayuan.js"></script>
			<script type="text/javascript"
			src="../static/laydate/laydate.js"></script>
			<script src="../js/jquery-3.4.1.min.js"></script>
			<script type="text/javascript" src="../static/js/jquery.dataTables.min.js"></script>
			<script type="text/javascript" src="../static/js/dataTables.bootstrap.js"></script>
			<script type="text/javascript" src="../static/js/dataTables.tableTools.js"></script>
			<script type="text/javascript" src="../static/js/moment.js"></script>
			<script type="text/javascript" src="../static/js/sucaijiayuan.js"></script>
			<script type="text/javascript" src="../static/laydate/laydate.js"></script>
			<script type="text/javascript" src="../static/util/utilAlert.js"></script>
			<script type="text/javascript" src="../static/bootstrap/3.3.7/js/bootstrap.min.js"></script>
			<style type="text/css">
			@@ -89,7 +82,7 @@
			}
			#example tbody {
			display:block;
			height:385px;
			height:280px;
			overflow-y:scroll;
			}
			#example thead,#example tbody tr {
			@@ -307,7 +300,7 @@

			} */
			//添加
			function addrack(){
			/* function addrack(){
			var colors=document.getElementById("colors").value;
			var width=document.getElementById("width1").value;
			var heigth=document.getElementById("height1").value;
			@@ -475,7 +468,7 @@

			});

			}
			} */

			</script>
			</head>
			@@ -576,24 +569,29 @@
			</div>

			<!--表格 -->
			<select id="dzw" class="btn btn-primary">
			<option value="1">吊装位1</option>
			<option value="2">吊装位2</option>
			</select>
			<button type="button" onclick="ruku()" class="btn btn-primary ">入库</button>
			<button type="button" onclick="ruku1()" class="btn btn-primary ">扫码入库</button>
			<!-- <button type="button" onclick="ruku1()" class="btn btn-primary ">扫码入库</button> -->
			<button type="button" @click="chuku()" class="btn btn-primary ">出库</button>
			<button type="button" @click="addshelftask()" class="btn btn-primary ">吊装位入库</button>
			<button type="button" onclick="oncheck()" class="btn btn-primary ">添加原片</button>
			<!-- <button type="button" onclick="updateAll()" class="btn btn-primary ">修改原片</button> -->
			<button type="button" @click="shanchu()" class="btn btn-primary ">删除原片</button>
			<button type="button" @click="start('启用')" class="btn btn-primary ">启用</button>
			<button type="button" @click="start('禁用')" class="btn btn-primary ">禁用</button>
			<button type="button" @click="fanpian()" class="btn btn-primary ">翻片</button>
			<!-- <button type="button" @click="fanpian()" class="btn btn-primary ">翻片</button> -->
			<button type="button" onclick="updatecount()" class="btn btn-primary ">修改数量</button>
			<button type="button" @click="addshelftask()" class="btn btn-primary ">吊装位入库</button>

			<table id="example" class="table table-bordered table-condensed">
			<thead style="font-size: 20px; Height: 40px">
			<tr>
			<th><input type="checkbox" name="allChecked" /></th>
			<th style="display:none">编号</th>
			<th>库位号</th>
			<th>GlassId</th>
			<th>类型</th>
			<th>长度(mm)</th>
			<th>高度(mm)</th>
			<th>厚度(mm)</th>
			@@ -1102,7 +1100,7 @@
			return false;
			}
			const gongneng = func;
			let sql="UPDATE gmms_shelf_rack set falg='"+
			let sql="UPDATE storage_rack set falg='"+
			func+"' where number in("+this.shelfId.join()+");";
			//alert(sql);
			this.connects(gongneng,sql,0,1);
			@@ -1122,6 +1120,7 @@
			}, */
			//入库功能：
			rukus:function(){


			let errortext="没有输入原片";
			this.glass.shelfID=$('#shelfRankInput').val();
			@@ -1148,7 +1147,10 @@
			alert(errortext+"!");
			return false;
			}
			let sql="{call AXJ_liaojiaguanli_ruku(?,?,?,?,?,?,?,?,?)}~"+JSON.stringify(this.glass);
			//获取选择的吊装位
			this.glass.dzw=$("#dzw").val();
			alert(JSON.stringify(this.glass));
			let sql="{call AXJ_liaojiaguanli_ruku(?,?,?,?,?,?,?,?,?,?)}~"+JSON.stringify(this.glass);
			//console.log(sql);
			$("#myModal-add-info").modal('hide');
			this.connects("入库",sql,1,1);
			@@ -1158,7 +1160,8 @@
			alert("请选中一行");
			return false;
			}
			let sql="{call AXJ_liaojiaguanli_chuku(?,?)}~"+"{'shelfid':'"+this.shelfId+"'}";
			this.dzw=$("#dzw").val();
			let sql="{call AXJ_liaojiaguanli_chuku(?,?,?)}~"+"{'shelfid':'"+this.shelfId+"','dzw':'"+this.dzw+"'}";
			//console.log(sql)
			this.connects("出库",sql,1,1);
			},
			@@ -1229,7 +1232,8 @@

			},
			addshelftask:function(){
			let sql="{call AXJ_liaojiaguanli_diaozhuangweiruku(?)}";
			this.load_rack=$("#dzw").val();
			let sql="{call AXJ_liaojiaguanli_diaozhuangweiruku(?,?)}~"+"{'load_rack':'"+this.load_rack+"'}";
			this.connects("吊装位入库",sql,1,1);
			}

			@@ -1243,7 +1247,7 @@
			sql="{call AXJ_liaojiaguanli_colors(?)}";
			loadAjxs('原片仓储颜色查询',sql,flag,"colors");
			}


			})
			</script>
			</html>