新增了了缺料看板相同订单号只显示第一行订单号功能

ch

2022-08-15 48b92ad114d76907ce2e1e6f645c5cd2f0c55fbc

新增了了缺料看板相同订单号只显示第一行订单号功能

 DBUtility/ÒµÎñµ¥¾Ý/Xt_BaseBillFun.cs

@@ -517,7 +517,50 @@
            }
        }

       


        public static void GraphLine_XB(DataGridView grdMain, int MainIDCol, int SubIDCol, string s, ref long n)
        {
            long HMainID = 0;
            bool b = false;
            //循环所有行
            for (int i = 0; i < grdMain.RowCount; i++)
            {
                if (HMainID == 0)
                {
                    HMainID = ClsPub.isLong(grdMain.Rows[i].Cells[MainIDCol].Value);
                    n++;
                }
                else
                {
                    if (HMainID == ClsPub.isLong(grdMain.Rows[i].Cells[MainIDCol].Value))
                    {
                        if (s == "否")
                        {
                            //区域性清空
                            SetDataGrid(grdMain, i, MainIDCol + 1, i, SubIDCol - 1, "");

                        }
                    }
                    else
                    {
                        HMainID = ClsPub.isLong(grdMain.Rows[i].Cells[MainIDCol].Value);
                        b = !b;
                        n++;
                    }
                }
                if (b)
                {
                    grdMain.Rows[i].DefaultCellStyle.BackColor = Color.Black;
                }
                else
                {
                    grdMain.Rows[i].DefaultCellStyle.BackColor = Color.Black;
                }
            }
        }


        //设置网格
        public static void SetDataGrid(DataGridView grdMain, int BRow, int BCol, int ERow, int ECol, string sText)
        {
@@ -531,6 +574,19 @@

        }

        //设置网格
        public static void SetDataGrid_XB(DataGridView grdMain, int BRow, int BCol, int ERow, int ECol, string sText)
        {
            for (int i = BRow; i <= ERow; i++)
            {
                for (int j = BCol; j <= ECol; j++)
                {
                    grdMain.Rows[i].Cells[j].Value = DBNull.Value;
                }
            }

        }

        //画网格下线
        /// <summary>
        /// ç”»ç½‘格下线

 Kanban/Sc_CJKB.cs

@@ -102,15 +102,15 @@
                //开工时间小于当天时间，但是任务单状态还是 å¾…生产，系统自动黄色警示；
                //完工时间小于当天时间，但是任务单还是待生产或者在执行的，系统自动红色警示；

                //int HEDateCol = Fun_GetCol("计划完工日期");
                //DateTime oNow = DateTime.Today.Date;
                //for (int i = 0; i < grdMain.Rows.Count; i++)
                //{
                //    if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
                //    {
                //        grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
                //    }
                //}
                int HEDateCol = Fun_GetCol("计划完工日期");
                DateTime oNow = DateTime.Today.Date;
                for (int i = 0; i < grdMain.Rows.Count; i++)
                {
                    if (DBUtility.ClsPub.isDate(grdMain.Rows[i].Cells[HEDateCol].Value) < oNow)
                    {
                        grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
                    }
                }

                //设置合计列
                string sTotalCol = "";

 Kanban/Sc_QLKB.cs

@@ -148,7 +148,7 @@
                //ClsIni clsIni = new ClsIni();
                //string text = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + "\\HXErp_SY.ini");
                //this.sDeptID = text;

                string s = "";

                ClsCN SubCn = new ClsCN();
                string sSql = "";
@@ -156,7 +156,7 @@
                ClsIni oIni = new ClsIni();
                string sID = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + @"\" + "HXErp_SY.ini");
                sDeptID = sID;
                string procName = "exec h_p_QLKB " + this.sDeptID;
                string procName = "exec h_p_QLKB_CS " + this.sDeptID;
                this.DSet = SubCn.RunProcReturn(procName, this.ViewName, ref Pub_Class.ClsPub.sExeReturnInfo);
                bool flag = this.DSet == null;
                if (!flag)
@@ -170,7 +170,7 @@
                    });
                    this.oSumGrid.BuildTotalCols(cols);
                    int frCol = 10;
                    string s = "是";
                     s = "否";
                    Xt_BaseBillFun.DisplayGrid(this.grdMain, base.Name, s, frCol);
                }
                int HEDateCol = Fun_GetCol("计划开工日期");
@@ -182,7 +182,13 @@
                        grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
                    }
                }
            } 
                s = "否";
                int MainIDCol = Fun_GetCol("hmainid");
                int SubIDCol = Fun_GetCol("hsubid");
                long n = 0;
                DBUtility.Xt_BaseBillFun.GraphLine_XB(grdMain, MainIDCol, SubIDCol, s, ref n);

            }
            catch (Exception e)
            {
                return;
@@ -327,6 +333,17 @@
                        grdMain.Rows[i].DefaultCellStyle.ForeColor = Color.Red;
                    }
                }


                int MainIDCol = Fun_GetCol("hmainid");
                int SubIDCol = Fun_GetCol("hsubid");
                string s = "否";
                long n = 0;
                DBUtility.Xt_BaseBillFun.GraphLine_XB(grdMain, MainIDCol, SubIDCol, s, ref n);




                ////-----------预警状态 å°äºŽç­‰äºŽ æ˜¾ç¤º çº¢è‰²ï¼Œ å°äºŽ7 æ©™è‰²ï¼Œå°äºŽç­‰äºŽ14 é»„色 
                //int HYJDateCol = Fun_GetCol("预警状态（天）");
                //int HSumUnDownQtyCol = Fun_GetCol("总未下采购量");

 NETERPNoWin/Program.cs

@@ -25,10 +25,12 @@
            {
                if (DBUtility.ClsPub.CheckUpdate())
                {
                    string strFileName = DBUtility.ClsPub.AppPath + @"\HX_Update.exe";
                    System.Diagnostics.Process.Start(strFileName);
                    Application.Exit();
                    return;
                    //string strFileName = DBUtility.ClsPub.AppPath + @"\HX_Update.exe";
                    //System.Diagnostics.Process.Start(strFileName);
                    //Application.Exit();
                    //return;
                    MESMain oMESMain = new MESMain();
                    Application.Run(oMESMain);
                }
                else
                {

 NETERPNoWin/bin/x86/Debug.zip

Binary files differ

 NETERPNoWin/bin/x86/Debug/BLL.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/BLL.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/BaseSet.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/BaseSet.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/DAL.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/DAL.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/DBUtility.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/DBUtility.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/Interop.gregn6Lib.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/Kanban.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/Kanban.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/Model.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/Model.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/NETERPNoWin.exe

Binary files differ

 NETERPNoWin/bin/x86/Debug/NETERPNoWin.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/OAM.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/OAM.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/PlanM.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/PlanM.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/Pub_Class.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/Pub_Class.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/Pub_Control.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/Pub_Control.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/SQLHelper.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/SQLHelper.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/WarM.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/WarM.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/WorkM.dll

Binary files differ

 NETERPNoWin/bin/x86/Debug/WorkM.pdb

Binary files differ

 NETERPNoWin/bin/x86/Debug/stdole.dll

Binary files differ

 NETERPNoWin/obj/x86/Debug/Interop.gregn6Lib.dll

Binary files differ

 NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.FileListAbsolute.txt

@@ -107,3 +107,4 @@
D:\Git仓库\MESWMS-API(最新)\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.csproj.CopyComplete
D:\Git仓库\MESWMS-API(最新)\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.exe
D:\Git仓库\MESWMS-API(最新)\MES-WEB-API\MES-WEB-API\NETERPNoWin\obj\x86\Debug\NETERPNoWin.pdb
D:\Git仓库\MESWMS-API(最新)\MES-WEB-API\MES-WEB-API\NETERPNoWin\bin\x86\Debug\stdole.dll

 NETERPNoWin/obj/x86/Debug/NETERPNoWin.csprojAssemblyReference.cache

Binary files differ

 NETERPNoWin/obj/x86/Debug/NETERPNoWin.exe

Binary files differ

 NETERPNoWin/obj/x86/Debug/NETERPNoWin.pdb

Binary files differ

 WebAPI/Web.config

@@ -22,7 +22,7 @@
      <!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/>    -->
      <!--<add key="sUrl" value="http://192.168.63.195/WEBS-WMS/WebService1.asmx"/> é¢œå°å¼æœº-->
      <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> å¤å®-->
      <add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx" /> 
      <add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 
      <!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/>    åšæ—¥ç§‘技-->
      <!--<add key="sUrl" value="http://192.168.0.214/WEBS-WMS/WebService1.asmx"/>    ç‘žä¸Žç¥º-->
      <!--<add key="sUrl" value="http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx"/>    æ£®æ¥·-->
@@ -92,7 +92,7 @@
      </basicHttpBinding>
    </bindings>
    <client>
      <endpoint address="http://47.96.97.237/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
      <endpoint address="http://60.190.4.42:9003/WebService/WebService1.asmx" binding="basicHttpBinding"
        bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap"
        name="WebService1Soap" />
    </client>
@@ -100,7 +100,7 @@
  <applicationSettings>
    <WebAPI.Properties.Settings>
      <setting name="WebAPI_WebS_WebService1" serializeAs="String">
        <value>http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx</value>
        <value>http://60.190.4.42:9003/WebService/WebService1.asmx</value>
      </setting>
    </WebAPI.Properties.Settings>
  </applicationSettings>