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

YL

2021-07-21 70d0220b04e5019b890650aadd6668ca5574c64f

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

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

@@ -391,8 +391,15 @@
                        $("#HMaker").val(sessionStorage["HUserName"]);
                    }
                });
                //根据源单id获取源单信息
                LoadingInformation();
                if (HSouceBillType == 3722) {
                    //根据源单id获取源单信息
                    LoadingInformation2();
                } else if (HSouceBillType == 3791) {
                    //根据源单id获取源单信息
                    LoadingInformation();
                } else {
                    layer.alert("源单类型无效！", { icon: 5 });
                }
            }
            else if (OperationType == 3) {
                RoadBillMain(linterid);
@@ -402,6 +409,40 @@
            set_InitGrid();

            //根据源单id获取源单信息
            function LoadingInformation2() {
                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + "/QC_ProcessCheckBill/get_ICMOBillStatus_Tmp",
                    type: "GET",
                    data: { "HInterID": linterid, "HEntryID": 0, "HBillType": HSouceBillType },
                    success: function (result) {
                        var data = result.data[0];
                        if (result.count == 1) {
                            $("#HProcExchBillNo").val(data.HProcExchBillNo);
                            $("#HProcExchInterID").val(data.HProcExchInterID);
                            $("#HProcExchEntryID").val(data.HProcExchEntryID);
                            $("#HProcExchQty").val(data.HProcExchQty);
                            $("#HICMOBillNo").val(data.HICMOBillNo);
                            $("#HICMOInterID").val(data.HICMOInterID);
                            $("#HICMOQty").val(data.HICMOQty);
                            $("#HSourceName").val(data.HSourceName);
                            $("#HSourceID").val(data.HSourceID);
                            $("#HMaterID").val(data.HMaterID);
                            $("#HMainSourceBillNo").val("");
                            $("#HMainSourceBillType").val(data.HBillType);
                            $("#HMainSourceInterID").val(data.HInterID);
                        } else {
                            layer.alert(result.Message, { icon: 5 });
                        }
                        layer.close(wait);
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }

            //根据源单id获取源单信息
            function LoadingInformation() {
                var wait = layer.load();
                $.ajax({

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

@@ -235,7 +235,7 @@
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../质量管理/工序检验单/QC_ProcessCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid, 'yes']
                        , content: ['../../质量管理/工序检验单/QC_ProcessCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=' + 3791, 'yes']
                        , resize: false
                        , cancel: function () {
                            btnIs();