Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

yusijie

2023-03-27 5b19fc51b6129ff8e5f40ecf25f1a73717f3e53b

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

 WebTM/views/index.html

@@ -448,7 +448,7 @@
                                        <dd><a lay-href="车间管理/工序流转卡/Sc_ProcessExchangeBillList.html">工序流转卡维护</a></dd>
                                        <dd><a lay-href="车间管理/工序流转卡/Sc_ProcessExchangeIssueBillList.html">工序流转卡（下达）</a></dd>
                                        <dd><a lay-href="车间管理/工序流转卡/Sc_ProcExchWorkBackBillList.html">工序返工申请列表</a></dd>
                                        <dd><a lay-href="车间管理/工序流转卡/Sc_ProcExchWorkBackBillEdit.html">工序返工申请</a></dd>
                                        <!--<dd><a lay-href="车间管理/工序流转卡/Sc_ProcExchWorkBackBillEdit.html">工序返工申请</a></dd>-->
                                        <dd><a lay-href="车间管理/工序流转卡/Sc_ProcessSendWorkList.html">工序派工列表</a></dd>
                                        <dd><a lay-href="车间管理/工序流转卡/Sc_ProcessSendWorkEdit.html">工序派工</a></dd>
                                        <!--<dd><a lay-href="车间管理/工序流转卡/Sc_ProcExchWorkBackBillEdit.html">工序返工申请单编辑</a></dd>-->

 WebTM/views/²Ö´æ¹ÜÀí/ÌõÂë¿â´æ/KF_ICInventoryByMaterID.html

@@ -212,7 +212,7 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_WarehouseList.html?Type=HFIFOWHID', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_WarehouseList.html?Type=HWHID', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");

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

@@ -436,7 +436,23 @@
                                                        <input class="layui-input" name="HSTDMACHINEPREPARETIME" lay-verify="HSTDMACHINEPREPARETIME" id="HSTDMACHINEPREPARETIME" autocomplete="off" value="0">
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">幅宽</label>
                                                    <div class="layui-input-inline" style="">
                                                        <input class="layui-input" name="HWidth" lay-verify="HWidth" id="HWidth" autocomplete="off" value="0">
                                                    </div>
                                                </div>

                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-row">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">克重</label>
                                                    <div class="layui-input-inline" style="">
                                                        <input class="layui-input" name="HWeight" lay-verify="HWeight" id="HWeight" autocomplete="off" value="0">
                                                    </div>
                                                </div>
                                                
                                            </div>
                                        </div>
@@ -653,7 +669,7 @@
                                , "HSubjoin2": data.附加属性2
                                , "HColor": data.颜色
                                , "HMaterClsID": data.物料分类
                                , "HMaterTypeID": data.物料属性
                                , "HMaterTypeID": data.物料属性 == "0" ? 1 : data.物料属性
                                , "HWhID": data.默认仓库
                                , "HWhName": data.仓库名称
                                , "HSPGroupID": data.默认仓位组
@@ -689,6 +705,8 @@
                                , "HPERUNITSTANDHOUR": data.标准工时
                                , "HSTDLABORPREPARETIME": data.标准人员准备工时
                                , "HSTDMACHINEPREPARETIME": data.标准机器准备工时
                                , "HWidth": data.HWidth
                                , "HWeight": data.HWeight
                            });
                            console.log($('#HUnitGroupID').val());
                        } else {
@@ -741,6 +759,14 @@
                    layer.msg("请选择辅助计量单位！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }                
                //if ($("#HWidth").val() == 0) {
                //    layer.msg("幅宽不能为0！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;
                //}
                //if ($("#HWeight").val() == 0) {
                //    layer.msg("克重不能为0！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;
                //}

                $.ajax(
                    {

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

@@ -13,7 +13,7 @@
        //不同的数据库应该选用不同的报表XML数据生成类，SQL Server数据库用SqlXMLReportData，Oracle数据库用OracleXMLReportData
        //OledbXMLReportData适合于Access等本地数据库，为了演示方便，这里从Grid++Report的Access例子数据库中获取报表数据

        SqlXMLReportData.GenOneRecordset(this, "select a.HNumber è®¾å¤‡ç¼–号,a.HName è®¾å¤‡åç§°,g.HName æ‰€å±žè½¦é—´,e.HName è´£ä»»äºº from Gy_Source a left join Gy_Department g on a.HDeptID=g.HItemID left join Gy_Employee e on g.HEmpID=e.HItemID where a.HItemID=" + Request.Params["linterid"]);
        SqlXMLReportData.GenOneRecordset(this, "select æµè½¬å¡å· æµè½¬å¡,返工数量,产品名称 ç‰©æ–™åç§°,产品代码 ç‰©æ–™ä»£ç ,规格型号,返工开始流水号 å¼€å§‹æµæ°´å·,返工结束流水号 ç»“束流水号,返工开始工序 å¼€å§‹å·¥åº,返工结束工序 ç»“束工序,生产订单号 ç”Ÿäº§è®¢å•,单位 è®¡é‡å•ä½,日期  ,流水号,工序代码,工序 å·¥åºåç§°,表体备注 å¤‡æ³¨ from h_v_Sc_ProcExchRecordBackBillList where hmainid=" + Request.Params["linterid"]);
    }
    </script>
</head>

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

@@ -226,6 +226,36 @@
                                    </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: 120px;">
                                                <input type="text" class="layui-input" name="HAuxQty" lay-verify="HAuxQty" id="HAuxQty" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">辅助单位</label>
                                            <div class="layui-input-block" style="margin-left: 80px;">
                                                <input type="text" class="layui-input" lay-verify="HAuxUnitName" name="HAuxUnitName" id="HAuxUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HAuxUnit" id="HAuxUnit" lay-verify="HAuxUnit" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHAuxUnit" id="btnHAuxUnit" 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">
                                            <label class="layui-form-label" style="width: 85px;">幅宽</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HWidth" lay-verify="HWidth" id="HWidth" style="background-color:#efefef4d;display: inline-block;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">克重</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HWeight" lay-verify="HWeight" id="HWeight" style="background-color:#efefef4d;display: inline-block;" readonly>
                                            </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: 115px;">
                                                <input type="date" class="layui-input" lay-verify="HPlanBeginDate" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 80px;">
@@ -447,6 +477,11 @@
            //选择计量单位按钮
            form.on('submit(btnHUnit)', function () {
                get_btnHUnit();
            });

            //选择辅助单位按钮
            form.on('submit(btnHAuxUnit)', function () {
                get_btnHAuxUnit();
            });

            //选择BOM按钮
@@ -702,7 +737,8 @@
                        $("#HModel").val(checkStatus.data[0].HModel);
                        $("#HUnitID").val(checkStatus.data[0].HUnitID);//计量单位id
                        $("#HUnitName").val(checkStatus.data[0].HUnitName);//计量单位名称

                        $("#HWidth").val(checkStatus.data[0].HWidth);//幅宽
                        $("#HWeight").val(checkStatus.data[0].HWeight);//克重
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
@@ -754,6 +790,32 @@
                        //获取数据
                        $("#HUnitID").val(checkStatus.data[0].HItemID);
                        $("#HUnitName").val(checkStatus.data[0].HName);

                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }

            //辅助单位
            function get_btnHAuxUnit() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: "计量单位列表"  //标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_UnitList.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        //获取数据
                        $("#HAuxUnit").val(checkStatus.data[0].HItemID);
                        $("#HAuxUnitName").val(checkStatus.data[0].HName);

                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
@@ -899,6 +961,11 @@
                            , "HBeginDate": Format(new Date(d.data[0].最迟开工日期), "yyyy-MM-dd")
                            , "HEndDate": Format(new Date(d.data[0].最迟完工日期), "yyyy-MM-dd")
                            , "HRemark": d.data[0].表头备注
                            , "HAuxQty": d.data[0].HAuxQty
                            , "HAuxUnit": d.data[0].HAuxUnit
                            , "HAuxUnitName": d.data[0].HAuxUnitName
                            , "HWidth": d.data[0].HWidth
                            , "HWeight": d.data[0].HWeight
                            //其他信息
                            , "hmakers": d.data[0].制单人
                            , "hmakedate": d.data[0].制单日期 == null ? "" : Format(new Date(d.data[0].制单日期), "yyyy-MM-dd")

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

@@ -181,15 +181,22 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">芯体物料代码</label>
                                            <label class="layui-form-label">选单号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HXTNumber" id="HXTNumber">
                                                <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>-->
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">芯体规格型号</label>
                                            <label class="layui-form-label">工艺路线</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HXTModel" id="HXTModel">
                                                <input type="text" class="layui-input" name="RoutingBill" id="RoutingBill" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="hidden" class="layui-input" name="HRoutingBillID" id="HRoutingBillID">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnRoutingBill" id="btnRoutingBill" 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">
@@ -213,24 +220,24 @@
                            </div>
                        </div>-->
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">选单号</label>
                                            <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>-->
                                                <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>
                                            <label class="layui-form-label">幅宽</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="RoutingBill" id="RoutingBill" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="hidden" class="layui-input" name="HRoutingBillID" id="HRoutingBillID" >
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnRoutingBill" id="btnRoutingBill" style="width: 40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                                <input type="text" class="layui-input" name="HWidth" id="HWidth" style="float: left; background-color: #efefef4d; display: inline-block;" 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="HWeight" id="HWeight" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
                                            </div>
                                        </div>
                                       
                                    </div>
                                    <div class="layui-row">
                                        <!--<div class="layui-col-xs6 layui-inline">
@@ -248,28 +255,30 @@
                                </button>
                            </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="HAuxQty" id="HAuxQty" 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="HSplitNo" id="HSplitNo" 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>
                                                <input type="hidden" class="layui-input" name="HAuxUnit" id="HAuxUnit" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHAuxUnit" id="btnHAuxUnit" style="width: 40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </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="HCusNumber" id="HCusNumber" placeholder="请输入内容" onmouseover="this.title=this.value" style="width:610px;">
                                            </div>
                                        </div>
                                        <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="HPickLabel" id="HPickLabel" placeholder="请输入内容" onmouseover="this.title=this.value" style="width:610px;">
                                            </div>
                                        </div>
                                        <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="HPickLabelNumber" id="HPickLabelNumber" placeholder="请输入内容" onmouseover="this.title=this.value" style="width:610px;">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <!--其他信息-->
@@ -330,7 +339,7 @@
                                        <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="HMaterModel" id="HMaterModel" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HMaterModel1" id="HMaterModel1" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
@@ -422,6 +431,13 @@
                                                <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="HXTNumber" id="HXTNumber">
                                            </div>
                                        </div>

                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs3 layui-inline">
@@ -440,6 +456,12 @@
                                            <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-inline">
                                                <input type="text" class="layui-input" name="HXTModel" id="HXTModel">
                                            </div>
                                        </div>
                                    </div>
@@ -464,6 +486,26 @@
                                            <div class="layui-input-inline">
                                                <input type="checkbox" name="isHBLFlag" id="isHBLFlag" value="false" lay-skin="primary" lay-filter="isHBLFlag">
                                                <input type="hidden" name="HBLFlag" id="HBLFlag" value="false" lay-skin="primary" lay-filter="HBLFlag">
                                            </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="HCusNumber" id="HCusNumber" placeholder="请输入内容" onmouseover="this.title=this.value" style="width:610px;">
                                            </div>
                                        </div>
                                        <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="HPickLabel" id="HPickLabel" placeholder="请输入内容" onmouseover="this.title=this.value" style="width:610px;">
                                            </div>
                                        </div>
                                        <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="HPickLabelNumber" id="HPickLabelNumber" placeholder="请输入内容" onmouseover="this.title=this.value" style="width:610px;">
                                            </div>
                                        </div>
                                    </div>
@@ -1201,6 +1243,10 @@
                get_HideColumn();
            });

            //选择辅助单位按钮
            form.on('submit(btnHAuxUnit)', function () {
                get_btnHAuxUnit();
            });

            //选择产品弹窗
            form.on('submit(btnSearchMater2)', function () {//产品
@@ -1323,7 +1369,7 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HMaterModel").val(checkStatus.data[0].HModel);
                        $("#HMaterModel1").val(checkStatus.data[0].HModel);
                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
                        $("#HMaterName").val(checkStatus.data[0].HName);
                        $("#HMaterID").val(checkStatus.data[0].HItemID);
@@ -1835,6 +1881,13 @@
                                , "HEquipMentID": data.HEquipMentID
                                , "HProductNum": data.成品编号
                                , "HExplanation": data.摘要
                                , "HMaterModel": data.材料规格
                                , "HWidth": data.幅宽
                                , "HWeight": data.克重
                                , "HAuxQty": data.辅数量
                                , "HAuxUnit": data.HAuxUnit
                                , "HAuxUnitName": data.辅助单位
                                , "HSplitNo": data.拆分号
                               
                                , "HProjectNum": data.项目编号
                                , "HVerNum": data.版本
@@ -1856,7 +1909,7 @@
                                , "HMaterName": data.子件名称
                                , "HMaterID": data.HMaterID
                                , "HMaterNumber": data.子件代码
                                , "HMaterModel": data.子件规格
                                , "HMaterModel1": data.子件规格
                                , "HUnitNumber": data.单位代码
                                , "HMainMaterID": data.主要材料
                                , "HPlanQty": data.生产数量
@@ -1951,6 +2004,32 @@
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }

            //辅助单位
            function get_btnHAuxUnit() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: "计量单位列表"  //标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_UnitList.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        //获取数据
                        $("#HAuxUnit").val(checkStatus.data[0].HItemID);
                        $("#HAuxUnitName").val(checkStatus.data[0].HName);

                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }

            //#region æŸ¥è¯¢ (器具清单)
@@ -2121,6 +2200,10 @@
                            $("#HPickLabelNumber").val(data.包装标识编码);
                            $("#HXTNumber").val(data.芯体物料代码);
                            $("#HXTModel").val(data.芯体规格型号);
                            $("#HWidth").val(data.HWidth);
                            $("#HWeight").val(data.HWeight);
                            $("#HAuxUnitName").val(data.HAuxUnitName);
                            $("#HAuxUnit").val(data.HAuxUnit);
                            $("#HBLFlag").val(result.data[0].HBLFlag == 0 ? false : true);
                            $("input[name='isHBLFlag']").prop("checked", result.data[0].HBLFlag);//true:选中 false:不选中
                            form.render("checkbox");

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

@@ -166,6 +166,36 @@
                                            </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: 120px;">
                                                <input type="text" class="layui-input" lay-verify="HWidth" name="HWidth" id="HWidth" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">克重</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" lay-verify="HWeight" name="HWeight" id="HWeight" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <!--<div class="layui-inline" >
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">辅助单位</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>
                                                <input type="hidden" class="layui-input" name="HAuxUnit" id="HAuxUnit" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHAuxUnit" id="btnHAuxUnit" style="width: 40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>-->
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">材料规格 </label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" lay-verify="HMaterModel" name="HMaterModel" id="HMaterModel" >
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
@@ -334,11 +364,16 @@
            var dataNum = [];
            var HBillNo = $("#HBillNo").val();
            for (var i = 0; i < HProcessExchangeSum; i++) {
                dataNum.push({ "HBillNo": HBillNo + "_" + (i + 1), "HQty": HProcessExchangeHqty});
                dataNum.push({ "HBillNo": HBillNo + "_" + (i + 1), "HQty": HProcessExchangeHqty, "HSplitNo": 0});
            }
            option1.data = dataNum;
            table.render(option1);
        })

        //选择辅助单位按钮
        form.on('submit(btnHAuxUnit)', function () {
            get_btnHAuxUnit();
        });

        //保存提交
        form.on('submit(btnSave)', function (data) {//提交
@@ -641,12 +676,13 @@
                    , { type: 'numbers', title: '序号', totalRow: true }
                    , { field: 'HBillNo', title: '流转卡号' }
                    , { field: 'HQty', title: '流转卡数量', edit: 'text' }
                    , { field: 'HSplitNo', title: '拆分号', edit: 'text' }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo1' }
                ]]
                , limit: Number.MAX_VALUE//默认显示全部
            };

            option1.data = [{ "HBillNo": "", "HQty": 0 }];
            option1.data = [{ "HBillNo": "", "HQty": 0, "HSplitNo": 0 }];
            table.render(option1);
        }

@@ -677,6 +713,11 @@
                        $("#HPlanEndDate").val(Format(data1.data[0].计划完工日期, "yyyy-MM-dd"));
                        $("#HUnitID").val(data1.data[0].HUnitID);
                        $("#HUnitNumber").val(data1.data[0].计量单位代码);
                        $("#HWidth").val(data1.data[0].HWidth);
                        $("#HWeight").val(data1.data[0].HWeight);
                        //$("#HAuxUnitName").val(data1.data[0].HAuxUnitName);
                        //$("#HAuxUnit").val(data1.data[0].HAuxUnit);
                       // $("#HMaterModel").val(data1.data[0].HMaterModel);

                        $.ajax({
                            type: "get",
@@ -789,6 +830,32 @@
            }
        }

        //辅助单位
        function get_btnHAuxUnit() {
            layer.open({
                type: 2//弹窗类型
                , skin: 'layui-layer-rim' //加上边框
                , area: ['90%', '90%']//大小
                , title: "计量单位列表"  //标题
                , shift: 2//弹出动画
                , content: ['../../Baseset/基础资料/Gy_UnitList.html', 'yes']
                , btn: ['确定', '取消']
                , btn1: function (index, layero) {//按钮【按钮一】的回调
                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                    if (checkStatus.data.length === 0) {
                        return layer.msg('请选择数据');
                    }
                    //获取数据
                    $("#HAuxUnit").val(checkStatus.data[0].HItemID);
                    $("#HAuxUnitName").val(checkStatus.data[0].HName);

                    layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) { }
            })
        }

        //非空验证
        function AllowLoadData(data) {


 WebTM/views/ÁìÁÏ·¢»õ/ÊÕÁÏÈë¿â/Kf_ReciveBill_Fast_AR.html

@@ -392,6 +392,8 @@
                    //, { field: 'HInterID', title: '主内码', sort: true, width: 200 }
                    //, { field: 'HEntryID', title: '子内码', sort: true, width: 200 }
                    //, { field: 'HPieceQty', title: '条码数量', width: 150 }
                    , { type: 'numbers', title: '序号', totalRow: true }
                    //, { field: 'numbers', title: '序号', width: 60, totalRow: true }
                    , { field: 'HQty', title: '数量', edit: 'text', totalRow: true }
                    //, { field: 'HQtyMust', title: '订单数量' }
                    , { field: 'HNumber', title: '物料代码' }

 WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBackBill_Fast.html

@@ -1093,7 +1093,8 @@
                , page: true
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HSNO', title: '序号', width: 60 }
                    , { type: 'numbers', title: '序号', totalRow: true }
                    , { field: 'HSNO', title: '序号', width: 60, totalRow: true  }
                    , { field: 'HQty', title: '数量', width: 80, totalRow: true}
                    , { field: 'HQtyMust', title: '应发数量', width: 80, totalRow: true }
                    , { field: 'HMaterNumber', title: '物料代码', width: 150 }

 WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBill_Fast.html

@@ -1172,6 +1172,8 @@
                            sessionStorage["SourceFlag"] = true;
                            layer.load(3);
                            element.tabChange('tab-POStockInBill', '2');
                            var pFocus = $("#HBarCode");
                            pFocus.focus();

                            table.render({
                                elem: '#wl-table'