雅琪诺报工台产量汇报单传参修改

YL

2022-01-26 4d7afc0a8b0dbac43dc25ad02858aef668947929

雅琪诺报工台产量汇报单传参修改

 WebTM/views/IpadStepIndex.html

@@ -376,7 +376,7 @@
            HICMOInterID = $("#df" + i + "").html();     //生产订单主内码
            HICMOEntryID = $("#ds" + i + "").html();     //生产订单子内码
            HProcID = $("#ps" + i + "").html();          //工序ID
            console.log(HProcID);


            if (workcode != "" && workcode != null) {
                $('.cns').removeClass('check1');  //删除不同父级clss样式相同的所有元素

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²úÁ¿»ã±¨/Sc_Add_ProductReportStepBillList.html

@@ -241,15 +241,28 @@
                                                            <input class="layui-input" name="HWasterQty" lay-verify="HWasterQty" id="HWasterQty" autocomplete="off">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                    <!--<div class="layui-inline">
                                                        <label class="layui-form-label">因料报废数:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HWasterQty2" lay-verify="HWasterQty2" id="HWasterQty2" autocomplete="off">
                                                        </div>
                                                    </div>
                                                    </div>-->
                                                </div>
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">开工时间:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HWorkBeginDate" id="HWorkBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">报工时间:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HWorkReportDate" id="HWorkReportDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                        </div>
                                                    </div>

                                                    <!--<div class="layui-inline">
                                                        <label class="layui-form-label">开工时间:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HRelBeginDate" id="HRelBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
@@ -260,7 +273,7 @@
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HRelEndDate" id="HRelEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                        </div>
                                                    </div>
                                                    </div>-->
                                                </div>
                                            </div>
                                            <div class="layui-tab-item">
@@ -410,11 +423,11 @@
            function set_InitFrom() {
                //日期时间选择器
                laydate.render({
                    elem: '#HRelBeginDate'
                    elem: '#HWorkBeginDate'
                    , type: 'datetime'
                });
                laydate.render({
                    elem: '#HRelEndDate'
                    elem: '#HWorkReportDate'
                    , type: 'datetime'
                });
                laydate.render({
@@ -448,7 +461,7 @@
            {
                //初始基本信息赋值
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //单据日期
                $("#HRelEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //报工日期
                $("#HWorkReportDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //报工日期
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //制单日期
                $("#HMaker").val(sessionStorage["HUserName"]);     //制单人
            }
@@ -458,7 +471,7 @@
                refSav = "Add";
                //初始基本信息赋值
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //单据日期
                $("#HRelEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //报工日期
                $("#HWorkReportDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //报工日期
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //制单日期
                $("#HMaker").val(sessionStorage["HUserName"]);     //制单人

@@ -474,8 +487,8 @@
                $('#HPlanQty').attr("disabled", true);
                $('#HSourceName').attr("disabled", true);
                $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HRelBeginDate').attr("disabled", true);
                $('#HRelEndDate').attr("disabled", true);
                $('#HWorkBeginDate').attr("disabled", true);
                $('#HWorkReportDate').attr("disabled", true);

                $.ajax(
                    {
@@ -507,13 +520,13 @@
                                //$("#HSourceInterID").val(LoadData[0].HICMOInterID); //源单主内码
                                $("#HSourceEntryID").val(LoadData[0].HSourceEntryID); //源单子内码(源单行号)
                                $("#HSourceBillType").val(HSourceBillType); //源单类型
                                $("#HGroupID").val(LoadData[0].HDeptID); //班组ID
                                $("#HGroupNumber").val(LoadData[0].HDeptNumber); //班组编码
                                $("#HGroupName").val(LoadData[0].HDeptName); //班组
                                //$("#HGroupID").val(LoadData[0].HDeptID); //班组ID
                                //$("#HGroupNumber").val(LoadData[0].HDeptNumber); //班组编码
                                //$("#HGroupName").val(LoadData[0].HDeptName); //班组
                                $("#HICMOInterID").val(LoadData[0].HICMOInterID); //生产订单ID
                                $("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //生产订单子ID
                                $("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //生产订单
                                $("#HRelBeginDate").val(LoadData[0].HBeginDate); //开工时间
                                $("#HWorkBeginDate").val(LoadData[0].HBeginDate); //开工时间
                                $("#HPlanQty").val(LoadData[0].HDatePlanQty); //计划数量

                            }
@@ -544,8 +557,8 @@
                $('#HPlanQty').attr("disabled", true);
                $('#HSourceName').attr("disabled", true);
                $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HRelBeginDate').attr("disabled", true);
                $('#HRelEndDate').attr("disabled", true);
                $('#HWorkBeginDate').attr("disabled", true);
                $('#HWorkReportDate').attr("disabled", true);
               
                $.ajax(
                    {
@@ -587,13 +600,13 @@
                                $("#HICMOInterID").val(LoadData[0].HICMOInterID); //生产订单ID
                                $("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //生产订单子ID
                                $("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //生产订单
                                $("#HRelBeginDate").val(formatDate(LoadData[0].开工时间)); //开工时间
                                $("#HRelEndDate").val(formatDate(LoadData[0].报工时间)); //报工时间
                                $("#HWorkBeginDate").val(formatDate(LoadData[0].开工时间)); //开工时间
                                $("#HWorkReportDate").val(formatDate(LoadData[0].报工时间)); //报工时间
                                $("#HPlanQty").val(LoadData[0].HDatePlanQty); //计划数量
                                $("#HQty").val(LoadData[0].汇报数量); //报工数量
                                $("#HBadCount").val(LoadData[0].不良数量); //不良数量
                                $("#HWasterQty").val(LoadData[0].因工报废数量); //因工报废数量
                                $("#HWasterQty2").val(LoadData[0].因料报废数量); //因料报废数量
                                /*$("#HWasterQty2").val(LoadData[0].因料报废数量); //因料报废数量*/
                                $("#HMaker").val(LoadData[0].制单人); //制单人
                                $("#HMakeDate").val(formatDate(LoadData[0].制单日期)); //制单日期
                                $("#HUpDater").val(sessionStorage["HUserName"]); //修改人
@@ -626,7 +639,7 @@
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '3714' },
                    data: { "HBillType": '3724' },
                    success: function (d) {
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HInterID").val(0);
@@ -683,6 +696,7 @@
            //退出
            form.on('submit(Exit)', function (data) {
                Pub_Close(1);
                parent.location.reload();
            });


@@ -863,12 +877,12 @@
                    dataType: "json",//数据类型可以为 text xml json  script  jsonp
                    async: false,
                    success: function (datas) {
                        var LoadData = datas.data.Sc_ProcessReportSub;
                        var LoadData = datas.data.Sc_ICMOBillWorkQtyStatus_Tmp;
                        var HQty = LoadData[0].HQty;
                        var HBadCount = LoadData[0].HBadQty;
                        var HWasterQty = LoadData[0].HWasterQty;
                        var HWasterQty2 = LoadData[0].HWasterQty2;
                        var yessqty = HQty + HBadCount + HWasterQty + HWasterQty2;
                        //var HWasterQty2 = LoadData[0].HWasterQty2;
                        var yessqty = HQty + HBadCount + HWasterQty; //+ HWasterQty2;
                        var sumqty = parseFloat($("#HQty").val()) + yessqty;
                        if (sumqty > parseFloat($("#HPlanQty").val())) {
                            layer.confirm("已汇报数量:【" + yessqty + "】,当前汇报数量:【" + parseFloat($("#HQty").val()) + "】不能大于计划数量:【" + parseFloat($("#HPlanQty").val()) + "】！", {
@@ -899,9 +913,9 @@
                if (objdata.field.HWasterQty == "" || objdata.field.HWasterQty == null) {
                    objdata.field.HWasterQty = 0;
                }
                if (objdata.field.HWasterQty2 == "" || objdata.field.HWasterQty2 == null) {
                    objdata.field.HWasterQty2 = 0;
                }
                //if (objdata.field.HWasterQty2 == "" || objdata.field.HWasterQty2 == null) {
                //    objdata.field.HWasterQty2 = 0;
                //}
                var sMainStr = JSON.stringify(objdata.field);
                var sMainSub = sMainStr + ';'+ refSav;

@@ -1017,14 +1031,14 @@
                //因工报废数
                var HWasterQty = $("#HWasterQty").val() == '' ? '0' : $("#HWasterQty").val();
                //因料报废数
                var HWasterQty2 = $("#HWasterQty2").val() == '' ? '0' : $("#HWasterQty2").val();
                //var HWasterQty2 = $("#HWasterQty2").val() == '' ? '0' : $("#HWasterQty2").val();
                //合格=采集-(不良+报废)GatherQty
                Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty) + parseFloat(HWasterQty2));
                Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty));
                if (Hqy < 0)
                {
                    layer.msg("合格数量不能为负数!");
                    HBadCount = 0;
                    Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty) + parseFloat(HWasterQty2));
                    Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty));
                    $("#HBadCount").val(HBadCount);
                    $("#HBadCount").focus();
                }
@@ -1040,13 +1054,13 @@
                //不良数量
                var HBadCount = $("#HBadCount").val() == '' ? '0' : $("#HBadCount").val();
                //因料报废数
                var HWasterQty2 = $("#HWasterQty2").val() == '' ? '0' : $("#HWasterQty2").val();
                //var HWasterQty2 = $("#HWasterQty2").val() == '' ? '0' : $("#HWasterQty2").val();
                //合格=采集-(不良+报废)GatherQty
                Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty) + parseFloat(HWasterQty2));
                Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty));
                if (Hqy < 0) {
                    layer.msg("合格数量不能为负数!");
                    HWasterQty = 0;
                    Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty) + parseFloat(HWasterQty2));
                    Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty));
                    $("#HWasterQty").val(HWasterQty);
                    $("#HWasterQty").focus();
                }
@@ -1094,11 +1108,11 @@
                layer.msg("产品编码不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HRelBeginDate").val() == '' || $("#HRelBeginDate").val() == null) {
            if ($("#HWorkBeginDate").val() == '' || $("#HWorkBeginDate").val() == null) {
                layer.msg("开工时间不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HRelEndDate").val() == '' || $("#HRelEndDate").val() == null) {
            if ($("#HWorkReportDate").val() == '' || $("#HWorkReportDate").val() == null) {
                layer.msg("开工时间不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²úÁ¿»ã±¨/Sc_ProductReportStepBillList.html

@@ -125,6 +125,8 @@
        var HSourceID = ""; //资源ID
        var HICMOInterID = ""; //生产订单主ID
        var HICMOEntryID = ""; //生产订单子ID
        var HMaker = ""; //当前登录人
        var Czybm = ""; //当前登录人编号
        var HSourceInterID = ""; //生产状态临时表主ID
        var HSourceBillType = ""; //源单类型
        var HProcID = ""; //工序ID
@@ -206,8 +208,8 @@
                        , { field: 'HBillNo', title: '单据号', width: 200 }
                        , {
                            field: 'HBillType', title: '单据类型', width: 200, templet: function (d) {
                                if (d.单据类型 == "3714") {
                                    return "工序汇报单";
                                if (d.HBillType == "3724") {
                                    return "产量汇报临时单";
                                }
                            }
                        }
@@ -303,7 +305,8 @@
            //报工平台进入(有源单)
            function set_AddNew()
            {
                sWhere = " where b.HSourceID='" + HSourceID + "' and b.HSourceBillNo='" + workcode + "' and b.HSourceInterID='" + (HSourceInterID == "null" ? 0 : HSourceInterID) + "' and b.HSourceEntryID='" + (HICMOEntryID == "null" ? 0 : HICMOEntryID) + "' and a.HMaker='" + HMaker + "' ";
                //sWhere = " where b.HSourceID='" + HSourceID + "' and b.HSourceBillNo='" + workcode + "' and b.HSourceInterID='" + (HSourceInterID == "null" ? 0 : HSourceInterID) + "' and b.HSourceEntryID='" + (HICMOEntryID == "null" ? 0 : HICMOEntryID) + "' and a.HMaker='" + HMaker + "' ";
                sWhere = " where a.HSourceID='" + HSourceID + "' and a.HSourceBillNo='" + workcode + "' and a.HSourceInterID='" + (HSourceInterID == "null" ? 0 : HSourceInterID) + "' and a.HSourceEntryID='" + (HICMOEntryID == "null" ? 0 : HICMOEntryID) + "' and a.HMaker='" + HMaker + "' ";
                SchWhere = sWhere;
                console.log(sWhere);
                //进入页面显示的缓存列表

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²úÁ¿»ã±¨/Sc_ProductReportStepBillList_Web.html

@@ -237,9 +237,9 @@
                        , { field: '日期', title: '日期', width: 200, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
                        , {
                            field: '单据类型', title: '单据类型', width: 200, templet: function (d) {
                                if (d.单据类型 == "3714")
                                if (d.单据类型 == "3724")
                                {
                                    return "工序汇报单";
                                    return "产量汇报临时单";
                                }
                            }
                        }

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/·µ¹¤/Sc_Add_MESReturnStepWorkBillList.html

@@ -132,6 +132,22 @@
                                                </div>
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">工序序号</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HProcNo" id="HProcNo" lay-verify="number" autocomplete="off" class="layui-input" />
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">返工工序</label>
                                                        <div class="layui-input-inline">
                                                            <div class="layui-input-inline">
                                                                <select name="HProcID" id="HProcID" lay-verify="required" lay-search="">
                                                                    <option value="">选择或搜索选择返工工序</option>
                                                                </select>
                                                            </div>
                                                        </div>
                                                    </div>
                                                    <!--<div class="layui-inline">
                                                        <label class="layui-form-label">返工工序</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HProcName" id="HProcName" class="layui-input" value="" style="float:left;width:150px;">
@@ -140,17 +156,11 @@
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                            </button>
                                                        </div>
                                                    </div>
                                                    </div>-->
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">返工数量:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HQty" lay-verify="HQty" id="HQty" autocomplete="off">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">返工日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                        </div>
                                                    </div>
                                                </div>
@@ -219,6 +229,12 @@
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceList" id="HSourceList" 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">返工日期:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                        </div>
                                                    </div>
                                                </div>
@@ -359,6 +375,9 @@
            //初始化表单插件
            set_InitFrom();

            //初始化返工工序列表(所有工序)
            ReworkProcess();

            //判断操作类型
            if (OperationType == 1) {//无源单
                set_AddFNew();
@@ -412,8 +431,40 @@

            }

            //初始化返工工序列表(所有工序)
            function ReworkProcess()
            {
                $.ajax(
                    {
                        type: "GET",
                        url: GetWEBURL() + "/Sc_MESReturnStepWorkBill/GetMESReturnStepSelectBill", //方法所在页面和方法名
                        async: true,
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1)// è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            {
                                var str = ''; //声明字符串
                                $("#HProcID option:gt(0)").remove();//重新加载前，移除第一个以外的option
                                $.each(data.data, function (i, obj) {
                                    str += '<option value="' + obj.HItemID + '">' + obj.工序名称 + '</option>';
                                });//遍历循环遍历
                                $(str).appendTo("#HProcID");//绑定
                                form.render("select");//注意：最后必须重新渲染下拉框，否则没有任何效果。
                            }
                            else
                            {
                                layer.alert(data.Message, { icon: 5 });
                            }
                        },
                        error: function (err) {
                            layer.alert(err, { icon: 5 });
                        }
                    });
            }

            //有源单新增
            function set_AddNew() {
                
                refSav = "Add";
                //初始基本信息赋值
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //单据日期
@@ -429,7 +480,7 @@
                $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HMaterName').attr("disabled", true);
                $('#HMaterSpec').attr("disabled", true);
                $('#HProcID').attr("disabled", true);
                //$('#HProcID').attr("disabled", true);
                $('#HProcName').attr("disabled", true);
                $('#HProcList').addClass("layui-btn-disabled").attr("disabled", true);
                $('#HPlanBeginDate').attr("disabled", true);
@@ -470,13 +521,11 @@
                                $("#HSourceBillNo").val(HSourceBillNo); //源单内码
                                $("#HSourceInterID").val(HSourceInterID); //源单主码
                                $("#HSourceEntryID").val(HSourceEntryID); //源单子码

                                $("#HProcID").val(LoadData[0].HProcID); //返工工序ID
                                $("#HProcName").val(LoadData[0].HProcName); //返工工序
                                //$("#HProcID").val(LoadData[0].HProcID); //返工工序ID
                                //$("#HProcName").val(LoadData[0].HProcName); //返工工序

                                $("#HDeptID").val(LoadData[0].HDeptID); //车间ID
                                $("#HDeptName").val(LoadData[0].HDeptName); //车间
                                
                                
                            }
                            else {
@@ -603,6 +652,7 @@
                {
                    return false;
                }
           
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Sc_MESReturnStepWorkBill/SaveGetMESReturnStepWorkFrom", //方法所在页面和方法名
@@ -924,6 +974,14 @@
                layer.msg("单据日期不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HProcNo").val() == '' || $("#HProcNo").val() == null) {
                layer.msg("返工工序号不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HProcID").val() == '' || $("#HProcID").val() == null) {
                layer.msg("返工工序不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HMaterID").val() == '' || $("#HMaterID").val() == null) {
                layer.msg("产品编码不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú°ü×°µ¥/Sc_PackUnionBill.html

@@ -35,6 +35,18 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">箱号条码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" id="BoxBarCode" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">条码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" id="BarCode" style="width:190px;">
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HDate" style="width:190px;">
@@ -45,31 +57,13 @@
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HDate1" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">部门名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" id="HDepartName" style="width:190px;">
                                    </div>
                                </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">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">物料代码</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" id="HMaterNumber" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">物料名称</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" id="HMaterName" style="width:190px;">
                                        </div>
                                    </div>

                                    <div class="layui-inline">
                                        <label class="layui-form-label">制单人</label>
                                        <div class="layui-input-block">
@@ -198,8 +192,8 @@
                resultTableHead = []; //清空表头列，防止重复渲染
                //初始查询
                //get_Display(sWhere);
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
                $("#HDate1").val(Format(new Date(new Date()), "yyyy-MM-dd"));
                get_FastQuery();

            }
@@ -314,8 +308,8 @@
                var HDate = $("#HDate").val();//开始日期
                var HDate1 = $("#HDate1").val();//结束日期
                var HBillNo = $("#HBillNo").val(); //单据号
                var HDepartName = $("#HDepartName").val();
                var HMaterNumber = $("#HMaterNumber").val();
                var BoxBarCode = $("#BoxBarCode").val();
                var BarCode = $("#BarCode").val();
                var HMaterName = $("#HMaterName").val();
                var HMakerMan = $("#HMakerMan").val();
                
@@ -328,11 +322,11 @@
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                if (HDepartName) {
                    sWhere += " and éƒ¨é—¨ like '%" + HDepartName + "%'";
                if (BoxBarCode) {
                    sWhere += " and ç®±å·æ¡å½¢ç  like '%" + BoxBarCode + "%'";
                }
                if (HMaterNumber) {
                    sWhere += " and ç‰©æ–™ä»£ç  like '%" + HMaterNumber + "%'";
                if (BarCode) {
                    sWhere += " and æ¡ç  like '%" + BarCode + "%'";
                }
                if (HMaterName) {
                    sWhere += " and ç‰©æ–™åç§° like '%" + HMaterName + "%'";
@@ -345,11 +339,11 @@
            }
            //重置过滤条件
            function set_ClearQuery() {
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
                $("#HDate1").val(Format(new Date(new Date()), "yyyy-MM-dd"));
                $("#HBillNo").val("");
                $("#HDepartName").val("");
                $("#HMaterNumber").val("");
                $("#BoxBarCode").val("");
                $("#BarCode").val("");
                $("#HMaterName").val("");
                $("#HMakerMan").val("");
                sWhere = " ";

 WebTM/views/ÏúÊÛ¹ÜÀí/·¢»õ֪ͨµ¥/Xs_SeOutStockBillList.html

@@ -143,13 +143,14 @@
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sWhere);
                get_FastQuery(table, option);
                //get_Display(sWhere);
            }
            //#endregion
            //#region åˆå§‹åŒ–表格方法
            $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
            $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
            function set_InitGrid() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'

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

@@ -383,15 +383,15 @@
                , where: { HBillID: linterid, HBillType: '1201', sWhere: '' }
                , cols: [[
                    { type: 'radio' }
                , { field: 'HQty', title: '数量', sort: true }
                , { field: 'HQtyMust', title: '应收数量', sort: true }
                , { field: 'HMaterNumber', title: '物料代码', sort: true }
                , { field: 'HMaterName', title: '物料名称', sort: true }
                , { field: 'HMaterModel', title: '规格型号', sort: true }
                , { field: 'HSourceInterID', title: '源单主内码', sort: true }
                , { field: 'HSourceEntryID', title: '源单子内码', sort: true }
                , { field: 'HSourceBillNo', title: '源单单号', sort: true }
                , { field: 'HBatchNo', title: '批次', sort: true }
                    , { field: 'HQty', title: '数量', sort: true, width:100 }
                    , { field: 'HQtyMust', title: '应收数量', sort: true, width: 100}
                    , { field: 'HMaterNumber', title: '物料代码', sort: true, width: 200}
                    , { field: 'HMaterName', title: '物料名称', sort: true, width: 200}
                    , { field: 'HMaterModel', title: '规格型号', sort: true,width: 200}
                    , { field: 'HSourceInterID', title: '源单主内码', sort: true, width: 200 }
                    , { field: 'HSourceEntryID', title: '源单子内码', sort: true, width: 200}
                    , { field: 'HSourceBillNo', title: '源单单号', sort: true, width: 200}
                    , { field: 'HBatchNo', title: '批次', sort: true, width: 200}
                ]]
                , height: 500
                , done: function () {
@@ -649,17 +649,17 @@
                               , where: { HBillID: sInterID, HBillType: '1201', sWhere: '' }
                               , cols: [[
                                  { type: 'radio' }
                                , { field: 'HQty', title: '数量', width: 80 }
                                , { field: 'HQtyMust', title: '应收数量', width: 80 }
                                , { field: 'HMaterNumber', title: '物料代码', width: 100 }
                                , { field: 'HMaterName', title: '物料名称', width: 150 }
                                , { field: 'HMaterModel', title: '规格型号', width: 100 }
                                , { field: 'HSourceInterID', title: '源单主内码', width: 100 }
                                , { field: 'HSourceEntryID', title: '源单子内码', width: 100 }
                                , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                                , { field: 'HBatchNo', title: '批次', width: 100 }
                                , { field: 'HAuxPropID', title: '辅助属性', width: 100 }
                                , { field: 'HMTONo', title: '计划跟踪号', width: 100 }
                                , { field: 'HQty', title: '数量', width: 100 }
                                , { field: 'HQtyMust', title: '应收数量', width: 100 }
                                , { field: 'HMaterNumber', title: '物料代码', width: 200 }
                                , { field: 'HMaterName', title: '物料名称', width: 200 }
                                   , { field: 'HMaterModel', title: '规格型号', width: 200 }
                                   , { field: 'HSourceInterID', title: '源单主内码', width: 200 }
                                   , { field: 'HSourceEntryID', title: '源单子内码', width: 200 }
                                   , { field: 'HSourceBillNo', title: '源单单号', width: 200 }
                                   , { field: 'HBatchNo', title: '批次', width: 200 }
                                   , { field: 'HAuxPropID', title: '辅助属性', width: 200 }
                                   , { field: 'HMTONo', title: '计划跟踪号', width: 200 }
                         ]]
                         , height: 500
                           })
@@ -865,15 +865,15 @@
                                                  , cellMinWidth : 115
                                                  , cols: [[
                                                      { type: 'radio' }
                                                    , { field: 'HQty', title: '数量', sort: true }
                                                    , { field: 'HQtyMust', title: '应收数量', sort: true  }
                                                    , { field: 'HMaterNumber', title: '物料代码', sort: true }
                                                    , { field: 'HMaterName', title: '物料名称', sort: true }
                                                    , { field: 'HMaterModel', title: '规格型号', sort: true }
                                                    , { field: 'HSourceInterID', title: '源单主内码', sort: true }
                                                    , { field: 'HSourceEntryID', title: '源单子内码', sort: true }
                                                    , { field: 'HSourceBillNo', title: '源单单号', sort: true }
                                                    , { field: 'HBatchNo', title: '批次', sort: true }
                                                      , { field: 'HQty', title: '数量', sort: true, width:100 }
                                                      , { field: 'HQtyMust', title: '应收数量', sort: true, width: 100 }
                                                      , { field: 'HMaterNumber', title: '物料代码', sort: true, width: 200}
                                                      , { field: 'HMaterName', title: '物料名称', sort: true, width: 200}
                                                      , { field: 'HMaterModel', title: '规格型号', sort: true, width: 200}
                                                      , { field: 'HSourceInterID', title: '源单主内码', sort: true, width: 200}
                                                      , { field: 'HSourceEntryID', title: '源单子内码', sort: true, width: 200}
                                                      , { field: 'HSourceBillNo', title: '源单单号', sort: true, width: 200}
                                                      , { field: 'HBatchNo', title: '批次', sort: true, width: 200}
                                                  ]]
                                                  , height: 500
                                                  , done: function () {
@@ -934,14 +934,14 @@
                              , where: { HBillID: sInterID, HBillType: '1201', sWhere: '' }
                              , cols: [[
                                  { type: 'radio' }
                                , { field: 'HQty', title: '数量', sort: true }
                                , { field: 'HQtyMust', title: '应收数量', sort: true }
                                , { field: 'HMaterNumber', title: '物料代码', sort: true }
                                , { field: 'HMaterName', title: '物料名称', sort: true }
                                , { field: 'HMaterModel', title: '规格型号', sort: true }
                                , { field: 'HSourceInterID', title: '源单主内码', sort: true }
                                , { field: 'HSourceEntryID', title: '源单子内码', sort: true }
                                , { field: 'HSourceBillNo', title: '源单单号', sort: true }
                                  , { field: 'HQty', title: '数量', sort: true, width: 100}
                                  , { field: 'HQtyMust', title: '应收数量', sort: true, width: 100}
                                  , { field: 'HMaterNumber', title: '物料代码', sort: true, width: 200}
                                  , { field: 'HMaterName', title: '物料名称', sort: true, width: 200}
                                  , { field: 'HMaterModel', title: '规格型号', sort: true, width: 200}
                                  , { field: 'HSourceInterID', title: '源单主内码', sort: true, width: 200}
                                  , { field: 'HSourceEntryID', title: '源单子内码', sort: true, width: 200}
                                  , { field: 'HSourceBillNo', title: '源单单号', sort: true, width: 200}
                                , { field: 'HBatchNo', title: '批次'}
                              ]]
                                // , data: [linterid]