nothing

ch

2021-11-01 9700fa5f390e5b31ff966ce63f5f91ca46eedb72

nothing

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

@@ -2474,6 +2474,7 @@
        //批次按钮
        private void BatchNo_Click(object sender, EventArgs e)
        {
            lblCaption.Focus();
            bool b = false;
            for (int i = 0; i < grdMain.RowCount; i++)
            {

 WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs

@@ -165,6 +165,8 @@
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                string msg3 = sArray[1].ToString();
                string msg4 = sArray[2].ToString();

                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
@@ -172,6 +174,7 @@
                List<Models.ClsGy_EquipFileMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_EquipFileMain>>(msg2);

                string hbillno= list[0].HBillNo;
                string HYear = DateTime.Now.Year.ToString();
                DateTime HDate = list[0].HDate;
                long HInterID = list[0].HInterID;
                string HEquipFileNumber = list[0].HEquipFileNumber; 
@@ -197,6 +200,8 @@
                string HLogo = list[0].HLogo;                //√        varchar(50)    //品牌
                int HSellSupID = list[0].HSellSupID;              // âˆš    int        //供应商(Gy_Supplier)
                int HMakeSupID = list[0].HMakeSupID;              // int        //制造商 (Gy_Supplier) 
                string HMaker = msg4;
                string HMakeDate = DateTime.Now.Date.ToString();

                if (!DBUtility.ClsPub.AllowNumber(HEquipFileNumber))
                {
@@ -212,11 +217,11 @@
                oCN.RunProc("Insert into Gy_EquipFileBillMain " +
                   " (hbillno,HEquipFileNumber,HEquipFileNo,HName,HModel,HModel2,HMaterID,HUnitID,HOutComDate" +
                   ",HOutComNo,HDeptID,HUseEmpID,HRepairEmpID,HAddress,HSetupDate,HStartupDate,HStatus," +
                   "HEquipFileTypeID,HProNum,HBarCode,HWorkArea,HLogo,HSellSupID,HMakeSupID,hbilltype,HDate) " +
                   "HEquipFileTypeID,HProNum,HBarCode,HWorkArea,HLogo,HSellSupID,HMakeSupID,hbilltype,HDate,HYear) " +
                   " Values('" + hbillno + "','" + HEquipFileNumber + "','" + HEquipFileNo + "','" + HName + "','" + HModel + "','" + HModel2 + "'," + HMaterID + "," + HUnitID +
                   ",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HUseEmpID + "," + HRepairEmpID + ",'" + HAddress +
                   "','" + HSetupDate + "','" + HStartupDate + "','" + HStatus + "'," + HEquipFileTypeID + ",'" + HProNum +
                   "','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID +",'3308','" + HDate +
                   "','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID +",'3308','" + HDate +"','"+ HYear+
                   "')", ref DBUtility.ClsPub.sExeReturnInfo);
                //修改上级为非末级代码
                oCN.Commit();
@@ -252,6 +257,7 @@
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                string msg3 = sArray[1].ToString();
                string msg4 = sArray[2].ToString();

                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
@@ -280,7 +286,9 @@
                string HWorkArea = list[0].HWorkArea;            //√    varchar(50)    //产地
                string HLogo = list[0].HLogo;                //√        varchar(50)    //品牌
                int HSellSupID = list[0].HSellSupID;              // âˆš    int        //供应商(Gy_Supplier)
                int HMakeSupID = list[0].HMakeSupID;              // int        //制造商 (Gy_Supplier) 
                int HMakeSupID = list[0].HMakeSupID;              // int        //制造商 (Gy_Supplier)
                string HUpDater = msg4;
                string HUpDateDate = DateTime.Now.Date.ToString();

                if (!DBUtility.ClsPub.AllowNumber(HEquipFileNumber))
                {
@@ -330,6 +338,8 @@
                    ",HLogo=" + HLogo +
                    ",HSellSupID=" + HSellSupID + 
                    ",HMakeSupID= " + HMakeSupID +
                    ",HUpDater= " + HUpDater +
                    ",HUpDateDate= " + HUpDateDate +
                    " Where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                //修改子项目代码
                //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);

 WebAPI/Models/Gy_OrderBackInfo.cs

@@ -1,13 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;

using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
 
namespace WebAPI.Models
{
    public class Gy_OrderBackInfo
@@ -27,5 +22,6 @@
        public bool HStopflag { get; set; }  //禁用标志

        public bool HUseFlag { get; set; }   //使用状态

    }
}

 WebAPI/Models/Gy_OrderLevList.cs

@@ -1,8 +1,3 @@

using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -15,14 +10,14 @@
        public long HItemID { get; set; }     //ID
        public string HNumber { get; set; }   //代码
        public string HName { get; set; }     //名称
        public string HShortNumber { get; set; }  //短代码
        public string HShortNumber { get; set; } // çŸ­ä»£ç 
        public long HParentID { get; set; }      //父级ID
        public long HLevel { get; set; }      //层级
        public long HEndFlag { get; set; }      //
        public long HEndFlag { get; set; }

        public string HHelpCode { get; set; }   // åŠ©è®°ç 

        public string HRemark { get; set; }    //备注
        public string HRemark { get; set; }   // å¤‡æ³¨

        public bool HStopflag { get; set; }  //禁用标志


 WebAPI/Models/Gy_WorkPayType.cs

@@ -16,10 +16,11 @@
        public long HLevel { get; set; }
        public bool HEndFlag { get; set; }      //末级标志
        public bool HStopflag { get; set; }     //禁用标志
      

        public string HRemark { get; set; }       //备注
        public string HUseFlag { get; set; }      //使用标志



    }
}

 WebAPI/Models/Gy_WorkType.cs

@@ -21,5 +21,8 @@
        public string HForEmp { get; set; }   //短代码
        public string HRemark { get; set; }       //备注
        public string HUseFlag { get; set; }      //使用标志



    }
}