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

wtt

2024-07-04 3b57005ff0ece33bde3cce11bc3a93ab57722071

 WebTM/views/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBill.html

@@ -83,12 +83,12 @@
                                                <input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                        <!--<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="HBadReasonHQty" id="HBadReasonHQty" value="0">
                                            </div>
                                        </div>
                                        </div>-->
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
@@ -383,7 +383,7 @@
            //var HSouceBillType = 3722;

            get_Display_UserList();
            get_ConfigFileInfo_EquipFile();
            //get_ConfigFileInfo_EquipFile();

            //判断操作类型
            if (OperationType == 1) {//无源单新增
@@ -398,9 +398,12 @@
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                        $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
                        $("#HMaker").val(sessionStorage["HUserName"]);
                        $("#HGroupID").val(sessionStorage["HGroupID"]); //根据登录用户带出班组ID
                        $("#HGroupName").val(sessionStorage["HGroup"]); //根据登录用户带出班组
                        $("#HProcID").val(sessionStorage["HProcID"]); //工序ID
                        $("#HProcNo").val(sessionStorage["HProcName"]); //工序名称
                        $("#HSourceID").val(sessionStorage["HSource"]); //生产资源ID
                        $("#HSourceName").val(sessionStorage["HSourceID"]); //生产资源名称
                        layer.close(ajaxLoad);
                    }
                });
@@ -417,10 +420,7 @@
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                        $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
                        $("#HMaker").val(sessionStorage["HUserName"]);
                        $("#HGroupID").val(sessionStorage["HGroupID"]); //根据登录用户带出班组ID
                        $("#HGroupName").val(sessionStorage["HGroup"]); //根据登录用户带出班组
                        $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));                      
                        layer.close(ajaxLoad);
                    }
                });
@@ -470,7 +470,31 @@


            //#region æ‰¹é‡ä¿å­˜æŒ‰é’®
            form.on('submit(btnSumSave)', function () {
            form.on('submit(btnSumSave)', function (data) {
                var sMainStr = JSON.stringify(data.field);
                var oMain = sMainStr + ';' + OperationType;
                var ajaxLoad = layer.load();
                $("#HBarCode").val("");
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Sc_QualityReportBill/set_SaveBarCode",
                    async: true,
                    data: { "oMain": oMain },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) {
                            layer.close(ajaxLoad);                           
                        }
                        else {
                            layer.close(ajaxLoad);
                            layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    },
                    error: function (err) {
                        layer.close(ajaxLoad);
                        layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                });
                get_SumSave();
            });
            //#endregion
@@ -601,7 +625,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Sc_QualityReportBill/set_SaveBill',
                    type: "GET",
                    data: { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HChecker": sessionStorage["HUserName"],"HBadReasonHQty": $("#HBadReasonHQty").val() },
                    data: { "HInterID": $("#HInterID").val(), "HBillNo": $("#HBillNo").val(), "HChecker": sessionStorage["HUserName"]/*,"HBadReasonHQty": $("#HBadReasonHQty").val()*/ },
                    success: function (result) {
                        if (result.count == 1) {
                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
@@ -686,6 +710,10 @@
                            $("#HCheckManName").val(data1.data[0]["质检员"]);
                            $("#HGroupID").val(data1.data[0]["HGroupID"]);
                            $("#HGroupName").val(data1.data[0]["生产班组"]);
                            $("#HProcID").val(data1.data[0]["HProcID"]); //工序ID
                            $("#HProcNo").val(data1.data[0]["工序"]); //工序名称
                            $("#HSourceID").val(data1.data[0]["HSourceID"]); //生产资源ID
                            $("#HSourceName").val(data1.data[0]["生产资源"]); //生产资源名称
                            layer.close(ajaxLoad);

                            //layer.alert("查询成功", { icon: 1 });
@@ -806,6 +834,7 @@
                            "HInterID":$("#HInterID").val(),
                            "HBillNo":$("#HBillNo").val(),
                            "HMaterID": $("#HMaterID").val(),
                            "HMaterNumber": $("#HMaterNumber").val(),
                            "HMaterName": $("#HMaterName").val(),
                            "HProcID": $("#HProcID").val(),
                            "HProcNo": $("#HProcNo").val(),