llj
2025-09-09 4593e30e104a17bebf9f3035b8597cdf4bdc6fed
条码打印补充
4个文件已修改
185 ■■■■ 已修改文件
WebSRM/WebSRM.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html 159 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHanding.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebSRM/WebSRM.csproj.user
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
    <NameOfLastUsedPublishProfile>D:\GitHub\SRM-LAYUI-HK\WebSRM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <UseIISExpress>true</UseIISExpress>
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html
@@ -411,7 +411,7 @@
                    
                }
                else if (obj.event == 'inputHMinQty') {
                    var oldHMinQty = data.HMinQty;
                    var $input = $(this), val = $input.val();
                    $(obj.tr).find(".layui-table-edit").keyup(function () {
                        var $input = $(this), val = $input.val();
@@ -487,10 +487,13 @@
                    }
                    if (HMinQty < HBQty) {
                        f_alert("标准包装数量不能小于最小包装数量!请重新输入!")
                        obj.update({
                            HBQty: Math.ceil(parseFloat(obj.data.HQty) / parseFloat(obj.value)),
                        });
                        return;
                    }
                    else {
                        obj.update({
                            biaoqianzhangshu: Math.ceil(parseFloat(obj.data.HQty) / parseFloat(obj.value)),
                        });
                    }
                    break;  
            }
@@ -584,9 +587,10 @@
                                var option_Success;
                                option_Success = {
                                    elem: '#subTable'
                                   // , url: GetWEBURL() + 'showHBarCodeBillDetail'  //h_v_Web_BarCodeBill_ForWeb1
                                    // , url: GetWEBURL() + 'showHBarCodeBillDetail'  //h_v_Web_BarCodeBill_ForWeb1
                                    , toolbar: '#toolbarDemo1'
                                    , defaultToolbar: ['filter', 'exports']
                                    , limit: 500
                                    , cols: [[
                                        , { field: 'HBarCode', title: '条码', width: 100 }
                                        , { field: 'HMaterID', title: '物料ID', width: 100, hide: true }
@@ -613,24 +617,24 @@
                                    ]]
                                }
                                //#region ADD
                                var barcodes = data.data;
                                // 将条码列表转换为逗号分隔的字符串
                                var barcodeStr = barcodes.join(',');
                                $.ajax({
                                    type: "GET",
                                    url: GetWEBURL() + "/showHBarCodeBillDetail",
                                    async: true,
                                    data: { sMsg: lentryid, user: sessionStorage["Organization"] },
                                    url: GetWEBURL() + "/GetBarcodeDetails",
                                    data: { barcodes: barcodeStr },
                                    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) {
                                            for (var i = 0; i < data.length; i++) {
                                                if (i == data.length - 1)//最后一条
                                                {
                                                    rowdata_1.push({
                                                        "HMaterID": data[i].HItemID,
                                                        "HBarCode": data[i].HBarCode,
@@ -638,7 +642,7 @@
                                                        "HMaterShortNumber": "",
                                                        "HMaterName": data[i].物料名称,
                                                        "HMaterModel": data[i].规格型号,
                                                        "HMinQty": standardQty ,
                                                        "HMinQty": data[i].标准包装数,
                                                        "HBQty": data[i].最小包装数,
                                                        "HSourceBillType": data[i].条码类型,
                                                        "HBatchNo": data[i].批号,
@@ -650,10 +654,9 @@
                                                        "HSupID": data[i].供应商代码,
                                                        "HSupName": data[i].供应商名称,
                                                        "HEXPUNIT": data[i].保质期单位,
                                                        "HQty": (totalQty % standardQty), // 本次生成条码数量
                                                        "HQty": (data[i].生成条码数量 % data[i].标准包装数 == 0 ? data[i].标准包装数: (data[i].生成条码数量 % data[i].标准包装数)), // 本次生成条码数量
                                                        "biaoqianzhangshu": 1
                                                    });
                                                    k = 1;
                                                }
                                                else {
                                                    rowdata_1.push({
@@ -663,7 +666,7 @@
                                                        "HMaterShortNumber": "",
                                                        "HMaterName": data[i].物料名称,
                                                        "HMaterModel": data[i].规格型号,
                                                        "HMinQty":  standardQty,
                                                        "HMinQty": data[i].标准包装数,
                                                        "HBQty": data[i].最小包装数,
                                                        "HSourceBillType": data[i].条码类型,
                                                        "HBatchNo": data[i].批号,
@@ -675,40 +678,118 @@
                                                        "HSupID": data[i].供应商代码,
                                                        "HSupName": data[i].供应商名称,
                                                        "HEXPUNIT": data[i].保质期单位,
                                                        "HQty": standardQty, // 本次生成条码数量
                                                        "HQty": data[i].标准包装数, // 本次生成条码数量
                                                        "biaoqianzhangshu": 1
                                                    });
                                                }
                                            }
                                            // 更新表格数据
                                            option_Success.data = rowdata_1;
                                            table.render(option_Success);
                                        }
                                        else {
                                            // $("#verifycode").click();
                                            f_alert(data.Message);
                                    }
                                });
                                //#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
                                        }
                                        layer.closeAll("loading");
                                    },
                                    error: function (err) {
                                        f_alert("错误:" + err);
                                        layer.closeAll("loading");
                                    }
                                });
                            }
                            layer.closeAll("loading");
                        },
                        error: function (err) {
                            f_alert("错误:" + err);
                        }
                    });
                return false;
                                return false;
            });
           //#endregion
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHanding.html
@@ -653,6 +653,10 @@
        function get_createBarCode() {
            var checkStatus = table.checkStatus('mainTable')
                , data = checkStatus.data;
            if (data[0].是否启用 != 'Y') {
                layer.msg('请先启用再生成条码!');
                return;
            }
            if (checkStatus.data.length) {
                //var linterIDArray[0] = data[0].HItemID;
                var linterIDArray = []; var BarCodeArr = data[0].HItemID+',';
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html
@@ -774,9 +774,15 @@
                            }
                        }
                    }
                    if (responseData === 2) {
                            layer.msg("物料组织和登录组织不一致,请检查!");
                            $("#HMaterName").val("");
                            $("#HMaterNumber").val("");
                            $("#HModel").val("");
                        $("#HUSEORGID").val(OrganizationID);
                        return;
                    }
                    if (responseData === 1) {
                        // 弹出询问框
                        layer.confirm('该物料已经被本供应商获取,是否继续?', {
                            icon: 3,
                            title: '提示'
@@ -785,17 +791,9 @@
                            get_MaterialCheck(1);
                        });
                    } else if (responseData.code === "1") {
                        // 正常返回物料信息
                        $("#HMaterName").val(responseData.data[0]["HName"]);
                        $("#HModel").val(responseData.data[0]["HModel"]);
                        $("#HUSEORGID").val(responseData.data[0]["HUSEORGID"]);
                        if ($("#HUSEORGID").val() != OrganizationID) {
                            layer.msg("物料组织和登录组织不一致,请检查!");
                                $("#HMaterName").val("");
                                $("#HMaterNumber").val("");
                                $("#HModel").val("");
                                $("#HUSEORGID").val(OrganizationID);
                        }
                        form.render('select');
                    } else {
                        layer.msg(responseData.Message || "物料信息不存在", { time: 5000 });