From 616f399430a993132d2dca9316c973f4ccc8605a Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期五, 20 八月 2021 15:24:50 +0800
Subject: [PATCH] 条码生成模块新增按F7选择辅助属性功能,辅助属性View模块新增按物料过滤调用方法

---
 DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources             |    0 
 DBUtility/obj/Release/build.force                                      |    0 
 DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources                 |    0 
 DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cache          |    0 
 DBUtility/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs |    4 +
 DBUtility/obj/Release/DBUtility.Xt_BillCheckFlowStatusNow.resources    |    0 
 DBUtility/obj/Release/DBUtility.frmBillQueryCondition_New.resources    |    0 
 DBUtility/obj/Release/DBUtility.Xt_BillType.resources                  |    0 
 DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources                 |    0 
 DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache          |    0 
 WarM/条码打印/Gy_BarCodeBill.cs                                            |   61 +++++++++++++++++---
 DAL/基础资料/InterFace基础资料/ClsIF_Property_View.cs                          |   73 +++++++++++++++++++++++
 DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources                |    0 
 DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources            |    0 
 DBUtility/obj/Release/DBUtility.frm_B_BillQueryCondition_New.resources |    0 
 DBUtility/obj/Release/DBUtility.FrmSelectDate.resources                |    0 
 DBUtility/obj/Release/DBUtility.pdb                                    |    0 
 DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache       |    0 
 DBUtility/obj/Release/DBUtility.Xt_ProcessWait.resources               |    0 
 DBUtility/obj/Release/ResolveAssemblyReference.cache                   |    0 
 DBUtility/obj/Release/DBUtility.Xt_Wait.resources                      |    0 
 DBUtility/obj/Release/DBUtility.dll                                    |    0 
 LMES/bin/x86/HXERP.ini                                                 |   37 ++++++++++++
 23 files changed, 163 insertions(+), 12 deletions(-)

diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/InterFace\345\237\272\347\241\200\350\265\204\346\226\231/ClsIF_Property_View.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/InterFace\345\237\272\347\241\200\350\265\204\346\226\231/ClsIF_Property_View.cs"
index 261d7c2..c713d91 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/InterFace\345\237\272\347\241\200\350\265\204\346\226\231/ClsIF_Property_View.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/InterFace\345\237\272\347\241\200\350\265\204\346\226\231/ClsIF_Property_View.cs"
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Data;
+using DBUtility;
 
 namespace DAL
 {
@@ -17,8 +18,10 @@
         public ClsIF_Property_View()
         {
             base.MvarReportTitle = "杈呭姪灞炴�ц缃�";
-            base.MvarItemKey = "h_v_IF_Property";
-            base.SQLName = "Select HItemID,HNumber 杈呭姪灞炴�т唬鐮�,HName 杈呭姪灞炴�� from h_v_IF_Property where HStopflag=0  ";
+            base.MvarItemKey = "h_v_IF_PropertyByMaterID";
+            base.SQLName = "Select HItemID,HNumber 杈呭姪灞炴�т唬鐮�,HName 杈呭姪灞炴�� from h_v_IF_PropertyByMaterID ";
+            base.SQLWhere = " where HStopflag=0 ";
+            base.SQLOrder = " ";
             //涓嬫媺SQL
             base.SQLNameForDown = " Select top 30 HItemID,HNumber 杈呭姪灞炴�т唬鐮�,HName 杈呭姪灞炴�� from h_v_IF_Property ";
             base.SQLOrderForDown = "  Order by HNumber ";
@@ -94,5 +97,71 @@
                 throw (e);
             }
         }
+
+        /// <summary>
+        /// 鍩虹璧勬枡甯姪-鍏ㄩ儴鍨�
+        /// </summary>
+        /// <returns></returns>
+        public override bool RefreshView(string sLike)
+        {
+            try
+            {//
+                Pub_Control.frmHlpInfo_View ofrm = new Pub_Control.frmHlpInfo_View();
+                //
+                string sSQL = SQLName + SQLWhere + sLike + SQLOrder;
+                //缂栬緫ofrm
+                ofrm.sTitle = MvarReportTitle;
+                ofrm.sBill = MvarItemKey;
+                ofrm.txtFindInfo.Text = WherePart;
+
+                //
+                DataSet Ds;
+                Pub_Class.ClsSqlHelper oCn = new Pub_Class.ClsSqlHelper();
+                Ds = oCn.RunProcReturn(sSQL, MvarItemKey);
+                if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+                {
+                    return false;
+                }
+
+                //缁戝畾
+                ofrm.grdShow.DataSource = Ds.Tables[0].DefaultView;
+                Ds.Dispose();
+                Ds = null;
+                ofrm.grdShow.SuspendLayout();
+                ofrm.grdShow.Columns[0].Visible = false;
+                ofrm.ShowDialog();
+                //寰楀埌瀵瑰簲鍒� 
+                int HItemIDCol = 0;
+                int HNumberCol = 1;
+                int HNameCol = 2;
+                //
+                if (ofrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+                {
+                    if (ofrm.grdShow.CurrentRow == null)
+                    {
+                        return false;
+                    }
+                    oModel = new ClsGy_Base_Model();
+                    oModel.HItemID = Pub_Class.ClsPub.isLong(ofrm.grdShow.Rows[ofrm.grdShow.CurrentRow.Index].Cells[0].Value);
+                    oModel.HNumber = Pub_Class.ClsPub.isStrNull(ofrm.grdShow.Rows[ofrm.grdShow.CurrentRow.Index].Cells[1].Value);
+                    oModel.HName = Pub_Class.ClsPub.isStrNull(ofrm.grdShow.Rows[ofrm.grdShow.CurrentRow.Index].Cells[2].Value);
+                }
+                else
+                {
+                    return false;
+                }
+                //
+                ofrm.Dispose();
+                ofrm = null;
+                //
+                return true;
+            }
+            catch (Exception e)
+            {
+                throw (e);
+            }
+        }
+
+
     }
 }
diff --git a/DBUtility/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/DBUtility/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
new file mode 100644
index 0000000..5d01041
--- /dev/null
+++ b/DBUtility/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
@@ -0,0 +1,4 @@
+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/DBUtility/obj/Release/DBUtility.FrmSelectDate.resources b/DBUtility/obj/Release/DBUtility.FrmSelectDate.resources
new file mode 100644
index 0000000..06c24d0
--- /dev/null
+++ b/DBUtility/obj/Release/DBUtility.FrmSelectDate.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources b/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources
new file mode 100644
index 0000000..a123754
--- /dev/null
+++ b/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_BillCheckFlowStatusNow.resources b/DBUtility/obj/Release/DBUtility.Xt_BillCheckFlowStatusNow.resources
new file mode 100644
index 0000000..06c24d0
--- /dev/null
+++ b/DBUtility/obj/Release/DBUtility.Xt_BillCheckFlowStatusNow.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_BillType.resources b/DBUtility/obj/Release/DBUtility.Xt_BillType.resources
new file mode 100644
index 0000000..4e0d7a1
--- /dev/null
+++ b/DBUtility/obj/Release/DBUtility.Xt_BillType.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources
new file mode 100644
index 0000000..eed8fed
--- /dev/null
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources
new file mode 100644
index 0000000..bd0c9a1
--- /dev/null
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources
new file mode 100644
index 0000000..3054b1f
--- /dev/null
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources
new file mode 100644
index 0000000..7f747dc
--- /dev/null
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_ProcessWait.resources b/DBUtility/obj/Release/DBUtility.Xt_ProcessWait.resources
new file mode 100644
index 0000000..6555d82
--- /dev/null
+++ b/DBUtility/obj/Release/DBUtility.Xt_ProcessWait.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_Wait.resources b/DBUtility/obj/Release/DBUtility.Xt_Wait.resources
new file mode 100644
index 0000000..06c24d0
--- /dev/null
+++ b/DBUtility/obj/Release/DBUtility.Xt_Wait.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
new file mode 100644
index 0000000..873f3b5
--- /dev/null
+++ b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
new file mode 100644
index 0000000..ebee6a3
--- /dev/null
+++ b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cache
new file mode 100644
index 0000000..089d37c
--- /dev/null
+++ b/DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.dll b/DBUtility/obj/Release/DBUtility.dll
new file mode 100644
index 0000000..cefc8d8
--- /dev/null
+++ b/DBUtility/obj/Release/DBUtility.dll
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.frmBillQueryCondition_New.resources b/DBUtility/obj/Release/DBUtility.frmBillQueryCondition_New.resources
new file mode 100644
index 0000000..06c24d0
--- /dev/null
+++ b/DBUtility/obj/Release/DBUtility.frmBillQueryCondition_New.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.frm_B_BillQueryCondition_New.resources b/DBUtility/obj/Release/DBUtility.frm_B_BillQueryCondition_New.resources
new file mode 100644
index 0000000..06c24d0
--- /dev/null
+++ b/DBUtility/obj/Release/DBUtility.frm_B_BillQueryCondition_New.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.pdb b/DBUtility/obj/Release/DBUtility.pdb
new file mode 100644
index 0000000..f43463e
--- /dev/null
+++ b/DBUtility/obj/Release/DBUtility.pdb
Binary files differ
diff --git a/DBUtility/obj/Release/ResolveAssemblyReference.cache b/DBUtility/obj/Release/ResolveAssemblyReference.cache
new file mode 100644
index 0000000..77f56cc
--- /dev/null
+++ b/DBUtility/obj/Release/ResolveAssemblyReference.cache
Binary files differ
diff --git a/DBUtility/obj/Release/build.force b/DBUtility/obj/Release/build.force
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/DBUtility/obj/Release/build.force
diff --git a/LMES/bin/x86/HXERP.ini b/LMES/bin/x86/HXERP.ini
new file mode 100644
index 0000000..4b0d5e2
--- /dev/null
+++ b/LMES/bin/x86/HXERP.ini
@@ -0,0 +1,37 @@
+[po]
+Server=47.96.97.237,15127
+[Erp]
+Server=47.96.97.237,15127
+DataBase=HX_LMESsys
+DataBaseNumber=001-智云LMES管理系统
+UserName=HX_USER
+PassWord=lc@841022
+UserPsd=
+Remember=
+[K3Erp]
+Server=47.96.97.237,15127
+DataBase=
+UserName=HX_USER
+PassWord=lc@841022
+[K32Erp]
+Server=47.96.97.237,15127
+DataBase=HX_LMESsys
+UserName=HX_USER
+PassWord=lc@841022
+[SRM]
+Server=.\sql2008
+DataBase=hx_lims_SRM
+UserName=HX_USER
+PassWord=lc@841022
+[UserInfo]
+UserName=admin,景焕章,生管员,条码,测试用户
+UserPsd=
+Remember=1
+HOrgName=手机事业部
+[CLOUDINFO]
+sCLOUDUrl=ddddd
+sCLOUDAcc=4455xddd
+sCLOUDUseName=顾问1
+sCLOUDPsd=123456
+
+
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
index 164b9d3..5a95409 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
@@ -156,6 +156,7 @@
         public Int64 HInterID = 0;      //鍐呯爜
         public Int64 HOrgID = -1;
         public string HOrgNumber = "";
+        public string ERPMode = ""; //ERP妯″紡锛圵ISE銆丆LOUD锛�
         public string CampanyName = ""; //瀹㈡埛瀹氬埗鍖栧悕绉�
         public string SourceQtyCtl = ""; //瓒呮簮鍗曟暟閲忔帶鍒�
                                          //-------------------------------------------------------------------------
@@ -373,6 +374,7 @@
             }
             else
             {
+                ERPMode = oSystemParameter.omodel.WMS_WMSStockCtl_ERPMode;
                 CampanyName = oSystemParameter.omodel.WMS_CampanyName;
                 SourceQtyCtl = oSystemParameter.omodel.BarCode_SourceQtyCtl;
             }
@@ -975,6 +977,7 @@
             grdSub.RowCount = 0;
             grdMain.ColumnCount = 60;                       //鎬诲垪鏁�
             DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
+            grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
             grdMain.Columns[HMainIDCol].HeaderText = "婧愬崟涓籌D";
             grdMain.Columns[HSubIDCol].HeaderText = "婧愬崟瀛怚D";
             grdMain.Columns[HBillNoCol].HeaderText = "婧愬崟鍗曞彿";
@@ -1027,7 +1030,6 @@
             grdMain.Columns[HInnerBillNoCol].HeaderText = "鍐呴儴閲囪喘璁㈠崟鍙�";
             grdMain.Columns[HMakerCol].HeaderText = "鍒跺崟浜�";
             ////
-            grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
             //鏍煎紡鍖� 
             grdMain.Columns[HTagCol].Visible = false;                           //闅愯棌鍒�
             grdMain.Columns[HMainIDCol].Visible = false;
@@ -1037,8 +1039,8 @@
             grdMain.Columns[HModelCol].Visible = false;
             //grdMain.Columns[HBatchNoCol].Visible = false;
             grdMain.Columns[HAuxPropIDCol].Visible = false;
-            grdMain.Columns[HAuxPropNumberCol].Visible = false;
-            grdMain.Columns[HAuxPropNameCol].Visible = false;
+            //grdMain.Columns[HAuxPropNumberCol].Visible = false;
+            //grdMain.Columns[HAuxPropNameCol].Visible = false;
             grdMain.Columns[HUnitIDCol].Visible = false;
             grdMain.Columns[HinitQtyCol].Visible = false;
             grdMain.Columns[HSupIDCol].Visible = false;
@@ -1153,8 +1155,8 @@
             grdSub.Columns[HMaterID2Col].Visible = false;
             grdSub.Columns[HModel2Col].Visible = false;
             grdSub.Columns[HAuxPropID2Col].Visible = false;
-            grdSub.Columns[HAuxPropNumber2Col].Visible = false;
-            grdSub.Columns[HAuxPropName2Col].Visible = false;
+            //grdSub.Columns[HAuxPropNumber2Col].Visible = false;
+            //grdSub.Columns[HAuxPropName2Col].Visible = false;
             grdSub.Columns[HUnitID2Col].Visible = false;
             grdSub.Columns[HPrintCol].Visible = false;
             grdSub.Columns[HSourceInterID2Col].Visible = false;
@@ -1336,6 +1338,7 @@
             }
             DAL.ClsIF_Material_View oMater = new DAL.ClsIF_Material_View();//鐗╂枡
             DAL.ClsIF_Unit_View oUnit = new DAL.ClsIF_Unit_View();//璁¢噺鍗曚綅
+            DAL.ClsIF_Property_View oProperty = new DAL.ClsIF_Property_View();//杈呭姪灞炴��
             if (!grdStatus)
             {
                 return;
@@ -1368,6 +1371,9 @@
                                         grdMain.Rows[sRow].Cells[HMinQtyCol].Value = oMater.omodel.HQtyMin;
                                         grdMain.Rows[sRow].Cells[HDateCol].Value = dtpHDate.Value.ToShortDateString();
                                         grdMain.Rows[sRow].Cells[HShowDateCol].Value = dtpHDate.Value.ToShortDateString();
+                                        grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
+                                        grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
+                                        grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
                                         if (oUnit.GetInfoByID(oMater.omodel.HUnitID))
                                         {
                                             grdMain.Rows[sRow].Cells[HUnitIDCol].Value = oUnit.omodel.HItemID.ToString();
@@ -1392,6 +1398,9 @@
                                         grdMain.Rows[sRow].Cells[HUnitIDCol].Value = 0;
                                         grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = "";
                                         grdMain.Rows[sRow].Cells[HUnitNameCol].Value = "";
+                                        grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
+                                        grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
+                                        grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
                                     }
                                 }
                                 else
@@ -1402,6 +1411,11 @@
                                     grdMain.Rows[sRow].Cells[HMaterModelCol].Value = "";
                                     grdMain.Rows[sRow].Cells[HMinQtyCol].Value = 0;
                                     grdMain.Rows[sRow].Cells[HUnitIDCol].Value = 0;
+                                    grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = "";
+                                    grdMain.Rows[sRow].Cells[HUnitNameCol].Value = "";
+                                    grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
+                                    grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
+                                    grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
                                 }
                                 break;
 
@@ -1435,6 +1449,31 @@
                             case HDateCol:
                                 BLL.ClsPub_BLL.Sub_SelectDate(grdMain, sRow, HDateCol);
                                 oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[sRow].Cells[HDateCol].Value);
+                                break;
+
+                            case HAuxPropNumberCol:
+                                oProperty.WherePart = "";
+                                if (ERPMode == "CLOUD")
+                                {
+                                    sWhere = " and HMaterNumber = '" + DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[HMaterNumberCol].Value) + "'";
+                                }
+                                else
+                                {
+                                    sWhere = "";
+                                }
+                                if (oProperty.RefreshView(sWhere))
+                                {
+                                    grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = oProperty.oModel.HItemID.ToString();
+                                    grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = oProperty.oModel.HNumber;
+                                    grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = oProperty.oModel.HName;
+                                    oEdit.Text = oProperty.oModel.HNumber;
+                                }
+                                else
+                                {
+                                    grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
+                                    grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
+                                    grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
+                                }
                                 break;
 
 
@@ -1793,13 +1832,14 @@
             //grdMain.Rows[i].Cells[HSourceNumberCol].Value = oTable.Rows[0]["鐢熶骇绾夸唬鐮�"].ToString();
             grdMain.Rows[i].Cells[HSourceNameCol].Value = oTable.Rows[0]["鐢熶骇绾�"].ToString();
             grdMain.Rows[i].Cells[HEndDateCol].Value = oTable.Rows[0]["璁″垝瀹屽伐鏃ユ湡"].ToString();
-            grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString(); 
+            grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
             //--
             //璁剧疆鍙紪杈戝垪
             string sAllowCol = HQtyCol.ToString() +
+                                "," + HMinQtyCol.ToString() +
+                                "," + HAuxPropNumberCol.ToString() +
                                 "," + HBatchNoCol.ToString() +
-                                "," + HRemarkCol.ToString() +
-                                "," + HMinQtyCol.ToString();
+                                "," + HRemarkCol.ToString();
             grdMain.Columns[HBillNoCol].ReadOnly = true;
             //璁剧疆鍚堣鍒�
             string sTotalCol = HQtyCol.ToString();
@@ -1870,9 +1910,10 @@
             //--
             //璁剧疆鍙紪杈戝垪
             string sAllowCol = HQtyCol.ToString() +
+                                "," + HMinQtyCol.ToString() +
+                                "," + HAuxPropNumberCol.ToString() +
                                 "," + HBatchNoCol.ToString() +
-                                "," + HRemarkCol.ToString() +
-                                "," + HMinQtyCol.ToString();
+                                "," + HRemarkCol.ToString();
             grdMain.Columns[HBillNoCol].ReadOnly = true;
             //璁剧疆鍚堣鍒�
             string sTotalCol = HQtyCol.ToString();

--
Gitblit v1.9.1