From a1709bcc95fe641126f5c34e0a344e406b467f88 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 16 五月 2023 11:11:15 +0800
Subject: [PATCH] 流转卡和生产订单只能自己删除自己的单据。pda进站单增加白坯发布字段,放在接收数量后面,不允许编辑,每次扫进站单出站单的时候,自动把白坯发布的汇总数量显示。生产订单模块增加一个字段,是否取库存,底部备注,做成下拉框。生产报表这个字段有值的不计算产能。工艺路线批量插入白坯定型和染厂(第一道和第二道)(把以前所有的流水号加20,在把白坯定型(10),和染厂(20)刷进去

---
 Kanban/Sc_QLKB.cs |   69 ++++++++++++++++++++++++++++++----
 1 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/Kanban/Sc_QLKB.cs b/Kanban/Sc_QLKB.cs
index e41c9fd..64fb0c9 100644
--- a/Kanban/Sc_QLKB.cs
+++ b/Kanban/Sc_QLKB.cs
@@ -144,12 +144,20 @@
                 ////}
                 //// 
                 ///
-                ClsCN clsCN = new ClsCN();
-                ClsIni clsIni = new ClsIni();
-                string text = ClsIni.ReadIni("Dept", "DeptID", Pub_Class.ClsPub.AppPath + "\\HXErp.ini");
-                this.sDeptID = text;
-                string procName = "exec h_p_QLKB " + this.sDeptID;
-                this.DSet = clsCN.RunProcReturn(procName, this.ViewName, ref Pub_Class.ClsPub.sExeReturnInfo);
+                //ClsCN clsCN = new ClsCN();
+                //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 = "";
+                string sWhere = "";
+                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_CS " + this.sDeptID;
+                this.DSet = SubCn.RunProcReturn(procName, this.ViewName, ref Pub_Class.ClsPub.sExeReturnInfo);
                 bool flag = this.DSet == null;
                 if (!flag)
                 {
@@ -162,10 +170,25 @@
                     });
                     this.oSumGrid.BuildTotalCols(cols);
                     int frCol = 10;
-                    string s = "鏄�";
+                     s = "鍚�";
                     Xt_BaseBillFun.DisplayGrid(this.grdMain, base.Name, s, frCol);
                 }
-            } 
+                //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;
+                //    }
+                //}
+                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);
+                //Total();
+            }
             catch (Exception e)
             {
                 return;
@@ -300,7 +323,26 @@
 
                     grdMain.DataSource = null;
                     grdMain.DataSource = DSet.Tables[0].DefaultView;
-                
+
+                //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 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("棰勮鐘舵�侊紙澶╋級");
@@ -465,6 +507,15 @@
                 HQty = 0;
                 timer1.Enabled = true;
             }
+            //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;
+            //    }
+            //}
         }
 
         private void toolStripButton1_Click(object sender, EventArgs e)

--
Gitblit v1.9.1