智云外网版WMS\MES\SCM（作废）
parent: 0635805f | 补丁 | 提交 | ignore whitespace
jhz
2023-01-02 9bf1acf98038b905831a56e438517ffda4a12911 
森楷箱号前缀及规则修改
5个文件已添加
3个文件已修改
440 ■■■■■ 已修改文件
SCM/Form3.Designer.cs 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SCM/Form3.cs 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SCM/Form4.Designer.cs 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SCM/Form4.cs 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SCM/Form4.resx 129 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SCM/SCM.csproj 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SCM/公用类/ClsPub1.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SCM/条码打印/Gy_BarCodeBill.cs 116 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 SCM/Form3.Designer.cs


New file


@@ -0,0 +1,40 @@





namespace SCM


{


    partial class Form3


    {


        /// <summary>


        /// Required designer variable.


        /// </summary>


        private System.ComponentModel.IContainer components = null;




        /// <summary>


        /// Clean up any resources being used.


        /// </summary>


        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>


        protected override void Dispose(bool disposing)


        {


            if (disposing && (components != null))


            {


                components.Dispose();


            }


            base.Dispose(disposing);


        }




        #region Windows Form Designer generated code




        /// <summary>


        /// Required method for Designer support - do not modify


        /// the contents of this method with the code editor.


        /// </summary>


        private void InitializeComponent()


        {


            this.components = new System.ComponentModel.Container();


            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;


            this.ClientSize = new System.Drawing.Size(800, 450);


            this.Text = "Form3";


        }




        #endregion


    }


}




 SCM/Form3.cs


New file


@@ -0,0 +1,19 @@


using System;


using System.Collections.Generic;


using System.ComponentModel;


using System.Data;


using System.Drawing;


using System.Linq;


using System.Text;


using System.Windows.Forms;




namespace SCM


{


    public partial class Form3 : Form


    {


        public Form3()


        {


            InitializeComponent();


        }


    }


}




 SCM/Form4.Designer.cs


New file


@@ -0,0 +1,63 @@





namespace SCM


{


    partial class Form4


    {


        /// <summary>


        /// Required designer variable.


        /// </summary>


        private System.ComponentModel.IContainer components = null;




        /// <summary>


        /// Clean up any resources being used.


        /// </summary>


        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>


        protected override void Dispose(bool disposing)


        {


            if (disposing && (components != null))


            {


                components.Dispose();


            }


            base.Dispose(disposing);


        }




        #region Windows Form Designer generated code




        /// <summary>


        /// Required method for Designer support - do not modify


        /// the contents of this method with the code editor.


        /// </summary>


        private void InitializeComponent()


        {


            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form4));


            this.axGRDesigner1 = new Axgrdes6Lib.AxGRDesigner();


            ((System.ComponentModel.ISupportInitialize)(this.axGRDesigner1)).BeginInit();


            this.SuspendLayout();


            // 


            // axGRDesigner1


            // 


            this.axGRDesigner1.Enabled = true;


            this.axGRDesigner1.Location = new System.Drawing.Point(26, 43);


            this.axGRDesigner1.Name = "axGRDesigner1";


            this.axGRDesigner1.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("axGRDesigner1.OcxState")));


            this.axGRDesigner1.Size = new System.Drawing.Size(240, 240);


            this.axGRDesigner1.TabIndex = 0;


            // 


            // Form4


            // 


            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);


            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;


            this.ClientSize = new System.Drawing.Size(800, 450);


            this.Controls.Add(this.axGRDesigner1);


            this.Name = "Form4";


            this.Text = "Form4";


            ((System.ComponentModel.ISupportInitialize)(this.axGRDesigner1)).EndInit();


            this.ResumeLayout(false);




        }




        #endregion




        private Axgrdes6Lib.AxGRDesigner axGRDesigner1;


    }


}




 SCM/Form4.cs


New file


@@ -0,0 +1,19 @@


using System;


using System.Collections.Generic;


using System.ComponentModel;


using System.Data;


using System.Drawing;


using System.Linq;


using System.Text;


using System.Windows.Forms;




namespace SCM


{


    public partial class Form4 : Form


    {


        public Form4()


        {


            InitializeComponent();


        }


    }


}




 SCM/Form4.resx


New file


@@ -0,0 +1,129 @@


<?xml version="1.0" encoding="utf-8"?>


<root>


  <!-- 


    Microsoft ResX Schema 


    


    Version 2.0


    


    The primary goals of this format is to allow a simple XML format 


    that is mostly human readable. The generation and parsing of the 


    various data types are done through the TypeConverter classes 


    associated with the data types.


    


    Example:


    


    ... ado.net/XML headers & schema ...


    <resheader name="resmimetype">text/microsoft-resx</resheader>


    <resheader name="version">2.0</resheader>


    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>


    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>


    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>


    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>


    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">


        <value>[base64 mime encoded serialized .NET Framework object]</value>


    </data>


    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">


        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>


        <comment>This is a comment</comment>


    </data>


                


    There are any number of "resheader" rows that contain simple 


    name/value pairs.


    


    Each data row contains a name, and value. The row also contains a 


    type or mimetype. Type corresponds to a .NET class that support 


    text/value conversion through the TypeConverter architecture. 


    Classes that don't support this are serialized and stored with the 


    mimetype set.


    


    The mimetype is used for serialized objects, and tells the 


    ResXResourceReader how to depersist the object. This is currently not 


    extensible. For a given mimetype the value must be set accordingly:


    


    Note - application/x-microsoft.net.object.binary.base64 is the format 


    that the ResXResourceWriter will generate, however the reader can 


    read any of the formats listed below.


    


    mimetype: application/x-microsoft.net.object.binary.base64


    value   : The object must be serialized with 


            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter


            : and then encoded with base64 encoding.


    


    mimetype: application/x-microsoft.net.object.soap.base64


    value   : The object must be serialized with 


            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter


            : and then encoded with base64 encoding.




    mimetype: application/x-microsoft.net.object.bytearray.base64


    value   : The object must be serialized into a byte array 


            : using a System.ComponentModel.TypeConverter


            : and then encoded with base64 encoding.


    -->


  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">


    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />


    <xsd:element name="root" msdata:IsDataSet="true">


      <xsd:complexType>


        <xsd:choice maxOccurs="unbounded">


          <xsd:element name="metadata">


            <xsd:complexType>


              <xsd:sequence>


                <xsd:element name="value" type="xsd:string" minOccurs="0" />


              </xsd:sequence>


              <xsd:attribute name="name" use="required" type="xsd:string" />


              <xsd:attribute name="type" type="xsd:string" />


              <xsd:attribute name="mimetype" type="xsd:string" />


              <xsd:attribute ref="xml:space" />


            </xsd:complexType>


          </xsd:element>


          <xsd:element name="assembly">


            <xsd:complexType>


              <xsd:attribute name="alias" type="xsd:string" />


              <xsd:attribute name="name" type="xsd:string" />


            </xsd:complexType>


          </xsd:element>


          <xsd:element name="data">


            <xsd:complexType>


              <xsd:sequence>


                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />


                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />


              </xsd:sequence>


              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />


              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />


              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />


              <xsd:attribute ref="xml:space" />


            </xsd:complexType>


          </xsd:element>


          <xsd:element name="resheader">


            <xsd:complexType>


              <xsd:sequence>


                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />


              </xsd:sequence>


              <xsd:attribute name="name" type="xsd:string" use="required" />


            </xsd:complexType>


          </xsd:element>


        </xsd:choice>


      </xsd:complexType>


    </xsd:element>


  </xsd:schema>


  <resheader name="resmimetype">


    <value>text/microsoft-resx</value>


  </resheader>


  <resheader name="version">


    <value>2.0</value>


  </resheader>


  <resheader name="reader">


    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>


  </resheader>


  <resheader name="writer">


    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>


  </resheader>


  <data name="axGRDesigner1.OcxState" mimetype="application/x-microsoft.net.object.binary.base64">


    <value>


        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w


        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACFTeXN0


        ZW0uV2luZG93cy5Gb3Jtcy5BeEhvc3QrU3RhdGUBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAXQAAAAIB


        AAAAAQAAAAAAAAAAAAAAAEgAAAAACQAACwAQAAsABAALAAAACwABABMA/////xMA/////wMAAQAAAAsA


        IAALAAAgAwABAAAAAwAPAAAABQAAAAAAAABZQAAAAAAL


</value>


  </data>


</root>




 SCM/SCM.csproj


@@ -111,6 +111,18 @@


  </ItemGroup>


  <ItemGroup>


    <Compile Include="Class1.cs" />


    <Compile Include="Form3.cs">


      <SubType>Form</SubType>


    </Compile>


    <Compile Include="Form3.Designer.cs">


      <DependentUpon>Form3.cs</DependentUpon>


    </Compile>


    <Compile Include="Form4.cs">


      <SubType>Form</SubType>


    </Compile>


    <Compile Include="Form4.Designer.cs">


      <DependentUpon>Form4.cs</DependentUpon>


    </Compile>


    <Compile Include="Gy_BarCodeBill_CusList.cs">


      <SubType>Form</SubType>


    </Compile>


@@ -573,6 +585,9 @@


      <SubType>Designer</SubType>


      <DependentUpon>Form1.cs</DependentUpon>


    </EmbeddedResource>


    <EmbeddedResource Include="Form4.resx">


      <DependentUpon>Form4.cs</DependentUpon>


    </EmbeddedResource>


    <EmbeddedResource Include="Gy_BarCodeBill_CusList.resx">


      <DependentUpon>Gy_BarCodeBill_CusList.cs</DependentUpon>


      <SubType>Designer</SubType>


@@ -816,6 +831,14 @@


    </EmbeddedResource>


  </ItemGroup>


  <ItemGroup>


    <COMReference Include="Axgrdes6Lib">


      <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>


      <VersionMajor>6</VersionMajor>


      <VersionMinor>0</VersionMinor>


      <Lcid>0</Lcid>


      <WrapperTool>aximp</WrapperTool>


      <Isolated>False</Isolated>


    </COMReference>


    <COMReference Include="Axgregn6Lib">


      <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>


      <VersionMajor>6</VersionMajor>


@@ -824,6 +847,33 @@


      <WrapperTool>aximp</WrapperTool>


      <Isolated>False</Isolated>


    </COMReference>


    <COMReference Include="grdes6Lib">


      <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>


      <VersionMajor>6</VersionMajor>


      <VersionMinor>0</VersionMinor>


      <Lcid>0</Lcid>


      <WrapperTool>tlbimp</WrapperTool>


      <Isolated>False</Isolated>


      <EmbedInteropTypes>True</EmbedInteropTypes>


    </COMReference>


    <COMReference Include="gregn6Lib">


      <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>


      <VersionMajor>6</VersionMajor>


      <VersionMinor>0</VersionMinor>


      <Lcid>0</Lcid>


      <WrapperTool>tlbimp</WrapperTool>


      <Isolated>False</Isolated>


      <EmbedInteropTypes>True</EmbedInteropTypes>


    </COMReference>


    <COMReference Include="stdole">


      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>


      <VersionMajor>2</VersionMajor>


      <VersionMinor>0</VersionMinor>


      <Lcid>0</Lcid>


      <WrapperTool>primary</WrapperTool>


      <Isolated>False</Isolated>


      <EmbedInteropTypes>True</EmbedInteropTypes>


    </COMReference>


  </ItemGroup>


  <ItemGroup>


    <WebReferences Include="Web References\" />




 SCM/¹«ÓÃÀà/ClsPub1.cs


@@ -15,14 +15,14 @@


        //public static string WEBSURL = "http://192.168.1.29/WEBS-WMS/WebService1.asmx";               //圣龙    å†…网


        //public static string WEBSURL = "http://122.227.138.236/WEBS-WMS/WebService1.asmx";            //圣龙(不用)


        //public static string WEBSURL = "http://220.189.218.154:8092/WEBS-WMS/WebService1.asmx";   //四维尔    æ–°ä¸­é—´å±‚    å¤–网


        public static string WEBSURL = "http://192.168.0.178/WEBS-WMS/WebService1.asmx";          //四维尔    æ–°ä¸­é—´å±‚    å†…网


        //public static string WEBSURL = "http://192.168.0.178/WEBS-WMS/WebService1.asmx";          //四维尔    æ–°ä¸­é—´å±‚    å†…网


        //public static string WEBSURL = "http://122.227.199.62:5050/LMESWEBS/WebService1.asmx";        //韩电    å¤–网JIT（不用）


        //public static string WEBSURL = "http://122.227.199.62:5050/WMSWEBS/WebService1.asmx";         //韩电    å¤–网


        //public static string WEBSURL = "http://192.168.10.60/WMSWEBS/WebService1.asmx";               //韩电    å†…网宁波


        //public static string WEBSURL = "http://60.190.50.86:5050/WEBS_CE/WebService1.asmx";           //飞龙


        //public static string WEBSURL = "http://192.192.192.13/WMSWEBS/WebService1.asmx";              //卓力


        //public static string WEBSURL = "http://120.195.29.36:1230/WEBS-WMS/WebService1.asmx";         //江苏龙亨


        //public static string WEBSURL = "http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx";         //森楷


        public static string WEBSURL = "http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx";         //森楷


        //public static string WEBSURL = "http://192.168.63.195/WEBS-WMS/WebService1.asmx";


        //public static string WEBSURL = "http://192.168.2.18/WEBS-WMS/WebService1.asmx";              //公司台式机


        //public static string WEBSURL = "http://192.168.0.107/WEBS-WMS/WebService1.asmx";              //家




 SCM/ÌõÂë´òÓ¡/Gy_BarCodeBill.cs


@@ -173,6 +173,7 @@


        public  string ModName = "85";


        public  string ModCaption = "条码生成";


        public bool BillChange;   //


        public string psCaseNoNumber = ""; //箱号前缀




        public DBUtility.ClsPub.Enum_BillStatus BillStatus;


        public SCM.WMSWeb.WebService1 oWeb = new SCM.WMSWeb.WebService1();


@@ -197,6 +198,7 @@


            //grdSub.Rows.Clear();


            txtHGroupID.Text = "";


            txtHCaseNo.Text = "";


            psCaseNoNumber = "";


            cmbHBarCodeType.Items.Clear();


            cmbSourceBillType.Items.Clear();




@@ -690,6 +692,11 @@


                else if(ClsPub.isInt(txtHCaseNo.Text) <= ClsPub.isInt(txtHCaseNo.Tag))


                {


                    MessageBox.Show(" æ‰€è¾“入箱号必须大于已生成过箱号数：" + txtHCaseNo.Tag.ToString() + "！");


                    return false;


                }


                if(psCaseNoNumber=="")


                {


                    MessageBox.Show(" ç®±å·å‰ç¼€ä¸èƒ½ä¸ºç©ºï¼");


                    return false;


                }


            }


@@ -1732,7 +1739,7 @@


                    string sHGroupID = "";      //班组


                    string sHBatchNo = "";      //批次


                    string HDate = "";          //日期


                    string sCaseNoNumber = "";  //箱号前缀


                    //string sCaseNoNumber = "";  //箱号前缀


                    int sCaseNo = 0;            //箱号


                    string sMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells[HMaterNumberCol].Value);


                    string sAuxItemName = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells[HAuxPropNameCol].Value);


@@ -1742,8 +1749,8 @@


                    sCaseNo = ClsPub.isInt(txtHCaseNo.Text) + grdSub.Rows.Count - 1;




                    //箱号前缀 = ç­ç»„ID + æ‰¹æ¬¡ + æ—¥æœŸ + ç‰©æ–™ä»£ç  + è¾…助属性


                    sCaseNoNumber = sHGroupID + sHBatchNo + HDate + sMaterNumber + sAuxItemName;


                    oWeb.getRunProc("Exec h_p_WMS_SetBarCodeNoByEmp  '" + sCaseNoNumber + "'," + sCaseNo, ref DBUtility.ClsPub.sExeReturnInfo);


                    //sCaseNoNumber = sHGroupID + sHBatchNo + HDate + sMaterNumber + sAuxItemName;


                    oWeb.getRunProc("Exec h_p_WMS_SetBarCodeNoByEmp  '" + psCaseNoNumber + "'," + sCaseNo, ref DBUtility.ClsPub.sExeReturnInfo);


                }




                string HWei = "";      //尾数


@@ -1861,7 +1868,7 @@


                        HGBBarCode = ClsPub.isStrNull(grdSub.Rows[i].Cells[HGBBarCode2Col].Value);


                        POOrderBillNo = ClsPub.isStrNull(grdSub.Rows[i].Cells[POOrderBillNo2Col].Value);


                        HBarCode_Pack = ClsPub.isStrNull(grdSub.Rows[i].Cells[HBarCode_Pack2Col].Value);


                        HCustomQty1 = ClsPub.isLong(grdSub.Rows[i].Cells[HCustomQty12Col].Value);


                        HCustomQty1 = ClsPub.isLong(grdSub.Rows[i].Cells[HCustomQty12Col].Value); //箱号（森楷）


                        sSQLMul[mm] = "insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +


                                    ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +


                                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +


@@ -2917,16 +2924,17 @@


                        string HGroupID = "";   //班组


                        string HBatchNo = "";   //批次


                        string HDate = "";      //日期


                        string sCaseNoNumber = "";      //箱号前缀


                        //string sCaseNoNumber = "";      //箱号前缀


                        string sMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells[HMaterNumberCol].Value);


                        string sAuxItemName = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells[HAuxPropNameCol].Value);


                        HGroupID = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells[HGroupIDCol].Value);


                        HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells[HBatchNoCol].Value);


                        HDate = SetDateStr(dtpHDate.Value);




                        


                        //箱号前缀 = ç­ç»„ID + æ‰¹æ¬¡ + æ—¥æœŸ + ç‰©æ–™ä»£ç  + è¾…助属性


                        sCaseNoNumber = HGroupID + HBatchNo + HDate + sMaterNumber + sAuxItemName;


                        Ds = oWeb.getDataSetBySQL("exec h_p_WMS_GetMaxNo  '" + sCaseNoNumber + "'", "h_p_WMS_GetMaxNo", ref DBUtility.ClsPub.sExeReturnInfo);//获取最大流水号


                        //sCaseNoNumber = HGroupID + HBatchNo + HDate + sMaterNumber + sAuxItemName;


                        psCaseNoNumber =DBUtility.ClsPub.isStrNull( Ds.Tables[0].Rows[0]["箱号前缀"]);


                        Ds = oWeb.getDataSetBySQL("exec h_p_WMS_GetMaxNo  '" + psCaseNoNumber + "'", "h_p_WMS_GetMaxNo", ref DBUtility.ClsPub.sExeReturnInfo);//获取最大流水号


                        txtHCaseNo.Text = (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) + 1).ToString();


                        txtHCaseNo.Tag = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]).ToString();


                    }


@@ -3800,31 +3808,31 @@




                if (CampanyName == "森楷") //系统参数  å®¢æˆ·å®šåˆ¶åŒ–名称


                {


                    for (int i = 0; i < grdMain.Rows.Count; i++)


                    {


                        if (ClsPub.isLong(grdMain.Rows[i].Cells[HMaterIDCol].Value) != 0)


                        {


                            grdMain.Rows[i].Cells[HGroupIDCol].Value = oGroup.oModel.HItemID.ToString();


                            grdMain.Rows[i].Cells[HGroupNumberCol].Value = oGroup.oModel.HNumber;


                            grdMain.Rows[i].Cells[HGroupNameCol].Value = oGroup.oModel.HName;


                        }


                    }


                    //for (int i = 0; i < grdMain.Rows.Count; i++)


                    //{


                    //    if (ClsPub.isLong(grdMain.Rows[i].Cells[HMaterIDCol].Value) != 0)


                    //    {


                    //        grdMain.Rows[i].Cells[HGroupIDCol].Value = oGroup.oModel.HItemID.ToString();


                    //        grdMain.Rows[i].Cells[HGroupNumberCol].Value = oGroup.oModel.HNumber;


                    //        grdMain.Rows[i].Cells[HGroupNameCol].Value = oGroup.oModel.HName;


                    //    }


                    //}




                    string HGroupID = "";   //班组


                    string HBatchNo = "";   //批次


                    string HDate = "";      //日期


                    string sCaseNoNumber = "";      //箱号前缀


                    string sMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells[HMaterNumberCol].Value);


                    string sAuxItemName = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells[HAuxPropNameCol].Value);


                    HGroupID = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells[HGroupIDCol].Value);


                    HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells[HBatchNoCol].Value);


                    HDate = SetDateStr(dtpHDate.Value);


                    //string HGroupID = "";   //班组


                    //string HBatchNo = "";   //批次


                    //string HDate = "";      //日期


                    //string sCaseNoNumber = "";      //箱号前缀


                    //string sMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells[HMaterNumberCol].Value);


                    //string sAuxItemName = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells[HAuxPropNameCol].Value);


                    //HGroupID = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells[HGroupIDCol].Value);


                    //HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells[HBatchNoCol].Value);


                    //HDate = SetDateStr(dtpHDate.Value);




                    //箱号前缀 = ç­ç»„ID + æ‰¹æ¬¡ + æ—¥æœŸ + ç‰©æ–™ä»£ç  +辅助属性


                    sCaseNoNumber = HGroupID + HBatchNo + HDate + sMaterNumber + sAuxItemName;


                    DataSet Ds = oWeb.getDataSetBySQL("exec h_p_WMS_GetMaxNo  '" + sCaseNoNumber + "'", "h_p_WMS_GetMaxNo", ref DBUtility.ClsPub.sExeReturnInfo);//获取最大流水号


                    txtHCaseNo.Text = (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) + 1).ToString();


                    txtHCaseNo.Tag = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]).ToString();


                    ////箱号前缀 = ç­ç»„ID + æ‰¹æ¬¡ + æ—¥æœŸ + ç‰©æ–™ä»£ç  +辅助属性


                    //sCaseNoNumber = HGroupID + HBatchNo + HDate + sMaterNumber + sAuxItemName;


                    //DataSet Ds = oWeb.getDataSetBySQL("exec h_p_WMS_GetMaxNo  '" + sCaseNoNumber + "'", "h_p_WMS_GetMaxNo", ref DBUtility.ClsPub.sExeReturnInfo);//获取最大流水号


                    //txtHCaseNo.Text = (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) + 1).ToString();


                    //txtHCaseNo.Tag = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]).ToString();


                }


            }


            else


@@ -3833,32 +3841,32 @@




                if (CampanyName == "森楷") //系统参数  å®¢æˆ·å®šåˆ¶åŒ–名称


                {


                    for (int i = 0; i < grdMain.Rows.Count; i++)


                    {


                        if (ClsPub.isLong(grdMain.Rows[i].Cells[HMaterIDCol].Value) != 0)


                        {


                            grdMain.Rows[i].Cells[HGroupIDCol].Value = 0;


                            grdMain.Rows[i].Cells[HGroupNumberCol].Value = "";


                            grdMain.Rows[i].Cells[HGroupNameCol].Value = "";


                        }


                    }


                    //for (int i = 0; i < grdMain.Rows.Count; i++)


                    //{


                    //    if (ClsPub.isLong(grdMain.Rows[i].Cells[HMaterIDCol].Value) != 0)


                    //    {


                    //        grdMain.Rows[i].Cells[HGroupIDCol].Value = 0;


                    //        grdMain.Rows[i].Cells[HGroupNumberCol].Value = "";


                    //        grdMain.Rows[i].Cells[HGroupNameCol].Value = "";


                    //    }


                    //}




                    string HGroupID = "";   //班组


                    string HBatchNo = "";   //批次


                    string HDate = "";      //日期


                    string sCaseNoNumber = "";      //箱号前缀


                    //string HGroupID = "";   //班组


                    //string HBatchNo = "";   //批次


                    //string HDate = "";      //日期


                    //string sCaseNoNumber = "";      //箱号前缀




                    string sMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells[HMaterNumberCol].Value);


                    string sAuxItemName = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells[HAuxPropNameCol].Value);


                    HGroupID = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells[HGroupIDCol].Value);


                    HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells[HBatchNoCol].Value);


                    HDate = SetDateStr(dtpHDate.Value);


                    //string sMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells[HMaterNumberCol].Value);


                    //string sAuxItemName = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells[HAuxPropNameCol].Value);


                    //HGroupID = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells[HGroupIDCol].Value);


                    //HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells[HBatchNoCol].Value);


                    //HDate = SetDateStr(dtpHDate.Value);




                    //箱号前缀 = ç­ç»„ID + æ‰¹æ¬¡ + æ—¥æœŸ


                    sCaseNoNumber = HGroupID + HBatchNo + HDate + sMaterNumber + sAuxItemName;


                    DataSet Ds = oWeb.getDataSetBySQL("exec h_p_WMS_GetMaxNo  '" + sCaseNoNumber + "'", "h_p_WMS_GetMaxNo", ref DBUtility.ClsPub.sExeReturnInfo);//获取最大流水号


                    txtHCaseNo.Text = (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) + 1).ToString();


                    txtHCaseNo.Tag = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]).ToString();


                    ////箱号前缀 = ç­ç»„ID + æ‰¹æ¬¡ + æ—¥æœŸ


                    //sCaseNoNumber = HGroupID + HBatchNo + HDate + sMaterNumber + sAuxItemName;


                    ////DataSet Ds = oWeb.getDataSetBySQL("exec h_p_WMS_GetMaxNo  '" + sCaseNoNumber + "'", "h_p_WMS_GetMaxNo", ref DBUtility.ClsPub.sExeReturnInfo);//获取最大流水号


                    ////txtHCaseNo.Text = (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) + 1).ToString();


                    ////txtHCaseNo.Tag = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]).ToString();


                }


            }


            oGroup = null;