添加翻新机

watero-rst-web/src/main/webapp/WEB-INF/views/cm/report/customer_picChart.ftl

@@ -33,7 +33,7 @@
 </div>
 <tfoot>
 </tfoot>
-<script type="text/javascript" src="${path}/common/lib/echarts/3.8/echarts.js"></script>
+<#--<script type="text/javascript" src="${path}/common/lib/echarts/3.8/echarts.js"></script>-->
 <script type="text/javascript" src="${path}/common/lib/echarts/3.8/macarons.js"></script>
 <script type="text/javascript" src="${path}/common/lib/echarts/3.8/echarts.common.min.js"></script>
 <script type="text/javascript">

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/addRenovationMachine.ftl

@@ -31,35 +31,45 @@
 <div class="pd-20">
     <form   class="form form-horizontal" id="form-admin-add">
         <div class="input-box">
+            <span class="input-dic spanhidth">产品:</span>
+            <select class="my-select" name="produceId" id="produceId">
+            <#if (produceList ?size > 0)>
+                <#list produceList as list>
+                    <option value ="${list.produceId}">${list.produceName}</option>
+                </#list>
+            <#else >
+                <option value ="">暂无产品，请先添加产品</option>
+            </#if>
+            </select>
+        </div>
+        <div class="input-box">
             <span class="input-dic spanhidth">批次:</span>
             <select class="my-select" name="batchId" id="batchId">
             <#if (listptsBatch ?size > 0)>
                 <#list listptsBatch as list>
-                    <option value ="${list.batchId}" softwareVersionNo="${list.softwareVersionNo!''}" bomName="${list.bomName!''}(${list.bomVersion!''})">${list.batchNo}</option>
+                    <option value ="${list.batchId}">${list.batchNo}</option>
                 </#list>
             <#else >
                 <option value ="">暂无批次，请先添加批次</option>
             </#if>
-            </select>
+            </select><br>
+            <span style="margin-left: 15.5%">请对照生产计划部给到的纸制生产计划信息。</span>
         </div>
         <div class="input-box">
             <span class="input-dic spanhidth">软件版本:</span>
-            <span class="input-dic spanhidth" id="softwareVersionNo" style="width: 76%;text-align: left;padding-left: 10px;    margin-bottom: 10px;height: 30px;"></span>
-        <#-- <input class="my-input" type="text" style="width: 76%;"  name="machineLine" id="machineLine" value="A1"/>-->
-        <#--<select class="my-select" name="versionId" id="versionId">
-        <#if (listVersion ?size > 0)>
-            <#list listVersion as list>
-                <option value ="${list.machineVersionId}">${list.machineVersionName}</option>
-            </#list>
-        <#else >
-            <option value ="">暂无软件版本，请先添加软件版本</option>
-        </#if>
-        </select>-->
+            <select class="my-select" name="versionId" id="versionId">
+            <#if (listVersion ?size > 0)>
+                <#list listVersion as list>
+                    <option value ="${list.machineVersionId}">${list.machineVersionName}</option>
+                </#list>
+            <#else >
+                <option value ="">暂无软件版本，请先添加软件版本</option>
+            </#if>
+            </select>
         </div>
         <div class="input-box">
             <span class="input-dic spanhidth">Bom单:</span>
-            <span class="input-dic spanhidth" id="bomName" style="width: 76%;text-align: left;padding-left: 10px;    margin-bottom: 15px;height: 30px;"></span>
-        <#--<select class="my-select" name="bomId" id="bomId">
+            <select class="my-select" name="bomId" id="bomId">
             <#if listBom??>
                 <#if (listBom ?size > 0)>
                     <#list listBom as list>
@@ -71,7 +81,7 @@
             <#else >
                 <option value ="">暂无Bom，请先添加Bom单</option>
             </#if>
-        </select>-->
+            </select>
         </div>
         <div class="input-box">
             <span class="input-dic" style="margin-top: 0">是否翻新机:</span>
@@ -83,9 +93,7 @@
             </label>
         </div>
 
-        <div class="input-box"><span class="input-dic spanhidth">拉线:</span>
-            <input class="my-input" type="text" style="width: 76%;"  name="machineLine" id="machineLine" value="A1"/>
-        </div>
+        <div class="input-box"><span class="input-dic spanhidth">拉线:</span><input class="my-input" type="text" style="width: 76%;"  name="machineLine" id="machineLine" value="A1"/> </div>
         <div class="input-box"><span class="input-dic spanhidth">机器数量:</span><input class="my-input" type="text" style="width: 76%;"  name="number" id="number" value="4" placeholder="每次最少生成一个机器"/> </div>
         <div class="input-box">如果遇到批次，软件版本，BOM不清晰时，请联系POA（刘经理）</div>
 
@@ -99,33 +107,26 @@
 <#--<script type="text/javascript" src="${path}/common/admin/js/tips.js"></script>-->
 <script type="text/javascript">
 
-    $(function(){
-        var version = $("#batchId").find("option:selected").attr("softwareVersionNo");
-        var bomName = $("#batchId").find("option:selected").attr("bomName");
-        $("#softwareVersionNo").html(version);
-        $("#bomName").html(bomName);
-    })
-
     /*监听批次修改Bom  bom单*/
     $("#batchId").change(function(){
         var batchId = $(this).val();
-        var version = $("#batchId").find("option:selected").attr("softwareVersionNo");
-        var bomName = $("#batchId").find("option:selected").attr("bomName");
-        $("#softwareVersionNo").html(version);
-        $("#bomName").html(bomName);
-        //getBom(batchId);
+        getBom(batchId);
+    });
+    /*监听产品修改批次  bom单*/
+    $("#produceId").change(function(){
+        var produceId = $(this).val();
+        getProduce(produceId);
     });
-
 
     /*获取bom信息，赋值在页面上*/
-    /* function getBom(batchId){
-         var bom = new Object();
-         $.ajax({
-             type: "POST",
-             data: {
-                 batchId : batchId
-             },
-             url: "${path}/admin/machine/select_bom",
+    function getBom(batchId){
+        var bom = new Object();
+        $.ajax({
+            type: "POST",
+            data: {
+                batchId : batchId
+            },
+            url: "${path}/admin/machine/select_bom",
             async: false,
             success: function(data){
                 if (data.returnCode == 200) {
@@ -144,8 +145,40 @@
             });
 
         }
-    }*/
+    }
 
+    /*获取批次信息，赋值在页面上*/
+    function getProduce(produceId){
+        var listptsBatch = new Object();
+        $.ajax({
+            type: "POST",
+            data: {
+                productId : produceId
+            },
+            url: "${path}/admin/machine/select_Batch",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    listptsBatch = data.returnMsg.listptsBatch;
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+            }
+        });
+
+        if(listptsBatch != null){
+            $("#bomId").empty();
+            $("#batchId").empty();
+            $.each(listptsBatch,function(n,value) {
+                if(n == 0){
+                    getBom(value.batchId);
+                }
+                var appoption = "<option value='"+value.batchId+"'>"+value.batchNo+"</option>";
+                $("#batchId").append(appoption);
+            });
+
+        }
+    }
     function dataCharm() {
 
         var batchId = $("#batchId").val();
@@ -154,17 +187,17 @@
             return false;
         }
 
-//         var versionId = $("#versionId").val();
-//         if(versionId == null || versionId == "" || typeof(versionId)=="undefined"){
-//             layer.msg("必须选择一个软件版本，没有软件版本请到产品列表中添加软件版本",{icon: 5,time:3000});
-//             return false;
-//         }
-
-//        var bomId = $("#bomId").val();
-//         if(bomId == null || bomId == "" || typeof(bomId)=="undefined"){
-//             layer.msg("必须选择一个Bom单，没有Bom单请到Bom单列表添加Bom单",{icon: 5,time:3000});
-//             return false;
-//         }
+        var versionId = $("#versionId").val();
+        if(versionId == null || versionId == "" || typeof(versionId)=="undefined"){
+            layer.msg("必须选择一个软件版本，没有软件版本请到产品列表中添加软件版本",{icon: 5,time:3000});
+            return false;
+        }
+
+        var bomId = $("#bomId").val();
+        if(bomId == null || bomId == "" || typeof(bomId)=="undefined"){
+            layer.msg("必须选择一个Bom单，没有Bom单请到Bom单列表添加Bom单",{icon: 5,time:3000});
+            return false;
+        }
 
         var machineLine = $("#machineLine").val();
         if(machineLine == null || machineLine == "" || typeof(machineLine)=="undefined"){