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

wtt

2024-10-28 07cf94734c36d4eae6ddbc4dd338bf5af81a2193

 WebTM/views/²É¹º¹ÜÀí/ÊÕÁÏ֪ͨµ¥/Add_Edit_Cg_POInStockBillList.html

@@ -851,18 +851,14 @@
                        return;
                    }
                    $.ajax({
                        url: GetWEBURL() + '/Cg_POOrderBill/list',
                        url: GetWEBURL() + '/Cg_POOrderBill/PushList',
                        type: "GET",
                        data: { "sWhere": "and å•æ®å· = '" + HSourceBillNo+"'", "user": sessionStorage["HUserName"] },
                        data: { "HBillNo": HSourceBillNo, "user": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                var checkStatus = result;
                                if (checkStatus.data[0].状态 != "已审核") {
                                    layer.close(ajaxLoad);
                                    layer.msg("源单状态未审核", { icon: 5 });
                                    return;
                                }
                                if ($("#HSourceBillType").val() == "1102") {
                                    option.data = [];//清空子表
                                    $("#HProjectName").val(checkStatus.data[0].项目名称);
                                    $("#HProjectNumber").val(checkStatus.data[0].项目代码);
                                    $("#HProjectID").val(checkStatus.data[0].HProjectID);
@@ -886,7 +882,7 @@
                                    for (var i = 0; i < result.data.length; i++) {
                                        var HNewQty = checkStatus.data[j].数量 - checkStatus.data[j].关联数量//数量
                                        var HNewMoney = checkStatus.data[j].金额 - checkStatus.data[j].关联数量 * checkStatus.data[j].单价//减少关联数量的金额
                                        var HNewTaxMoney = HNewMoney * checkStatus.data[j].税率*0.01
                                        var HNewTaxMoney = HNewMoney * checkStatus.data[j].税率 * 0.01
                                        option.data.push({
                                            "HMaterID": checkStatus.data[j].HMaterID, "物料代码": checkStatus.data[j].物料代码, "物料名称": checkStatus.data[j].物料名称, "规格型号": checkStatus.data[j].规格型号,
                                            "HUnitID": checkStatus.data[j].HUnitID, "计量单位": checkStatus.data[j].计量单位,
@@ -899,13 +895,15 @@
                                    }
                                    table.render(option);
                                    layer.close(ajaxLoad);
                                    layer.msg("查询成功", { time: 1 * 1000,icon: 1 });
                                    layer.msg("查询成功", { time: 1 * 1000, icon: 1 });
                                }
                            } else {
                                layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                                layer.alert(result.Message, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                                layer.close(ajaxLoad);
                            }
                        }, error: function () {
                            layer.alert(result.msg+"发生错误!", { icon: 5 });
                            layer.alert(result.Message + "发生错误!", { icon: 5 });
                            layer.close(ajaxLoad);
                        }
                    });
                }
@@ -2166,10 +2164,19 @@
                        if (checkStatus.data.length == 0) {
                            return layer.msg("请至少选择一条数据!");
                        }
                        var HSupID = $("#HSupID").val();//判断供应商
                        if (HSupID == 0 || HSupID == '') {
                            HSupID = checkStatus.data[0]["HSupID"];
                        }
                        //layer.alert("你已选择" + checkStatus.data.length + "条数据");
                        //获取收料通知单代码
                        var ProcessNumber = [];
                        for (var i = 0; i < checkStatus.data.length; i++) {
                            if (checkStatus.data[i]["HSupID"] != HSupID) {
                                layer.msg("下推失败!已经选中的记录中存在不同供应商!");
                                layer.close(index);//关闭弹窗
                                return;
                            }
                            ProcessNumber.push(checkStatus.data[i]);
                        }