界面上快捷方式工艺路线列表模块改成工艺路线查询模块。 物料列表增加字段显示这个物料有没有工艺路线。 工艺路线新增的时候选择物料的弹框增加物料代码对的过...

yangle

2023-05-06 292e2a1444cf753321cd629c4d296842a167e426

界面上快捷方式工艺路线列表模块改成工艺路线查询模块。
物料列表增加字段显示这个物料有没有工艺路线。
工艺路线新增的时候选择物料的弹框增加物料代码对的过滤条件。
工艺路线新增点击上一行下一行，点了之后选中的工序就不选中了。上下移动的时候，流水号不变
物料列表能不能根据物料流水号从大到小排序。
物料新增模块的备注字段名改成白坯要求，流转卡新增模块的备注2改成白坯要求
物料分类批量刷新。物料代码开头 WB代表纬编  QF代表经编  YM代表羊毛
生产订单新增：生产车间隐藏
物料新增主计量单位默认是米
工艺路线复制之后，选择物料，工艺路线名称不会自己改变。（改成物料代码）
"生产订单列表排序
日期 单据号 产品物料代码 客户 业务员 门幅 规格 生产数量  计量单位 是否下推生成流转卡 制单人  制单日期 "
生产订单列表。字段框能不能自适应，自己根据数据内容调节大小
日期 单据号 产品物料 代码 客户 业务员 门幅 克重  规格 生产数量  计量单位  制单人  制单日期

 WebTM/views/home/console_QiaoYi.html

@@ -68,9 +68,9 @@
                                                </a>
                                            </li>
                                            <li class="layui-col-xs3">
                                                <a lay-href="计划管理/工艺路线/Gy_RoutingBillList.html">
                                                <a lay-href="计划管理/工艺路线/Gy_RoutingBillListQuery.html">
                                                    <i class="layui-icon layui-icon-addition"></i>
                                                    <cite>工艺路线列表</cite>
                                                    <cite>工艺路线查询</cite>
                                                </a>
                                            </li>
                                        </ul>
@@ -133,9 +133,9 @@
                                                </a>
                                            </li>
                                            <li class="layui-col-xs3">
                                                <a lay-href="计划管理/工艺路线/Gy_RoutingBillList.html">
                                                <a lay-href="计划管理/工艺路线/Gy_RoutingBillListQuery.html">
                                                    <i class="layui-icon layui-icon-addition"></i>
                                                    <cite>工艺路线列表</cite>
                                                    <cite>工艺路线查询</cite>
                                                </a>
                                            </li>
                                        </ul>

 WebTM/views/index_QiaoYi.html

@@ -931,7 +931,7 @@
                                    <a>公用资料</a>
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="基础资料/公用基础资料/Gy_Material.html">物料列表</a></dd>
                                        <!-- <dd><a lay-href="基础资料/公用基础资料/Gy_MaterType.html">物料分类列表</a></dd> -->
                                         <dd><a lay-href="基础资料/公用基础资料/Gy_MaterType.html">物料分类列表</a></dd> 
                                        <dd><a lay-href="基础资料/公用基础资料/Gy_Warehouse.html">仓库列表</a></dd>
                                        <!-- <dd><a lay-href="基础资料/公用基础资料/Gy_WorkStationList.html">工位列表</a></dd> -->
                                        <!-- <dd><a lay-href="基础资料/公用基础资料/Gy_StockPlace_List.html">仓位列表</a></dd> -->

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_Material.html

@@ -143,8 +143,8 @@
                                                    <label class="layui-form-label"> ç‰©æ–™åˆ†ç±»ï¼š</label>
                                                    <div class="layui-input-inline">
                                                        <input type="text" readonly name="HMaterClsName" id="HMaterClsName" class="layui-input" value="" style="float: left; width: 100px;">
                                                        <input type="hidden" name="HMaterClsID" id="HMaterClsID" class="layui-input" value="0" style="float:left;width:150px;">
                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHMaterClsID" id="btnHMaterClsID" style="width:40px;">
                                                        <input type="hidden" name="HMaterTypeID" id="HMaterTypeID" class="layui-input" value="0" style="float:left;width:150px;">
                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHMaterTypeID" id="btnHMaterTypeID" style="width:40px;">
                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                        </button>
                                                    </div>
@@ -155,7 +155,7 @@
                                                    <div class="layui-input-inline">
                                                        <div class="layui-form">
                                                            <div class="layui-form-item">
                                                                <select name="HMaterTypeID" id="HMaterTypeID" lay-verify="HMaterTypeID">
                                                                <select name="HMaterClsID" id="HMaterClsID" lay-verify="HMaterClsID">
                                                                    <option value="1" selected>外购</option>
                                                                    <option value="2">自制</option>
                                                                    <option value="3">委外</option>
@@ -171,7 +171,7 @@
                                           
                                            <div class="layui-row">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label"> å¤‡æ³¨ï¼š</label>
                                                    <label class="layui-form-label"> ç™½å¯è¦æ±‚：</label>
                                                    <div class="layui-input-inline ">
                                                        <textarea placeholder="请输入维备注" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
                                                    </div>
@@ -622,7 +622,9 @@
                    var data2 = JSON.parse(data);
                    $("#HWhID").val(data2["HWhID"]);
                    $("#HWhName").val(data2["HWhName"]);
                    $("#HMaterTypeID").val(data2["HMaterTypeID"]);
                    $("#HMaterClsID").val(data2["HMaterClsID"]);
                    $("#HUnitID").val(data2["HUnitID"]);
                    $("#HUnitName").val(data2["HUnitName"]);
                    form.render('select');
                }
            }
@@ -634,7 +636,9 @@
                var data = {
                    HWhID: $("#HWhID").val()
                    , HWhName: $("#HWhName").val()
                    , HMaterTypeID: $("#HMaterTypeID").val()
                    , HMaterClsID: $("#HMaterClsID").val()
                    , HUnitID: $("#HUnitID").val()
                    , HUnitName: $("#HUnitName").val()
                }
                //本地存储
                localStorage.setItem("Add_Edit_Gy_Material", JSON.stringify(data));
@@ -676,9 +680,9 @@
                                , "HSubjoin": data.附加属性1
                                , "HSubjoin2": data.附加属性2
                                , "HColor": data.颜色
                                , "HMaterClsID": data.HMaterClsID
                                , "HMaterTypeID": data.HMaterTypeID
                                , "HMaterClsName": data.物料分类
                                , "HMaterTypeID": data.物料属性 == "0" ? 1 : data.物料属性
                                , "HMaterClsID": data.物料属性 == "0" ? 1 : data.物料属性
                                , "HWhID": data.默认仓库
                                , "HWhName": data.仓库名称
                                , "HSPGroupID": data.默认仓位组
@@ -1052,7 +1056,7 @@
            });

            //选择物料分类
            form.on('submit(btnHMaterClsID)', function () {
            form.on('submit(btnHMaterTypeID)', function () {
                layer.open({
                    type: 2
                    , area: ['90%', '90%']//大小
@@ -1073,7 +1077,7 @@
                            return layer.msg('请选择一条数据');
                        }
                        $("#HMaterClsName").val(checkStatus.data[0].名称);
                        $("#HMaterClsID").val(checkStatus.data[0].HItemID);
                        $("#HMaterTypeID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/HBarPlanPrint.html

@@ -176,7 +176,7 @@
                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_QK_PackingBillList.aspx?typename='" + OpenTmp + "'&linterid=" + value, true, "");
                break;
            case "HProcessExchange"://工序流转卡
                var ListTrue = value.split(',');
                var ListTrue = value.split('|');
                if (ListTrue[1] == 0) {
                    CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp  + ".grf", "xmlLBM_Sc_ProcessExchangeBillList.aspx?linterid=" + ListTrue[0], true, "");
                } else {

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_Sc_ProcessExchangeBillList.aspx

@@ -14,7 +14,7 @@
            //OledbXMLReportData适合于Access等本地数据库，为了演示方便，这里从Grid++Report的Access例子数据库中获取报表数据

            //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
            SqlXMLReportData.GenEntireData(this, "select  b.流水号,a.拆分号,a.流转卡数量,a.产品代码,a.单据号,a.产品规格,a.产品名称,a.日期,a.计划完工日期,a.单据号,b.工序名称,b.模具编号,b.工艺参数,b.加工说明,a.幅宽,a.克重,a.备注2,a.底部备注,a.客户,a.业务员,a.毛高,a.寸数组织,a.全毛长,a.坯布密度,a.毛纱名称及规格,a.底丝,a.定型浆料,a.交货日期,a.染色要求 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid   where b.hmainid="+Request.Params["linterid"] +"order by cast(b.流水号 as int)","select 1");
            SqlXMLReportData.GenEntireData(this, "select  cast((cast( b.流水号 as float)/10) as decimal(6,1)) æµæ°´å·,生产订单号,a.生产数量,a.拆分号,a.流转卡数量,a.交货日期,a.产品代码,a.单据号,a.产品规格,a.产品名称,a.日期,a.计划完工日期,a.单据号,b.工序名称,b.模具编号,b.工艺参数,b.加工说明,a.幅宽,a.克重,a.备注2,a.底部备注,a.客户,a.业务员,a.毛高,a.寸数组织,a.全毛长,a.坯布密度,a.毛纱名称及规格,a.底丝,a.辅数量,a.辅助单位,a.定型浆料,a.交货日期,a.染色要求 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid   where b.hmainid in("+Request.Params["linterid"]+")    order by cast(b.流水号 as int)","select 1");
        }
    </script>
</head>

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillEdit_NoTable.html

@@ -80,7 +80,7 @@
                                                <input type="hidden" name="HSTOCKINORGID" id="HSTOCKINORGID" lay-verify="HSTOCKINORGID">
                                            </div>
                                        </div>
                                        

                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">日期*</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
@@ -110,16 +110,7 @@
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">生产车间</label>
                                            <div class="layui-input-block" style="margin-left: 71px;">
                                                <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>


                                        <div class="layui-inline" style="width: 51%;">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">客户</label>
@@ -384,6 +375,18 @@
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">生产车间</label>
                                            <div class="layui-input-block" style="margin-left: 71px;">
                                                <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
@@ -437,7 +440,7 @@
                    }
                });
            }
            else if (OperationType==2) {
            else if (OperationType == 2) {
                RoadBillMain(linterid);
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
@@ -759,9 +762,9 @@
                        $("#HModel").val(checkStatus.data[0].规格型号);
                        $("#HUnitID").val(checkStatus.data[0].HUnitID);//计量单位id
                        $("#HUnitName").val(checkStatus.data[0].计量单位名称);//计量单位名称
                        $("#HWidth").val(checkStatus.data[0].HWidth);//幅宽
                        $("#HWeight").val(checkStatus.data[0].HWeight);//克重
                        $("#HColorRemark").val(checkStatus.data[0].染色要求);//克重
                        $("#HWidth").val(checkStatus.data[0].幅宽);//幅宽
                        $("#HWeight").val(checkStatus.data[0].克重);//克重
                        $("#HColorRemark").val(checkStatus.data[0].染色要求);//染色要求
                        $("#HRemark").val(checkStatus.data[0].备注);//备注
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
@@ -900,7 +903,7 @@
                            ////$('#set_CancelCloseBill').removeClass("layui-btn-disabled").attr("disabled", false);
                            //$('#set_CancelltionBill').removeClass("layui-btn-disabled").attr("disabled", false);
                            ////$('#set_AbandonCancelltion').removeClass("layui-btn-disabled").attr("disabled", false);
                           

                        }
                        else {
                            layer.close(index);
@@ -992,17 +995,17 @@
                            , "HWeight": d.data[0].HWeight
                            , "HColorRemark": d.data[0].染色要求
                            //其他信息
                            , "hmakers": OperationType == 2 ? "" :d.data[0].制单人
                            , "hmakers": OperationType == 2 ? "" : d.data[0].制单人
                            , "hmakedate": OperationType == 2 ? "" : d.data[0].制单日期 == null ? "" : Format(new Date(d.data[0].制单日期), "yyyy-MM-dd")
                            , "hchecker": OperationType == 2 ? "" :d.data[0].审核人
                            , "hchecker": OperationType == 2 ? "" : d.data[0].审核人
                            , "hcheckdate": OperationType == 2 ? "" : d.data[0].审核日期 == null ? "" : Format(new Date(d.data[0].审核日期), "yyyy-MM-dd")
                            , "hupdater": OperationType == 2 ? "" : d.data[0].修改人
                            , "hupdatedate": OperationType == 2 ? "" :d.data[0].修改日期 == null ? "" : Format(new Date(d.data[0].修改日期), "yyyy-MM-dd")
                            , "hupdatedate": OperationType == 2 ? "" : d.data[0].修改日期 == null ? "" : Format(new Date(d.data[0].修改日期), "yyyy-MM-dd")
                            , "hdeleteman": OperationType == 2 ? "" : d.data[0].作废人
                            , "hdeletedate": OperationType == 2 ? "" :d.data[0].作废日期 == null ? "" : Format(new Date(d.data[0].作废日期), "yyyy-MM-dd")
                            , "hdeletedate": OperationType == 2 ? "" : d.data[0].作废日期 == null ? "" : Format(new Date(d.data[0].作废日期), "yyyy-MM-dd")
                        });
                        form.render('select');
                       

                    }
                })
            }
@@ -1295,7 +1298,7 @@
                //    layer.msg("BOM没有选择");
                //    return false;
                //}
              


                return true;
            }

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -56,9 +56,9 @@
                                        <div class="layui-input-block" style="margin-top:10px">
                                            <select name="HSF" id="HSF" lay-verify="required" lay-search class="layui-input">
                                                <!--  <option value="全部">全部</option>-->
                                                <option value="全部">全部</option>
                                                <option value="全部" selected="selected">全部</option>
                                                <option value="已下推">已下推</option>
                                                <option value="未下推" selected="selected">未下推</option>
                                                <option value="未下推" >未下推</option>
                                            </select>
                                        </div>
                                    </div>
@@ -175,7 +175,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill"><i class="layui-icon layui-icon-form"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck"><i class="layui-icon layui-icon-form"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Excel"><i class="layui-icon layui-icon-file-b"></i>Excel导入</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Excel"><i class="layui-icon layui-icon-file-b"></i>Excel导入</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                            </div>
@@ -426,67 +426,71 @@
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    //, cellMinWidth: 90
                    , cellMinWidth: 'auto'
                    , totalRow: true
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        { type: 'checkbox', fixed: 'left', totalRowText: '合计' }
                        , { field: 'hmainid', title: 'hmainid', sort: true, width: 165, hide: true }
                        , { field: 'HEntryID', title: 'HEntryID', sort: true, width: 165, hide: true }
                        , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                        , { field: 'HEntryID', title: 'HEntryID', sort: true, hide: true }
                        , { field: '日期', title: '日期' }
                        , { field: '单据号', title: '单据号', sort: true, width: 170 }
                        , { field: '产品代码', title: '产品代码', width: 160 }
                        , { field: '产品名称', title: '产品名称', width: 160 }
                        , { field: '规格型号', title: '规格型号', width: 215 }
                        , { field: '状态', title: '状态', sort: true, width: 170 }
                        , { field: '唯一ID', title: '唯一ID', sort: true, width: 170 }
                        , { field: '是否下推生成流转卡', title: '是否下推生成流转卡', sort: true, width: 170 }
                        , { field: '生产车间代码', title: '生产车间代码', width: 115 }
                        , { field: '生产车间', title: '生产车间', width: 115 }
                        , { field: '生产任务单数量', title: '生产订单数量', width: 115, totalRow: true }
                        , { field: '包装标识代码', title: '包装标识代码', width: 115 }
                        , { field: '包装标识', title: '包装标识', width: 115 }
                        , { field: '计量单位代码', title: '计量单位代码', width: 115 }
                        , { field: '单据号', title: '单据号', sort: true }
                        , { field: '产品代码', title: '产品代码' }
                        , { field: '产品名称', title: '产品名称'}
                        , { field: '客户', title: '客户' }
                        , { field: '业务员', title: '业务员' }
                        , { field: 'HWidth', title: '门幅' }
                        , { field: '规格型号', title: '规格型号' }
                        , { field: '生产任务单数量', title: '生产订单数量', totalRow: true }
                        , { field: '计量单位', title: '计量单位' }
                        , { field: '是否下推生成流转卡', title: '是否下推生成流转卡', sort: true }
                        , { field: '制单人', title: '制单人' }
                        , { field: '制单日期', title: '制单日期' }
                        , { field: '状态', title: '状态', sort: true }
                        //, { field: '计量单位代码', title: '计量单位代码', width: 115 }
                        , { field: 'HAuxQty', title: '辅数量' }
                        , { field: 'HAuxUnitName', title: '辅助单位' }
                        , { field: '计划开工日期', title: '计划开工日期' }
                        , { field: '计划完工日期', title: '计划完工日期' }
                        , { field: '最迟开工日期', title: '最迟开工日期' }
                        , { field: '最迟完工日期', title: '最迟完工日期' }
                        , { field: '齐套数量', title: '齐套数量' }
                        , { field: '计划生产数量', title: '计划生产数量' }
                        , { field: '关联数量', title: '关联数量' }
                        , { field: '未关联数量', title: '未关联数量' }
                        , { field: '表头备注', title: '表头备注' }
                        , { field: '制单人', title: '制单人' }
                        , { field: '制单日期', title: '制单日期' }
                        , { field: '审核人', title: '审核人' }
                        , { field: '审核日期', title: '审核日期' }
                        , { field: '修改人', title: '修改人' }
                        , { field: '修改日期', title: '修改日期' }
                        , { field: '关闭人', title: '关闭人' }
                        , { field: '关闭日期', title: '关闭日期' }
                        , { field: '唯一ID', title: '唯一ID', sort: true, }
                        , { field: '生产车间代码', title: '生产车间代码'  }
                        , { field: '生产车间', title: '生产车间',  }
                        , { field: '包装标识代码', title: '包装标识代码' }
                        , { field: '包装标识', title: '包装标识',  }
                        , { field: '齐套数量', title: '齐套数量' }
                        , { field: '计划生产数量', title: '计划生产数量' }
                        , { field: '关联数量', title: '关联数量' }
                        , { field: '未关联数量', title: '未关联数量' }
                        , { field: '表头备注', title: '表头备注' }
                        //, { field: '作废人', title: '作废人', hide: true }
                        //, { field: '作废日期', title: '作废日期', hide: true }
                        //, { field: '销售订单日期', title: '销售订单日期', sort: true, width: 120, hide: true }
                       
                        , { field: '销售订单日期', title: '销售订单日期', sort: true, width: 200 }
                        , { field: '销售订单编号', title: '销售订单编号', sort: true, width: 200 }
                        , { field: '销售物料名称', title: '销售物料名称', sort: true, width: 200 }
                        , { field: '包装方式', title: '包装方式', sort: true, width: 150 }
                        , { field: '销售数量', title: '销售数量', sort: true, width: 150 }
                        , { field: '销售订单联系人', title: '销售订单联系人', sort: true, width: 150 }
                        , { field: '业务状态', title: '业务状态', sort: true, width: 150 }
                        , { field: '销售订单日期', title: '销售订单日期', sort: true  }
                        , { field: '销售订单编号', title: '销售订单编号', sort: true }
                        , { field: '销售物料名称', title: '销售物料名称', sort: true }
                        , { field: '包装方式', title: '包装方式', sort: true }
                        , { field: '销售数量', title: '销售数量', sort: true }
                        , { field: '销售订单联系人', title: '销售订单联系人', sort: true }
                        , { field: '业务状态', title: '业务状态', sort: true }
                        //, { field: '订单跟踪号', title: '订单跟踪号', sort: true, width: 120, hide: true }
                        //, { field: 'HDeptID', title: 'HDeptID', hide: true}
                        //, { field: 'HMaterID', title: 'HMaterID', hide: true }
                        //, { field: 'hunitid', title: 'hunitid', hide: true }
                        //, { field: 'hempid', title: 'hempid' , hide: true}
                        //, { field: '业务员代码', title: '业务员代码', width: 100, hide: true}
                        //, { field: '业务员', title: '业务员', hide: true}
                       
                        //, { field: 'hcusid', title: 'hcusid', hide: true }
                        //, { field: '客户代码', title: '客户代码', hide: true }
                        //, { field: '客户', title: '客户', hide: true }
                      
                        //, { field: 'HCenterID', title: 'HCenterID' , hide: true}
                        //, { field: '工作中心代码', title: '工作中心代码', hide: true}
                        //, { field: '工作中心', title: '工作中心', hide: true}
@@ -504,6 +508,22 @@
                        //, { field: '单据类型', title: '单据类型', hide: true}
                        //, { field: '计划跟踪号', title: '计划跟踪号', hide: true}
                    ]]
                    , done: function (res, curr, count) {
                        var $data = $('div[lay-id="mainTable"]').find('.layui-table-body').find('tr').eq(0).find('td');
                        var $head = $('div[lay-id="mainTable"]').find('.layui-table-header').find('tr').eq(0).find('th');
                        var $total = $('div[lay-id="mainTable"]').find('.layui-table-total').find('tr').eq(0).find('td');
                        for (var i = 0; i < $data.length; i++) {
                            var l1 = $data.eq(i).find('div').width();
                            var l2 = $head.eq(i).find('div').width();
                            if (l1 > l2) {
                                $head.eq(i).find('div').width(l1);
                                $total.eq(i).find('div').width(l1);
                            } else {
                                $data.eq(i).find('div').width(l2);
                                $total.eq(i).find('div').width(l2);
                            }
                        }
                    }
                };
            }


 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html

@@ -1153,7 +1153,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '物料表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_MaterialList_LSQP.html', 'yes']
                    , content: ['../../Baseset/基础资料/Gy_MaterialList.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1169,7 +1169,7 @@
                        $("#HUnitID").val(checkStatus.data[0].HUnitID);//计量单位id
                        $("#HUnitName").val(checkStatus.data[0].HUnitName);//计量单位名称
                        if ($("#HName").val() == "") {
                            $("#HName").val(checkStatus.data[0].HNumber + '/' + checkStatus.data[0].HName + '/' + checkStatus.data[0].HModel);
                            $("#HName").val(checkStatus.data[0].HNumber);
                        }

                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
@@ -2094,6 +2094,7 @@
                    for (var i = 0; i < option.data.length; i++) {
                        if (option.data[i]["HProcNo"] == data[0]["HProcNo"]) {
                            tables.push(option.data[i - 1]);
                            data[0].LAY_CHECKED = true;
                            option.data[i - 1] = data[0];
                            option.data[i] = tables[0];
                            table.render(option);
@@ -2114,6 +2115,7 @@
                    for (var i = 0; i < option.data.length; i++) {
                        if (option.data[i]["HProcNo"] == data[0]["HProcNo"]) {
                            tables.push(option.data[i + 1]);
                            data[0].LAY_CHECKED = true;
                            option.data[i + 1] = data[0];
                            option.data[i] = tables[0];
                            table.render(option);

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill.html

@@ -94,17 +94,17 @@
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs3 layui-inline">
        <label class="layui-form-label">订单跟踪号</label>
        <div class="layui-input-inline">
            <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
        </div>
    </div>-->
                    <label class="layui-form-label">订单跟踪号</label>
                    <div class="layui-input-inline">
                        <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
                    </div>
                </div>-->
                                        <!--<div class="layui-col-xs3 layui-inline">
        <label class="layui-form-label">图号版本</label>
        <div class="layui-input-inline">
            <input type="text" class="layui-input" name="HPicNumVer" id="HPicNumVer" style="background-color:#efefef4d;" readonly>
        </div>
    </div>-->
                    <label class="layui-form-label">图号版本</label>
                    <div class="layui-input-inline">
                        <input type="text" class="layui-input" name="HPicNumVer" id="HPicNumVer" style="background-color:#efefef4d;" readonly>
                    </div>
                </div>-->
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs3 layui-inline">
@@ -113,8 +113,8 @@
                                                <input type="text" class="layui-input" name="HMaterName2" id="HMaterName2" onmouseover="this.title=this.value" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="hidden" name="HMaterID2" id="HMaterID2" value="0">
                                                <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater2" id="btnSearchMater2" style="width: 40px;">
                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                </button>-->
                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                        </button>-->
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
@@ -130,11 +130,11 @@
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs3 layui-inline">
            <label class="layui-form-label">总装图号</label>
            <div class="layui-input-inline">
                <input type="text" class="layui-input" name="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
            </div>
        </div>-->
                    <label class="layui-form-label">总装图号</label>
                    <div class="layui-input-inline">
                        <input type="text" class="layui-input" name="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
                    </div>
                </div>-->
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs3 layui-inline">
@@ -158,33 +158,33 @@
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs3 layui-inline">
            <label class="layui-form-label">材质</label>
            <div class="layui-input-inline">
                <input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
            </div>
        </div>-->
                    <label class="layui-form-label">材质</label>
                    <div class="layui-input-inline">
                        <input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
                    </div>
                </div>-->
                                    </div>
                                    <div class="layui-row">
                                        <!--<div class="layui-col-xs3 layui-inline">
            <label class="layui-form-label">计划开工日期</label>
            <div class="layui-input-inline">
                <input type="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;">
            </div>
        </div>
        <div class="layui-col-xs3 layui-inline">
            <label class="layui-form-label">计划完工日期</label>
            <div class="layui-input-inline">
                <input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px;">
            </div>
        </div>-->
                    <label class="layui-form-label">计划开工日期</label>
                    <div class="layui-input-inline">
                        <input type="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;">
                    </div>
                </div>
                <div class="layui-col-xs3 layui-inline">
                    <label class="layui-form-label">计划完工日期</label>
                    <div class="layui-input-inline">
                        <input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px;">
                    </div>
                </div>-->

                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">选单号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="textBox2" id="textBox2" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
                                                <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="width: 40px;">
                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                </button>-->
                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                        </button>-->
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
@@ -205,29 +205,29 @@
                                        </div>

                                        <!--<div class="layui-col-xs3 layui-inline">
            <label class="layui-form-label">成品编号</label>
            <div class="layui-input-inline">
                <input type="text" class="layui-input" name="HProductNum" id="HProductNum" onmouseover="this.title=this.value">
            </div>
        </div>-->
                    <label class="layui-form-label">成品编号</label>
                    <div class="layui-input-inline">
                        <input type="text" class="layui-input" name="HProductNum" id="HProductNum" onmouseover="this.title=this.value">
                    </div>
                </div>-->
                                    </div>

                                    <div class="layui-row">
                                        <!--<div class="layui-col-xs6 layui-inline">
            <label class="layui-form-label" style="width:12.5%">备注</label>
            <div class="layui-input-inline">
                <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="请输入内容" onmouseover="this.title=this.value" style="width:610px;">
            </div>
        </div>
        <div class="layui-col-xs3 layui-inline">
            <label class="layui-form-label">日计划工单选单号</label>
            <div class="layui-input-inline">
                <input type="text" class="layui-input" name="HWorkBillSortNo" id="HWorkBillSortNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkBillSort" id="btnSearchWorkBillSort" style="width: 40px;">
                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                </button>
            </div>
        </div>-->
                    <label class="layui-form-label" style="width:12.5%">备注</label>
                    <div class="layui-input-inline">
                        <input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="请输入内容" onmouseover="this.title=this.value" style="width:610px;">
                    </div>
                </div>
                <div class="layui-col-xs3 layui-inline">
                    <label class="layui-form-label">日计划工单选单号</label>
                    <div class="layui-input-inline">
                        <input type="text" class="layui-input" name="HWorkBillSortNo" id="HWorkBillSortNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkBillSort" id="btnSearchWorkBillSort" style="width: 40px;">
                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                        </button>
                    </div>
                </div>-->
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">辅数量</label>
                                            <div class="layui-input-inline">
@@ -241,6 +241,21 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">分缸号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HSplitColorQty" id="HSplitColorQty" style="float: left;" value="0">
                                            </div>
                                        </div>

                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">拆分总量</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HSplitSumQty" id="HSplitSumQty" style="float: left;" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">辅助单位</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HAuxUnitName" id="HAuxUnitName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
@@ -250,26 +265,27 @@
                                                </button>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <!--<div class="layui-col-xs3 layui-inline">
        <label class="layui-form-label">补料原因</label>
        <div class="layui-input-inline">
            <input type="text" class="layui-input" name="HExplanation" id="HExplanation" placeholder="请输入内容" onmouseover="this.title=this.value">
        </div>
    </div>-->
                    <label class="layui-form-label">补料原因</label>
                    <div class="layui-input-inline">
                        <input type="text" class="layui-input" name="HExplanation" id="HExplanation" placeholder="请输入内容" onmouseover="this.title=this.value">
                    </div>
                </div>-->
                                        <!--<div class="layui-col-xs3 layui-inline">
        <label class="layui-form-label">补料标记</label>
        <div class="layui-input-block">
            <input type="checkbox" name="HBLFlag" id="HBLFlag" lay-skin="primary" title="" checked="">
        </div>
    </div>-->
                    <label class="layui-form-label">补料标记</label>
                    <div class="layui-input-block">
                        <input type="checkbox" name="HBLFlag" id="HBLFlag" lay-skin="primary" title="" checked="">
                    </div>
                </div>-->
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">克重</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HWeight" id="HWeight" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
                                            </div>
                                        </div>
                                        
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">业务员</label>
                                            <div class="layui-input-inline">
@@ -295,7 +311,7 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs6 layui-inline">
                                            <label class="layui-form-label" style="width:12.5%">备注2</label>
                                            <label class="layui-form-label" style="width:12.5%">白坯要求</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HRemark2" id="HRemark2" placeholder="请输入内容" onmouseover="this.title=this.value" style="width: 610px;">
                                            </div>
@@ -509,17 +525,17 @@
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">版本</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">版本</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>-->
                    <label class="layui-form-label">版本</label>
                    <div class="layui-input-inline">
                        <input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
                    </div>
                </div>
                <div class="layui-col-xs3 layui-inline">
                    <label class="layui-form-label">版本</label>
                    <div class="layui-input-inline">
                        <input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
                    </div>
                </div>-->
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">芯体物料代码</label>
                                            <div class="layui-input-inline">
@@ -571,7 +587,7 @@
                                                <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="float: left;">
                                            </div>
                                        </div>
                                        

                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">日计划工单选单号</label>
                                            <div class="layui-input-inline">
@@ -1010,6 +1026,7 @@
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    async: false,
                    data: { "HBillType": '3772' },
                    success: function (d) {
                        //console.log(d.data);
@@ -1778,9 +1795,33 @@
                    layer.msg("拆分号的结尾不能是.！");
                    return;
                } else {
                    var ref = /^[0-9]+\.?[0-9]*$/;
                    var ref = /^[0-9]+$/;
                    if (!ref.test(HSplitNo)) {
                        layer.msg("拆分号请输正确入数字！");
                        return;
                    }
                }

                var HSplitSumQty = $('#HSplitSumQty').val();
                if (HSplitSumQty.substring(HSplitSumQty.length - 1, HSplitSumQty.length) == ".") {
                    layer.msg("拆分总量的结尾不能是.！");
                    return;
                } else {
                    var ref = /^[0-9]+$/;
                    if (!ref.test(HSplitSumQty)) {
                        layer.msg("拆分总量请输正确入数字！");
                        return;
                    }
                }

                var HSplitColorQty = $('#HSplitColorQty').val();
                if (HSplitColorQty.substring(HSplitColorQty.length - 1, HSplitColorQty.length) == ".") {
                    layer.msg("分缸号的结尾不能是.！");
                    return;
                } else {
                    var ref = /^[0-9]+$/;
                    if (!ref.test(HSplitColorQty)) {
                        layer.msg("分缸号请输正确入数字！");
                        return;
                    }
                }
@@ -2001,6 +2042,7 @@
                $.ajax({
                    url: GetWEBURL() + "Sc_ProcessExchangeBill/GetProcessExchangeBillMain",
                    type: "GET",
                    async: false,
                    data: {
                        "HInterID": linterid
                    },
@@ -2045,6 +2087,8 @@
                                , "HCusID": data.HCusID
                                , "HCusNames": data.客户
                                , "HColorRemark": data.染色要求
                                , "HSplitSumQty": data.拆分总量
                                , "HSplitColorQty": data.分缸号
                               
                                , "HProjectNum": data.项目编号
                                , "HVerNum": data.版本

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html

@@ -1588,7 +1588,12 @@
            function get_print() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                if (checkStatus.data.length > 0) {
                    var linterid = [];

                    for (var i = 0; i < data.length; i++) {
                        linterid.push(data[i].hmainid.toString())
                    }
                    layer.open({
                        type: 2
                        , area: ['80%', '80%']
@@ -1596,7 +1601,7 @@
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() +","+ QJQD + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HProcessExchange', 'yes']
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + "|" + QJQD + '&MyMsg=' + linterid.toString() + '&Type=HProcessExchange', 'yes']
                        , resize: false
                    })
                }