Merge branch 'master' of http://121.37.232.241:10101/r/DIXWeb

ahai

2023-05-17 4c4987a6ca92425bb20f6f54d832d875e03af9aa

Merge branch 'master' of http://121.37.232.241:10101/r/DIXWeb

 src/DIXPadWPF/App.config

@@ -17,7 +17,7 @@
  </appSettings>
  <connectionStrings>
    <add name="DIX" connectionString="data source=43.98.48.159;initial catalog=DIX;Pooling=true;Max Pool Size=100;Min Pool Size=0;integrated security=false;persist security info=True;User ID=developer;Password=p@d201908" providerName="System.Data.EntityClient"/>
    <add name="MySQLDIX" connectionString="Host=43.98.47.112;Port=3306;Database=DIX;Protocol=TCP;Compress=false;Pooling=true; 
    <add name="MySQLDIX" connectionString="Host=43.98.47.105;Port=3306;Database=DIX;Protocol=TCP;Compress=false;Pooling=true; 
                                                                         AllowLoadLocalInfile=true;ConnectionLifetime=0;UserID=root;Password=p@ssw0rd;" providerName="MySql.Data.MySqlClient"/>
  </connectionStrings>
  <entityFramework>

 src/DIXPadWPF/DIXPadInspectItemPage.xaml

@@ -97,7 +97,8 @@
                                              IsReadOnly="True"
                                              HeadersVisibility="Column"  
                                              ColumnHeaderHeight="40"
                                              SelectionMode="Single" >
                                              SelectionMode="Single"
                                              EnableRowVirtualization ="False">
            <DataGrid.ColumnHeaderStyle>
                <Style TargetType="DataGridColumnHeader">
                    <Setter Property="VerticalContentAlignment" Value="Center"></Setter>

 src/DIXPadWPF/DIXPadInspectItemPage.xaml.cs

@@ -173,14 +173,12 @@
                    InitnspectObjectItem(mpcObject.Id, ids);
                    lbInspectTimes.Content = Inspecttimesstr;
                    SetNGColor(ids);
                    SetColor();
                }
                //备用，显示备用按钮，点击备用按钮，所有项目都OK
                else if (statusid == 2)
                {
                    InitnspectObjectItem(mpcObject.Id, mpcObject.InspectObjectStatusId);
                    lbInspectTimes.Content = Inspecttimesstr;
                    SetColor();
                    btnbackup.Visibility = Visibility.Visible;
                }
                //通常设备
@@ -188,7 +186,6 @@
                {
                    InitnspectObjectItem(mpcObject.Id, mpcObject.InspectObjectStatusId);
                    lbInspectTimes.Content = Inspecttimesstr;
                    SetColor();
                }
            }
            else if (Code == "Update")
@@ -212,7 +209,6 @@
                        SetNGColor(ids);
                    }
                }
                SetColor();
                SetstatusColor();
            }
            else
@@ -241,10 +237,8 @@
                        SetNGColor(ids);
                    }
                }
                SetColor();
                SetstatusColor();
            }
           
        }
        public void InitnspectbackupObjectItem(int InspectObjectID)
        {
@@ -1627,6 +1621,7 @@
            this.DataSourceVM = new InsepctItemShowViewModel(sp);
            PdtDataGrid.ItemsSource = null;
            PdtDataGrid.ItemsSource = this.DataSourceVM.InspectItemList;
            SetColor();
        }
        public void SetColor()
        {
@@ -1636,7 +1631,7 @@
                showstr = this.DataSourceVM.InspectItemList[i].showstr;
                if (showstr == "LightGray")
                {
                    DataGridRow rowContainer = (DataGridRow)PdtDataGrid.ItemContainerGenerator.ContainerFromIndex(i);
                    var rowContainer = this.PdtDataGrid.ItemContainerGenerator.ContainerFromIndex(i) as DataGridRow;
                    if (rowContainer == null)
                    {
                        PdtDataGrid.UpdateLayout();
@@ -1849,23 +1844,23 @@
                            {
                                if (lspc[i].Code == "update")
                                {
                                    sst = new MySQLInspectItem() { InspectObjectID = lspc[i].InspectObjectID, InspectItemID = lspc[i].InspectItemID, CheckType = lspc[i].YesRadioContent, Limit = double.Parse(lspc[i].NoRadioContent), NGReason = lspc[i].NGReason, DealDetial = lspc[i].DealDetial, IsImproved = lspc[i].IsImproved, Totaljudge = GetJudge(lspc[i].Judge), Inspecttimes = times, ReInspecttimes = x, imgstring = lspc[i].imgstring, isbackup = lspc[i].isbackup };
                                    sst = new MySQLInspectItem() { InspectObjectID = lspc[i].InspectObjectID, InspectItemID = lspc[i].InspectItemID, CheckType = lspc[i].YesRadioContent, Limit = double.Parse(lspc[i].NoRadioContent), NGReason = lspc[i].NGReason, DealDetial = lspc[i].DealDetial, IsImproved = lspc[i].IsImproved, Totaljudge = GetJudge(lspc[i].Judge), Inspecttimes = times, ReInspecttimes = lspc[i].ReInspectTimes, imgstring = lspc[i].imgstring, isbackup = lspc[i].isbackup };
                                }
                                else if (lspc[i].Code == "updup")
                                {
                                    sst = new MySQLInspectItem() { InspectObjectID = lspc[i].InspectObjectID, InspectItemID = lspc[i].InspectItemID, CheckType = lspc[i].YesRadioContent, Limit = double.Parse(lspc[i].NoRadioContent), NGReason = lspc[i].NGReason, DealDetial = lspc[i].DealDetial, IsImproved = lspc[i].IsImproved, Totaljudge = GetJudge("NG"), Inspecttimes = times, ReInspecttimes = x, imgstring = lspc[i].imgstring, isbackup = lspc[i].isbackup };
                                    sst = new MySQLInspectItem() { InspectObjectID = lspc[i].InspectObjectID, InspectItemID = lspc[i].InspectItemID, CheckType = lspc[i].YesRadioContent, Limit = double.Parse(lspc[i].NoRadioContent), NGReason = lspc[i].NGReason, DealDetial = lspc[i].DealDetial, IsImproved = lspc[i].IsImproved, Totaljudge = GetJudge("NG"), Inspecttimes = times, ReInspecttimes = lspc[i].ReInspectTimes, imgstring = lspc[i].imgstring, isbackup = lspc[i].isbackup };
                                    datalist.Add(sst);
                                    sst = new MySQLInspectItem() { InspectObjectID = lspc[i].InspectObjectID, InspectItemID = lspc[i].InspectItemID, CheckType = lspc[i].YesRadioContent, Limit = lspc[i].ReLimit, NGReason = lspc[i].NGReason, DealDetial = lspc[i].DealDetial, IsImproved = lspc[i].IsImproved, Totaljudge = GetJudge(lspc[i].Judge), Inspecttimes = times, ReInspecttimes = x + 1, imgstring = lspc[i].imgstring, isbackup = lspc[i].isbackup };
                                    sst = new MySQLInspectItem() { InspectObjectID = lspc[i].InspectObjectID, InspectItemID = lspc[i].InspectItemID, CheckType = lspc[i].YesRadioContent, Limit = lspc[i].ReLimit, NGReason = lspc[i].NGReason, DealDetial = lspc[i].DealDetial, IsImproved = lspc[i].IsImproved, Totaljudge = GetJudge(lspc[i].Judge), Inspecttimes = times, ReInspecttimes = lspc[i].ReInspectTimes+1, imgstring = lspc[i].imgstring, isbackup = lspc[i].isbackup };
                                }
                            }
                            else
                            {
                                sst = new MySQLInspectItem() { InspectObjectID = lspc[i].InspectObjectID, InspectItemID = lspc[i].InspectItemID, CheckType = lspc[i].YesRadioContent, Limit = 0, NGReason = lspc[i].NGReason, DealDetial = lspc[i].DealDetial, IsImproved = lspc[i].IsImproved, Totaljudge = GetJudge(lspc[i].Judge), Inspecttimes = times, ReInspecttimes = x, imgstring = lspc[i].imgstring, isbackup = lspc[i].isbackup };
                                sst = new MySQLInspectItem() { InspectObjectID = lspc[i].InspectObjectID, InspectItemID = lspc[i].InspectItemID, CheckType = lspc[i].YesRadioContent, Limit = 0, NGReason = lspc[i].NGReason, DealDetial = lspc[i].DealDetial, IsImproved = lspc[i].IsImproved, Totaljudge = GetJudge(lspc[i].Judge), Inspecttimes = times, ReInspecttimes = lspc[i].ReInspectTimes, imgstring = lspc[i].imgstring, isbackup = lspc[i].isbackup };
                            }
                        }
                        else if (lspc[i].NoIsChecked)
                        {
                            sst = new MySQLInspectItem() { InspectObjectID = lspc[i].InspectObjectID, InspectItemID = lspc[i].InspectItemID, CheckType = lspc[i].NoRadioContent, Limit = 0, NGReason = lspc[i].NGReason, DealDetial = lspc[i].DealDetial, IsImproved = lspc[i].IsImproved, Totaljudge = GetJudge(lspc[i].Judge), Inspecttimes = times, ReInspecttimes = x, imgstring = lspc[i].imgstring, isbackup = lspc[i].isbackup };
                            sst = new MySQLInspectItem() { InspectObjectID = lspc[i].InspectObjectID, InspectItemID = lspc[i].InspectItemID, CheckType = lspc[i].NoRadioContent, Limit = 0, NGReason = lspc[i].NGReason, DealDetial = lspc[i].DealDetial, IsImproved = lspc[i].IsImproved, Totaljudge = GetJudge(lspc[i].Judge), Inspecttimes = times, ReInspecttimes = lspc[i].ReInspectTimes, imgstring = lspc[i].imgstring, isbackup = lspc[i].isbackup };
                        }
                        datalist.Add(sst);
                    }
@@ -1875,11 +1870,11 @@
                    }
                    else
                    {
                        List<MySQLInspectItem> mylist = ReContactList(datalist);
                        rm = MBIZ.clearolddata(mylist[0].InspectObjectID, mylist[0].Inspecttimes, createtime);
                        //List<MySQLInspectItem> mylist = ReContactList(datalist);
                        rm = MBIZ.clearolddata(datalist[0].InspectObjectID, datalist[0].Inspecttimes, createtime);
                        if (rm.Count > 0)
                        {
                            rmg = MBIZ.SaveInspectObjectItem(mylist, GetUserInfo.UserNo, dt, "update");
                            rmg = MBIZ.SaveInspectObjectItem(datalist, GetUserInfo.UserNo, dt, "update");
                            if (rmg.Count > 0)
                            {
                                foreach (KeyValuePair<int, List<ImageModel>> item in imagedic)
@@ -1889,7 +1884,7 @@
                                        rmgs = MBIZ.SaveImgString(item.Value[i].SN, item.Value[i].ImgString, item.Value[i].Id, "update");
                                    }
                                }
                                MBIZ.TransferJudge(mylist, GetUserInfo.UserNo,dt);
                                MBIZ.TransferJudge(datalist, GetUserInfo.UserNo,dt);
                                if (Code == "new")
                                {
                                    DixPadInspect dp = new DixPadInspect();

 src/DIXWeb.Business/GlobalM/InspectBaseBusiness.cs

@@ -19,7 +19,7 @@
        }
        public DataTable GetDataList(string tableName)
        {
            string sql = " SELECT * FROM [DIX]."+tableName;
            string sql = " SELECT * FROM [DIX]."+tableName +" order by id asc";
            var table = GetDataTableWithSql(sql);
            return table;
        }
@@ -45,13 +45,13 @@
        {
            List<ImageModel> myimagelist = new List<ImageModel>();
            ImageModel myimage;
              string sql = " SELECT Id,ImgString FROM [DIX].[biz].[ItemImg] where SN='" + sn + "'";
              string sql = " SELECT ImgId,ImgString FROM [DIX].[biz].[ItemImg] where SN='" + sn + "'";
            var table = GetDataTableWithSql(sql);
            if (table != null || table.Rows.Count > 0)
            {
                for (int i = 0;i<table.Rows.Count;i++)
                {
                    int id = Convert.ToInt32(table.Rows[i]["Id"].ToString());
                    int id = Convert.ToInt32(table.Rows[i]["ImgId"].ToString());
                    string img = table.Rows[i]["ImgString"].ToString();
                    myimage = new ImageModel() { Id = id, SN = sn, ImgString = img };
                    myimagelist.Add(myimage);

 src/DIXWeb.Business/MySQLBiz/MySQLInspectBaseBiz.cs

@@ -57,13 +57,13 @@
        {
            List<ImageModel> myimagelist = new List<ImageModel>();
            ImageModel myimage;
            string sql = " SELECT Id,ImgString FROM dix.itemimg where SN='" + sn + "'";
            string sql = " SELECT ImgId,ImgString FROM dix.itemimg where SN='" + sn + "'";
            var table = Service.GetDataTableWithSql(sql);
            if (table != null || table.Rows.Count > 0)
            {
                for (int i = 0; i < table.Rows.Count; i++)
                {
                    int id = Convert.ToInt32(table.Rows[i]["Id"].ToString());
                    int id = Convert.ToInt32(table.Rows[i]["ImgId"].ToString());
                    string img = table.Rows[i]["ImgString"].ToString();
                    myimage = new ImageModel() { Id = id, SN = sn, ImgString = img };
                    myimagelist.Add(myimage);