条码打印更改数据库ip;生成条码修改供应商id传值;生成送货物料信息修改供应商id传值
4个文件已修改
88 ■■■■■ 已修改文件
WebSRM/App_Data/MssqlReportData.cs 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebSRM/App_Data/MssqlReportData.cs
@@ -14,18 +14,10 @@
    //连接SQL Server数据库的连接串,应该修改为与实际一致。如果是运行Grid++Report本身的例子,应该首先附加例子数据库到
    //SQL Server2000/2005数据库上。
    //public const string SqlConnStr = "Data Source=(local);Initial Catalog=gridreport;Persist Security Info=True;User ID=sa;Password=;";
    //惠康
    public const string SqlConnStr = "Data Source=172.16.72.16;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
    //测试
    //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
    //凯贝
    //public const string SqlConnStr = "Data Source=192.168.50.253;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
    //安瑞
    //public const string SqlConnStr = "Data Source=192.168.80.91;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
    //
    //夏宝
    public const string SqlConnStr = "Data Source=192.168.1.223;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
    //安瑞
    //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
    //添康科技
    //public const string SqlConnStr = "Data Source=192.168.1.8;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
    //public string sServer;
    //public string sDataBase;
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialBarCodeBill.html
@@ -40,9 +40,9 @@
                            <div class="layui-form-item">
                                <div class="layui-row">
                                    <div class="layui-col-xs3">
                                        <label class="layui-form-label"> 供 应 商:</label>
                                        <label class="layui-form-label"> 供应商代码:</label>
                                        <div class="layui-input-inline">
                                            <input class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" readonly="readonly" autocomplete="off">
                                            <input class="layui-input" name="HSupNumber" lay-verify="HSupNumber" id="HSupNumber" readonly="readonly" autocomplete="off">
                                            <input id="HSupID" name="HSupID" type="hidden" />
                                        </div>
                                    </div>
@@ -50,9 +50,9 @@
                                        <label class="layui-form-label"> 供 应 商:</label>
                                        <div class="layui-input-inline">
                                            <input class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" readonly="readonly" autocomplete="off">
                                            <input id="HSupName" name="HSupName" type="hidden" />
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
@@ -64,11 +64,11 @@
                                <div class="layui-tab-item layui-show">
                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                                    <script type="text/html" id="toolbarDemo">
                                        <div class="layui-btn-container">
                                        <!--<div class="layui-btn-container">
                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-add"><i class="layui-icon layui-icon-addition"></i>拆分</button>
                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn"><i class="layui-icon layui-icon-addition"></i>列设置</button>
                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-del"><i class="layui-icon layui-icon-subtraction"></i>删行</button>
                                        </div>
                                        </div>-->
                                    </script>
                                    <!-- 条码类型下拉框模板 -->
                                    <script type="text/html" id="barCodeTypeTpl">
@@ -288,7 +288,7 @@
                                    "HKFDQDate": data[i].有效期,
                                    "HKFDate": data[i].生产日期,
                                    "HBatchManager": data[i].是否启用批号,
                                    "HSupID": data[i].供应商代码,
                                    "HSupID": data[i].HSupID,
                                    "HSupName": data[i].供应商名称,
                                    "HEXPUNIT": data[i].保质期单位,
                                    "HQty": 1, // 默认生成条码数量
@@ -592,8 +592,9 @@
                                    , defaultToolbar: ['filter', 'exports']
                                    , limit: 500
                                    , cols: [[
                                        , { field: 'HBarCode', title: '条码', width: 100 }
                                        { field: 'HBarCode', title: '条码', width: 230, ellipsis: true }
                                        , { field: 'HMaterID', title: '物料ID', width: 100, hide: true }
                                        , { field: 'HBarItemID', title: '条码ID', width: 100, hide: true }
                                        , { field: 'HMaterNumber', title: '物料编码', width: 120 }
                                        /*                    , { field: 'HOldMaterNumber', title: '旧物料编码', width: 120, hide: true }*/
                                        , { field: 'HMaterShortNumber', title: '物料代码', width: 120, hide: true }
@@ -621,11 +622,11 @@
                                var barcodes = data.data;
                                // 将条码列表转换为逗号分隔的字符串
                                var barcodeStr = barcodes.join(',');
                                //var barcodeStr = barcodes.join('~');
                                $.ajax({
                                    type: "GET",
                                    url: GetWEBURL() + "/GetBarcodeDetails",
                                    data: { barcodes: barcodeStr },
                                    data: { barcodes: barcodes },
                                    dataType: "json",
                                    success: function (data_1) {
                                        if (data_1.count != 0) {
@@ -633,10 +634,10 @@
                                            var rowdata_1 = [];
                                            for (var i = 0; i < data.length; i++) {
                                                if (i == data.length - 1)//最后一条
                                                {
                                                    rowdata_1.push({
                                                        "HMaterID": data[i].HItemID,
                                                        "HBarItemID": data[i].HBarItemID,
                                                        "HBarCode": data[i].HBarCode,
                                                        "HMaterNumber": data[i].物料代码,
                                                        "HMaterShortNumber": "",
@@ -651,37 +652,14 @@
                                                        "HKFDQDate": data[i].有效期,
                                                        "HKFDate": data[i].生产日期,
                                                        "HBatchManager": data[i].是否启用批号,
                                                        "HSupID": data[i].供应商代码,
                                                        "HSupID": data[i].HSupID,
                                                        "HSupName": data[i].供应商名称,
                                                        "HEXPUNIT": data[i].保质期单位,
                                                        "HQty": (data[i].生成条码数量 % data[i].标准包装数 == 0 ? data[i].标准包装数: (data[i].生成条码数量 % data[i].标准包装数)), // 本次生成条码数量
                                                        "HQty":data[i].生成条码数量 , // 本次生成条码数量
                                                        "biaoqianzhangshu": 1
                                                    });
                                                }
                                                else {
                                                    rowdata_1.push({
                                                        "HMaterID": data[i].HItemID,
                                                        "HBarCode": data[i].HBarCode,
                                                        "HMaterNumber": data[i].物料代码,
                                                        "HMaterShortNumber": "",
                                                        "HMaterName": data[i].物料名称,
                                                        "HMaterModel": data[i].规格型号,
                                                        "HMinQty": data[i].标准包装数,
                                                        "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": data[i].标准包装数, // 本次生成条码数量
                                                        "biaoqianzhangshu": 1
                                                    });
                                                }
                                                
                                            }
@@ -805,7 +783,7 @@
                    return;
                }
                for (var j = 0; j < data2.length; j++) {
                    rows += data2[j].HMaterID.toString() + ',';
                    rows += data2[j].HBarItemID.toString() + ',';
                    rows2 += data2[j].HBarCode.toString() + ',';
                }
                rows = rows.substring(rows.length - 1, 0);
@@ -857,8 +835,9 @@
                    data: { "sWhere": sWhere, "user": '', "Organization": sessionStorage["Organization"] },
                    success: function (result) {
                        if (result.data.length > 0) {
                            $("#HSupID").val(result.data[0].HItemID);
                            $("#HSupNumber").val(result.data[0].供应商代码);
                            $("#HSupName").val(result.data[0].供应商名称);
                            $("#HSupID").val(result.data[0].供应商代码);
                        } else {
                            layer.msg("供应商信息未维护", { time: 5000 });
                        }
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html
@@ -85,7 +85,7 @@
                                            <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="HSupID" id="HSupID" value="0">-->
                                                <input type="hidden" name="HUserID" id="HUserID" value="0">
                                            </div>
                                        </div>
@@ -124,7 +124,8 @@
                                        <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="HSupID" id="HSupID" readonly>
                                                <input type="text" class="layui-input" name="HSupNumber" id="HSupNumber" readonly>
                                                <input type="text" class="layui-input" name="HSupID" id="HSupID" style="display:none;" >
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
@@ -707,7 +708,8 @@
                        $("#HMinPackQty").val(data[0]["最小包装数"]);
                        $("#HInBoxPackQty").val(data[0]["标准包装数"]);
                        $("#HOutBoxPackQty").val(data[0]["HOutBoxPackQty"]);
                        $("#HSupID").val(data[0]["供应商代码"]);
                        $("#HSupID").val(data[0]["HSupID"]);
                        $("#HSupNumber").val(data[0]["供应商代码"]);
                        $("#HSupName").val(data[0]["供应商名称"]);
                        $("#HMaker").val(data[0]["创建人"]);
                        $("#HCheckEmp").val(data[0]["审核人"]);
@@ -818,7 +820,8 @@
                success: function (result) {
                    if (result.data.length > 0) {
                        $("#HSupName").val(result.data[0].供应商名称);
                        $("#HSupID").val(result.data[0].供应商代码);
                        $("#HSupNumber").val(result.data[0].供应商代码);
                        $("#HSupID").val(result.data[0].HItemID);
                    } else {
                        layer.msg("供应商信息未维护", { time: 5000 });
                    }
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_Web_PoBarCodeBillList.aspx
@@ -15,7 +15,9 @@
            //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
            //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
            SqlXMLReportData.GenOneRecordset(this, "select * from h_v_SRM_BarCodeBillList where HItemID in(" + Request.Params["linterid"] + ")");
            //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_SRM_BarCodeBillList where HItemID in(" + Request.Params["linterid"] + ")");
            SqlXMLReportData.GenEntireData(this, "select * from h_v_SRM_BarCodeBillList where HItemID in(" + Request.Params["linterid"] + ")","select 1");
        }
    </script>
</head>