1

yusijie

2024-06-07 b28acfba24adf4f1d2b567d0e2d99c29bd8c6d03

1

 WebSRM/App_Data/MssqlReportData.cs

@@ -16,7 +16,7 @@
    //public const string SqlConnStr = "Data Source=(local);Initial Catalog=gridreport;Persist Security Info=True;User ID=sa;Password=;";
    //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.1.253;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;";
    //
@@ -102,7 +102,9 @@
        //    conn.Close();
        //    LogService.Write("Connection close.");
        //}
        LogService.Write("YES1");
        SqlConnection ReportConn = new SqlConnection(SqlConnStr);
        LogService.Write("YES2");
        SqlDataAdapter ReportDataAdapter = new SqlDataAdapter(QuerySQL, ReportConn);
        DataSet ReportDataSet = new DataSet();
        ReportConn.Open();

 WebSRM/Web.config

@@ -79,6 +79,11 @@
                <add value="login.html" />
            </files>
        </defaultDocument>
        <security>
            <requestFiltering>
                <requestLimits maxAllowedContentLength="10485760" maxUrl="10485760" maxQueryString="10485760" />
            </requestFiltering>
        </security>
  </system.webServer>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

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

@@ -154,25 +154,26 @@
            //计算有效期至
            if (HExpUnit == "Y") {//年
                date = new Date(date);
                console.log(date.getFullYear(date));
                date.setYear(date.getFullYear(date) + HKFPeriod);
                console.log(Format(date, "yyyy-MM-dd"));
                date.setDate(date.getDate(date) - 1);

                return Format(date, "yyyy-MM-dd");
            }
            if (HExpUnit == "M") {//月
                date = new Date(date);
                date.setMonth(date.getMonth(date) + HKFPeriod);
                date.setDate(date.getDate(date) - 1);

                return Format(date, "yyyy-MM-dd");
            }
            if (HExpUnit == "D") {//日
                date = new Date(date);
                date.setDate(date.getDate(date) + HKFPeriod);
                console.log(Format(date, "yyyy-MM-dd"));
                date.setDate(date.getDate(date) - 1);

                return Format(date, "yyyy-MM-dd");
            }
            else { //安瑞计算方式          
            else { //安瑞计算方式
                if (days == undefined || days == '') {
                    days = 1;
                }
@@ -459,7 +460,7 @@
                    }
                    //获取下标
                    index = findIndex(_sSubStr[i].HMaterNumber, _sSubStr[i].HMaterModel, newArray);
                    if (index === -1) {
                    if (index === -1 || _sSubStr[i].HIsSplit == 0) {
                        //如果数组中没有当前数据，则将数据添加进数组中
                        newArray.push(_sSubStr[i]);

@@ -467,7 +468,7 @@
                        if (newArray[index].HPOOrderBillNo == _sSubStr[i].HPOOrderBillNo) {
                            //如果数组中有和当前数据中物料代码、规格型号一致的信息，则将他们的数量累加
                            newArray[index].HQty = Number(newArray[index].HQty) + Number(_sSubStr[i].HQty);
                        }                       
                        }
                    }
                }

@@ -701,6 +702,7 @@
                    , { field: 'HSourceInterID', title: '源单主内码', width: 150, hide: true }
                    , { field: 'HSupID', title: '供应商ID', width: 150, hide: true }
                    , { field: 'HSupName', title: '供应商名称', width: 150, hide: true }
                    , { field: 'HIsSplit', title: '是否拆分', width: 150, hide: true } //0否，1是

                ]]
                , done: function (res, curr, count) {
@@ -789,9 +791,11 @@
                                                        , "HSupName": data[i].HSupName
                                                        , "HSupBatchNo": data[i].HSupBatchNo
                                                        , "HSupMaterNumber": data[i].HSupMaterNumber
                                                        , "HEXPUNIT": data[i].HEXPUNIT
                                                        , "HIsSplit": 1
                                                    }
                                                    //oldData.push(data1);
                                                    oldData.splice(dataindex, 0, data1);
                                                    oldData.push(data1);
                                                    //oldData.splice(dataindex, 0, data1);
                                                };
                                                break;
                                            }

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

@@ -58,7 +58,7 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">产品名称</label>
                                    <label class="layui-form-label">物料名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HName" id="HName">
                                    </div>
@@ -125,7 +125,7 @@
                                        </select>
                                    </div>
                                </div>-->
                                <div class="layui-inline">
                                <div class="layui-inline" style="display:none">
                                    <label class="layui-form-label">是否已下推送货单</label>
                                    <div class="layui-input-block">
                                        <select id="HISGenerate" name="HISGenerate" lay-filter="">
@@ -266,20 +266,20 @@
                , { field: '数量', title: '订货数量', sort: true }
                , { field: '交货地点', title: '交货地点', sort: true }
                , { field: '交货日期', title: '交货日期', width: 180, sort: true }
                , { field: '计划跟踪单号', title: '计划跟踪单号', sort: true, hide: true }
                , { field: '计划跟踪单号', title: '计划跟踪单号', sort: true, hide: true }//
                , { field: '采购订单号', title: '采购订单号', sort: true, hide: true }
                , { field: '委外订单号', title: '委外订单号', sort: true, hide: true }
                , { field: '剩余入库数量', title: '剩余入库数量', sort: true }
                , { field: '剩余送货数量', title: '剩余送货数量', sort: true }
                , { field: '关闭状态', title: '关闭状态', sort: true }
                , { field: '变更状态', title: '变更状态', sort: true }
                , { field: '变更状态', title: '变更状态', sort: true }//
                , { field: '委外组织', title: '委外组织', sort: true }
                , { field: '采购组织', title: '采购组织', sort: true }
                , { field: '确认人', title: '确认人', sort: true, hide: true }
                , { field: '确认日期', title: '确认日期', sort: true, hide: true }
                , { field: '驳回人', title: '驳回人', sort: true, hide: true }
                , { field: '驳回日期', title: '驳回日期', sort: true, hide: true }
                , { field: '驳回理由', title: '驳回理由', sort: true, hide: true }
                , { field: '确认人', title: '确认人', sort: true, hide: true }//
                , { field: '确认日期', title: '确认日期', sort: true, hide: true }//
                , { field: '驳回人', title: '驳回人', sort: true, hide: true }//
                , { field: '驳回日期', title: '驳回日期', sort: true, hide: true }//
                , { field: '驳回理由', title: '驳回理由', sort: true, hide: true }//
              ]]
                //, skin: 'row' //表格风格
                // , even: true
@@ -496,10 +496,10 @@
                    sqlWhere += " and 物料代码 like ^^%" + $("#HNumber").val() + "%^^";
                if ($("#HName").val() != "")
                    sqlWhere += " and 物料名称 like ^^%" + $("#HName").val() + "%^^";
                //if ($("#HModel").val() != "")
                //    sqlWhere += " and 规格型号 like ^^%" + $("#HModel").val() + "%^^";
                if ($("#HClStatus").val() != "")
                    sqlWhere += " and 关闭状态 like ^^%" + $("#HClStatus").val() + "%^^";
                //if ($("#HModel").val() != "")
                //    sqlWhere += " and 规格型号 like ^^%" + $("#HModel").val() + "%^^";
                //if ($("#HPURCHASEORGID").val() != "")
                //    sqlWhere += " and 采购组织 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
                //if ($("#HDate1").val() != "") {
@@ -508,42 +508,13 @@
                //if ($("#HDate2").val() != "") {
                //    sqlWhere += " and 日期 <= ^^" + $("#HDate2").val() + "^^";
                //}
                if ($("#HISGenerate").val() != "") {
                    if ($("#HISGenerate").val() == "是") {
                        sqlWhere += " and 未关联数量 <= 0";
                    }
                    else if ($("#HISGenerate").val() == "否") {
                        sqlWhere += " and 未关联数量 > 0";
                    }
                }
                //var Time = $("#Time").val();
                //var dd = new Date();
                //var dt;
                //switch (Time) {
                //    case 1: dd = new Date(dd.setDate(dd.getDate() + 7));
                //    case 2: dd = new Date(dd.setDate(dd.getDate() + 14));
                //    case 3: dd = new Date(dd.setMonth(dd.getMonth() + 1));
                //    case 4: dd = new Date(dd.setMonth(dd.getMonth() + 2));
                //    case 5: dd = new Date(dd.setMonth(dd.getMonth() + 3));
                //    case 6: dd = new Date(dd.setMonth(dd.getMonth() + 6));
                //    case 7: dd = new Date(dd.setMonth(dd.getMonth() + 12));
                //    default: dd = new Date(dd.setDate(dd.getDate()));
                //}
                //dt = dd.getFullYear().toString();
                //if (dd.getMonth() + 1 < 10) {
                //    dt = dt + "-0" + (dd.getMonth() + 1).toString();
                //}
                //else {
                //    dt = dt + "-0" + (dd.getMonth() + 1).toString();
                //}
                //if (dd.getDate() < 10) {
                //    dt = dt + "-0" + dd.getDate().toString();
                //}
                //else {
                //    dt = dt + "-" + dd.getDate().toString();
                //}
                //if (Time != 8) {
                //    sqlWhere += " and 交货日期 <= ^^" + dt + "^^";
                //if ($("#HISGenerate").val() != "") {
                //    if ($("#HISGenerate").val() == "是") {
                //        sqlWhere += " and 未关联数量 <= 0";
                //    }
                //    else if ($("#HISGenerate").val() == "否") {
                //        sqlWhere += " and 未关联数量 > 0";
                //    }
                //}
                sql = sqlWhere;
                //从第一页开始
@@ -560,20 +531,6 @@
                f_Bhjq: function () { //拒绝

                },
                //JSreload: function () {
                //    var demoReload = $('#test-table-demoReload');
                //    //执行重载
                //    table.JSreload('mainTable', {
                //        page: {
                //            curr: 1 //重新从第 1 页开始
                //        }
                //      , where: {
                //          key: {
                //              id: demoReload.val()
                //          }
                //      }
                //    });
                //}
            };
            $('.test-table-reload-btn .layui-btn').on('click', function () {
                var type = $(this).data('type');

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

@@ -411,7 +411,7 @@
                            layer.close(wait);
                        } else {
                            layer.close(wait);
                            layer.alert(data1.Message, { icon: 5 });
                            layer.msg(data1.Message, {time:2000, icon: 5 });
                        }
                    },
                    error: function (result) {

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

@@ -127,6 +127,16 @@
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">业务终止</label>
                                        <div class="layui-input-block">
                                            <select id="HIsStop" name="HIsStop" lay-filter="">
                                                <option value="全部">全部</option>
                                                <option value="是">是</option>
                                                <option value="否" selected>否</option>
                                            </select>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
@@ -472,7 +482,7 @@
                var wait = layer.load();//遮罩
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "GetPOOrderBill",
                    url: GetWEBURL() + "GetPOOrderBill", //H_p_SRM_POOrderBillList
                    async: true,
                    data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere },
                    success: function (data1) {
@@ -567,10 +577,10 @@
                if ($("#HPURCHASEORGID").val() != "" && $("#HPURCHASEORGID option:selected").text() != "安瑞集团")
                    sqlWhere += " and HPURCHASEORGID = ^^" + $("#HPURCHASEORGID").val() + "^^";
                if ($("#HDate1").val() != "") {
                    sqlWhere += " and 采购日期 >= ^^" + $("#HDate1").val() + "^^";
                    sqlWhere += " and 日期 >= ^^" + $("#HDate1").val() + "^^";
                }
                if ($("#HDate2").val() != "") {
                    sqlWhere += " and 采购日期 <= ^^" + $("#HDate2").val() + "^^";
                    sqlWhere += " and 日期 <= ^^" + $("#HDate2").val() + "^^";
                }
                if ($("#HISGenerate").val() != "") {
                    if ($("#HISGenerate").val() == "是") {
@@ -596,7 +606,16 @@
                    else if ($("#HIsFreeze").val() == "业务冻结") {
                        sqlWhere += " and 业务冻结 = ^^业务冻结^^";
                    }
                }                
                if ($("#HIsStop").val() != "") {
                    if ($("#HIsStop").val() == "是") {
                        sqlWhere += " and 业务终止 = ^^业务终止^^";
                    }
                    else if ($("#HIsStop").val() == "否") {
                        sqlWhere += " and 业务终止 = ^^正常^^";
                    }
                }

                var Time = $("#Time").val();
                if (Time > 0) {
                    var dd = new Date();

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

@@ -227,7 +227,7 @@
                        } else {
                            table.render(option);
                            layer.close(wait);
                            layer.alert(data1.Message, { icon: 5 });
                            layer.msg(data1.Message, { time:2000,icon: 5 });
                        }
                    },
                    error: function (result) {

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_POInStockBill.aspx

@@ -15,6 +15,7 @@

        //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
        //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
        LogService.Write("select * from h_v_SRM_POInStockBillList where hmainid="+Request.Params["linterid"] +" order by 物料代码");
        SqlXMLReportData.GenOneRecordset(this, "select * from h_v_SRM_POInStockBillList where hmainid=" + Request.Params["linterid"]+ " order by 物料代码");
    }
</script>

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/xmlSRM_POInStockBill.aspx.designer.cs

@@ -2,16 +2,18 @@
// <自动生成>
//     此代码由工具生成。
//
//     对此文件的更改可能会导致不正确的行为，并且如果
//     重新生成代码，这些更改将会丢失。 
//     对此文件的更改可能导致不正确的行为，如果
//     重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------

namespace WebSRM.layuiAdmin.std_v1._2._1.src.views.SRM {
    
    
    public partial class xmlSRM_POInStockBill {
        
namespace WebSRM.layuiAdmin.std_v1._2._1.src.views.SRM
{


    public partial class xmlSRM_POInStockBill
    {

        /// <summary>
        /// form1 控件。
        /// </summary>

 WebSRM/login.html

@@ -54,7 +54,7 @@
    <!--顺序不能改变-->
    <script src="layuiAdmin.std-v1.2.1/src/js/jquery.min.js"></script>
    <script src="layuiAdmin.std-v1.2.1/src/js/supersized.3.2.7.min.js"></script>
    <script src="layuiAdmin.std-v1.2.1/src/js/supersized-init.js"></script>
    <script src="layuiAdmin.std-v1.2.1/src/js/supersized-init.js"></script><!--登录图片-->
    <script src="layuiAdmin.std-v1.2.1/src/js/jquery-1.9.1.min.js"></script>
    <script src="layuiAdmin.std-v1.2.1/src/js/jquery.selectlist.js"></script>
    <script src="layuiAdmin.std-v1.2.1/src/layuiadmin/layui/layui.js"></script>