Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

ch

2022-10-28 45334377dbbe7f6c0132f4b9c581b1a3fa133861

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

 DAL/DAL.csproj

@@ -94,6 +94,7 @@
    <Compile Include="源单\InterFace源单\Cls_S_IF_PackageDismantleBillList.cs" />
    <Compile Include="源单\InterFace源单\Cls_S_IF_MoveStockBillList.cs" />
    <Compile Include="源单\InterFace源单\Cls_S_IF_MateOutBackBillList.cs" />
    <Compile Include="源单\InterFace源单\Cls_S_IF_ProcessExchangeBillList.cs" />
    <Compile Include="源单\InterFace源单\Cls_S_IF_POStockInBackBillList.cs" />
    <Compile Include="源单\InterFace源单\Cls_S_IF_OtherInBillList.cs" />
    <Compile Include="源单\InterFace源单\Cls_S_IF_ICMOReportBillList.cs" />

 DAL/Ô´µ¥/InterFaceÔ´µ¥/Cls_S_IF_ProcessExchangeBillList.cs

New file
@@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Text;
using SQLHelper;
using DBUtility;

namespace DAL
{
    public class Cls_S_IF_ProcessExchangeBillList : Cls_S_Xt_BaseBill
    {

        public Cls_S_IF_ProcessExchangeBillList()
        {
            base.ViewName = "h_v_IF_ProcessExchangeBillList_Source";
            base.mvarReportTitle = "工序流转卡";
            base.mvarItemKey = "3772";
            base.sCondtion = "    ";
            base.sOrderSql = "  order by å•æ®å· desc,hsubid ";
            base.sKeyCol = "单据号";
        }

    }
}

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

@@ -211,6 +211,7 @@
            cmbSourceBillType.Items.Add("采购订单");
            cmbSourceBillType.Items.Add("收料通知单");
            cmbSourceBillType.Items.Add("委外订单");
            cmbSourceBillType.Items.Add("工序流转卡");
            cmbSourceBillType.Items.Add("退货通知单");
            cmbSourceBillType.Items.Add("其他入库单");
            cmbSourceBillType.Items.Add("直接调拨单");
@@ -789,6 +790,15 @@
                    {
                        TM = HOrgNumber + HNumber + HBatchNo;
                    }//博日特殊处理
                    else if (cmbHBarCodeType.Text == "序列码")
                    {
                        //条码规则： GX+物料内码+年年月月日日+5位流水号
                        LSHlen = 5;
                        //条码前缀 = GX+物料内码+年年月月日日
                        sTMNumber = "GX" + HNumber + sYear + sPeriod + sDay;
                        Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //获取最大流水号
                        LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
                    }
                    else if(cmbHBarCodeType.Text == "仪器外购件条码普通规则" || cmbHBarCodeType.Text == "仪器外购件条码容器规则")
                    {
                        //物料编码+单据日期（YYMMDD）+流水4位 
@@ -896,6 +906,11 @@
                            LSH2 = "0" + LSH2;
                        }
                        if (cmbHBarCodeType.Text == "唯一条码")
                        {
                            //条码编号 = æ¡ç å‰ç¼€ + æµæ°´å·
                            TM = sTMNumber + LSH2;
                        }
                        else if (cmbHBarCodeType.Text == "序列码")
                        {
                            //条码编号 = æ¡ç å‰ç¼€ + æµæ°´å·
                            TM = sTMNumber + LSH2;
@@ -2177,6 +2192,15 @@
                    FillSelectData(oIF_PackageDismantleBillList.oBillSelectColl);
                }
            }
            else if (cmbSourceBillType.Text.Trim() == "工序流转卡")
            {
                string sWhere = " and HOrgID =" + HOrgID.ToString();
                DAL.Cls_S_IF_ProcessExchangeBillList oIF_ProcessExchangeBillList = new DAL.Cls_S_IF_ProcessExchangeBillList();
                if (oIF_ProcessExchangeBillList.Refresh(sWhere))  //选择原单
                {
                    FillSelectData(oIF_ProcessExchangeBillList.oBillSelectColl);
                }
            }
            else
            {

@@ -2319,6 +2343,16 @@
                    grdMain.Rows[i].Cells[HTagCol].Value = "*";
                    //得到信息
                    Ds = oCn.RunProcReturn("select * from h_v_IF_PackageDismantleList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_PackageDismantleList");
                    //写入信息
                    Sub_WriteInForm1(Ds.Tables[0], i);
                }
                //工序流转卡
                if (oSelectRow.BillType == "3772")
                {
                    grdMain.Rows.Add();
                    grdMain.Rows[i].Cells[HTagCol].Value = "*";
                    //得到信息
                    Ds = oCn.RunProcReturn("select * from h_v_IF_ProcessExchangeList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_ProcessExchangeList");
                    //写入信息
                    Sub_WriteInForm1(Ds.Tables[0], i);
                }
@@ -3432,5 +3466,23 @@
                MessageBox.Show("生成箱码失败！" + e1.Message );
            }
        }

        private void cmbSourceBillType_TextChanged(object sender, EventArgs e)
        {
            if (cmbSourceBillType.Text == "工序流转卡")
            {
                cmbHBarCodeType.Items.Clear();
                cmbHBarCodeType.Items.Add("序列码");
                this.cmbHBarCodeType.SelectedIndex = 0;
            }
            else
            {
                cmbHBarCodeType.Items.Clear();
                cmbHBarCodeType.Items.Add("唯一条码");
                cmbHBarCodeType.Items.Add("品种条码");
                cmbHBarCodeType.Items.Add("批次条码");
                this.cmbHBarCodeType.SelectedIndex = 0;
            }
        }
    }
}

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

@@ -164,7 +164,7 @@
            this.Tool.Location = new System.Drawing.Point(0, 0);
            this.Tool.Name = "Tool";
            this.Tool.Padding = new System.Windows.Forms.Padding(0);
            this.Tool.Size = new System.Drawing.Size(1356, 62);
            this.Tool.Size = new System.Drawing.Size(1017, 50);
            this.Tool.Stretch = true;
            this.Tool.TabIndex = 17;
            this.Tool.Text = "toolStrip1";
@@ -214,7 +214,7 @@
            // toolStripSeparator2
            // 
            this.toolStripSeparator2.Name = "toolStripSeparator2";
            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
            // 
            // AddRow
            // 
@@ -276,13 +276,13 @@
            // toolStripSeparator4
            // 
            this.toolStripSeparator4.Name = "toolStripSeparator4";
            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
            this.toolStripSeparator4.Visible = false;
            // 
            // toolStripSeparator8
            // 
            this.toolStripSeparator8.Name = "toolStripSeparator8";
            this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
            // 
            // wxm
            // 
@@ -301,7 +301,7 @@
            // toolStripSeparator9
            // 
            this.toolStripSeparator9.Name = "toolStripSeparator9";
            this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
            // 
            // cz
            // 
@@ -320,7 +320,7 @@
            // toolStripSeparator5
            // 
            this.toolStripSeparator5.Name = "toolStripSeparator5";
            this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
            // 
            // kc
            // 
@@ -339,13 +339,13 @@
            // toolStripSeparator1
            // 
            this.toolStripSeparator1.Name = "toolStripSeparator1";
            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
            // 
            // toolStripSeparator12
            // 
            this.toolStripSeparator12.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
            this.toolStripSeparator12.Name = "toolStripSeparator12";
            this.toolStripSeparator12.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator12.Size = new System.Drawing.Size(6, 50);
            // 
            // mrlk
            // 
@@ -355,7 +355,7 @@
            this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
            this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
            this.mrlk.Name = "mrlk";
            this.mrlk.Size = new System.Drawing.Size(73, 59);
            this.mrlk.Size = new System.Drawing.Size(60, 47);
            this.mrlk.Text = "默认列宽";
            this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
            this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -365,7 +365,7 @@
            // 
            this.toolStripSeparator11.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
            this.toolStripSeparator11.Name = "toolStripSeparator11";
            this.toolStripSeparator11.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator11.Size = new System.Drawing.Size(6, 50);
            // 
            // bclk
            // 
@@ -375,7 +375,7 @@
            this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
            this.bclk.ImageTransparentColor = System.Drawing.Color.White;
            this.bclk.Name = "bclk";
            this.bclk.Size = new System.Drawing.Size(73, 59);
            this.bclk.Size = new System.Drawing.Size(60, 47);
            this.bclk.Text = "保存列宽";
            this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
            this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -385,7 +385,7 @@
            // 
            this.toolStripSeparator10.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
            this.toolStripSeparator10.Name = "toolStripSeparator10";
            this.toolStripSeparator10.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator10.Size = new System.Drawing.Size(6, 50);
            // 
            // tb
            // 
@@ -405,7 +405,7 @@
            // toolStripSeparator6
            // 
            this.toolStripSeparator6.Name = "toolStripSeparator6";
            this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
            // 
            // gl
            // 
@@ -424,7 +424,7 @@
            // toolStripSeparator7
            // 
            this.toolStripSeparator7.Name = "toolStripSeparator7";
            this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
            // 
            // BatchNo
            // 
@@ -443,7 +443,7 @@
            // toolStripSeparator3
            // 
            this.toolStripSeparator3.Name = "toolStripSeparator3";
            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
            // 
            // tc
            // 
@@ -463,10 +463,9 @@
            // 
            this.lblCaption.AutoSize = true;
            this.lblCaption.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.lblCaption.Location = new System.Drawing.Point(668, 15);
            this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.lblCaption.Location = new System.Drawing.Point(501, 12);
            this.lblCaption.Name = "lblCaption";
            this.lblCaption.Size = new System.Drawing.Size(110, 24);
            this.lblCaption.Size = new System.Drawing.Size(89, 19);
            this.lblCaption.TabIndex = 18;
            this.lblCaption.Text = "单据编辑";
            // 
@@ -477,18 +476,16 @@
            this.P1.Controls.Add(this.lblCaption);
            this.P1.Controls.Add(this.gbUp);
            this.P1.Dock = System.Windows.Forms.DockStyle.Top;
            this.P1.Location = new System.Drawing.Point(55, 62);
            this.P1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.P1.Location = new System.Drawing.Point(41, 50);
            this.P1.Name = "P1";
            this.P1.Size = new System.Drawing.Size(1249, 171);
            this.P1.Size = new System.Drawing.Size(937, 137);
            this.P1.TabIndex = 31;
            // 
            // pic1
            // 
            this.pic1.Location = new System.Drawing.Point(417, 4);
            this.pic1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.pic1.Location = new System.Drawing.Point(313, 3);
            this.pic1.Name = "pic1";
            this.pic1.Size = new System.Drawing.Size(104, 51);
            this.pic1.Size = new System.Drawing.Size(78, 41);
            this.pic1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
            this.pic1.TabIndex = 36;
            this.pic1.TabStop = false;
@@ -511,11 +508,9 @@
            this.gbUp.Controls.Add(this.label14);
            this.gbUp.Controls.Add(this.cmbSourceBillType);
            this.gbUp.Controls.Add(this.label10);
            this.gbUp.Location = new System.Drawing.Point(19, 49);
            this.gbUp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.gbUp.Location = new System.Drawing.Point(14, 39);
            this.gbUp.Name = "gbUp";
            this.gbUp.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.gbUp.Size = new System.Drawing.Size(1189, 100);
            this.gbUp.Size = new System.Drawing.Size(892, 80);
            this.gbUp.TabIndex = 33;
            this.gbUp.TabStop = false;
            // 
@@ -523,38 +518,37 @@
            // 
            this.cmbHWorksNumber.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbHWorksNumber.FormattingEnabled = true;
            this.cmbHWorksNumber.Location = new System.Drawing.Point(525, 21);
            this.cmbHWorksNumber.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmbHWorksNumber.Location = new System.Drawing.Point(394, 17);
            this.cmbHWorksNumber.Name = "cmbHWorksNumber";
            this.cmbHWorksNumber.Size = new System.Drawing.Size(249, 23);
            this.cmbHWorksNumber.Size = new System.Drawing.Size(188, 20);
            this.cmbHWorksNumber.TabIndex = 98;
            // 
            // label4
            // 
            this.label4.AutoSize = true;
            this.label4.ForeColor = System.Drawing.Color.Black;
            this.label4.Location = new System.Drawing.Point(436, 26);
            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label4.Location = new System.Drawing.Point(327, 21);
            this.label4.Name = "label4";
            this.label4.Size = new System.Drawing.Size(67, 15);
            this.label4.Size = new System.Drawing.Size(53, 12);
            this.label4.TabIndex = 97;
            this.label4.Text = "工厂代码";
            // 
            // dtpHDate
            // 
            this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
            this.dtpHDate.Location = new System.Drawing.Point(901, 21);
            this.dtpHDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.dtpHDate.Location = new System.Drawing.Point(676, 17);
            this.dtpHDate.Margin = new System.Windows.Forms.Padding(2);
            this.dtpHDate.Name = "dtpHDate";
            this.dtpHDate.Size = new System.Drawing.Size(249, 25);
            this.dtpHDate.Size = new System.Drawing.Size(188, 21);
            this.dtpHDate.TabIndex = 96;
            // 
            // label2
            // 
            this.label2.AutoSize = true;
            this.label2.Location = new System.Drawing.Point(812, 26);
            this.label2.Location = new System.Drawing.Point(609, 21);
            this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
            this.label2.Name = "label2";
            this.label2.Size = new System.Drawing.Size(69, 15);
            this.label2.Size = new System.Drawing.Size(53, 12);
            this.label2.TabIndex = 95;
            this.label2.Text = "日    æœŸ";
            // 
@@ -562,20 +556,18 @@
            // 
            this.cmbHOrgID.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbHOrgID.FormattingEnabled = true;
            this.cmbHOrgID.Location = new System.Drawing.Point(135, 21);
            this.cmbHOrgID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmbHOrgID.Location = new System.Drawing.Point(101, 17);
            this.cmbHOrgID.Name = "cmbHOrgID";
            this.cmbHOrgID.Size = new System.Drawing.Size(249, 23);
            this.cmbHOrgID.Size = new System.Drawing.Size(188, 20);
            this.cmbHOrgID.TabIndex = 85;
            // 
            // label3
            // 
            this.label3.AutoSize = true;
            this.label3.ForeColor = System.Drawing.Color.Black;
            this.label3.Location = new System.Drawing.Point(47, 26);
            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label3.Location = new System.Drawing.Point(35, 21);
            this.label3.Name = "label3";
            this.label3.Size = new System.Drawing.Size(69, 15);
            this.label3.Size = new System.Drawing.Size(53, 12);
            this.label3.TabIndex = 84;
            this.label3.Text = "组    ç»‡";
            // 
@@ -583,20 +575,18 @@
            // 
            this.cmbHBarCodeType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbHBarCodeType.FormattingEnabled = true;
            this.cmbHBarCodeType.Location = new System.Drawing.Point(901, 58);
            this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmbHBarCodeType.Location = new System.Drawing.Point(676, 46);
            this.cmbHBarCodeType.Name = "cmbHBarCodeType";
            this.cmbHBarCodeType.Size = new System.Drawing.Size(249, 23);
            this.cmbHBarCodeType.Size = new System.Drawing.Size(188, 20);
            this.cmbHBarCodeType.TabIndex = 81;
            // 
            // label1
            // 
            this.label1.AutoSize = true;
            this.label1.ForeColor = System.Drawing.Color.Black;
            this.label1.Location = new System.Drawing.Point(812, 62);
            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label1.Location = new System.Drawing.Point(609, 50);
            this.label1.Name = "label1";
            this.label1.Size = new System.Drawing.Size(67, 15);
            this.label1.Size = new System.Drawing.Size(53, 12);
            this.label1.TabIndex = 80;
            this.label1.Text = "条码类型";
            // 
@@ -605,10 +595,9 @@
            this.cmdHEmpID.BackColor = System.Drawing.Color.Transparent;
            this.cmdHEmpID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID.Image")));
            this.cmdHEmpID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
            this.cmdHEmpID.Location = new System.Drawing.Point(1189, -9);
            this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdHEmpID.Location = new System.Drawing.Point(892, -7);
            this.cmdHEmpID.Name = "cmdHEmpID";
            this.cmdHEmpID.Size = new System.Drawing.Size(29, 28);
            this.cmdHEmpID.Size = new System.Drawing.Size(22, 22);
            this.cmdHEmpID.TabIndex = 79;
            this.cmdHEmpID.UseVisualStyleBackColor = false;
            this.cmdHEmpID.Visible = false;
@@ -617,10 +606,9 @@
            // 
            this.cmdSourceBillNo.Image = ((System.Drawing.Image)(resources.GetObject("cmdSourceBillNo.Image")));
            this.cmdSourceBillNo.ImageAlign = System.Drawing.ContentAlignment.TopRight;
            this.cmdSourceBillNo.Location = new System.Drawing.Point(747, 56);
            this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdSourceBillNo.Location = new System.Drawing.Point(560, 45);
            this.cmdSourceBillNo.Name = "cmdSourceBillNo";
            this.cmdSourceBillNo.Size = new System.Drawing.Size(29, 28);
            this.cmdSourceBillNo.Size = new System.Drawing.Size(22, 22);
            this.cmdSourceBillNo.TabIndex = 42;
            this.cmdSourceBillNo.UseVisualStyleBackColor = true;
            this.cmdSourceBillNo.Click += new System.EventHandler(this.cmdSourceBillNo_Click);
@@ -628,10 +616,9 @@
            // txtHSourceBillNo
            // 
            this.txtHSourceBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHSourceBillNo.Location = new System.Drawing.Point(525, 58);
            this.txtHSourceBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHSourceBillNo.Location = new System.Drawing.Point(394, 46);
            this.txtHSourceBillNo.Name = "txtHSourceBillNo";
            this.txtHSourceBillNo.Size = new System.Drawing.Size(220, 25);
            this.txtHSourceBillNo.Size = new System.Drawing.Size(166, 21);
            this.txtHSourceBillNo.TabIndex = 41;
            this.txtHSourceBillNo.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtHSourceBillNo_KeyPress);
            // 
@@ -639,10 +626,9 @@
            // 
            this.label14.AutoSize = true;
            this.label14.ForeColor = System.Drawing.Color.Black;
            this.label14.Location = new System.Drawing.Point(436, 62);
            this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label14.Location = new System.Drawing.Point(327, 50);
            this.label14.Name = "label14";
            this.label14.Size = new System.Drawing.Size(68, 15);
            this.label14.Size = new System.Drawing.Size(53, 12);
            this.label14.TabIndex = 40;
            this.label14.Text = "选 å• å·";
            // 
@@ -651,20 +637,19 @@
            this.cmbSourceBillType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbSourceBillType.FormattingEnabled = true;
            this.cmbSourceBillType.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.cmbSourceBillType.Location = new System.Drawing.Point(135, 58);
            this.cmbSourceBillType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmbSourceBillType.Location = new System.Drawing.Point(101, 46);
            this.cmbSourceBillType.Name = "cmbSourceBillType";
            this.cmbSourceBillType.Size = new System.Drawing.Size(249, 23);
            this.cmbSourceBillType.Size = new System.Drawing.Size(188, 20);
            this.cmbSourceBillType.TabIndex = 36;
            this.cmbSourceBillType.TextChanged += new System.EventHandler(this.cmbSourceBillType_TextChanged);
            // 
            // label10
            // 
            this.label10.AutoSize = true;
            this.label10.ForeColor = System.Drawing.Color.Black;
            this.label10.Location = new System.Drawing.Point(47, 62);
            this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label10.Location = new System.Drawing.Point(35, 50);
            this.label10.Name = "label10";
            this.label10.Size = new System.Drawing.Size(67, 15);
            this.label10.Size = new System.Drawing.Size(53, 12);
            this.label10.TabIndex = 35;
            this.label10.Text = "源单类型";
            // 
@@ -692,20 +677,18 @@
            this.panel2.Controls.Add(this.txtHMaker);
            this.panel2.Controls.Add(this.label8);
            this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.panel2.Location = new System.Drawing.Point(55, 633);
            this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.panel2.Location = new System.Drawing.Point(41, 506);
            this.panel2.Name = "panel2";
            this.panel2.Size = new System.Drawing.Size(1249, 116);
            this.panel2.Size = new System.Drawing.Size(937, 93);
            this.panel2.TabIndex = 32;
            // 
            // txtHDeleteDate
            // 
            this.txtHDeleteDate.BackColor = System.Drawing.Color.Transparent;
            this.txtHDeleteDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.txtHDeleteDate.Location = new System.Drawing.Point(967, 59);
            this.txtHDeleteDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.txtHDeleteDate.Location = new System.Drawing.Point(725, 47);
            this.txtHDeleteDate.Name = "txtHDeleteDate";
            this.txtHDeleteDate.Size = new System.Drawing.Size(131, 19);
            this.txtHDeleteDate.Size = new System.Drawing.Size(98, 15);
            this.txtHDeleteDate.TabIndex = 19;
            // 
            // label25
@@ -713,10 +696,9 @@
            this.label25.AutoSize = true;
            this.label25.BackColor = System.Drawing.Color.Transparent;
            this.label25.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.label25.Location = new System.Drawing.Point(888, 62);
            this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label25.Location = new System.Drawing.Point(666, 50);
            this.label25.Name = "label25";
            this.label25.Size = new System.Drawing.Size(67, 15);
            this.label25.Size = new System.Drawing.Size(53, 12);
            this.label25.TabIndex = 18;
            this.label25.Text = "作废日期";
            // 
@@ -724,10 +706,9 @@
            // 
            this.txtHDeleteMan.BackColor = System.Drawing.Color.Transparent;
            this.txtHDeleteMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.txtHDeleteMan.Location = new System.Drawing.Point(967, 15);
            this.txtHDeleteMan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.txtHDeleteMan.Location = new System.Drawing.Point(725, 12);
            this.txtHDeleteMan.Name = "txtHDeleteMan";
            this.txtHDeleteMan.Size = new System.Drawing.Size(131, 19);
            this.txtHDeleteMan.Size = new System.Drawing.Size(98, 15);
            this.txtHDeleteMan.TabIndex = 17;
            // 
            // label27
@@ -735,10 +716,9 @@
            this.label27.AutoSize = true;
            this.label27.BackColor = System.Drawing.Color.Transparent;
            this.label27.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.label27.Location = new System.Drawing.Point(888, 15);
            this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label27.Location = new System.Drawing.Point(666, 12);
            this.label27.Name = "label27";
            this.label27.Size = new System.Drawing.Size(52, 15);
            this.label27.Size = new System.Drawing.Size(41, 12);
            this.label27.TabIndex = 16;
            this.label27.Text = "作废人";
            // 
@@ -746,10 +726,9 @@
            // 
            this.txtHUpDateDate.BackColor = System.Drawing.Color.Transparent;
            this.txtHUpDateDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.txtHUpDateDate.Location = new System.Drawing.Point(749, 59);
            this.txtHUpDateDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.txtHUpDateDate.Location = new System.Drawing.Point(562, 47);
            this.txtHUpDateDate.Name = "txtHUpDateDate";
            this.txtHUpDateDate.Size = new System.Drawing.Size(131, 19);
            this.txtHUpDateDate.Size = new System.Drawing.Size(98, 15);
            this.txtHUpDateDate.TabIndex = 15;
            // 
            // label23
@@ -757,10 +736,9 @@
            this.label23.AutoSize = true;
            this.label23.BackColor = System.Drawing.Color.Transparent;
            this.label23.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.label23.Location = new System.Drawing.Point(671, 59);
            this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label23.Location = new System.Drawing.Point(503, 47);
            this.label23.Name = "label23";
            this.label23.Size = new System.Drawing.Size(67, 15);
            this.label23.Size = new System.Drawing.Size(53, 12);
            this.label23.TabIndex = 14;
            this.label23.Text = "修改日期";
            // 
@@ -768,10 +746,9 @@
            // 
            this.txtHUpDater.BackColor = System.Drawing.Color.Transparent;
            this.txtHUpDater.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.txtHUpDater.Location = new System.Drawing.Point(749, 15);
            this.txtHUpDater.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.txtHUpDater.Location = new System.Drawing.Point(562, 12);
            this.txtHUpDater.Name = "txtHUpDater";
            this.txtHUpDater.Size = new System.Drawing.Size(131, 19);
            this.txtHUpDater.Size = new System.Drawing.Size(98, 15);
            this.txtHUpDater.TabIndex = 13;
            // 
            // label21
@@ -779,10 +756,9 @@
            this.label21.AutoSize = true;
            this.label21.BackColor = System.Drawing.Color.Transparent;
            this.label21.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.label21.Location = new System.Drawing.Point(671, 15);
            this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label21.Location = new System.Drawing.Point(503, 12);
            this.label21.Name = "label21";
            this.label21.Size = new System.Drawing.Size(52, 15);
            this.label21.Size = new System.Drawing.Size(41, 12);
            this.label21.TabIndex = 12;
            this.label21.Text = "修改人";
            // 
@@ -790,10 +766,9 @@
            // 
            this.txtHCloseDate.BackColor = System.Drawing.Color.Transparent;
            this.txtHCloseDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.txtHCloseDate.Location = new System.Drawing.Point(529, 59);
            this.txtHCloseDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.txtHCloseDate.Location = new System.Drawing.Point(397, 47);
            this.txtHCloseDate.Name = "txtHCloseDate";
            this.txtHCloseDate.Size = new System.Drawing.Size(131, 19);
            this.txtHCloseDate.Size = new System.Drawing.Size(98, 15);
            this.txtHCloseDate.TabIndex = 11;
            // 
            // label19
@@ -801,10 +776,9 @@
            this.label19.AutoSize = true;
            this.label19.BackColor = System.Drawing.Color.Transparent;
            this.label19.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.label19.Location = new System.Drawing.Point(451, 62);
            this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label19.Location = new System.Drawing.Point(338, 50);
            this.label19.Name = "label19";
            this.label19.Size = new System.Drawing.Size(67, 15);
            this.label19.Size = new System.Drawing.Size(53, 12);
            this.label19.TabIndex = 10;
            this.label19.Text = "关闭日期";
            // 
@@ -812,10 +786,9 @@
            // 
            this.txtHCloseMan.BackColor = System.Drawing.Color.Transparent;
            this.txtHCloseMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.txtHCloseMan.Location = new System.Drawing.Point(528, 16);
            this.txtHCloseMan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.txtHCloseMan.Location = new System.Drawing.Point(396, 13);
            this.txtHCloseMan.Name = "txtHCloseMan";
            this.txtHCloseMan.Size = new System.Drawing.Size(131, 19);
            this.txtHCloseMan.Size = new System.Drawing.Size(98, 15);
            this.txtHCloseMan.TabIndex = 9;
            // 
            // label17
@@ -823,10 +796,9 @@
            this.label17.AutoSize = true;
            this.label17.BackColor = System.Drawing.Color.Transparent;
            this.label17.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.label17.Location = new System.Drawing.Point(451, 20);
            this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label17.Location = new System.Drawing.Point(338, 16);
            this.label17.Name = "label17";
            this.label17.Size = new System.Drawing.Size(52, 15);
            this.label17.Size = new System.Drawing.Size(41, 12);
            this.label17.TabIndex = 8;
            this.label17.Text = "关闭人";
            // 
@@ -834,10 +806,9 @@
            // 
            this.txtHCheckDate.BackColor = System.Drawing.Color.Transparent;
            this.txtHCheckDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.txtHCheckDate.Location = new System.Drawing.Point(312, 59);
            this.txtHCheckDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.txtHCheckDate.Location = new System.Drawing.Point(234, 47);
            this.txtHCheckDate.Name = "txtHCheckDate";
            this.txtHCheckDate.Size = new System.Drawing.Size(131, 19);
            this.txtHCheckDate.Size = new System.Drawing.Size(98, 15);
            this.txtHCheckDate.TabIndex = 7;
            // 
            // label15
@@ -845,10 +816,9 @@
            this.label15.AutoSize = true;
            this.label15.BackColor = System.Drawing.Color.Transparent;
            this.label15.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.label15.Location = new System.Drawing.Point(233, 62);
            this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label15.Location = new System.Drawing.Point(175, 50);
            this.label15.Name = "label15";
            this.label15.Size = new System.Drawing.Size(67, 15);
            this.label15.Size = new System.Drawing.Size(53, 12);
            this.label15.TabIndex = 6;
            this.label15.Text = "审核日期";
            // 
@@ -856,10 +826,9 @@
            // 
            this.txtHChecker.BackColor = System.Drawing.Color.Transparent;
            this.txtHChecker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.txtHChecker.Location = new System.Drawing.Point(312, 16);
            this.txtHChecker.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.txtHChecker.Location = new System.Drawing.Point(234, 13);
            this.txtHChecker.Name = "txtHChecker";
            this.txtHChecker.Size = new System.Drawing.Size(131, 19);
            this.txtHChecker.Size = new System.Drawing.Size(98, 15);
            this.txtHChecker.TabIndex = 5;
            // 
            // label13
@@ -867,10 +836,9 @@
            this.label13.AutoSize = true;
            this.label13.BackColor = System.Drawing.Color.Transparent;
            this.label13.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.label13.Location = new System.Drawing.Point(233, 20);
            this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label13.Location = new System.Drawing.Point(175, 16);
            this.label13.Name = "label13";
            this.label13.Size = new System.Drawing.Size(52, 15);
            this.label13.Size = new System.Drawing.Size(41, 12);
            this.label13.TabIndex = 4;
            this.label13.Text = "审核人";
            // 
@@ -878,10 +846,9 @@
            // 
            this.txtHMakeDate.BackColor = System.Drawing.Color.Transparent;
            this.txtHMakeDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.txtHMakeDate.Location = new System.Drawing.Point(95, 59);
            this.txtHMakeDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.txtHMakeDate.Location = new System.Drawing.Point(71, 47);
            this.txtHMakeDate.Name = "txtHMakeDate";
            this.txtHMakeDate.Size = new System.Drawing.Size(131, 19);
            this.txtHMakeDate.Size = new System.Drawing.Size(98, 15);
            this.txtHMakeDate.TabIndex = 3;
            // 
            // label11
@@ -889,10 +856,9 @@
            this.label11.AutoSize = true;
            this.label11.BackColor = System.Drawing.Color.Transparent;
            this.label11.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.label11.Location = new System.Drawing.Point(16, 62);
            this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label11.Location = new System.Drawing.Point(12, 50);
            this.label11.Name = "label11";
            this.label11.Size = new System.Drawing.Size(67, 15);
            this.label11.Size = new System.Drawing.Size(53, 12);
            this.label11.TabIndex = 2;
            this.label11.Text = "制单日期";
            // 
@@ -900,10 +866,9 @@
            // 
            this.txtHMaker.BackColor = System.Drawing.Color.Transparent;
            this.txtHMaker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.txtHMaker.Location = new System.Drawing.Point(95, 16);
            this.txtHMaker.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.txtHMaker.Location = new System.Drawing.Point(71, 13);
            this.txtHMaker.Name = "txtHMaker";
            this.txtHMaker.Size = new System.Drawing.Size(131, 19);
            this.txtHMaker.Size = new System.Drawing.Size(98, 15);
            this.txtHMaker.TabIndex = 1;
            // 
            // label8
@@ -911,10 +876,9 @@
            this.label8.AutoSize = true;
            this.label8.BackColor = System.Drawing.Color.Transparent;
            this.label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.label8.Location = new System.Drawing.Point(16, 20);
            this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label8.Location = new System.Drawing.Point(12, 16);
            this.label8.Name = "label8";
            this.label8.Size = new System.Drawing.Size(52, 15);
            this.label8.Size = new System.Drawing.Size(41, 12);
            this.label8.TabIndex = 0;
            this.label8.Text = "制单人";
            // 
@@ -926,19 +890,17 @@
            // panel1
            // 
            this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
            this.panel1.Location = new System.Drawing.Point(0, 62);
            this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.panel1.Location = new System.Drawing.Point(0, 50);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(55, 687);
            this.panel1.Size = new System.Drawing.Size(41, 549);
            this.panel1.TabIndex = 33;
            // 
            // panel3
            // 
            this.panel3.Dock = System.Windows.Forms.DockStyle.Right;
            this.panel3.Location = new System.Drawing.Point(1304, 62);
            this.panel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.panel3.Location = new System.Drawing.Point(978, 50);
            this.panel3.Name = "panel3";
            this.panel3.Size = new System.Drawing.Size(52, 687);
            this.panel3.Size = new System.Drawing.Size(39, 549);
            this.panel3.TabIndex = 34;
            // 
            // grdMain
@@ -950,13 +912,12 @@
            this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
            this.grdMain.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.grdMain.Location = new System.Drawing.Point(4, 4);
            this.grdMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.grdMain.Location = new System.Drawing.Point(3, 3);
            this.grdMain.Name = "grdMain";
            this.grdMain.ReadOnly = true;
            this.grdMain.RowHeadersWidth = 30;
            this.grdMain.RowTemplate.Height = 23;
            this.grdMain.Size = new System.Drawing.Size(1233, 339);
            this.grdMain.Size = new System.Drawing.Size(923, 268);
            this.grdMain.TabIndex = 44;
            this.grdMain.RowHeadersWidthChanged += new System.EventHandler(this.grdMain_RowHeadersWidthChanged);
            this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
@@ -973,25 +934,23 @@
            this.grdSum.BackgroundColor = System.Drawing.Color.Khaki;
            this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.grdSum.Location = new System.Drawing.Point(55, 609);
            this.grdSum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.grdSum.Location = new System.Drawing.Point(41, 487);
            this.grdSum.Name = "grdSum";
            this.grdSum.ReadOnly = true;
            this.grdSum.RowHeadersWidth = 51;
            this.grdSum.RowTemplate.Height = 23;
            this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
            this.grdSum.Size = new System.Drawing.Size(1249, 24);
            this.grdSum.Size = new System.Drawing.Size(937, 19);
            this.grdSum.TabIndex = 45;
            // 
            // grdPrint
            // 
            this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            this.grdPrint.Location = new System.Drawing.Point(1079, 679);
            this.grdPrint.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.grdPrint.Location = new System.Drawing.Point(809, 543);
            this.grdPrint.Name = "grdPrint";
            this.grdPrint.RowHeadersWidth = 51;
            this.grdPrint.RowTemplate.Height = 23;
            this.grdPrint.Size = new System.Drawing.Size(33, 30);
            this.grdPrint.Size = new System.Drawing.Size(25, 24);
            this.grdPrint.TabIndex = 46;
            this.grdPrint.Visible = false;
            // 
@@ -1001,21 +960,19 @@
            this.tabControl1.Controls.Add(this.tabPage2);
            this.tabControl1.Controls.Add(this.tabPage3);
            this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.tabControl1.Location = new System.Drawing.Point(55, 233);
            this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.tabControl1.Location = new System.Drawing.Point(41, 187);
            this.tabControl1.Name = "tabControl1";
            this.tabControl1.SelectedIndex = 0;
            this.tabControl1.Size = new System.Drawing.Size(1249, 376);
            this.tabControl1.Size = new System.Drawing.Size(937, 300);
            this.tabControl1.TabIndex = 47;
            // 
            // tabPage1
            // 
            this.tabPage1.Controls.Add(this.grdMain);
            this.tabPage1.Location = new System.Drawing.Point(4, 25);
            this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.tabPage1.Location = new System.Drawing.Point(4, 22);
            this.tabPage1.Name = "tabPage1";
            this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.tabPage1.Size = new System.Drawing.Size(1241, 347);
            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
            this.tabPage1.Size = new System.Drawing.Size(929, 274);
            this.tabPage1.TabIndex = 0;
            this.tabPage1.Text = "物料信息";
            this.tabPage1.UseVisualStyleBackColor = true;
@@ -1023,11 +980,10 @@
            // tabPage2
            // 
            this.tabPage2.Controls.Add(this.grdSub);
            this.tabPage2.Location = new System.Drawing.Point(4, 25);
            this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.tabPage2.Location = new System.Drawing.Point(4, 22);
            this.tabPage2.Name = "tabPage2";
            this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.tabPage2.Size = new System.Drawing.Size(1241, 347);
            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
            this.tabPage2.Size = new System.Drawing.Size(929, 274);
            this.tabPage2.TabIndex = 1;
            this.tabPage2.Text = "条码信息";
            this.tabPage2.UseVisualStyleBackColor = true;
@@ -1041,13 +997,12 @@
            this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
            this.grdSub.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.grdSub.Location = new System.Drawing.Point(4, 4);
            this.grdSub.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.grdSub.Location = new System.Drawing.Point(3, 3);
            this.grdSub.Name = "grdSub";
            this.grdSub.ReadOnly = true;
            this.grdSub.RowHeadersWidth = 30;
            this.grdSub.RowTemplate.Height = 23;
            this.grdSub.Size = new System.Drawing.Size(1233, 339);
            this.grdSub.Size = new System.Drawing.Size(923, 268);
            this.grdSub.TabIndex = 45;
            this.grdSub.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdSub_CellBeginEdit);
            this.grdSub.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdSub_CellContentClick);
@@ -1056,10 +1011,9 @@
            // tabPage3
            // 
            this.tabPage3.Controls.Add(this.grdList);
            this.tabPage3.Location = new System.Drawing.Point(4, 25);
            this.tabPage3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.tabPage3.Location = new System.Drawing.Point(4, 22);
            this.tabPage3.Name = "tabPage3";
            this.tabPage3.Size = new System.Drawing.Size(1241, 347);
            this.tabPage3.Size = new System.Drawing.Size(929, 274);
            this.tabPage3.TabIndex = 2;
            this.tabPage3.Text = "档案列表";
            this.tabPage3.UseVisualStyleBackColor = true;
@@ -1074,20 +1028,19 @@
            this.grdList.Dock = System.Windows.Forms.DockStyle.Fill;
            this.grdList.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.grdList.Location = new System.Drawing.Point(0, 0);
            this.grdList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.grdList.Name = "grdList";
            this.grdList.ReadOnly = true;
            this.grdList.RowHeadersWidth = 30;
            this.grdList.RowTemplate.Height = 23;
            this.grdList.Size = new System.Drawing.Size(1241, 347);
            this.grdList.Size = new System.Drawing.Size(929, 274);
            this.grdList.TabIndex = 46;
            // 
            // Gy_BarCodeBill
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.BackColor = System.Drawing.Color.Lavender;
            this.ClientSize = new System.Drawing.Size(1356, 749);
            this.ClientSize = new System.Drawing.Size(1017, 599);
            this.Controls.Add(this.tabControl1);
            this.Controls.Add(this.grdSum);
            this.Controls.Add(this.panel2);
@@ -1098,7 +1051,6 @@
            this.Controls.Add(this.grdPrint);
            this.ForeColor = System.Drawing.Color.Black;
            this.KeyPreview = true;
            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.Name = "Gy_BarCodeBill";
            this.Text = "单据编辑";
            this.WindowState = System.Windows.Forms.FormWindowState.Maximized;

 WarM/ÌõÂë´òÓ¡/Gy_BarCodeBill.resx

@@ -360,7 +360,7 @@
  <data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
        jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
        grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
        FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
@@ -370,7 +370,7 @@
  <data name="sdy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
        UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
        V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
        9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -383,7 +383,7 @@
  <data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
        UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
        V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
        9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -396,7 +396,7 @@
  <data name="AddRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
        9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
        W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
        mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
@@ -407,7 +407,7 @@
  <data name="spRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
        9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
        W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
        mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
@@ -418,7 +418,7 @@
  <data name="bc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
        /gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
        mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
        ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
@@ -433,7 +433,7 @@
  <data name="DelRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
        G9hj1huCuMS7SUYi8l4IqhvHUf5tHRWc59ntcRy3dgXrusq2baUppUf3fe8L3mD0J0EPZLsCC0Sdcw8B
        5hgV4HBaEIt14bIUCYUyTUViCmpYhqFICLM61wq41YcEbeDbDmqwbpEYMKICC0QhRhUwYMQUEGxhS6KC
        EIJ472We51dYm8+DEr1Cgm8BkhijCeNe575vhZJLk8OdQMCvkhKM+FfwjBIdc4oAgaQtFlpzV0Q+Xg/P
@@ -443,7 +443,7 @@
  <data name="wxm.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
        /gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
        mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
        ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
@@ -458,7 +458,7 @@
  <data name="cz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
        wxCQBhAOPfp/ytn/JBgCUpQIsRWGQQYQZwhQ8ilQEQj3XwAqnokFG8/EbwDMNrhiUCCSohluM0wxzAC8
        mkEAagBYMbI/QQYQ1AwCuAwgSjMI4DKAaIBkwD2C0YULAJ2LYQgMEwWgBiAbAsMkGQLGoLBAxyR5C2YQ
        OoYDBgYA9kn+I3B8Li4AAAAASUVORK5CYII=
@@ -467,7 +467,7 @@
  <data name="kc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEwSURBVDhPlZKxSgNBEIb3Qa66V7ha6xS+glgErvURzBNE
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEwSURBVDhPlZKxSgNBEIb3Qa66V7ha6xS+glgErvURzBNE
        2wOLaKet2NlEsFtIiohgJR6xEdQ0Gojwu/9k59xdL1z84Ye73Z1vZmfWpLJVgeMD02l//K8IACy+l2N8
        vl1h8XyO14cTzO0RnsaHEgxbEhBDer0B6CzLkOc5CPp6d4B6DXixgwYgSUIIA+/qWjZWy1vJTBD/+/1T
        8dwDfNCvNTgEDIc3YkIW9Vl0hcfrfdxf7GE62tkMkLu70gnQClJPRrvbAdIesILZZUcF4RXastMTBVBt
@@ -478,7 +478,7 @@
  <data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
        oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
        znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
        vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -493,7 +493,7 @@
  <data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
        /QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
        77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
        aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
@@ -508,7 +508,7 @@
  <data name="tb.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
        EGSEmEwXoo0iRkR/ZBkSaC3m74qmC3/GjS7Edv5RTQNCMzUyNMWUWFaTo6AIaqjQ2/d999id61SLXnjh
        cr73ec8991yVqXZPLzq9PfD6e+AL2M1rnZ4n4IyO29Xa0YUf27twhwDlJfv3mdaawz8lw1mNWbrV7sHa
        6jrcUxsYTOOPbprelAxnNWbp+r1HWF1ZhnoMDHwFKp8BeYO0s0+b38IDyXBWY5au3nmIdOqbhC6HgYIh
@@ -523,7 +523,7 @@
  <data name="gl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
        taxNNPnOolY+yhjjQo12oRQ3bhWiZGULF3Kv5Nucbeacs4/HeX/HnJ289tRT7+/5/Z7nfc+vw+bXgvD4
        NuFZDojpC2DOvwX/1i6YCDPeDXEjDyu+C5oRhrgX1knMZrMQkfe83vNf45+QydlVEtKZDETkvaWlkMlk
        Chn3LFOhptIQMQsgsHmElvYetHXYcHB4YgpjIzOLJMhKCiIqagoZLUVKJPEWlWg2UlOKs3KmB7ncC3RI
@@ -537,7 +537,7 @@
  <data name="BatchNo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
        BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
        CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
        tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -547,7 +547,7 @@
  <data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
        bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
        rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
        wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg

 WebAPI/Controllers/BaseSet/Gy_ConkTypeController.cs

New file
@@ -0,0 +1,343 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;

namespace WebAPI.Controllers
{
    public class Gy_ConkTypeController : ApiController
    {
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;

        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;

        /// <summary>
        /// è¿”回故障类别列表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_ConkType/list")]
        [HttpGet]
        public object list(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                //if (!DBUtility.ClsPub.Security_Log_second("Gy_ConkType", 1, false, user))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无查看权限！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                string sql1 = string.Format(@"select * from h_v_Gy_ConkTypeList where 1='" + 1 + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by æ•…障类别代码 ", "h_v_Gy_ConkTypeList");
                }
                else
                {
                    string sql = sql1 + sWhere + " order by æ•…障类别代码 ";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_ConkTypeList");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        /// <summary>
        /// ä¿å­˜æŒ‰é’®
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_ConkType/ModifyByID")]
        [HttpPost]
        public object ModifyByID([FromBody] JObject oMain)
        {
            try
            {
                //DAL.ClsGy_Warehouse_Ctl oDept = new DAL.ClsGy_Warehouse_Ctl();
                //DAL.ClsGy_Warehouse_View oDeptHlp = new DAL.ClsGy_Warehouse_View();

                var _value = oMain["oMain"].ToString();
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                string msg3 = sArray[1].ToString();

                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
                List<ConkType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ConkType>>(msg2);

                long HItemID = list[0].HItemID;
                string HNumber = list[0].HNumber;
                string HName = list[0].HName;
                string HHelpCode = list[0].HHelpCode;
                string HShortNumber = list[0].HShortNumber;
                long HParentID = list[0].HParentID;
                long HLevel = list[0].HLevel;
                bool HEndFlag = list[0].HEndFlag;
                bool HStopflag = list[0].HStopflag;
                string HRemark = list[0].HRemark;
                string HUseFlag = list[0].HUseFlag;
                DateTime HMakeTime = list[0].HMakeTime;
                string HMakeEmp = list[0].HMakeEmp;
                string HCheckEmp = list[0].HCheckEmp;
                DateTime HCheckTime = list[0].HCheckTime;
                string HModifyEmp = list[0].HModifyEmp;
                DateTime HModifyTime = list[0].HModifyTime;
                string HStopEmp = list[0].HStopEmp;
                DateTime HStopTime = list[0].HStopTime;
                long HUSEORGID = list[0].HUSEORGID;
                long HCREATEORGID = list[0].HCREATEORGID;


                #region [注释代码]
                ////判断权限
                //if (!ClsPub.Security_Log("Gy_Warehouse_Edit", 1, false, msg3))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "没有找到该功能模块！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                //if (!DBUtility.ClsPub.AllowNumber(HNumber))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                //if (oDept.HavSameNumber(HItemID, HNumber))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "代码重复！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                #endregion

                //保存
                //保存完毕后处理
                if (HItemID == 0)
                {
                    oCN.BeginTran();
                    oCN.RunProc("Insert into Gy_ConkType  " +
                        " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                        ",HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HMakeTime,HMakeEmp," +
                        "HUSEORGID,HCREATEORGID) " +
                        " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
                        "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HUseFlag + ",'" + HMakeTime + "','" + HMakeEmp + "','" + HUSEORGID + "','" + HCREATEORGID + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改上级为非末级代码
                    oCN.RunProc("Update Gy_ConkType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.Commit();
                }
                else
                {
                    //若MAINDI重复则重新获取
                    oCN.BeginTran();
                    //主表
                    oCN.RunProc("Update Gy_ConkType set " +
                        " HNumber='" + HNumber + "'" +
                        ",HName='" + HName + "'" +
                        ",HShortNumber='" + HShortNumber + "'" +
                        ",HHelpCode='" + HHelpCode + "'" +
                        ",HLevel=" + HLevel.ToString() +
                        ",HParentID=" + HParentID.ToString() +
                        ",HEndflag=" + Convert.ToString(HEndFlag ? 1 : 0) +
                        ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
                        ",HMakeEmp='" + HMakeEmp + "'" +
                        ",HUseFlag='" + HUseFlag + "'" +
                        ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改子项目代码
                    //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Warehouse,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
                    //将上级 ä¸ºéžæœ«çº§
                    oCN.RunProc("Update Gy_ConkType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    //
                    oCN.Commit();
                }
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "保存成功！";
                //WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
                objJsonResult.data = 1;
                return objJsonResult;
            }
            catch (Exception e)
            {
                //oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.Message;
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        /// <summary>
        /// æ ¹æ®åŸºç¡€èµ„æ–™ID æŸ¥æ‰¾è®°å½•
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_ConkType/cx")]
        [HttpGet]
        public object cx(long HInterID)
        {
            try
            {

                ds = oCN.RunProcReturn("select * from h_v_Gy_ConkTypeList where HitemID=" + HInterID, "h_v_Gy_ConkTypeList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        /// <summary>
        /// åŒ…装方式列表删除功能
        /// </summary>
        /// <returns></returns>
        [Route("DeltetGy_ConkType")]
        [HttpGet]
        public object DeltetGy_ConkType(string HItemID, string user)
        {
            DataSet ds;
            DataSet ds1;
            try
            {
                ////删除权限
                //if (!DBUtility.ClsPub.Security_Log("Gy_Warehouse_Delete", 1, false, user))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无删除权限";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (string.IsNullOrWhiteSpace(HItemID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HItemID为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                oCN.BeginTran();//开始事务
                ds = oCN.RunProcReturn("select * from Gy_ConkType where HItemID=" + HItemID, "Gy_ConkType");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有数据，无法删除！";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }
                //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
                //if (HStopflag)
                //{
                //    oCN.RollBack();//回滚事务
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "数据已删除无法再次删除！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                ds1 = oCN.RunProcReturn("Select HItemID from Gy_ConkType  Where HParentID='" + HItemID + "'", "Gy_ConkType");
                if (ds1.Tables[0].Rows.Count != 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "此项目存在子项目，不能删除！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string HUseFlag = Convert.ToString(ds.Tables[0].Rows[0]["HUseFlag"]);
                if (HUseFlag == "已使用")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "此项目已使用，不能删除！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                oCN.RunProc("delete from Gy_ConkType where HItemID=" + HItemID);
                oCN.Commit();//提交事务
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "* æ•°æ®åˆ é™¤æˆåŠŸï¼";
                objJsonResult.data = null;
                return objJsonResult; ;

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

    }
}

 WebAPI/Controllers/BaseSet/Gy_CurrencyController.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -31,6 +32,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_Currency", 1, false, user))
                {
@@ -61,10 +63,19 @@
                }
                else
                {
                    //添加列名
                    foreach (DataColumn col in ds.Tables[0].Columns)
                    {
                        Type dataType = col.DataType;
                        string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                        columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                    }

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
            }

 WebAPI/Controllers/BaseSet/Gy_CustomerController.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -29,6 +30,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Crm_CustomerFileList", 1, false, user))
                {
@@ -49,10 +51,19 @@
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_CustomerList");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)

 WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -29,6 +30,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Gy_Department", 1, false, user))
                {
@@ -49,10 +51,19 @@
                    ds = oCN.RunProcReturn(sql, "h_v_IF_DepartmentList");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)

 WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -31,6 +32,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_Employee", 1, false, user))
                {
@@ -51,10 +53,19 @@
                    ds = oCN.RunProcReturn(sql, "h_v_IF_EmployeeList");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -31,6 +32,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_Material", 1, false, user))
                {
@@ -51,9 +53,18 @@
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_MaterialList");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.list = columnNameList;
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }

 WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs

@@ -1,4 +1,5 @@
using DBUtility;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -31,6 +32,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_OrderBackInfoList", 1, false, user))
                {
@@ -51,12 +53,21 @@
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_OrderBackInfoList");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
                //}
                //else

 WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs

@@ -1,4 +1,5 @@
using DBUtility;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -31,6 +32,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_OrderLev", 1, false, user))
                {
@@ -52,12 +54,20 @@
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_OrderLevList");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
                //}
                //else

 WebAPI/Controllers/BaseSet/Gy_PackTypeController.cs

New file
@@ -0,0 +1,343 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;

namespace WebAPI.Controllers
{
    public class Gy_PackTypeController : ApiController
    {
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;

        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;


        /// <summary>
        /// è¿”回仓库列表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_PackType/list")]
        [HttpGet]
        public object list(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                //if (!DBUtility.ClsPub.Security_Log_second("Gy_PackType", 1, false, user))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无查看权限！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                string sql1 = string.Format(@"select * from h_v_Gy_PackTypeList where 1='" + 1 + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by åŒ…装方式代码 ", "h_v_Gy_PackTypeList");
                }
                else
                {
                    string sql = sql1 + sWhere + " order by åŒ…装方式代码 ";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_PackTypeList");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        /// <summary>
        /// ä¿å­˜æŒ‰é’®
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_PackType/ModifyByID")]
        [HttpPost]
        public object ModifyByID([FromBody] JObject oMain)
        {
            try
            {
                //DAL.ClsGy_Warehouse_Ctl oDept = new DAL.ClsGy_Warehouse_Ctl();
                //DAL.ClsGy_Warehouse_View oDeptHlp = new DAL.ClsGy_Warehouse_View();

                var _value = oMain["oMain"].ToString();
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                string msg3 = sArray[1].ToString();

                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
                List<PackType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PackType>>(msg2);

                long HItemID = list[0].HItemID;
                string HNumber = list[0].HNumber;
                string HName = list[0].HName;
                string HHelpCode = list[0].HHelpCode;
                string HShortNumber = list[0].HShortNumber;
                long HParentID = list[0].HParentID;
                long HLevel = list[0].HLevel;
                bool HEndFlag = list[0].HEndFlag;
                bool HStopflag = list[0].HStopflag;
                string HRemark = list[0].HRemark;
                string HUseFlag = list[0].HUseFlag;
                DateTime HMakeTime = list[0].HMakeTime;
                string HMakeEmp = list[0].HMakeEmp;
                string HPackMaterial = list[0].HPackMaterial;
                decimal HLenhth = list[0].HLenhth;
                decimal HWidth = list[0].HWidth;
                decimal HHeight = list[0].HHeight;

                #region [注释代码]
                ////判断权限
                //if (!ClsPub.Security_Log("Gy_Warehouse_Edit", 1, false, msg3))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "没有找到该功能模块！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                //if (!DBUtility.ClsPub.AllowNumber(HNumber))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                //if (oDept.HavSameNumber(HItemID, HNumber))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "代码重复！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                #endregion

                //保存
                //保存完毕后处理
                if (HItemID == 0)
                {
                    oCN.BeginTran();
                    oCN.RunProc("Insert into Gy_PackType  " +
                        " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                        ",HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HMakeTime,HMakeEmp,HPackMaterial,HLenhth,HWidth,HHeight) " +
                        " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
                        "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HUseFlag + ",'" + HMakeTime + "','" + HMakeEmp + "','" + HPackMaterial + "','" + HLenhth + "','" + HWidth + "','" + HHeight + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改上级为非末级代码
                    oCN.RunProc("Update Gy_PackType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.Commit();
                }
                else
                {
                    //若MAINDI重复则重新获取
                    oCN.BeginTran();
                    //主表
                    oCN.RunProc("Update Gy_PackType set " +
                        " HNumber='" + HNumber + "'" +
                        ",HName='" + HName + "'" +
                        ",HShortNumber='" + HShortNumber + "'" +
                        ",HHelpCode='" + HHelpCode + "'" +
                        ",HLevel=" + HLevel.ToString() +
                        ",HParentID=" + HParentID.ToString() +
                        ",HEndflag=" + Convert.ToString(HEndFlag ? 1 : 0) +
                        ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
                        ",HMakeEmp='" + HMakeEmp + "'" +
                        ",HPackMaterial='" + HPackMaterial + "'" +
                        ",HLenhth='" + HLenhth + "'" +
                        ",HWidth='" + HWidth + "'" +
                        ",HHeight='" + HHeight + "'" +
                        ",HUseFlag='" + HUseFlag + "'" +
                        ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改子项目代码
                    //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Warehouse,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
                    //将上级 ä¸ºéžæœ«çº§
                    oCN.RunProc("Update Gy_PackType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    //
                    oCN.Commit();
                }
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "保存成功！";
                //WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
                objJsonResult.data = 1;
                return objJsonResult;
            }
            catch (Exception e)
            {
                //oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.Message;
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        /// <summary>
        /// æ ¹æ®åŸºç¡€èµ„æ–™ID æŸ¥æ‰¾è®°å½•
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_PackType/cx")]
        [HttpGet]
        public object cx(long HInterID)
        {
            try
            {

                ds = oCN.RunProcReturn("select * from h_v_Gy_PackTypeList where HitemID=" + HInterID, "h_v_Gy_PackTypeList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        /// <summary>
        /// åŒ…装方式列表删除功能
        /// </summary>
        /// <returns></returns>
        [Route("DeltetGy_PackType")]
        [HttpGet]
        public object DeltetGy_PackType(string HItemID, string user)
        {
            DataSet ds;
            DataSet ds1;
            try
            {
                ////删除权限
                //if (!DBUtility.ClsPub.Security_Log("Gy_Warehouse_Delete", 1, false, user))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无删除权限";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (string.IsNullOrWhiteSpace(HItemID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HItemID为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                oCN.BeginTran();//开始事务
                ds = oCN.RunProcReturn("select * from Gy_PackType where HItemID=" + HItemID, "Gy_PackType");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有数据，无法删除！";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }
                //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
                //if (HStopflag)
                //{
                //    oCN.RollBack();//回滚事务
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "数据已删除无法再次删除！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                ds1 = oCN.RunProcReturn("Select HItemID from Gy_PackType  Where HParentID='" + HItemID + "'", "Gy_PackType");
                if (ds1.Tables[0].Rows.Count != 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "此项目存在子项目，不能删除！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string HUseFlag = Convert.ToString(ds.Tables[0].Rows[0]["HUseFlag"]);
                if (HUseFlag == "已使用")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "此项目已使用，不能删除！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                oCN.RunProc("delete from Gy_PackType where HItemID=" + HItemID);
                oCN.Commit();//提交事务
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "* æ•°æ®åˆ é™¤æˆåŠŸï¼";
                objJsonResult.data = null;
                return objJsonResult; ;

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }


    }
}

 WebAPI/Controllers/BaseSet/Gy_PropertyController.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -29,6 +30,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_Property", 1, false, user))
                {
@@ -49,12 +51,21 @@
                    ds = oCN.RunProcReturn(sql, "h_v_IF_PropertyList");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
                //}
                //else

 WebAPI/Controllers/BaseSet/Gy_SupplierController.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -29,6 +30,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_Supplier", 1, false, user))
                {
@@ -49,10 +51,19 @@
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_SupplierList");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)

 WebAPI/Controllers/BaseSet/Gy_TechParamByProcController.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -30,6 +31,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_TechParamByProc", 1, false, user))
                {
@@ -39,21 +41,30 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql1 = string.Format(@"select * from h_v_Gy_TechParamByProc where 1 = 1");//where ç»„织名称='" + Organization + "'
                string sql1 = string.Format(@"select * from h_v_Gy_TechParamByProcList where 1 = 1");//where ç»„织名称='" + Organization + "'
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by HEntryID ", "h_v_Gy_TechParamByProc");
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by å·¥è‰ºå‚数代码 ", "h_v_Gy_TechParamByProcList");
                }
                else
                {
                    string sql = sql1 + sWhere + " order by HEntryID";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_TechParamByProc");
                    string sql = sql1 + sWhere + " order by å·¥è‰ºå‚数代码";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_TechParamByProcList");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)

 WebAPI/Controllers/BaseSet/Gy_TechnologyController.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -30,6 +31,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_TechnologyParameter", 1, false, user))
                {
@@ -39,21 +41,30 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql1 = string.Format(@"select * from h_v_Gy_TechnologyParameter where 1 =1 ");//where ç»„织名称='" + Organization + "'
                string sql1 = string.Format(@"select * from h_v_Gy_TechnologyParameterList where 1 =1 ");//where ç»„织名称='" + Organization + "'
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by HItemID ", "h_v_Gy_TechnologyParameter");
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by HItemID ", "h_v_Gy_TechnologyParameterList");
                }
                else
                {
                    string sql = sql1 + sWhere + " order by HItemID";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_TechnologyParameter");
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_TechnologyParameterList");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)

 WebAPI/Controllers/BaseSet/Gy_TechnologyParUnitController.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -30,6 +31,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_TechnologyParameterUnit", 1, false, user))
                {
@@ -39,21 +41,30 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql1 = string.Format(@"select * from h_v_Gy_TechnologyParameterUnit where 1 = 1");//where ç»„织名称='" + Organization + "'
                string sql1 = string.Format(@"select * from h_v_Gy_TechnologyParameterUnitList where 1 = 1");//where ç»„织名称='" + Organization + "'
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by HItemID ", "h_v_Gy_TechnologyParameterUnit");
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by HItemID ", "h_v_Gy_TechnologyParameterUnitList");
                }
                else
                {
                    string sql = sql1 + sWhere + " order by HItemID";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_TechnologyParameterUnit");
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_TechnologyParameterUnitList");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)

 WebAPI/Controllers/BaseSet/Gy_UnitController.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -31,6 +32,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_UnitGroup", 1, false, user))
                {
@@ -52,10 +54,19 @@
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_UnitList");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)

 WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -29,6 +30,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_Warehouse", 1, false, user))
                {
@@ -49,11 +51,19 @@
                    ds = oCN.RunProcReturn(sql, "h_v_IF_WareHouseList");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)

 WebAPI/Controllers/BaseSet/Pay_PeriodInfoSetController.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -30,6 +31,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Pay_PeriodInfoSetList", 1, false, user))
                {
@@ -50,12 +52,21 @@
                    ds = oCN.RunProcReturn(sql, "h_v_Pay_PeriodInfoSetList");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
                //}
                //else

 WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -29,6 +30,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_WorkCenter_Query", 1, false, user))
                {
@@ -49,10 +51,19 @@
                    ds = oCN.RunProcReturn(sql, "h_v_IF_ORGANIZATIONSList");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)

 WebAPI/Controllers/POStockInBillController.cs

@@ -1524,6 +1524,19 @@
                var hinterID = list[0].HInterID;
                var FID = list[0].FID;

                #region æ ¡éªŒæ˜¯å¦æ‰«ææ¡ç 
                var HInterID = list[0].HInterID;
                string jysql = string.Format(@"select * from KF_PonderationBillMain_Temp where HSourceInterID = {0}", HInterID);
                DataTable jyDt =oCn.RunProcReturn(jysql, "jysql").Tables[0];
                if (jyDt.Rows.Count == 0 || jyDt == null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "请扫描条码";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                #endregion
                #region é‡‘蝶审核后会重新同步单据到mes æ•…不需要更新mes的收料通知单 
                /*
                oCn.BeginTran();
@@ -1545,7 +1558,7 @@
                //更新成功后 åŒæ­¥æ›´æ–°é‡‘蝶
                oCn.Commit();
                **/
                #endregion 
                #endregion

                JObject jsonRoot = new JObject();
                jsonRoot.Add("Creator", "");
@@ -1654,7 +1667,7 @@
            {
                //var code = HBarcode.Split('#')[0];
                //校验条码是否存在
                string sql = $"select* from  Gy_BarCodeBill where HSourceInterID ={HInterID} and HBarCode = '{HBarcode.Split('#')[0]}' and HQty = {HBarcode.Split('#')[1]}";
                string sql = $"select HItemID,HSourceBillNo from  Gy_BarCodeBill where HSourceInterID ={HInterID} and HBarCode = '{HBarcode.Split('#')[0]}' and HQty = {HBarcode.Split('#')[1]}";
                DataSet ds = oCn.RunProcReturn(sql, "H_v_SRM_POOrderBillList");
                if (ds.Tables[0].Rows.Count == 0)
                {
@@ -1664,6 +1677,29 @@
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
                else
                {
                    //存入条码临时表
                    sql = $"delete from KF_PonderationBillMain_Temp Where HBillNo='{ds.Tables[0].Rows[0]["HSourceBillNo"]}' ";
                    oCn.RunProc(sql);
                    sql = string.Format(@"Insert into KF_PonderationBillMain_Temp 
    (HInterID,HBillNo,HBillType,HMaterID,HProcID,HWhID,HSCWHID
    ,HStockPlaceID,HOutStockPlaceID,HGroupID,HQty,HQtyMust,HPieceQty
    ,HAuxPropID,HBatchNo,HBarCode,HAddr,HMaker,HMakeDate
    ,HSourceInterID,HSourceEntryID,HSourceBillType,HSourceBillNo,HMTONo
    ,HSTOCKORGID,HOWNERID,HExpressNumber,HSubBillType
    ,HRelationInterID,HRelationEntryID,HRelationBillNo,HRedBlueFlag
    ,HCusID)
    select HInterID,HSourceBillNo,HBillType,HMaterID,0,0,0
    ,0,0,0,HQty,HQty,0
    ,HAuxPropID,HBatchNo,'','','System',getdate()
    ,HSourceInterID,HSourceEntryID,HSourceBillType,HSourceBillNo,HMTONo
    ,HSTOCKORGID,HOWNERID,'',HBillType
    ,0,0,'',0
    ,0 from Gy_BarCodeBill  
    where HItemID = {0}", ds.Tables[0].Rows[0]["HItemID"]);
                    oCn.RunProc(sql);
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;

 WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_WorkStationBillController.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
@@ -23,6 +24,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_WorkStation_Query", 1, false, user))
                {
@@ -37,11 +39,19 @@

                ds = oCN.RunProcReturn(sql1 + sWhere + " order by å·¥ä½ä»£ç  ", "h_v_Gy_WorkStationList");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
@@ -54,5 +64,250 @@
            }
        }
        #endregion

        #region ä¿å­˜æŒ‰é’®
        [Route("Gy_WorkStationBill/ModifyByID")]
        [HttpPost]
        public object ModifyByID([FromBody] JObject oMain)
        {
            try
            {
                //DAL.ClsGy_Warehouse_Ctl oDept = new DAL.ClsGy_Warehouse_Ctl();
                //DAL.ClsGy_Warehouse_View oDeptHlp = new DAL.ClsGy_Warehouse_View();

                var _value = oMain["oMain"].ToString();
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                string msg3 = sArray[1].ToString();

                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
                List<WorkStation> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<WorkStation>>(msg2);

                long HItemID = list[0].HItemID;
                string HNumber = list[0].HNumber;
                string HName = list[0].HName;
                string HHelpCode = list[0].HHelpCode;
                string HShortNumber = list[0].HShortNumber;
                long HParentID = list[0].HParentID;
                long HLevel = list[0].HLevel;
                bool HEndFlag = list[0].HEndFlag;
                bool HStopflag = list[0].HStopflag;
                string HRemark = list[0].HRemark;
                long HUSEORGID = list[0].HUSEORGID;
                long HCREATEORGID = list[0].HCREATEORGID;


                #region [注释代码]
                ////判断权限
                //if (!ClsPub.Security_Log("Gy_Warehouse_Edit", 1, false, msg3))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "没有找到该功能模块！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                //if (!DBUtility.ClsPub.AllowNumber(HNumber))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                //if (oDept.HavSameNumber(HItemID, HNumber))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "代码重复！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                #endregion

                //保存
                //保存完毕后处理
                if (HItemID == 0)
                {
                    oCN.BeginTran();
                    oCN.RunProc("Insert into Gy_WorkStation  " +
                        " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                        ",HLevel,HEndFlag,HStopflag,HRemark," +
                        "HUSEORGID,HCREATEORGID) " +
                        " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
                        "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',"  + HUSEORGID + ",'" + HCREATEORGID + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改上级为非末级代码
                    oCN.RunProc("Update Gy_WorkStation set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.Commit();
                }
                else
                {
                    //若MAINDI重复则重新获取
                    oCN.BeginTran();
                    //主表
                    oCN.RunProc("Update Gy_WorkStation set " +
                        " HNumber='" + HNumber + "'" +
                        ",HName='" + HName + "'" +
                        ",HShortNumber='" + HShortNumber + "'" +
                        ",HHelpCode='" + HHelpCode + "'" +
                        ",HLevel=" + HLevel.ToString() +
                        ",HParentID=" + HParentID.ToString() +
                        ",HEndflag=" + Convert.ToString(HEndFlag ? 1 : 0) +
                        ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) +
                        ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改子项目代码
                    //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Warehouse,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
                    //将上级 ä¸ºéžæœ«çº§
                    oCN.RunProc("Update Gy_WorkStation set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    //
                    oCN.Commit();
                }
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "保存成功！";
                //WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
                objJsonResult.data = 1;
                return objJsonResult;
            }
            catch (Exception e)
            {
                //oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.Message;
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region æ ¹æ®åŸºç¡€èµ„æ–™ID æŸ¥æ‰¾è®°å½•
        [Route("Gy_WorkStationBill/cx")]
        [HttpGet]
        public object cx(long HInterID)
        {
            try
            {

                ds = oCN.RunProcReturn("select * from h_v_Gy_WorkStationList where HitemID=" + HInterID, "h_v_Gy_WorkStationList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region å·¥ä½åˆ—表删除功能
        [Route("DeltetGy_WorkStation")]
        [HttpGet]
        public object DeltetGy_WorkStation(string HItemID, string user)
        {
            DataSet ds;
            DataSet ds1;
            try
            {
                ////删除权限
                //if (!DBUtility.ClsPub.Security_Log("Gy_Warehouse_Delete", 1, false, user))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无删除权限";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (string.IsNullOrWhiteSpace(HItemID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HItemID为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                oCN.BeginTran();//开始事务
                ds = oCN.RunProcReturn("select * from Gy_WorkStation where HItemID=" + HItemID, "Gy_WorkStation");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有数据，无法删除！";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }
                //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
                //if (HStopflag)
                //{
                //    oCN.RollBack();//回滚事务
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "数据已删除无法再次删除！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                ds1 = oCN.RunProcReturn("Select HItemID from Gy_WorkStation  Where HParentID='" + HItemID + "'", "Gy_WorkStation");
                if (ds1.Tables[0].Rows.Count != 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "此项目存在子项目，不能删除！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //string HUseFlag = Convert.ToString(ds.Tables[0].Rows[0]["HUseFlag"]);
                //if (HUseFlag == "已使用")
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "此项目已使用，不能删除！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                oCN.RunProc("delete from Gy_WorkStation where HItemID=" + HItemID);
                oCN.Commit();//提交事务
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "* æ•°æ®åˆ é™¤æˆåŠŸï¼";
                objJsonResult.data = null;
                return objJsonResult; ;

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

    }
}

 WebAPI/Models/»ù´¡×ÊÁÏ/ConkType.cs

New file
@@ -0,0 +1,32 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;

namespace WebAPI.Models
{
    public class ConkType
    {
        public bool HEndFlag { get; set; }   //末级标志
        public string HHelpCode { get; set; }   //助记码
        public long HItemID { get; set; }  //主键
        public long HLevel { get; set; }   //等级
        public string HName { get; set; }   //名称 
        public string HNumber { get; set; }   //代码 
        public long HParentID { get; set; }   //父级ID
        public string HRemark { get; set; }   //备注
        public string HShortNumber { get; set; }   //短代码
        public bool HStopflag { get; set; }   //禁用标志
        public string HUseFlag { get; set; }   //使用状态
        public DateTime HMakeTime { get; set; }   //建立时间
        public string HMakeEmp { get; set; }   //创建人
        public string HCheckEmp { get; set; }   //审核人
        public DateTime HCheckTime { get; set; }   //审核人
        public string HModifyEmp { get; set; }   //修改人
        public DateTime HModifyTime { get; set; }   //修改时间
        public string HStopEmp { get; set; }   //禁用人
        public DateTime HStopTime { get; set; }   //禁用时间
        public long HUSEORGID { get; set; }   //使用组织
        public long HCREATEORGID { get; set; }   //创建组织
    }
}

 WebAPI/Models/»ù´¡×ÊÁÏ/PackType.cs

New file
@@ -0,0 +1,28 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;

namespace WebAPI.Models
{
    public class PackType
    {
        public bool HEndFlag { get; set; }   //末级标志
        public string HHelpCode { get; set; }   //助记码
        public long HItemID { get; set; }  //主键
        public long HLevel { get; set; }   //等级
        public string HName { get; set; }   //名称 
        public string HNumber { get; set; }   //代码 
        public long HParentID { get; set; }   //父级ID
        public string HRemark { get; set; }   //备注
        public string HShortNumber { get; set; }   //短代码
        public bool HStopflag { get; set; }   //禁用标志
        public string HUseFlag { get; set; }   //使用状态
        public DateTime HMakeTime { get; set; }   //建立时间
        public string HMakeEmp { get; set; }   //创建人
        public string HPackMaterial { get; set; }   //包装材质
        public decimal HLenhth { get; set; }   //长
        public decimal HWidth { get; set; }   //宽
        public decimal HHeight { get; set; }   //高
    }
}

 WebAPI/Models/»ù´¡×ÊÁÏ/WorkStation.cs

New file
@@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;

namespace WebAPI.Models
{
    public class WorkStation
    {
        public bool HEndFlag { get; set; }   //末级标志
        public string HHelpCode { get; set; }   //助记码
        public long HItemID { get; set; }  //主键
        public long HLevel { get; set; }   //等级
        public string HName { get; set; }   //名称 
        public string HNumber { get; set; }   //代码 
        public long HParentID { get; set; }   //父级ID
        public string HRemark { get; set; }   //备注
        public string HShortNumber { get; set; }   //短代码
        public bool HStopflag { get; set; }   //禁用标志
        public long HUSEORGID { get; set; }   //使用组织
        public long HCREATEORGID { get; set; }   //创建组织
    }
}

 WebAPI/WebAPI.csproj

@@ -320,6 +320,8 @@
    <Compile Include="App_Start\SwaggerConfig.cs" />
    <Compile Include="App_Start\WebApiConfig.cs" />
    <Compile Include="Controllers\BaseSet\Gy_BarCodeBillController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_ConkTypeController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_PackTypeController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_RoutingGroupController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_TechnologyController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_TechnologyParUnitController.cs" />
@@ -597,7 +599,10 @@
    <Compile Include="Models\TechParamByProc.cs" />
    <Compile Include="Models\其它\ReciveBill_FastModel.cs" />
    <Compile Include="Models\动态列\OptionListModel.cs" />
    <Compile Include="Models\基础资料\ConkType.cs" />
    <Compile Include="Models\基础资料\Gy_ClassTimePrj.cs" />
    <Compile Include="Models\基础资料\PackType.cs" />
    <Compile Include="Models\基础资料\WorkStation.cs" />
    <Compile Include="Models\工资管理\ClsGy_ClassTimePrj_Model.cs" />
    <Compile Include="Models\工资管理\ClsPay_GroupBalBillEmp.cs" />
    <Compile Include="Models\工资管理\ClsPay_GroupBalBillMain.cs" />
@@ -851,9 +856,11 @@
    <Folder Include="Views\Cj_CallGoodsBillMain\" />
    <Folder Include="Views\Cj_ComplementGoodsBill\" />
    <Folder Include="Views\Cj_SendGoodsBill\" />
    <Folder Include="Views\Gy_ConkType\" />
    <Folder Include="Views\Gy_EquipType\" />
    <Folder Include="Views\Gy_ICBomBill\" />
    <Folder Include="Views\Gy_MateMould\" />
    <Folder Include="Views\Gy_PackType\" />
    <Folder Include="Views\Gy_RoutingGroup\" />
    <Folder Include="Views\Gy_WorkStation\" />
    <Folder Include="Views\JIT_DayPlanPlatFormBill\" />