修改订单任务切换功能bug

廖井涛

2025-06-12 864b0203990d308294e0d8a9331158374822dbba

修改订单任务切换功能bug

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/java/com/northglass/service/cutmanage/CutManageService.java

@@ -556,8 +556,9 @@
    //结束任务
    public String delecttask(Long id,Long line) {
        RawFile rawFile=rawFileDao.findAcceptedByGroup2(id);
        System.out.println(1111);
        int lipiancount =galssTaskDao.finlipian2(rawFile.getFileName());
		
        System.out.println(2222);
        int slicecount;
        if (line==1) {
             slicecount=horizontalDao.findfall3(rawFile.getFileName());
@@ -857,7 +858,14 @@
            html.append("<td>").append(patternTask.getRawThickness()).append("</td>");
            html.append("<td>").append(patternTask.getColor()).append("</td>");
            html.append("<td>").append(patternTask.getContent()).append("</td>");
            html.append("<td><button style='background-color: #5CADFE' class='btn btn-large btn-success' onclick='updatetask(").append(patternTask.getId()).append(")'>修改数量</button>");
            html.append("<td><button style='background-color: #5CADFE' class='btn btn-large btn-success' onclick='updatetask(")
            .append(patternTask.getId()).append(",")
            .append(patternTask.getRawWidth()).append(",")
            .append(patternTask.getRawHeight()).append(",")
            .append(patternTask.getRawThickness()).append(",")
            .append("\""+patternTask.getColor()+"\"").append(",")
            .append(patternTask.getContent())
            .append(")'>提交产量</button>");
            html.append("</tr>");
        }
            

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/resources/application.properties

@@ -13,7 +13,7 @@
#jdbc.url=jdbc:oracle:thin:@127.0.0.1:1521:XE
#jdbc.username=gmms2
#jdbc.password=gmms2
#jdbc.url=jdbc:mariadb:// localhost:3307 10.12.0.100/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#jdbc.url=jdbc:mariadb:// localhost 10.12.0.100/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#mysql database setting  
jdbc.driver=org.mariadb.jdbc.Driver
jdbc.url=jdbc:mariadb://localhost:3307/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/webapp/WEB-INF/views/cutmanage/gettask.jsp

@@ -137,7 +137,8 @@
                <button id="btnStatcionMode" type='button' class='btn btn-primary' onclick='onChangeMode(${groups})' >单工位</button>
                <small style='color:red'>（单击按钮切换工位模式）</small>
                &nbsp;
            ${app}
            <%-- ${app} --%>
            <button type='button' onclick='task()' class='btn btn-primary' id='app'>手动任务</button>
            <button type="button"
                onclick="{location.href='${ctx }/cutmanage/gettask/${line}'}"
                class="btn btn-primary" id="app">领取 ${line} å·çº¿ä»»åŠ¡</button>

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/webapp/WEB-INF/views/cutmanage/gotasks.jsp

@@ -87,14 +87,11 @@
        var groups = document.getElementsByName('groups')[0].value;
        var state = document.getElementsByName('state')[0].value;
        var fileName = document.getElementById("fileName").innerHTML;
        if(state=="0"&&fileName.includes('P')){
        if(state=="0"){
            window.location.href = "${ctx}/cutmanage/gettasks/" + groups;
        }
        if(state=="1"){
            alert("当前已存在两个任务")
        }
        if(!fileName.includes('P')){
            alert("补片/手动工程请结束任务再领取")
        }
    }
    

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/webapp/WEB-INF/views/cutmanage/gotasks2.jsp

@@ -13,44 +13,54 @@

    //停止页面自动刷新

    function delecttask(id) {
    function delecttask(groups,id) {
        //disableAutoRefresh();
        $.ajax({
            async : false,

            type : "GET",

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

            dataType : "text",

            success : function(data) {
                window.location.href = "${ctx}/cutmanage/gettask/" + id;
                window.location.href = "${ctx}/cutmanage/gettask/" + groups;
            }
        });
        alert(id);
    }

    function delecttask1(id) {
    function delecttask1(groups,id) {
        //disableAutoRefresh();disableAutoRefresh();
        $.ajax({
            async : false,

            type : "GET",

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

            dataType : "text",

            success : function(data) {
                window.location.href = "${ctx}/cutmanage/gettask/" + id;
                window.location.href = "${ctx}/cutmanage/gettask/" + groups;
            }
        });
    }

    function updatetask(id) {
    function updatetask(id,width,height,thinkness,color,count) {
        $("#add-info1").modal('show');
        document.getElementById("width_t").value=width;
        document.getElementById("length_t").value=height;
        document.getElementById("thinkness_t").value=thinkness;
        document.getElementById("color_t").value=color;
		
        rankId=id;
        width_T=width;
        height_T=height;
        thinkness_T=thinkness;
        color_T=color;
        count_T=count;
    }

    function updatetask1(id) {
@@ -117,9 +127,22 @@
    //修改数量
    function addrack1(){
        
         var pieces=document.getElementById("pieces7").value;
         if(pieces==null||pieces==""){
         var width=document.getElementById("width_t").value;
         var length=document.getElementById("length_t").value;
         var thinkness=document.getElementById("thinkness_t").value;
         var color=document.getElementById("color_t").value;
         var count=document.getElementById("count_t").value;
     	
         if(count==null||count==""){
             alert("请输入数量 ");
         }else if(width==null||width==""){
             alert("请输入宽 ");
         }else if(length==null||length==""){
             alert("请输入长 ");
         }else if(thinkness==null||thinkness==""){
             alert("请输入厚 ");
         }else if(color==null||color==""){
             alert("请输入膜系 ");
         }else{
            $.ajax({
                  cache:false,
@@ -128,7 +151,11 @@
                     url:"${ctx}/cutmanage/updatepieces",
                     data:{
                         "rankid":rankId,
                         "pieces":pieces
                         "width":width,
                         "height":length,
                         "thinkness":thinkness,
                         "color":color,
                         "count":count
                     },success:function(data){ 
                           window.location.href="${ctx}/cutmanage/gettask/4";
                      }
@@ -144,6 +171,13 @@
    var group = ${groups};
    var rTime = 5000;
    var rankId=0;
	
	
    var width_T=0;
    var height_T=0;
    var thinkness_T=0;
    var color_T=0;
    var count_T=0;
</script>
<style>
.box table tr th, .box table tr td {
@@ -246,7 +280,6 @@
                            <th>总数量</th>
                            <th>完成面积(mm)</th>
                            <th>操作</th>

                        </tr>
                    </thead>
                    <tbody>${pattertaskHtml}
@@ -264,7 +297,7 @@
                            <th>高度</th>
                            <th>厚度</th>
                            <th>颜色</th>
                            <th>状态</th>
                            <th>数量</th>
                            <th>操作</th>

                        </tr>
@@ -278,30 +311,77 @@
            <div class="modal fade" id="add-info1" tabindex="-1" role="dialog"
                aria-labelledby="myModalLabel" aria-hidden="true">
                <div class="modal-dialog">
                    <div class="modal-content" style="height: 500px;">
                    <div class="modal-content" style="height: 350px;">
                        <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>
                                style="font-weight: bolder;">提交订单产量</h3>
                        </div>
                        
                            <input type="hidden" id="addRawPackage" name="Ids">
                            <div class="modal-body">
                                
                                <div id="linheight" class="form-group">
								
                                <div id="width" 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="number" required="required" max="9000" min="0" class=" sortNumber form-control"
                                            value="" name="width_t" id="width_t"
                                            onclick="this.value=''" style="width: 250px; font-size: 20px" />
                                    </div>
                                </div>
                                <div id="length" 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="number" required="required" max="9000" min="0" class=" sortNumber form-control"
                                            value="" name="length_t" id="length_t"
                                            onclick="this.value=''" style="width: 250px; font-size: 20px" />
                                    </div>
                                </div>
                                <div id="thinkness" 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="number" required="required" max="9000" min="0" class=" sortNumber form-control"
                                            value="" name="thinkness_t" id="thinkness_t"
                                            onclick="this.value=''" style="width: 250px; font-size: 20px" />
                                    </div>
                                </div>
                                <div id="color" 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" required="required" class=" sortNumber form-control"
                                            value="" name="color_t" id="color_t"
                                            onclick="this.value=''" style="width: 250px; font-size: 20px" />
                                    </div>
                                </div>
                                <div id="count" 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="number" required="required" max="9000" min="0" class=" sortNumber form-control"
                                            value="" name="pieces2" id="pieces7"
                                            value="" name="count_t" id="count_t"
                                            onclick="this.value=''" style="width: 250px; font-size: 20px" />
                                    </div>
                                </div>

                            </div>
                            <div class="modal-footer" >
                                <button type="button" class="btn btn-default btn-lg"

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/classes/application.properties

@@ -13,7 +13,7 @@
#jdbc.url=jdbc:oracle:thin:@127.0.0.1:1521:XE
#jdbc.username=gmms2
#jdbc.password=gmms2
#jdbc.url=jdbc:mariadb:// localhost:3307 10.12.0.100/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#jdbc.url=jdbc:mariadb:// localhost 10.12.0.100/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#mysql database setting  
jdbc.driver=org.mariadb.jdbc.Driver
jdbc.url=jdbc:mariadb://localhost:3307/gmms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/cutmanage/gettask.jsp

@@ -137,7 +137,8 @@
                <button id="btnStatcionMode" type='button' class='btn btn-primary' onclick='onChangeMode(${groups})' >单工位</button>
                <small style='color:red'>（单击按钮切换工位模式）</small>
                &nbsp;
            ${app}
            <%-- ${app} --%>
            <button type='button' onclick='task()' class='btn btn-primary' id='app'>手动任务</button>
            <button type="button"
                onclick="{location.href='${ctx }/cutmanage/gettask/${line}'}"
                class="btn btn-primary" id="app">领取 ${line} å·çº¿ä»»åŠ¡</button>

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/cutmanage/gotasks.jsp

@@ -80,18 +80,18 @@
    }
    
    function collectingTasks() {
        stopRefresh();
        if(typeof stopRefresh === "function"){
            stopRefresh();
        }
		
        var groups = document.getElementsByName('groups')[0].value;
        var state = document.getElementsByName('state')[0].value;
        var fileName = document.getElementById("fileName").innerHTML;
        if(state=="0"&&fileName.includes('P')){
        if(state=="0"){
            window.location.href = "${ctx}/cutmanage/gettasks/" + groups;
        }
        if(state=="1"){
            alert("当前已存在两个任务")
        }
        if(!fileName.includes('P')){
            alert("补片/手动工程请结束任务再领取")
        }
    }
    

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/m2e-wtp/web-resources/META-INF/maven/com.northglass/gmms2/pom.properties

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/m2e-wtp/web-resources/META-INF/maven/com.northglass/gmms2/pom.xml

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
#Generated by Maven
#Tue Jun 10 16:39:13 CST 2025
#Wed Jun 11 19:52:31 CST 2025
version=1.0-SNAPSHOT
groupId=com.northglass
artifactId=gmms2

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/layouts/default_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/account/login_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/cutmanage/gettask_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/cutmanage/gotasks_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/error/_404_jsp.java

File was deleted

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/target/tmp/jsp/org/apache/jsp/WEB_002dINF/views/mes/data/public_005fmanage_jsp.java

File was deleted