出站汇报单添加流转卡前缀规则;js文件添加退出登录方法;工艺路线明细字段顺序调整;流转卡批量拆分添加单个流转卡字段
9个文件已修改
295 ■■■■ 已修改文件
WebTM/WebTM.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/modules/common.js 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/home/console_pb.html 75 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index_pb.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html 83 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_BatchSplit.html 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -335,6 +335,7 @@
    <Content Include="views\仓存管理\条码报表\Kf_ICInvBalList.html" />
    <Content Include="views\仓存管理\生产入库单\Kf_ProductInBillList.html" />
    <Content Include="views\公共页面\Kf_ChaoBaoEditDlg.html" />
    <Content Include="views\公共页面\Kf_SourceBillEditDlg_PDA.html" />
    <Content Include="views\品质管理\客诉处理\QC_CustomerAppealReport_BadClass.html" />
    <Content Include="views\品质管理\客诉处理\QC_CustomerAppealReport_Material.html" />
    <Content Include="views\品质管理\客诉处理\QC_CustomerAppealReport_Emp.html" />
WebTM/layuiadmin/Scripts/webConfig.js
@@ -10,7 +10,7 @@
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
   /* var WEBURL = "http://localhost:8082/LuBaoAPI/";   //余思杰本地配置*/
    var WEBURL = "http://localhost:8082/LuBaoAPI/";   //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
    //var WEBURL = "http://localhost/API/";             //潘浙游本地配置
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //奥邦
WebTM/layuiadmin/modules/common.js
@@ -38,7 +38,28 @@
        });
      }
    });
  };
    };
    //退出2
    admin.events.logout2 = function () {
        //执行退出接口
        admin.req({
            url: layui.setter.base + 'json/user/logout.js'
            , type: 'get'
            , data: {}
            , done: function (res) { //这里要说明一下:done æ˜¯åªæœ‰ response çš„ code æ­£å¸¸æ‰ä¼šæ‰§è¡Œã€‚而 succese åˆ™æ˜¯åªè¦ http ä¸º 200 å°±ä¼šæ‰§è¡Œ
                //清空本地记录的 token,并跳转到登入页
                admin.exit(function () {
                    //location.href = 'user/login.html';
                    layer.confirm('您确定要退出吗?', { icon: 3, title: '提示' }, function (index) {
                        location.href = 'user/login_pb.html';
                    });
                });
            }
        });
    };
  
  //对外暴露的接口
WebTM/views/home/console_pb.html
@@ -18,69 +18,60 @@
                <div class="layui-col-md6" style="width:100%;margin-left:2.8%;margin-top:2.5%;">
                    <!-- å¿«æ·æ–¹å¼ -->
                    <div class="layui-card">
                        <div class="layui-card-header">快捷方式</div>
                        <div class="layui-card-header">车间快捷方式</div>
                        <div class="layui-card-body">
                            <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 480px;">
                                <div carousel-item="">
                                    <ul class="layui-row layui-col-space10 layui-this">
                                        <li class="layui-col-xs3">
                                            <a lay-href="生产管理/生产计划平台/JIT_DayPlanPlatForm.html">
                                            <a lay-href="生产管理/生产任务单/Sc_ICMOBillList.html">
                                                <i class="layui-icon layui-icon-add-circle"></i>
                                                <cite>生产计划平台</cite>
                                                <cite>生产订单列表</cite>
                                            </a>
                                        </li>
                                        <li class="layui-col-xs3">
                                            <a lay-href="生产管理/生产日计划工单/JIT_DayPlanBillList.html">
                                            <a lay-href="车间管理/工序流转卡/Sc_ProcessExchangeBillList.html">
                                                <i class="layui-icon layui-icon-mike"></i>
                                                <cite>日计划工单列表</cite>
                                                <cite>流转卡列表</cite>
                                            </a>
                                        </li>
                                        <li class="layui-col-xs3">
                                            <a lay-href="IpadIndex.html">
                                            <a lay-href="车间管理/工序出站汇报单/Cj_StationOutBill.html">
                                                <i class="layui-icon layui-icon-theme"></i>
                                                <cite>报工平台</cite>
                                                <cite>工序出站汇报单</cite>
                                            </a>
                                        </li>
                                        <li class="layui-col-xs3">
                                            <a lay-href="设备管理/Sb_EquipDotCheckBillEdit.html">
                                            <a lay-href="车间管理/工序出站汇报单/Cj_StationOutBillList.html">
                                                <i class="layui-icon layui-icon-chart"></i>
                                                <cite>设备点检记录单</cite>
                                                <cite>出站汇报单列表</cite>
                                            </a>
                                        </li>
                                        <li class="layui-col-xs3">
                                            <a lay-href="设备管理/Sb_EquipMaintainBillEdit.html">
                                            <a lay-href="生产管理/生产投料单/Sc_PPBomBillList.html">
                                                <i class="layui-icon layui-icon-app"></i>
                                                <cite>设备保养记录单</cite>
                                                <cite>生产用料清单列表</cite>
                                            </a>
                                        </li>
                                        <li class="layui-col-xs3">
                                            <a lay-href="设备管理/Sb_Add_EqpConkBookBillList.html">
                                            <a lay-href="工资管理/考勤汇报单/Pay_WorkTimesBillEdit.html">
                                                <i class="layui-icon layui-icon-addition"></i>
                                                <cite>设备故障登记单</cite>
                                                <cite>考勤汇报单</cite>
                                            </a>
                                        </li>
                                        <li class="layui-col-xs3">
                                            <a lay-href="设备管理/Sb_Add_EqpRepairCheckBillList.html">
                                            <a lay-href="工资管理/考勤汇报单/Pay_WorkTimesBillList.html">
                                                <i class="layui-icon layui-icon-addition"></i>
                                                <cite>设备维修验收单</cite>
                                                <cite>考勤汇报单列表</cite>
                                            </a>
                                        </li>
                                        <li class="layui-col-xs3">
                                            <a lay-href="生产管理/报工台工序/产量汇报/Sc_ICMOBillWorkQtyStatus_TmpList.html">
                                            <a lay-href="车间管理/关键件绑定/Sc_KeyElementBinding.html">
                                                <i class="layui-icon layui-icon-addition"></i>
                                                <cite>设备产量采集列表</cite>
                                            </a>
                                        </li>
                                    </ul>
                                    <ul class="layui-row layui-col-space10">
                                        <li class="layui-col-xs3">
                                            <a lay-href="生产管理/报工台工序/产量汇报/Sc_ICMOBillQualityStatus_TmpList.html">
                                                <i class="layui-icon layui-icon-addition"></i>
                                                <cite>设备质量采集列表</cite>
                                                <cite>关键件绑定</cite>
                                            </a>
                                        </li>
                                    </ul>
                                    </ul>
                                </div>
                                <div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub"></button><button class="layui-icon layui-carousel-arrow" lay-type="add"></button>
                            </div>
@@ -88,9 +79,9 @@
                    </div>
                </div>
                <div class="layui-col-md6" style="width:100%;margin-left:2.8%;">
                     <!--快捷方式-->
                    <!--快捷方式-->
                    <div class="layui-card">
                        <div class="layui-card-header">快捷方式</div>
                        <div class="layui-card-header">仓库快捷方式</div>
                        <div class="layui-card-body">
                            <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;">
                                <div carousel-item="">
@@ -100,8 +91,28 @@
                                                <i class="layui-icon layui-icon-console"></i>
                                                <cite>外购入库</cite>
                                            </a>
                                        </li>
                                    </ul>-->
                                        </li>
                                    </ul>-->
                                    <ul class="layui-row layui-col-space10">
                                        <li class="layui-col-xs3">
                                            <a lay-href="仓存管理/条码生成/Gy_BarCodeBill.html">
                                                <i class="layui-icon layui-icon-addition"></i>
                                                <cite>条码生成</cite>
                                            </a>
                                        </li>
                                        <li class="layui-col-xs3">
                                            <a lay-href="模治具管理/模治具管理/Gy_BarCodeBillList.html">
                                                <i class="layui-icon layui-icon-addition"></i>
                                                <cite>条码主档列表</cite>
                                            </a>
                                        </li>
                                        <li class="layui-col-xs3">
                                            <a lay-href="基础资料/公用基础资料/Gy_StockPlace_List.html">
                                                <i class="layui-icon layui-icon-addition"></i>
                                                <cite>仓位列表</cite>
                                            </a>
                                        </li>
                                    </ul>
                                </div>
                                <div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub"></button><button class="layui-icon layui-carousel-arrow" lay-type="add"></button>
                            </div>
@@ -113,6 +124,8 @@
    </div>
    <script src="../../layuiadmin/layui/layui.js?t=1"></script>
    <script src="../../layuiadmin/Scripts/webConfig.js"></script>
    <script>
        layui.config({
            base: '../../layuiadmin/' //静态资源所在路径
WebTM/views/index_pb.html
@@ -89,7 +89,7 @@
                        <dl class="layui-nav-child">
                            <!--<dd><a lay-href="set/user/info.html">基本资料</a></dd>-->
                            <dd><a lay-href="set/user/password.html">修改密码</a></dd>
                            <dd layadmin-event="logout" style="text-align: center;"><a>退出</a></dd>
                            <dd layadmin-event="logout2" style="text-align: center;"><a>退出</a></dd>
                        </dl>
                    </li>
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html
@@ -564,11 +564,13 @@
                    , { type: 'numbers', title: '序号', totalRow: true }
                    , { field: 'HProcNo', title: '流水号', edit: 'text' }
                    // , { field: 'HProcID', title: '工序ID', hide: true }//, hide: true
                    , { field: '工序', title: '工序', edit: 'text', event: "CheckHProcID" }//f7
                    , { field: '工作中心代码', title: '工作中心代码', edit: 'text', event: "CheckHCenterID" }//不填
                    , { field: '工序', title: '工序', edit: 'text', event: "CheckHProcID", width: 200 }//f7
                    , { field: '工作中心代码', title: '工作中心代码', edit: 'text', event: "CheckHCenterID", width: 120 }//不填
                    // , { field: 'HCenterID', title: '工作中心id', hide: true }//, hide: true
                    , { field: '工作中心', title: '工作中心' }//f7
                    , { field: 'HTechnologyParameter', title: '工艺参数', edit: 'text' }
                    , { field: '工作中心', title: '工作中心', width: 200 }//f7
                    , { field: 'HTechnologyParameter', title: '工艺参数', edit: 'text', width: 200 }
                    , { field: 'HProcPrice', title: '工序工价', edit: 'text', width: 110 }//默认
                    , { field: 'HWorkQty', title: '加工数量', edit: 'text', totalRow: true, width: 120 }//默认
                    , { field: 'HRemark', title: '备注', edit: 'text' }
                    // , { field: 'HSupID', title: '供应商ID', hide: true }
                    , { field: '供应商代码', title: '供应商代码', edit: 'text', width: 110, event: "CheckHSupID" }
@@ -587,7 +589,6 @@
                    //, { field: 'HPicNum', title: '图纸编号', edit: 'text' }
                    //, { field: 'HTimeUnit', title: '时间单位', edit: 'text' }
                    //, { field: 'HUnitTime', title: '运行时间', edit: 'text' }
                    , { field: 'HWorkQty', title: '加工数量', edit: 'text', totalRow: true, width: 120 }//默认
                    , { field: 'HSNCtrl', title: 'SN过站控制', templet: "#HSNCtrl", width: 120 }
                    , { field: 'HMaterToSourceCtrl', title: '上料防错控制', templet: "#HMaterToSourceCtrl", width:120 }
                    , { field: 'HQCFst', title: '是否首件', templet: "#HQCFst", width: 120 }
@@ -624,8 +625,7 @@
                    //, { field: 'HFlowProc', title: '流转工序', templet: "#HFlowProc" }//chenbox
                    //, { field: 'HSubStdEmpQty', title: '标准人数', edit: 'text' }
                    //, { field: 'HSubCanUseSourceQty', title: '可操作设备数', edit: 'text' }
                    //, { field: 'HFixPrice', title: '班产定额', edit: 'text' }//默认
                    , { field: 'HProcPrice', title: '工序工价', edit: 'text' }//默认
                    //, { field: 'HFixPrice', title: '班产定额', edit: 'text' }//默认
                    //, { field: 'HBadPrice', title: '不合格单价', edit: 'text' }//默认
                    //, { field: 'HWasterPrice', title: '报废单价', edit: 'text' }//默认
                    //, { field: 'HStdFlag', title: '标准定额', templet: "#HStdFlag" }//chenbox
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill.html
@@ -1190,6 +1190,89 @@
                                    getHModel($('#HProcExchHinteID').val(), $('#HProcPlanEntryID').val(), $('#HProcExchBillNo').val());
                                    break;
                                case "P20":
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HICMOInterID": data.hicmointerid,
                                        "HICMOBillNo": data.任务单号,
                                        "HMaterID": data.HMaterID,
                                        "HMaterName": data.产品,
                                        "HMaterNumber": data.产品代码,
                                        "HMaterModel": data.规格型号,
                                        "HPieceQty": data.流转卡数量,
                                        "HPlanQty": data.流转卡数量,
                                        "lngBillKey": data.hmainid,
                                        "HProcExchBillNo": data.单据号,
                                        "HProcExchHinteID": data.hmainid,
                                        "HProcPlanEntryID": data.hsubid,
                                        "HICMOQty": data.任务单数量,
                                        "HOrderProcNO": data.订单跟踪号,
                                        "HPRDOrgID": data.组织
                                    });
                                    //$("#HBarCode").attr("readonly", "readonly");//条形码只读
                                    //$("#HBarCode").css("background-color", "#efefef4d");
                                    HProcExchBillNoFlag = true;
                                    var HProcExchHinteID = $('#HProcExchHinteID').val();
                                    var HInterID = data.hmainid;
                                    //自动匹配流水号
                                    $.ajax({
                                        url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
                                        type: "GET",
                                        data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "Out" },
                                        success: function (data1) {
                                            if (data1.count == 1) {
                                                var data = data1.data[0];
                                                form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                                    "lngBillSubKey": data.hsubid,
                                                    "HProcName": data.工序,
                                                    "HProcID": data.工序ID,
                                                    "HProcNo": data.流水号,
                                                    "HCenterName": data.工作中心,
                                                    "HCenterID": data.HCenterID,
                                                    "NoOutboundHqty": (data.流转卡数量 - data.出站报废关联数量 - data.出站关联数量)
                                                });
                                                if (data.首道工序 == "是") {
                                                    FirstEndHProcNo = 1;
                                                } else if (data.末道工序 == "是") {
                                                    FirstEndHProcNo = 2;
                                                }
                                                $("#HProcNo").attr("readonly", "readonly");
                                                $("#HProcNo").css("background-color", "#efefef4d");
                                            }
                                        }
                                    })
                                    option = {
                                        elem: '#mainTable',
                                        url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
                                        //, cellMinWidth: 80
                                        toolbar: '#toolbarDemo'
                                        , where: { HProcExchHinteID: HProcExchHinteID }
                                        , cols: [[
                                            { type: 'numbers', title: '序号', totalRow: true }
                                            , { field: 'HOrderProcNO', title: '订单跟踪号', edit: 'text' }
                                            , { field: 'hbillno', title: '流转卡号', hide: true }
                                            , { field: 'HICMOBillNo', title: '生产订单号', edit: 'text' }
                                            , { field: '产品代码', title: '产品代码' }
                                            , { field: '产品名称', title: '产品名称', edit: 'text' }
                                            , { field: '流转卡数量', title: '流转卡数量' }
                                            , { field: '流水号', title: '流水号', edit: 'text' }
                                            , { field: '工序名称', title: '工序名称' }
                                            , { field: '工作中心', title: '工作中心' }
                                            , { field: '是否委外', title: '是否委外', edit: 'text' }
                                            , { field: '供应商', title: '供应商' }
                                            , { field: '计划数量', title: '计划数量' }
                                            , { field: '进站数量', title: '进站数量', edit: 'text' }
                                            , { field: '出站数量', title: '出站数量' }
                                        ]]
                                        , height: 500
                                    }
                                    table.render(option)
                                    getHModel($('#HProcExchHinteID').val(), $('#HProcPlanEntryID').val(), $('#HProcExchBillNo').val());
                                    break;
                            }
                            //layer.close(index);
                            //set_InitGrid();
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת/MES_StationOutBill_PDA.html
@@ -821,6 +821,88 @@
                                    }
                                    table.render(option)
                                    break;
                                case "P201":
                                case "P202":
                                case "P203":
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HICMOInterID": data.hicmointerid,
                                        "HICMOBillNo": data.任务单号,
                                        "HMaterID": data.HMaterID,
                                        "HMaterName": data.产品,
                                        "HMaterNumber": data.产品代码,
                                        "HMaterModel": data.规格型号,
                                        "HPieceQty": data.流转卡数量,
                                        "HPlanQty": data.流转卡数量,
                                        "lngBillKey": data.hmainid,
                                        "HProcExchBillNo": data.单据号,
                                        "HProcExchHinteID": data.hmainid,
                                        "HProcPlanEntryID": data.hsubid,
                                        "HICMOQty": data.任务单数量,
                                        "HOrderProcNO": data.订单跟踪号,
                                        "HPRDOrgID": data.组织
                                    });
                                    $("#HProcNo").attr('disabled', 'disabled');
                                    HProcExchBillNoFlag = true;
                                    var HProcExchHinteID = $('#HProcExchHinteID').val();
                                    var HInterID = data.hmainid;
                                    //自动匹配流水号
                                    $.ajax({
                                        url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
                                        type: "GET",
                                        data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "Out" },
                                        success: function (data1) {
                                            if (data1.count == 1) {
                                                var data = data1.data[0];
                                                form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                                    "lngBillSubKey": data.hsubid,
                                                    "HProcName": data.工序,
                                                    "HProcID": data.工序ID,
                                                    "HProcNo": data.流水号,
                                                    "HCenterName": data.工作中心,
                                                    "HCenterID": data.HCenterID,
                                                    "NoOutboundHqty": (data.流转卡数量 - data.出站报废关联数量 - data.出站关联数量)
                                                });
                                                if (data.首道工序 == "是") {
                                                    FirstEndHProcNo = 1;
                                                } else if (data.末道工序 == "是") {
                                                    FirstEndHProcNo = 2;
                                                }
                                                $("#HProcNo").attr("readonly", "readonly");
                                                $("#HProcNo").css("background-color", "#efefef4d");
                                            }
                                        }
                                    })
                                    option = {
                                        elem: '#mainTable',
                                        url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
                                        //, cellMinWidth: 80
                                        toolbar: '#toolbarDemo'
                                        , where: { HProcExchHinteID: HProcExchHinteID }
                                        , cols: [[
                                            { type: 'numbers', title: '序号', totalRow: true }
                                            , { field: 'HOrderProcNO', title: '订单跟踪号', edit: 'text' }
                                            , { field: 'hbillno', title: '流转卡号', hide: true }
                                            , { field: 'HICMOBillNo', title: '生产订单号', edit: 'text' }
                                            , { field: '产品代码', title: '产品代码' }
                                            , { field: '产品名称', title: '产品名称', edit: 'text' }
                                            , { field: '流转卡数量', title: '流转卡数量' }
                                            , { field: '流水号', title: '流水号', edit: 'text' }
                                            , { field: '工序名称', title: '工序名称' }
                                            , { field: '工作中心', title: '工作中心' }
                                            , { field: '是否委外', title: '是否委外', edit: 'text' }
                                            , { field: '供应商', title: '供应商' }
                                            , { field: '计划数量', title: '计划数量' }
                                            , { field: '进站数量', title: '进站数量', edit: 'text' }
                                            , { field: '出站数量', title: '出站数量' }
                                        ]]
                                        , height: 500
                                    }
                                    table.render(option)
                                    break;
                            }
                            switch (barNo) {
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill_BatchSplit.html
@@ -283,6 +283,7 @@
                        , { field: 'HQty', title: '订单总数', width: 110 }
                        , { field: 'HFinishQty', title: '已生成流转卡数', width: 130 }
                        , { field: 'HUsableQty', title: '剩余可用数量', width: 130 }
                        , { field: 'HLotcardQty', title: '单张流转卡数', width: 130 }
                        , { field: 'HProQty', title: '流转卡数量', width: 110, edit: 'text' }
                        , { field: 'HBatchNo', title: '批号', width: 110, edit: 'text' }
                        , { field: 'HGroupNumber', title: '班组', width: 110, edit: 'text' }
@@ -300,7 +301,7 @@
                //初始表格数据
                var rowdata = [{
                    "HICMOInterID": 0, "HICMOEntryID": 0, "HICMOBillNo": "", "HWorkShopID": 0, "HMaterID": 0, "物料代码": ""
                    , "物料名称": "", "规格型号": "", "HQty": 0, "HFinishQty": 0, "HUsableQty": 0
                    , "物料名称": "", "规格型号": "", "HQty": 0, "HFinishQty": 0, "HUsableQty": 0, "HLotcardQty": 0
                    , "HProQty": 0, "HRoutingInterID": 0, "HRoutingName": "", "HSheetQty": 0
                    , "HInterID": 0, "HBillNo": "", "HBatchNo": "", "HBatchManager": "", "HGroupNumber": ""
                }];
@@ -343,9 +344,10 @@
                                        , "HWorkShopID": subdata[i].HWorkShopID, "HMaterID": subdata[i].HMaterID, "物料代码": subdata[i].物料代码
                                        , "物料名称": subdata[i].物料名称
                                        , "规格型号": subdata[i].规格型号, "HQty": subdata[i].HQty, "HFinishQty": subdata[i].HFinishQty
                                        , "HUsableQty": subdata[i].HUsableQty, "HProQty": subdata[i].HProQty, "HRoutingInterID": subdata[i].HRoutingInterID
                                        , "HRoutingName": subdata[i].HRoutingName, "HSheetQty": subdata[i].HSheetQty, "HDate": formatDate(subdata[i].HDate)
                                        , "HInterID": HInterID, "HBillNo": HBillNo, "HBatchNo": "", "HBatchManager": subdata[i].是否启用批次, "HGroupNumber": ""
                                        , "HUsableQty": subdata[i].HUsableQty, "HLotcardQty": subdata[i].HLotcardQty, "HProQty": subdata[i].HProQty
                                        , "HRoutingInterID": subdata[i].HRoutingInterID, "HRoutingName": subdata[i].HRoutingName, "HSheetQty": subdata[i].HSheetQty
                                        , "HDate": formatDate(subdata[i].HDate), "HInterID": HInterID, "HBillNo": HBillNo, "HBatchNo": subdata[i].HBatchNo
                                        , "HBatchManager": subdata[i].是否启用批次, "HGroupNumber": ""
                                    }
                                )
                            }
@@ -369,6 +371,7 @@
                                    , { field: 'HQty', title: '订单总数', width: 110 }
                                    , { field: 'HFinishQty', title: '已生成流转卡数', width: 130 }
                                    , { field: 'HUsableQty', title: '剩余可用数量', width: 130 }
                                    , { field: 'HLotcardQty', title: '单张流转卡数', width: 130 }
                                    , { field: 'HProQty', title: '流转卡数量', width: 110, edit: 'text' }
                                    , { field: 'HBatchNo', title: '批号', width: 110, edit: 'text' }
                                    , { field: 'HGroupNumber', title: '班组', width: 110, edit: 'text' }
@@ -482,7 +485,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ["../../计划管理/工艺路线/Gy_RoutingBillList.html", "yes"]
                                , content: ['../../计划管理/工艺路线/Gy_RoutingBillList.html?HMaterID=' + obj.data.HMaterID + '&HProID=' + 0, 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调