生成条码添加用户，组织，工号，条码日期；启用物料信息方法替换；新增物料信息添加物料名称显示，物料信息校验不成功不允许保存，添加供应商过滤

yusijie

2025-09-13 d14c5dd9ebf781216f5b613f4f757f1d13e27c75

生成条码添加用户，组织，工号，条码日期；启用物料信息方法替换；新增物料信息添加物料名称显示，物料信息校验不成功不允许保存，添加供应商过滤

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html

@@ -539,7 +539,7 @@

                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr;
                var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"];
                var _sSubStr = JSON.parse(sSubStr);
                for (var i = 0; i < _sSubStr.length; i++) {
                    if (_sSubStr[i].HQty > 0 && (_sSubStr[i].HMinQty == 0 || _sSubStr[i].HWXQty == 0)) {
@@ -699,94 +699,9 @@
                                });
                                //#endregion
                                
                                            // #region 成功条码展示
                                            //$.ajax({
                                            //    type: "GET",
                                            //    url: GetWEBURL() + "/showHBarCodeBillDetail",
                                            //    async: true,
                                            //    data: { sMsg: lentryid, user: sessionStorage["Organization"] },
                                            //    dataType: "json",
                                            //    success: function (data_1) {
                                            //        if (data_1.count != 0) {
                                            //            var data = data_1.data;
                                            //            var rowdata_1 = [];
                                            //            var IDdif = data[0].HItemID;
                                            //            for (var i = 0,k=1; i < data.length; i++,k++) {
                                            //                    var totalQty = data[i].生成条码数量; // 总条码数
                                            //                    var standardQty = data[i].标准包装数; // 标准包装数
                                            //                    var labelCount = Math.ceil(totalQty / standardQty); // 计算标签数
                                            //                    var lastQty_sign = (totalQty % standardQty == 0) ? 0 : 1;//判断是否有余数

                                            //                if (k == labelCount && lastQty_sign==1) {
                                            //                    rowdata_1.push({
                                            //                        "HMaterID": data[i].HItemID,
                                            //                        "HBarCode": data[i].HBarCode,
                                            //                        "HMaterNumber": data[i].物料代码,
                                            //                        "HMaterShortNumber": "",
                                            //                        "HMaterName": data[i].物料名称,
                                            //                        "HMaterModel": data[i].规格型号,
                                            //                        "HMinQty": standardQty ,
                                            //                        "HBQty": data[i].最小包装数,
                                            //                        "HSourceBillType": data[i].条码类型,
                                            //                        "HBatchNo": data[i].批号,
                                            //                        "HISKFPERIOD": data[i].是否启用保质期 == null ? 0 : data[i].是否启用保质期,
                                            //                        "HKFPeriod": data[i].保质期 == null ? 0 : data[i].保质期,
                                            //                        "HKFDQDate": data[i].有效期,
                                            //                        "HKFDate": data[i].生产日期,
                                            //                        "HBatchManager": data[i].是否启用批号,
                                            //                        "HSupID": data[i].供应商代码,
                                            //                        "HSupName": data[i].供应商名称,
                                            //                        "HEXPUNIT": data[i].保质期单位,
                                            //                        "HQty": (totalQty % standardQty), // 本次生成条码数量
                                            //                        "biaoqianzhangshu": 1
                                            //                    });
                                            //                    k = 1;
                                            //                }
                                            //                else {
                                            //                    rowdata_1.push({
                                            //                        "HMaterID": data[i].HItemID,
                                            //                        "HBarCode": data[i].HBarCode,
                                            //                        "HMaterNumber": data[i].物料代码,
                                            //                        "HMaterShortNumber": "",
                                            //                        "HMaterName": data[i].物料名称,
                                            //                        "HMaterModel": data[i].规格型号,
                                            //                        "HMinQty":  standardQty,
                                            //                        "HBQty": data[i].最小包装数,
                                            //                        "HSourceBillType": data[i].条码类型,
                                            //                        "HBatchNo": data[i].批号,
                                            //                        "HISKFPERIOD": data[i].是否启用保质期 == null ? 0 : data[i].是否启用保质期,
                                            //                        "HKFPeriod": data[i].保质期 == null ? 0 : data[i].保质期,
                                            //                        "HKFDQDate": data[i].有效期,
                                            //                        "HKFDate": data[i].生产日期,
                                            //                        "HBatchManager": data[i].是否启用批号,
                                            //                        "HSupID": data[i].供应商代码,
                                            //                        "HSupName": data[i].供应商名称,
                                            //                        "HEXPUNIT": data[i].保质期单位,
                                            //                        "HQty": standardQty, // 本次生成条码数量
                                            //                        "biaoqianzhangshu": 1
                                            //                    });
                                            //                }



                                            //            }

                                            //            option_Success.data = rowdata_1;
                                            //            table.render(option_Success);

                                            //        }
                                            //        else {
                                            //            // $("#verifycode").click();
                                            //            f_alert(data.Message);
                                            //        }
                                            //        layer.closeAll("loading");
                                            //    },
                                            //    error: function (err) {
                                            //        f_alert("错误:" + err);
                                            //        layer.closeAll("loading");
                                            //    }
                                            //});
                                            // #endregion 
                            } else {
                                layer.msg(data.Message);
                                        }

                                        layer.closeAll("loading");

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHanding.html

@@ -623,27 +623,41 @@
            if (checkStatus.data.length === 1) {
                var InterID = data[0].HItemID.toString();
                var HMaterID = data[0].物料ID.toString();
                //逻辑审核方法
                var FirstID = sessionStorage["HSupIDs"];
                var HSupID = FirstID.split(",")[0];
                /*                var HSupID = "672189";*/

                // 先检查是否存在多条记录
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/MaterialHandingController/OpenMaterial", //方法所在页面和方法名
                    data: { "HInterID": InterID, "IsUse": num, "CurUserName": sessionStorage["HUserName"], "HMaterID": HMaterID},
                    url: GetWEBURL() + "/MaterialHandingController/CheckMaterialCount",
                    data: {
                        "HMaterID": HMaterID,
                        "HSupID": HSupID,
                        "HInterID": InterID
                    },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                //// 得到frame索引
                                var index = layer.getFrameIndex(window.name);
                                ////关闭当前frame
                        if (result.count > 0) {
                            // 存在多条记录，弹出确认框
                            layer.confirm('同一供应商下的该物料存在多条记录，是否将其余记录设置为未启用？', {
                                btn: ['确定', '取消'],
                                title: "启用确认"
                            }, function (index) {
                                //传1，使用update
                                layer.close(index);
                                //修改为功后刷新界面
                                $("#btnSearch").trigger('click');
                                callForEnable(InterID, HMaterID, HSupID, 1, num);
                            }, function (index) {
                                //传0，直接启用
                                layer.close(index);
                                //callForEnable(InterID, HMaterID, HSupID, 0, num);
                            });

                        } else {
                            layer.alert("已经启用，不准再次启用！", { icon: 5 });
                            // 没有多条记录，直接启用
                            callForEnable(InterID, HMaterID, HSupID, 0, num);
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    },
                    error: function () {
                        layer.alert("检查记录数量失败!", { icon: 5 });
                    }
                });
            }
@@ -652,8 +666,40 @@
            }
        }

        function callForEnable(InterID, HMaterID, HSupID, disableOthers, num) {
            $.ajax({
                type: "GET",
                url: GetWEBURL() + "/MaterialHandingController/OpenMaterial",
                data: {
                    "HInterID": InterID,
                    "IsUse": num,
                    "CurUserName": sessionStorage["HUserName"],
                    "HMaterID": HMaterID,
                    "HSupID": HSupID,
                    "disableOthers": disableOthers
                },
                success: function (result) {
                    if (result.count == 1) {
                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                            // 得到frame索引
                            var index = layer.getFrameIndex(window.name);
                            // 关闭当前frame
                            layer.close(index);
                            // 修改成功后刷新界面
                            $("#btnSearch").trigger('click');
                        });
                    } else {
                        layer.alert(result.Message, { icon: 5 });
                    }
                },
                error: function () {
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }
        //#endregion


        function get_createBarCode() {
            var checkStatus = table.checkStatus('mainTable')
                , data = checkStatus.data;

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html

@@ -82,7 +82,7 @@
                                            </button>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">物料名称</label>
                                            <label class="layui-form-label">物料简称</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="hidden" name="HUserID" id="HUserID" value="0">
@@ -97,6 +97,12 @@
                                        </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" name="HMaterName0" id="HMaterName0" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">最小包装</label>
                                            <div class="layui-input-inline">
@@ -603,8 +609,13 @@
                    return;
                }
            }
            if ($("#HMaterID").val() == 0 || $("#HMaterID").val() == null || $("#HMaterID").val() == undefined) {
                layer.msg("物料信息未校验成功，不允许保存！");
                return;
            }

            var HMaterID = $('#HMaterNumber').val();
            var sMainStr = JSON.stringify(data.field);
            var sMainStr = JSON.stringify(data.field) + ';' + sessionStorage["OrganizationID"];
            //var sMainSub = sMainStr + ";" +  HMaterID;
            var itID = $('#HitemID').val();
            var index = layer.load();
@@ -764,7 +775,7 @@
            var HMaterID = $("#HMaterID").val();
            var user = sessionStorage["HUserName"];
            var OrganizationID = sessionStorage["OrganizationID"];
            var SupID = $("#SupID").val();
            var SupID = $("#HSupID").val();

            $.ajax({
                type: "GET",
@@ -806,8 +817,12 @@
                        });
                    } else if (responseData.code === "1") {

                        $("#HMaterName").val(responseData.data[0]["HSubjoin"] == null ? responseData.data[0]["HName"] : responseData.data[0]["HSubjoin"]);
                        $("#HMaterName0").val(responseData.data[0]["HName"]);
                        $("#HMaterName").val(responseData.data[0]["HSubjoin"]);
                        $("#HModel").val(responseData.data[0]["HModel"]);
                        $("#HMaterID").val(responseData.data[0]["HItemID"]);

                        
                        form.render('select');
                    } else {
                        layer.msg(responseData.Message || "物料信息不存在", { time: 5000 });