切割管理文件修改

廖井涛

2023-07-18 d53379adaf52462a3e9edc86514e70549c3a6e9e

切割管理文件修改

 gmms/WebContent/js/mixins.js

@@ -22,7 +22,8 @@
                                        window.parent.location.href='../login/index.jsp';
                                  }else{
                                      result=result.substring(index).trim()
                                      alert(result);  
                                      alert(result);
                                      window.location.reload();
                                  }
                                  
                              }else{

 gmms/WebContent/qiegeguanli/qiegerenwu.jsp

@@ -11,6 +11,8 @@
<!-- 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">

<link rel="stylesheet" href="../static/css/element.css">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<script type="text/javascript" src="../static/jquery/jquery-3.1.0.min.js"></script>
<script type="text/javascript"
@@ -31,93 +33,7 @@
    clearInterval(interval);
   } */
  
  function delecttask(id){
          disableAutoRefresh();
          $.ajax({ 
            async: false, 
		
            type:"GET", 

             url:"${ctx}/cutmanage/delecttask/"+id, 

            dataType:"text", 

            success:function(data){
                window.location.href="${ctx}/cutmanage/gettask/"+id;
            }
        });
}
  
  function delecttask1(id){
          disableAutoRefresh();
          $.ajax({ 
            async: false, 
		
            type:"GET", 

             url:"${ctx}/cutmanage/delecttask1/"+id, 

            dataType:"text", 

            success:function(data){
                window.location.href="${ctx}/cutmanage/gettask/"+id;
            }
        });
}
  
  function updatetask(id){
          disableAutoRefresh();
          var groups=document.getElementsByName('groups')[0].value;
          $.ajax({
              cache:false,
              type:"POST",
              dataType : "json", 
               url:"${ctx}/cutmanage/updatetask",
               data:{
                   "id":id,
               },success:function(data){ 
                   window.location.href="${ctx}/cutmanage/gettask/"+groups;
              }
          }); 
}
  
  function updatetask1(id){
          disableAutoRefresh();
          var groups=document.getElementsByName('groups')[0].value;
          $.ajax({
            cache:false,
            type:"POST",
            dataType : "json", 
             url:"${ctx}/cutmanage/updatetask1",
             data:{
                 "id":id,
             },success:function(data){ 
                 window.location.href="${ctx}/cutmanage/gettask/"+groups;
            }
        }); 
}
  

  
  function able_entry(){
      //var g=${groups};
	  
      $.ajax({ url:"/gmms2/mesview/data/_service",
          type:"post",
         data:{m:"load_entery",p:g },
         success:function(data){
            var d=JSON.parse(data);
            if(d.result!="ok")
                alert(data);
            else
                window.location.reload();
        },
        error:function(data){
            alert(data);	
        }
      }
      );
  }


</script>
@@ -136,100 +52,125 @@
            
            <ol class="breadcrumb">
            
                <li><a href="#">设备<i class="fa fa-dashboard"></i>任务
				
                </a></li>
            </ol>
        </section>
    
    <div id = "allstatu" allstatu = "${allstatu}"></div>
           <div id = "info" info = "${info}"></div>
    <div id = "allstatu" ></div>
           <div id = "info" ></div>
        <!-- Main content -->
            <input style="display:none" type="text" name="groups" value="${groups}" />
        <section class="content container-fluid">
            <div>        
            </div>
            <div>
                <span>状态：</span>
                <span id="st"></span>
                <button class="btn btn-large btn-success" style="margin-left:20px" @click="ableEntry">确认</button>
            </div>
            <div class="box" style="height: 120px; overflow: auto;margin-top: 10px;">
			
            <div class="box" style="height: 620px; overflow: auto;margin-top: 10px;">
                    <table class="table table-striped table-hover"
                        style="overflow-x: auto">
                        <thead>
                            <tr>
                                <th>工程名称</th>
                                <!-- <th>宽度</th>
                                <th>高度</th>
                                <th>项目名称</th>
                                <th>原片宽度</th>
                                <th>原片高度</th>
                                <th>小片宽度</th>
                                <th>小片高度</th>
                                <th>厚度</th>
                                <th>类型</th> -->
                                <th>完成数量</th>
                                <th>总数量</th>
                                <th>完成面积(mm)</th>
                                <th>原片总数量</th>
                                <th>原片已加工数量</th>
                                <th>小片总数量</th>
                                <th>小片已加工数量</th>
                                <th>订单状态</th>
                                <th>制单人</th>
                                <th>操作</th>
                                
                            </tr>
                        </thead>
                        <tbody>
                            <tr v-for="items in shuzu">
                                <td v-show="index>0" v-for='(item,key,index) in items'>
                                    {{item}}
                                <td>
                                <td>
                                    <button @click="deleteTask(items[0])" style='background-color: #5CADFE' class='btn btn-large btn-success' >中断任务</button>
                                    &nbsp
                                    <button @click="clearTask(items[0])" style='background-color: #5CADFE' class='btn btn-large btn-success' >结束任务</button>
                            <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>
                                <td v-else-if="item[11]==2">
                                    已领取
                                </td>
                                <td v-else-if="item[11]==3">
                                    已完成
                                </td>
                                <td v-else-if="item[11]==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>
                                    &nbsp;&nbsp;&nbsp;
                                    <button @click="dainjishijian('手动完成',item[0])" 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>
                                    &nbsp;&nbsp;&nbsp;
                                    <button @click="dainjishijian('取消任务',item[0])" 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>
                                </td> -->
                                <td v-else>
									
                                </td>
                            </tr>
                        </tbody>
                    </table>
            </div>
            <div class="box" style="height: 600px; overflow: auto;margin-top: 10px;">
                    <table class="table table-striped table-hover2"
                        style="overflow-x: auto">
                        <thead>
                            <tr>
                                <th>编号</th>
                                <th>宽度</th>
                                <th>高度</th>
                                <th>厚度</th>
                                <th>颜色</th>
                                <th>状态</th>
                                <th>操作</th>
								
                            </tr>
                        </thead>
                        <tbody>
                            <tr    v-for='items in shuzu1'>
                                <td v-show="index>0" v-for='(item,key,index) in items'>
                                    {{item}}
                                </td>
                                <td>
                                    <button @click="updatetask(items[0],0,'三号线任务重新开始')"  style='background-color: #5CADFE' class='btn btn-large btn-success' >重新开始</button>
                                    &nbsp
                                    <button @click="updatetask(items[0],1,'三号线任务手动完成')"  style='background-color: #5CADFE' class='btn btn-large btn-success' >设置完成</button>
                                </td>
                            </tr>
                        </tbody>
                    </table>
			
            <div class="modal fade" id="modify-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">
                        <input type='hidden' id = "lineprint">
                            <div class="modal-header">
                                <button type="button" class="close" data-dismiss="modal"
                                    aria-hidden="true">&times;</button>
                                <h3 class="modal-title" id="myModalLabel">提示信息</h3>
                            </div>
                            <div class="modal-body" style="text-align: left;">
                                <h3>您确定要执行当前操作吗？</h3>
                            </div>
                            <div class="modal-footer">

                                <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"
                                    id="surefinish">确认</button>
                            </div>
                        </div>
                    </div>
                </form>
            </div>
			
        </section>
        <!-- /.content -->
    </div>
    <script>
      //var st=""${able};
      var sp=document.getElementById("st");
      var str1="未知";
      if(st==0){
          str1="未确认";
      }
      else{
          str1="已确认";
      }
      sp.innerText=str1;
    </script>
    <script src="../js/vue.min.js"></script>
<script type="text/javascript" src="../static/jquery/jquery-3.1.0.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>
<script src="../static/js/element.js"></script>
<script>
 let app = new Vue({
      el:'#app',
@@ -237,24 +178,34 @@
      data:{
          shuzu:[],
          shuzu1:[],
          lines:<%= request.getParameter("id") %>
          lines:<%= request.getParameter("id") %>,
          subval:{
              id:'',
              type:''
          }
      },
      methods:{
          deleteTask:function(ids){
              sql="{call AXJ_qiegeguanli_threelinetask_zhongduanrenwu(?,?,?)}~"+"{'ids':'"+ids+"'}";
              this.connects(this.lines+"号线中止",sql,2,1);
          dainjishijian:function(type,id){
              console.log(type,id);
              $("#modify-info").modal('show');
               if(type=="领取任务"){
                  this.subval.type=2;
              }else if(type=="结束任务"){
                  this.subval.type=3;
              }else if(type=="手动完成"){
                  this.subval.type=4;
              }else if(type=="取消任务"){
                  this.subval.type=1;
              }
               this.subval.id=id
          },
          clearTask:function(ids){
              sql="{call AXJ_qiegeguanli_threelinetask_jieshurenwu(?,?)}~"+"{'ids':'"+ids+"'}";
              this.connects(this.lines+"号线结束",sql,2,1);
          renwuguanli:function(){
              sql="{call AXJ_qiegeguanli_threelinetask_renwuguanli(?,?,?)}~"+JSON.stringify(this.subval);
              console.log(sql);
              this.connects("任务修改",sql,1,1)
          },
          updatetask:function(ids,types,clickname){
              sql="{call AXJ_qiegeguanli_threelinetask_updatetask(?,?,?)}~"+"{'ids':'"+ids+"','type':'"+types+"'}";
                this.connects(clickname,sql,2,1);
          },
          ableEntry:function(){
            sql="{call AXJ_qiegeguanli_threelinetask_sure(?,?)}~"+"{'ids':'"+<%= request.getParameter("id") %>+"'}";
            this.connects(this.lines+'号线确认',sql,2,1);
          renwuguanliquxiao:function(){
              this.subval='';
          }
          
      },
@@ -263,11 +214,9 @@
                 line:<%= request.getParameter("id") %>
         }
         this.shuzu="";
          let sql="{call AXJ_qiegeguanli_threelinetask_list1(?,?)}~"+JSON.stringify(canshu);
          let sql="{call AXJ_qiegeguanli_threelinetask_list1()}";
         let flag=2;
         loadAjxs(this.lines+'号线list1',sql,flag,"shuzu");
          sql="{call AXJ_qiegeguanli_threelinetask_list2(?,?)}~"+JSON.stringify(canshu);
         loadAjxs(this.lines+'号线list2',sql,flag,"shuzu1");  
         loadAjxs('任务查询成功',sql,flag,"shuzu"); 
      }

})

 gmms/WebContent/qiegeguanli/shangpianweixinxi.jsp

@@ -180,7 +180,7 @@
                                   &nbsp;&nbsp;&nbsp;
                                   <button @click='claerMsg(items[7],items[6])' 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>
                                   <button  @click='tuiku(items[7],items[6])' 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>
@@ -189,6 +189,37 @@
                       
                       </tbody>
                   </table>
   				
               </div>
   			
               <div class="box-body no-padding" style="background-color: aliceblue;margin-top: 20px;">
                 <table class="table table-striped" style="font-size: large;">
                       <thead>
                           <tr>
                               <th width="15%">吊装位</th>
                               <th>料架编号</th>
                               <th width="20%">操作</th>
                           </tr>
                       </thead>
                       <tbody>
                           <tr v-for='items in shuzu1'>
                               <td>{{items[0]}}</td>
                               <td>{{items[1]}}</td>
                               <td v-if="items[1]!=''">
       						
       							
                                   <button @click='claerMsg(items[4],items[3])' 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>
                               <td v-else>
       							
                               </td>
                           </tr>
       				
                       </tbody>
                   </table>
   				
               </div>
           </div>
           <%-- <div class="box" style="height: 220px; overflow: auto;">
@@ -270,19 +301,7 @@

                                    </div>
                                </div>
                                <div class="form-group">
                                    <h4>
                                        <label class="col-sm-3 control-label no-padding-right"
                                            style="font-weight: bolder;">任务编号 </label>
                                    </h4>

                                    <!-- <div class="col-sm-9">
                                        <input type="text" class=" sortNumber form-control"
                                            value="" name="taskid1"
                                            id="taskid" onclick="this.value=''"
                                            style="width: 250px; font-size: 20px" />
                                    </div> -->
                                </div>
								

                                <div class="form-group">
                                    <h4>
@@ -406,7 +425,7 @@
                                <button type="button" class="btn btn-default btn-lg"
                                    data-dismiss="modal">取消</button>

                                <button type="button" class="btn btn-primary btn-lg"
                                <button @click="claerMsgSub" type="button" class="btn btn-primary btn-lg"
                                    id="surefinish">确认</button>
                            </div>
                        </div>
@@ -441,124 +460,35 @@
                </form>
            </div>
            
            <div class="modal fade" id="add-fix-info" tabindex="-1" role="dialog"
			
            <div class="modal fade" id="tuikuhtml" tabindex="-1" role="dialog"
                aria-labelledby="myModalLabel" aria-hidden="true">
                <div class="modal-dialog">
                    <div class="modal-content">
                        <div class="modal-header">
                            <button type="button" class="close" data-dismiss="modal"
                                aria-hidden="true" data-backdrop="static">&times;</button>
                            <h3 class="modal-title" id="myModalLabel"
                                style="font-weight: bolder;">添加固定料架原片</h3>
                        </div>
                        <form class="form-horizontal" role="form" id="category_add"
                             method="post">
                            <input type="hidden" id="add-fix" name="Ids">
                            <div class="modal-body">
                                <div class="form-group">
                                    <h4>
                                        <label class="col-sm-3 control-label no-padding-right"
                                            style="font-weight: bolder;">料架号 </label>
                                    </h4>

                                    <div class="col-sm-9">
                                        <input type="text" id="fixrack"
                                                style="width: 250px; height: 35px; font-size: 20px"
                                                readonly="readonly">
											
                                    </div>
                                </div>

                                <div class="form-group">
                                    <h4>
                                        <label class="col-sm-3 control-label no-padding-right"
                                            style="font-weight: bolder;">颜色膜系 </label>
                                    </h4>

                                    <div class="col-sm-9">
                                        <input type="text" id="fixcolors" name="color"
                                            style="width: 250px; height: 35px; font-size: 20px"
                                            readonly="readonly">
                                        <div class="btn-group" style="margin-top: -10px">
                                            <button class="btn btn-primary dropdown-toggle"
                                                data-toggle="dropdown">
                                                选择&nbsp;<span class="caret"></span>
                                            </button>
                                            <ul class="dropdown-menu"
                                                style="height: 280px; overflow: auto;">
                                                <c:forEach items="${getColorList}" var="cs">
                                                    <li style="font-size: 20px"><a href="#"
                                                        onclick="$('#fixcolors').val('${cs}')">${cs}</a></li>
                                                </c:forEach>
                                            </ul>
                                        </div>

                                    </div>
                                </div>
								

                                <div class="form-group">
                                    <h4>
                                        <label class="col-sm-3 control-label no-padding-right"
                                            style="font-weight: bolder;">宽度 </label>
                                    </h4>

                                    <div class="col-sm-9">
                                        <input type="text" class=" sortNumber form-control"
                                            value="${addrawPackage.height}" name="width" id="width"
                                            onclick="this.value=''" style="width: 250px; font-size: 20px" />
                                    </div>
                                </div>
                                <div class="form-group">
                                    <h4>
                                        <label class="col-sm-3 control-label no-padding-right"
                                            style="font-weight: bolder;">高度 </label>
                                    </h4>

                                    <div class="col-sm-9">
                                        <input type="text" class="form-control" id="height"
                                            value="${addrawPackage.width}" name="height"
                                            onclick="this.value=''" style="width: 250px; font-size: 20px" />
                                    </div>
                                </div>
                                <div class="form-group">
                                    <h4>
                                        <label class="col-sm-3 control-label no-padding-right"
                                            style="font-weight: bolder;">厚度 </label>
                                    </h4>

                                    <div class="col-sm-9">
                                        <input type="text" class=" sortNumber form-control"
                                            value="${addrawPackage.thickness}" name="thickness"
                                            id="thickness" onclick="this.value=''"
                                            style="width: 250px; font-size: 20px" />
                                    </div>
                                </div>

                                <div class="form-group">
                                    <h4>
                                        <label class="col-sm-3 control-label no-padding-right"
                                            style="font-weight: bolder;">数量 </label>
                                    </h4>

                                    <div class="col-sm-9">
                                        <input type="text" class=" sortNumber form-control"
                                            value="${addrawPackage.pieces}" name="pieces" id="pieces"
                                            onclick="this.value=''" style="width: 250px; font-size: 20px" />
                                    </div>
                                </div>

                <form class="form-horizontal" role="form">
                    <div class="modal-dialog">
                        <div class="modal-content">
                        <input type='hidden' id = "fixlinenumber">
                            <div class="modal-header">
                                <button type="button" class="close" data-dismiss="modal"
                                    aria-hidden="true">&times;</button>
                                <h3 class="modal-title" id="myModalLabel">提示信息</h3>
                            </div>
                            <div class="modal-body" style="text-align: left;">
                                <h3>您确定要退库？</h3>
                            </div>
                            <div class="modal-footer">

                                <button type="button" class="btn btn-default btn-lg"
                                    data-dismiss="modal">关闭</button>
                                <button type="button" class="btn btn-primary btn-lg"
                                    id="addbtnsubmit">提交</button>
                                    data-dismiss="modal">取消</button>

                                <button @click="tuikuSub()" type="button" class="btn btn-primary btn-lg"
                                    id="surefinish">确认</button>
                            </div>
                        </form>
                        </div>
                    </div>
                </div>
                </form>
            </div>
			
			
    </section>
    </div>
    <!-- /.content -->
@@ -575,8 +505,9 @@
      mixins:[mixin],
      data:{
          shuzu:[],
          shelfRack:<%= DBHelper.getDBHelper("mes").query(false,"SELECT number from gmms_shelf_rack where state='使用中' and falg='启用';") %>,
          colors:<%= DBHelper.getDBHelper("mes").query(false,"SELECT glass_id from gmms_glass_number_color ") %>,
          shuzu1:[],
          shelfRack:<%= DBHelper.getDBHelper("mes").query(false,"SELECT number from storage_rack where state='使用中' and falg='启用';") %>,
          colors:<%= DBHelper.getDBHelper("mes").query(false,"SELECT glass_id from glass_number_color ") %>,
          updateGlassId:"",
          pieces:"",
          clearGlassMsg:{
@@ -651,20 +582,29 @@
                     return false;
                 }
                 let sql="{call AXJ_qiegeguanli_shangpianwei_tianjiayuanpian(?,?,?,?,?,?,?,?)}~"+JSON.stringify(this.glass);
                 this.connects("上片位添加原片",sql,2,1);
                 this.connects("上片位添加原片",sql,1,1);
          },
          tuiku:function(){
			  
          tuiku:function(shelfid,loadrackid){
              disableAutoRefresh();
                  $('#tuikuhtml').modal('toggle');
                  this.clearGlassMsg.shelfid=shelfid;
                  this.clearGlassMsg.loadrackid=loadrackid;
          },
          tuikuSub:function(){
			  
              sql="{call AXJ_qiegeguanli_shangpianwei_tuiku(?,?,?)}~"+"{'shelfid':'"+this.clearGlassMsg.shelfid+"','loadrackid':'"+this.clearGlassMsg.loadrackid+"'}";
                //console.log(sql);
                this.connects("退库任务已生成",sql,1,1);
          }
      },
      mounted:function(){
         this.shuzu="";
          let sql="{call AXJ_qiegeguanli_shangpianwei_chaxun()}";
         this.shuzu1="";
         let sql="{call AXJ_qiegeguanli_shangpianwei_chaxun()}";
         let flag=2;
         loadAjxs('仓储任务上面查询',sql,flag,"shuzu");
         let sql1="{call AXJ_qiegeguanli_shangpianwei_chaxun1()}";

         loadAjxs('仓储任务上面查询',sql1,flag,"shuzu1");
      }

})