库存检验单 增加 批次号，检验数量，良品数量，报废数量，可疑数 HBatchNo varchar(200) --批号 HInSpectQty dec(...

yangle

2024-07-29 aa1c13f339ac37aaa7c809c1ed6f0f122841ec32

库存检验单 增加 批次号，检验数量，良品数量，报废数量，可疑数 HBatchNo varchar(200) --批号 HInSpectQty dec(18,8) --检验数量 HRightQty dec(18,8) --合格数量 HUnRightQty dec(18,8) --不合格数量 HUnKnowQty dec(18,8) --可疑数量 实验室 仪器检验时，扫码流转卡二维码的， 改为 可以扫 取样单 二维码（即 可以扫流转卡也可以扫取样单）。 检验单里 保存 对应的 取样单 内码； 首件单，巡检单，工序检验单 表头增加 字段 HTakeSampleCheckBillID int --取样单内码 HTakeSampleCheckBillNo int --取样单 出站单 ：增加 字段： 返工数，工废数量，料废数量 ，料废返工数量 HBackWorkQty dec(18,8) -- 返工数 HBadByWorkQty dec(18,8) -- 工废数量 HBadByMaterQty dec(18,8) --料废数量 HBackWorkByMaterQty dec(18,8) --料废返工数量

 WebTM/WebTM.csproj

@@ -252,6 +252,7 @@
    <Content Include="views\video\1.wav" />
    <Content Include="views\video\jingbao.wav" />
    <Content Include="views\video\success.wav" />
    <Content Include="views\WMS扫码模块\三点照合扫码记录单\WMS_CusBarCodeCheckBill_PDA.html" />
    <Content Include="views\WMS扫码模块\上料防错单\Sc_MaterToSourceBill_PDA.html" />
    <Content Include="views\WMS扫码模块\上料防错单\Sc_MaterToSourceBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\其他入库\Kf_OtherInBackBillList_PDA.html" />
@@ -310,6 +311,7 @@
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBill_QiaoYi_PDA.html" />
    <Content Include="views\人事管理\异常反馈单\OA_ErrMsgBackBillList_PDA.html" />
    <Content Include="views\人事管理\异常反馈单\OA_ErrMsgBackBill_PDA.html" />
    <Content Include="views\仓存管理\三点照合扫码记录单\WMS_CusBarCodeCheckBillList.html" />
    <Content Include="views\仓存管理\仓库调拨\Add_Edit_Kf_MoveStockBill.html" />
    <Content Include="views\仓存管理\分步式调入单\Fb_StepFoldinBillEdit.html" />
    <Content Include="views\仓存管理\条码库存\KF_PonderationBillMain_Temp.html" />
@@ -411,6 +413,7 @@
    <Content Include="views\生产管理\异常反馈单\Sc_MESExecptFeedBackBillType.html" />
    <Content Include="views\生产管理\报工台工序\开工\Sc_SwipeCardStart.html" />
    <Content Include="views\生产管理\生产任务单\Sc_ICMOBillOrProcessExchangeResumeList.html" />
    <Content Include="views\生产管理\生产报表\Sc_NutInspectionCCDPassRate.html" />
    <Content Include="views\生产管理\生产报表\Sc_QualityReportBillMonth.html" />
    <Content Include="views\生产管理\生产报表\Sc_QualityReportBillDay.html" />
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatForm_BCP.html" />
@@ -446,6 +449,8 @@
    <Content Include="views\质量管理\检验取样还样单\QC_TakeSampleCheckBillMainList.html" />
    <Content Include="views\质量管理\检验取样还样单\QC_Add_TakeSampleCheckBill.html" />
    <Content Include="views\质量管理\质量报表\QC_InspectionFormReport.html" />
    <Content Include="views\质量管理\质量报表\QC_MoistureContentDataLedger.html" />
    <Content Include="views\质量管理\质量报表\QC_QualityStatisticsDailyReport.html" />
    <Content Include="views\质量管理\质量月度目标单\QC_MonthTarGetBill.html" />
    <Content Include="views\质量管理\质量月度目标单\QC_MonthTarGetBillList.html" />
    <Content Include="views\质量管理\车间自检单\QC_Add_Edit_WorkSelfCheckBill.html" />

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú±¨±í/Sc_NutInspectionCCDPassRate.html

@@ -31,28 +31,16 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">生产订单号</label>
                                    <label class="layui-form-label">批次号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" value="">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 76px;">产品条码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HBardCode" id="HBardCode" value="">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">流转卡号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
                                        <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo" value="">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                <!--<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;margin-left:5%;">

                                    </div>
@@ -138,13 +126,12 @@
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>
                                </div>-->
                            </div>
                        </div>
                        <div class="layui-tab layui-tab-card">
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
                                    <!--进出站记录-->
                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                                </div>
                            </div>
@@ -263,10 +250,10 @@

            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/EntryAndExitRecords',
                url: GetWEBURL() + '/LEMS/Sc_NutInspectionCCDPassRate',
                type: "GET",
                async: false,
                data: { "HBardCode": $("#HBardCode").val(), "HProcExchBillNo": $("#HProcExchBillNo").val(), "HICMOBillNo": $("#HICMOBillNo").val(), "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                data: { "HBatchNo": $("#HBatchNo").val(), "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        var data = [];

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ѳ¼ì¼Ç¼µ¥/QC_Add_Edit_PatrolProcCheckOtherill.html

@@ -225,6 +225,13 @@
                                                <input type="hidden" name="HProcID" id="HProcID" 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: 120px;">
                                                <input type="text" class="layui-input" name="HTakeSampleCheckBillNo" id="HTakeSampleCheckBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HTakeSampleCheckBillID" id="HTakeSampleCheckBillID" value="0">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
@@ -830,6 +837,8 @@
                            $("#HQCSchemeName").val(data.检验方案名称);
                            $("#HQCSchemeID").val(data.检验方案ID);
                            $("#HProcName").val(data.当前工序);
                            $("#HTakeSampleCheckBillNo").val(data.流转卡号);
                            $("#HTakeSampleCheckBillID").val(data.HProcExchInterID);
                            //获取表体检验项目信息
                            get_CheckItem();
                        } else {
@@ -873,6 +882,8 @@
                            $("#HQCSchemeID").val(data.检验方案ID);
                            $("#HProcName").val(data.当前工序);//
                            $("#HBatchNo").val(data.批号);
                            $("#HTakeSampleCheckBillNo").val(data.单据号);
                            $("#HTakeSampleCheckBillID").val(data.HInterID);
                            //获取表体检验项目信息
                            get_CheckItem();
                        } else {
@@ -948,6 +959,8 @@
                            $("#HICMOEntryID").val(data.HICMOEntryID);
                            $("#HQCSchemeName").val(data.检验方案名称);
                            $("#HQCSchemeID").val(data.检验方案ID);
                            $("#HTakeSampleCheckBillNo").val(data.HProcExchBillNo);
                            $("#HTakeSampleCheckBillID").val(data.HProcExchInterID);

                            //获取表体检验项目信息
                            get_CheckItem();
@@ -1517,6 +1530,8 @@
                                , "HShiftsName": data.班次名称
                                , "HErrTreatment": data.异常临时处理方案
                                , "HBatchNo": data.批号
                                , "HTakeSampleCheckBillID": data.HTakeSampleCheckBillID
                                , "HTakeSampleCheckBillNo": data.HTakeSampleCheckBillNo
                            });
                            $("input[name=HLastResult][value=true]").prop("checked", data.判定结论 === "合格");
                            $("input[name=HLastResult][value=false]").prop("checked", data.判定结论 === "不合格");

 WebTM/views/ÖÊÁ¿¹ÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBill.html

@@ -222,6 +222,13 @@
                                                <input type="hidden" name="HProcID" id="HProcID" 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: 120px;">
                                                <input type="text" class="layui-input" name="HTakeSampleCheckBillNo" id="HTakeSampleCheckBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HTakeSampleCheckBillID" id="HTakeSampleCheckBillID" value="0">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
@@ -870,6 +877,8 @@
                                $("#HICMOEntryID").val(HICMOEntryID);
                                $("#HQCSchemeName").val(data.检验方案名称);
                                $("#HQCSchemeID").val(data.检验方案ID);
                                $("#HTakeSampleCheckBillNo").val(data.HProcExchBillNo);
                                $("#HTakeSampleCheckBillID").val(data.HProcExchInterID);
                                //获取表体检验项目信息
                                get_CheckItem();
                            } else {
@@ -955,6 +964,8 @@
                            $("#HQCSchemeID").val(data.检验方案ID);
                            $("#HProcName").val(data.当前工序);//
                            $("#HBatchNo").val(data.批号);
                            $("#HTakeSampleCheckBillNo").val(data.单据号);
                            $("#HTakeSampleCheckBillID").val(data.HInterID);
                            //获取表体检验项目信息
                            get_CheckItem();
                        } else {
@@ -1472,6 +1483,8 @@
                                , "HShiftsName": data.班次名称
                                , "HErrTreatment": data.异常临时处理方案
                                , "HBatchNo": data.批号
                                , "HTakeSampleCheckBillID": data.HTakeSampleCheckBillID
                                , "HTakeSampleCheckBillNo": data.HTakeSampleCheckBillNo
                            });
                            data = result.data;
                            //data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;

 WebTM/views/ÖÊÁ¿¹ÜÀí/¿â´æ¼ìÑéµ¥/QC_Add_Edit_StockCheckBill.html

@@ -190,6 +190,40 @@
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline" id="hidediv1">
                                            <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="HBatchNo" id="HBatchNo" value="">
                                            </div>
                                        </div>
                                        <div class="layui-inline" id="hidediv1">
                                            <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="HInSpectQty" id="HInSpectQty" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-inline" id="hidediv1">
                                            <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="HRightQty" id="HRightQty" value="0">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline" id="hidediv1">
                                            <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="HUnRightQty" id="HUnRightQty" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-inline" id="hidediv1">
                                            <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="HUnKnowQty" id="HUnKnowQty" value="0">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline" style="width: 58%">
@@ -1504,6 +1538,11 @@
                                , "HShiftsID": data.HShiftsID
                                , "HShiftsName": data.班次名称
                                , "HErrTreatment": data.异常临时处理方案
                                , "HBatchNo": data.批号
                                , "HInSpectQty": data.检验数量
                                , "HRightQty": data.合格数量
                                , "HUnRightQty": data.不合格数量
                                , "HUnKnowQty": data.可疑数量
                            });
                            $("input[name=HLastResult][value=true]").prop("checked", data.判定结论 === "合格");
                            $("input[name=HLastResult][value=false]").prop("checked", data.判定结论 === "不合格");

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_MoistureContentDataLedger.html

@@ -34,37 +34,39 @@
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HDate">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HDate1">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">判定结果</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 85px;">
                                        <select name="HMonth" id="HMonth" lay-verify="HMonth">
                                        <select name="HResult" id="HResult" lay-verify="HResult">
                                            <option value="合格">合格</option>
                                            <option value="不合格">不合格</option>
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">组织</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 125px;">
                                        <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
                                            <!--动态渲染年份-->
                                        </select>
                                    <label class="layui-form-label" style="width: 85px; padding: 9px 18px;">生产资源</label>
                                    <div class="layui-input-block" style="margin-left: 77px;">
                                        <input type="text" class="layui-input" name="HSourceName" id="HSourceName" lay-verify="HSourceName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                        <input type="hidden" class="layui-input" name="HSourceID" lay-verify="HSourceID" id="HSourceID" value="0">
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                <!--<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;margin-left:5%;">

                                    </div>
@@ -150,13 +152,12 @@
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>
                                </div>-->
                            </div>
                        </div>
                        <div class="layui-tab layui-tab-card">
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
                                    <!--进出站记录-->
                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                                </div>
                            </div>
@@ -227,81 +228,48 @@
            set_ClearQuery();
        });


        //选择生产资源
        form.on('submit(btnHSource)', function () {
            btnHSource();
        });

        //#endregion

        //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法

        // åˆå§‹åŒ–界面
        function set_ClearBill() {
            Year();
            DeptName();
            Organ();
            $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
            $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
            //set_InitGrid();
            //查询
            get_FastQuery();
        }

        //å¹´
        function Year() {
            var yyyy = new Date().getFullYear();
            var YearOption = "";
            for (var i = 0; i <= 10; i++) {
                YearOption += '<option  style="color:blue;" value="' + (yyyy - 5 + i) + '">' + (yyyy - 5 + i) + '</option>';
            }
            $("#HYear").append(YearOption);
            $("#HYear").val(yyyy);
            $("#HMonth").val(new Date().getMonth()+1);
            form.render('select');
        }

        //生产车间
        function DeptName() {
            //获取车间列
            var HDeptName = '<option value="0" style="color:red;" selected>全部车间</option>';
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
                async: false,
                data: { "HOrgID": sessionStorage["OrganizationID"] },
                success: function (result) {
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        var data = result.data;
                        for (var i = 0; i < data.length; i++) {
                            if (i == 0)
                                HDeptName += '<option  style="color:blue;"  value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
                            else
                                HDeptName += '<option  style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';

                        }
                        $("#HDeptName").append(HDeptName);
                        form.render('select');
        //生产资源选择页面
        function btnHSource() {
            layer.open({
                type: 2//弹窗类型
                , skin: 'layui-layer-rim' //加上边框
                , area: ['90%', '90%']//大小
                , title: '生产资源列表'//标题
                , shift: 2//弹出动画
                , content: ['../../基础资料/生产基础资料/Gy_Source.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('请选择数据');
                    }
                    layer.closeAll("loading");
                }
            })
        }
                    //获取数据
                    $("#HSourceID").val(checkStatus.data[0].HItemID);
                    $("#HSourceName").val(checkStatus.data[0].生产资源名称);


        //获取组织
        function Organ() {
            //获取登录页组织列
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Web/GetOrganizations",
                async: false,
                success: function (result) {
                    var Organization = "";
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        var data = result.data;
                        for (var i = 0; i < data.length; i++) {
                            Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                        }
                        $("#HOrgID").append(Organization);
                        $("#HOrgID").val(sessionStorage["OrganizationID"])
                        form.render('select');
                    }
                    layer.closeAll("loading");
                    layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) { }
            })
        }

@@ -309,22 +277,13 @@

            var columns = [];
            columns.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
            columns.push({ field: '工序', title: '工序', sort: true, width: 90});
            columns.push({ field: '判定结果', title: '判定结果', sort: true, width: 110 });
            columns.push({ field: '不良原因', title: '不良原因', sort: true, width: 110 });
            columns.push({ field: '总计', title: '总计', sort: true, totalRow: true, width: 90});

            //获取年
            var yyyy = $("#HYear").val();
            //获取月份
            var MM = $("#HMonth").val();
            //获取开始月份的最大天数
            var SumMonth = new Date(yyyy, MM, 0).getDate(); //动态两月之差

            for (var i = 0; i < SumMonth; i++) {
                columns.push({ field: Format(yyyy + '/' + MM + '/' + (i + 1), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (i + 1), 'MM.dd'), width: 80 })
            }

            columns.push({ field: '日期', title: '日期', sort: true, width: 90});
            columns.push({ field: '机台号', title: '机台号', sort: true, width: 110 });
            columns.push({ field: '取样重量', title: '取样重量', sort: true, width: 110 });
            columns.push({ field: '测量结果', title: '测量结果', sort: true, totalRow: true, width: 110});
            columns.push({ field: '判定结果', title: '判定结果', sort: true, totalRow: true, width: 110});
            columns.push({ field: '检测人', title: '检测人', sort: true, totalRow: true, width: 110});
            columns.push({ field: '备注', title: '备注', sort: true, totalRow: true, width: 110});
            option = {
                elem: '#mainTable'
                , toolbar: '#toolbarDemo1'
@@ -348,7 +307,7 @@

            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/QC_CustomerAppealReport/QC_QualityStatisticsDailyReport',
                url: GetWEBURL() + '/QC_CustomerAppealReport/QC_MoistureContentDataLedger',
                type: "GET",
                async: false,
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
@@ -361,9 +320,9 @@
                        //刷新表格数据
                        DisPlay_HideColumn();

                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            ColFilter();
                        }
                        //if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                        //    ColFilter();
                        //}

                        layer.close(ajaxLoad);
                    } else {
@@ -379,10 +338,10 @@

        // å¿«é€Ÿè¿‡æ»¤
        function get_FastQuery() {
            var HYear = $("#HYear").val();
            var HMonth = $("#HMonth").val();
            var HDeptName = $("#HDeptName").val();
            var HOrgID = $("#HOrgID").val();
            var HBeginDate = $("#HBeginDate").val();
            var HEndDate = $("#HEndDate").val();
            var HResult = $("#HResult").val();
            var HSourceID = $("#HSourceID").val();

            var ColName = $("#ColName").val();//复选框
            var Comparator = $("#Comparator").val()
@@ -460,10 +419,10 @@


            sWhere = {
                HYear: HYear
                , HMonth: HMonth
                , HDeptName: HDeptName
                , HOrgID: HOrgID
                HBeginDate: HBeginDate
                ,HEndDate: HEndDate
                , HResult: HResult
                , HSourceID: HSourceID
            }
            set_InitGrid();
            get_Display(JSON.stringify(sWhere));

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_Add_Edit_FirstPieceCheckBill.html

@@ -228,6 +228,13 @@
                                                <input type="hidden" name="HProcID" id="HProcID" 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: 120px;">
                                                <input type="text" class="layui-input" name="HTakeSampleCheckBillNo" id="HTakeSampleCheckBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HTakeSampleCheckBillID" id="HTakeSampleCheckBillID" value="0">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
@@ -856,6 +863,8 @@
                            $("#HQCSchemeName").val(data.检验方案名称);
                            $("#HQCSchemeID").val(data.检验方案ID);
                            $("#HProcName").val(data.当前工序);
                            $("#HTakeSampleCheckBillNo").val(data.流转卡号);
                            $("#HTakeSampleCheckBillID").val(data.HProcExchInterID);
                            //获取表体检验项目信息
                            get_CheckItem();
                        } else {
@@ -900,6 +909,8 @@
                            $("#HQCSchemeID").val(data.检验方案ID);
                            $("#HProcName").val(data.当前工序);//
                            $("#HBatchNo").val(data.批号);
                            $("#HTakeSampleCheckBillNo").val(data.单据号);
                            $("#HTakeSampleCheckBillID").val(data.HInterID);
                            //获取表体检验项目信息
                            get_CheckItem();
                        } else {
@@ -979,6 +990,8 @@
                            $("#HICMOEntryID").val(data.HICMOEntryID);
                            $("#HQCSchemeName").val(data.检验方案名称);
                            $("#HQCSchemeID").val(data.检验方案ID);
                            $("#HTakeSampleCheckBillNo").val(data.HProcExchBillNo);
                            $("#HTakeSampleCheckBillID").val(data.HProcExchInterID);

                            //获取表体检验项目信息
                            get_CheckItem();
@@ -1573,6 +1586,8 @@
                                , "HErrTreatment": data.异常临时处理方案
                                , "HBatchNo": data.批号
                                , "HLastResult": data.判定结论 == "合格" ? "true" : "false"
                                , "HTakeSampleCheckBillID": data.HTakeSampleCheckBillID
                                , "HTakeSampleCheckBillNo": data.HTakeSampleCheckBillNo
                            });
                            data = result.data;
                            //data = result.data.h_v_QC_Edit_FirstPieceCheckBillList;

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill.html

@@ -92,7 +92,7 @@
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>                                       
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
@@ -116,11 +116,11 @@
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs4 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>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
@@ -155,15 +155,15 @@
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs4 layui-inline">
        <label class="layui-form-label">当前工序</label>
        <div class="layui-input-inline">
            <input type="text" class="layui-input" name="HProcName" id="HProcName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
            <input type="hidden" name="HProcID" id="HProcID" value="0">
            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSQProcID-BT" id="HSQProcID-BT" style="width: 40px; padding: 0 10px;">
                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
            </button>
        </div>
    </div>-->
            <label class="layui-form-label">当前工序</label>
            <div class="layui-input-inline">
                <input type="text" class="layui-input" name="HProcName" id="HProcName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                <input type="hidden" name="HProcID" id="HProcID" value="0">
                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSQProcID-BT" id="HSQProcID-BT" style="width: 40px; padding: 0 10px;">
                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                </button>
            </div>
        </div>-->
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">未出站数量</label>
                                            <div class="layui-input-block">
@@ -189,12 +189,12 @@
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs4 layui-inline">
        <label class="layui-form-label">核算工序</label>
        <div class="layui-input-inline">
            <input type="text" class="layui-input" name="HPayProcID" id="HPayProcID" style="background-color:#efefef4d;" readonly>
            <input type="hidden" value="0" name="HPayProcID" id="HPayProcID">
        </div>
    </div>-->
            <label class="layui-form-label">核算工序</label>
            <div class="layui-input-inline">
                <input type="text" class="layui-input" name="HPayProcID" id="HPayProcID" style="background-color:#efefef4d;" readonly>
                <input type="hidden" value="0" name="HPayProcID" id="HPayProcID">
            </div>
        </div>-->
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label"></label>
                                            <div class="layui-input-inline">
@@ -298,17 +298,17 @@
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">工时</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HWorkTimes" id="HWorkTimes" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">设备清单</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HSourceNameList" id="HSourceNameList" 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="HWorkTimes" id="HWorkTimes" value="0">
            </div>
        </div>
        <div class="layui-col-xs4 layui-inline">
            <label class="layui-form-label">设备清单</label>
            <div class="layui-input-inline">
                <input type="text" class="layui-input" name="HSourceNameList" id="HSourceNameList" style="background-color:#efefef4d;" readonly>
            </div>
        </div>-->
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
@@ -331,20 +331,20 @@
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <!--<div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">不良数量</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" value="0" name="" id="">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">料废返工数量</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" value="0" name="HBackWorkByMaterQty" style="width:190px;" id="HBackWorkByMaterQty" onfocus="this.select();">
                                            </div>
                                        </div>-->
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <!--<div class="layui-col-xs8 layui-inline">
                                            <label class="layui-form-label">备注</label>
                                            <div class="layui-input-block">
                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
                                            </div>
                                        </div>-->
            <label class="layui-form-label">备注</label>
            <div class="layui-input-block">
                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
            </div>
        </div>-->
                                    </div>
                                </div>
                            </div>
@@ -911,6 +911,7 @@
                                "HShiftsName": data.班次名称,
                                "HToCheckQty": data.取样数量,
                                "HLossQty": data.遗失数量,
                                "HBackWorkByMaterQty": data.料废返工数量,
                            });
                            if (data.是否审核 == "true") {
                                $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//审核按钮禁用