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

ch

2022-12-01 34c3b4b4a135316adb353f110fb1bd95c653ccad

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

 Model/Model.csproj

@@ -566,6 +566,7 @@
    <Compile Include="生产管理\设备管理\ClsSb_EquipRepairRequestBillSub.cs" />
    <Compile Include="生产管理\设备管理\ClsSb_EquipRepairSendWorkBillMain.cs" />
    <Compile Include="生产管理\设备管理\ClsSb_EquipRepairSendWorkBillSub.cs" />
    <Compile Include="生产管理\设备管理\ClsSb_EquipRepairWorkBillSub_Mater.cs" />
    <Compile Include="生产管理\设备管理\ClsSc_EquipMaintainBillSub_Item.cs" />
    <Compile Include="生产管理\设备管理\ClsSc_EquipMaintainPlanBillSub_Item.cs" />
    <Compile Include="生产管理\设备管理\ClsSc_ICMOBillMain.cs" />

 Model/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipRepairWorkBillSub_Mater.cs

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

namespace Model
{
    public class ClsSb_EquipRepairWorkBillSub_Mater : DBUtility.ClsXt_BaseBillSub
    {
        public Int64 HMaterID { get; set; }
        public string HMaterNumber { get; set; }
        public string HMaterName{ get; set; }
        public string HMaterModel{ get; set; }
        public double HQty{ get; set; }
        public double HQtyMust{ get; set; }
        public Int64 HUnitID{ get; set; }
        public string HUnitNumber{ get; set; }
        public string HUnitName{ get; set; }
        public Int64 HManagerID{ get; set; }
        public string HManagerNumber{ get; set; }
        public string HManagerName{ get; set; }
    }
}

 Model/ÏúÊÛ¹ÜÀí/ClsXs_SeOrderBillMain.cs

@@ -8,7 +8,7 @@
    {
        public string HAddress;//     varchar(200)                --交货地点 
        public Int64 HSSID;//     int                --结算方式 (Gy_SettleStyle)
        public Int64 HSellSID;//    int             --采购方式 (Gy_PoStockStyle)        new
        public Int64 HSellSID;//    int             --销售方式 (Gy_SellStyle)        new
        public Int64 HCusID;//      int                 --供应商 ï¼ˆGy_Supplier）
        public Int64 HCurID;//    int                  --币别 (Gy_Currency)
        public Single HExRate;//    money                  --汇率  (选择完币别带出)
@@ -20,5 +20,25 @@
        public DateTime HSSDate;//      datetime            --结算日期                    --addnew
        public string HChangeMan;//     varchar(50)        --变更人（不可编辑,灰色显示类似审核人）                --addnew
        public DateTime HChangeDate;//     datetime        --变更日期（不可编辑,灰色显示）                --addnew


        public Int64 HInterID;
        public long HYear;
        public long HPeriod;
        public string HBillType;
        public string HBillSubType;
        public DateTime HDate;
        public string HBillNo;
        public int HBillStatus;
        public string HRemark;
        public string HChecker;
        public string HCheckDate;
        public string HMaker;
        public string HMakeDate;
        public string HCloseMan;
        public string HCloseDate;
        public Int64 HERPInterID;
        public string HERPBillType;
        public Int64 HSALEORGID;
    }
}

 Model/ÏúÊÛ¹ÜÀí/ClsXs_SeOrderBillSub.cs

@@ -10,7 +10,7 @@
        public string HRemark;//         varchar(200)        --备注 
        public Int64 HMaterID;//  int      --物料ID (Gy_Material)
        public Int64 HUnitID;//    int    --计量单位 (Gy_Unit)
        public double HQty;//     dec(18,8)         --数量
        public double? HQty;//     dec(18,8)         --数量
        public double HPrice;//   dec(18,8)         --原币单价
        public double HMoney;//   dec(18,8)         --原币金额
        public Single HTaxRate;//   money              --税率
@@ -23,5 +23,24 @@
        public double HRelTaxPrice;//     dec(18,8)    --实际含税单价（不可编辑）            --addnew
        public double HOutStockQty;//     dec(18,8)        --出库数量（不可编辑）            --addnew
        public double HInvoiceQty;//         dec(18,8)    --开票数量（不可编辑）            --addnew


        public Int64 HInterID;
        public Int64 HEntryID;
        public Int64 HSourceInterID;
        public Int64 HSourceEntryID;
        public string HSourceBillNo;
        public string HSourceBillType;
        public double HRelationQty;
        public Int64 HPropertyID;
        public string HBatChNo;
        public Int64 HAuxPropID;
        public string HMTONo;
        public Int64 HERPInterID;
        public Int64 HERPEntryID;
        public decimal HBackRelationQty;
        public Int64 HWhID;
        public Int64 HSPID;
      
    }
}

 WebAPI/Controllers/BaseSet/Gy_CustomerController.cs

@@ -26,7 +26,7 @@
        /// </summary>
        [Route("Gy_Customer/list")]
        [HttpGet]
        public object list(string sWhere,string user, string Organization)
        public object list(string sWhere, string user, string Organization)
        {
            try
            {
@@ -315,6 +315,67 @@
        }



        [Route("Gy_Customer/SaveGy_CustomerListApi")]
        [HttpPost]
        public object SaveGy_CustomerListApi([FromBody] JObject oMain)
        {
            try
            {
                var model = oMain["model"].ToString();
                //反序列化
                model = "[" + model + "]";
                List<Customer> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Customer>>(model);
                string sql = string.Empty;
                oCN.BeginTran();
                sql = $"delete gy_Customer where HItemID = {lsmain[0].HItemID}";
                oCN.RunProc(sql);
                sql = "set identity_insert gy_Customer on";
                oCN.RunProc(sql);
                //主表
                oCN.RunProc("Insert into Gy_Customer " +
                    " (HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                    ",HLevel,HEndFlag,HStopflag,HRemark" +
                    ",HShortName,HAddress,HLinkMan,HLinkPhone,HMobilePhone" +
                    ",HFax,HPostalCode,HEmail,HBank,HBankAccount" +
                    ",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
                    ",HEnglishAddress,HCurID,HSSID,HAreaID,HCusStatus" +
                    ",HEmpID,HCreditDate,HCreditRatingDate,HMaxCreditRatingDate" +
                    ",HMonthUseQty,HForecastCreditRating,HCreditLevelID,HCountAccrualRating" +
                    ",HSubsidyAccrualRating,HCreditRating,HMaxCreditRating" +
                    ",HCusTypeID) " +
                    " Values('" + lsmain[0].HItemID + "','" + lsmain[0].HNumber + "','" + lsmain[0].HName + "','" + lsmain[0].HHelpCode + "','" + lsmain[0].HShortNumber + "'," + lsmain[0].HParentID +
                    ", " + lsmain[0].HLevel + ",0,'" + lsmain[0].HStopFlag + "','" + lsmain[0].HRemark + "'" +
                    ",'" + lsmain[0].HShortName + "','" + lsmain[0].HAddress + "','" + lsmain[0].HLinkMan + "','" + lsmain[0].HLinkPhone + "','" + lsmain[0].HMobilePhone + "'" +
                    ",'" + lsmain[0].HFax + "','" + lsmain[0].HPostalCode + "','" + lsmain[0].HEmail + "','" + lsmain[0].HBank + "','" + lsmain[0].HBankAccount + "'" +
                    ",'" + lsmain[0].HTaxNum + "'," + lsmain[0].HTaxRate + ",'" + lsmain[0].HCountry + "','" + lsmain[0].HCorMan + "','" + lsmain[0].HEnglishName + "'" +
                    ",'" + lsmain[0].HEnglishAddress + "'," + lsmain[0].HCurID + "," + lsmain[0].HSSID + "," + lsmain[0].HAreaID + ",'" + lsmain[0].HCusStatus + "'" +
                    "," + lsmain[0].HEmpID + "," + lsmain[0].HCreditDate + "," + lsmain[0].HCreditRatingDate + "," + lsmain[0].HMaxCreditRatingDate +
                    "," + lsmain[0].HMonthUseQty + "," + lsmain[0].HForecastCreditRating + "," + lsmain[0].HCreditLevelID + "," + lsmain[0].HCountAccrualRating +
                    "," + lsmain[0].HSubsidyAccrualRating + "," + lsmain[0].HCreditRating + "," + lsmain[0].HMaxCreditRating +
                    ", " + lsmain[0].HCusTypeID + ")");
                sql = "set identity_insert gy_Customer off";
                oCN.RunProc(sql);
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "新增单据成功！";
                //objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.Message;
                objJsonResult.data = null;
                return objJsonResult;
            }
        }



        /// <summary>
        /// ä¿®æ”¹å•æ®-保存按钮
        ///参数：string sql。

 WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs

@@ -26,7 +26,7 @@
        /// </summary>
        [Route("Gy_Department/list")]
        [HttpGet]
        public object list(string sWhere,string user,string Organization)
        public object list(string sWhere, string user, string Organization)
        {
            try
            {
@@ -75,8 +75,6 @@
                return objJsonResult;
            }
        }


        /// <summary>
        /// æ ¹æ®åŸºç¡€èµ„æ–™ID æŸ¥æ‰¾è®°å½•
        ///参数：string sql。
@@ -122,7 +120,7 @@
        /// <returns></returns>
        [Route("DeltetGy_Department")]
        [HttpGet]
        public object DeltetGy_Department(string HItemID,string user)
        public object DeltetGy_Department(string HItemID, string user)
        {
            DataSet ds;
            DataSet ds1;
@@ -334,15 +332,11 @@
                oCN.RunProc("Insert Into Gy_Department " +
                "(HNumber,HShortNumber,HName,HParentID" +
                ",HLevel,HEndFlag,HRemark,HStopFlag,HUseFlag" +
                ",HCREATEORGID,HUSEORGID,HBarCode,HCreator" +
                ",HUpdater,HChecker,HDeleteMan" +
                ",HSecManagerID,HCreateDate" +
                ",HCREATEORGID,HUSEORGID" +
                ") " +
                " values('" + HNumber + "','" + HShortNumber + "','" + HName + "',0" +
                ",'',0,'" + HRemark + "',0,''" +
                "," + HCreateOrgID + "," + HUseOrgID + ",'" + HBarCode + "','" + HCreator + "'" +
                ",'" + HUpdater + "','" + HChecker + "','" + HDeleteMan + "'" +
                "," + HSecManagerID + ", getdate()" +
                "," + HCreateOrgID + "," + HUseOrgID + "" +
              ") ");
                //修改上级为非末级代码
                oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
@@ -400,7 +394,7 @@
                }
                //反序列化
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  
                msg2 = msg2.Replace("\n", "");
                msg2 = "[" + msg2.ToString() + "]";
                List<Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(msg2);

@@ -601,8 +595,51 @@
            }
        }

        [Route("Gy_Department/SaveGy_DepartmentListApi")]
        [HttpPost]
        public object SaveGy_DepartmentListApi([FromBody] JObject oMain)
        {
            try
            {
                var model = oMain["model"].ToString();
                //反序列化
                model = "[" + model + "]";
                List<Department> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(model);
                string sql = string.Empty;
                oCN.BeginTran();
                sql = $"delete Gy_Department where HItemID = {lsmain[0].HItemID}";
                oCN.RunProc(sql);
                sql = "set identity_insert Gy_Department on";
                oCN.RunProc(sql);
                //主表
                oCN.RunProc("Insert Into Gy_Department " +
              "(HItemID,HNumber,HShortNumber,HName,HParentID" +
              ",HLevel,HEndFlag,HRemark,HStopFlag,HUseFlag" +
              ",HCREATEORGID,HUSEORGID"+
              ") " +
              " values('" + lsmain[0].HItemID + "','" + lsmain[0].HNumber + "','" + lsmain[0].HShortNumber + "','" + lsmain[0].HName + "',0" +
              ",'',0,'" + lsmain[0].HRemark + "',0,''" +
              "," + lsmain[0].HCreateOrgID + "," + lsmain[0].HUseOrgID + "" +
            ") ");
                sql = "set identity_insert Gy_Department off";
                oCN.RunProc(sql);
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "新增单据成功！";
                //objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.Message;
                objJsonResult.data = null;
                return objJsonResult;
            }
        }


        //
    }
}

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -328,7 +328,7 @@
        [HttpPost]
        public object SaveGy_MaterialListApi([FromBody] JObject msg)
        {
            var _value = msg["msg"].ToString();
            var _value = msg["model"].ToString();
            string msg3 = _value.ToString();
            string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg1 = sArray[0].ToString();

 WebAPI/Controllers/BaseSet/Gy_SupplierController.cs

@@ -254,6 +254,58 @@
            }
        }

        [Route("Gy_Supplier/SaveGy_SupplierListApi")]
        [HttpPost]
        public object SaveGy_SupplierListApi([FromBody] JObject msg)
        {
            try
            {
                var _value = msg["model"].ToString();
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                //反序列化
                _value = "[" + _value.ToString() + "]";
                List<Supplier> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Supplier>>(_value);
                string sql = string.Empty;
                //保存
                oCN.BeginTran();
                sql = $"delete Gy_Supplier where HItemID = {lsmain[0].HItemID}";
                oCN.RunProc(sql);
                sql = "set identity_insert Gy_Supplier on";
                oCN.RunProc(sql);
                oCN.RunProc("Insert Into Gy_Supplier " +
                 "(HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                     ",HLevel,HEndFlag,HStopflag,HRemark" +
                     ",HShortName,HAddress,HLinkMan,HLinkPhone,HMobilePhone" +
                     ",HFax,HPostalCode,HEmail,HBank,HBankAccount" +
                     ",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
                     ",HEnglishAddress,HCurID,HSSID,HAreaID) " +
                 " values('" + lsmain[0].HItemID + "','" + lsmain[0].HNumber + "','" + lsmain[0].HName + "','" + lsmain[0].HHelpCode + "','" + lsmain[0].HShortNumber + "','" + lsmain[0].HParentID + "'" +
                 "," + lsmain[0].HLevel + ",0,'" + lsmain[0].HStopflag + "','" + lsmain[0].HRemark + "'" +
                 ",'" + lsmain[0].HShortName + "','" + lsmain[0].HAddress + "','" + lsmain[0].HLinkMan + "','" + lsmain[0].HLinkPhone + "','" + lsmain[0].HMobilePhone + "'" +
                 ",'" + lsmain[0].HFax + "','" + lsmain[0].HPostalCode + "','" + lsmain[0].HEmail + "','" + lsmain[0].HBank + "','" + lsmain[0].HBankAccount + "'" +
                 ",'" + lsmain[0].HTaxNum + "','" + lsmain[0].HTaxRate + "','" + lsmain[0].HCountry + "','" + lsmain[0].HCorMan + "','" + lsmain[0].HEnglishName + "'" +
                 ",'" + lsmain[0].HEnglishAddress + "'," + lsmain[0].HCurID + "," + lsmain[0].HSSID + "," + lsmain[0].HAreaID +
                  ") ");
                //修改上级为非末级代码
                sql = "set identity_insert Gy_Supplier off";
                oCN.RunProc(sql);
                oCN.Commit();

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "保存成功！";
                objJsonResult.data = 1;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败！" + e.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }

        /// <summary>
        /// ä¿®æ”¹å•æ®-保存按钮

 WebAPI/Controllers/BaseSet/Gy_UnitController.cs

@@ -28,7 +28,7 @@
        /// </summary>
        [Route("Gy_Unit/list1")]
        [HttpGet]
        public object list(string sWhere,string user,string Organization)
        public object list(string sWhere, string user, string Organization)
        {
            try
            {
@@ -268,7 +268,7 @@
                    oItem.HShortNumber = sShortNumber;//短代码
                    oItem.HEndFlag = true;//末级标志
                    oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //等级
                    oItem.HRate= msg_HRate;//换算比例
                    oItem.HRate = msg_HRate;//换算比例
                    oBill.oModel = oItem;
                }

@@ -312,6 +312,50 @@
            }
        }

        [Route("Gy_Unit/SaveGy_UnitListApi")]
        [HttpPost]
        public object SaveGy_UnitListApi([FromBody] JObject msg)
        {
            try
            {
                var _value = msg["model"].ToString();
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ListModels oListModels = new ListModels();
                List<Model.ClsGy_Unit_Model> lsmain = new List<Model.ClsGy_Unit_Model>();
                lsmain = oListModels.getObjectByJson_Gy_Unit(_value);
                string sql = string.Empty;
                //保存
                oCN.BeginTran();
                sql = $"delete Gy_Unit where HItemID = {lsmain[0].HItemID}";
                oCN.RunProc(sql);
                sql = "set identity_insert Gy_Unit on";
                oCN.RunProc(sql);
                oCN.RunProc("Insert into Gy_Unit" +
                    " (HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                    ",HLevel,HEndFlag,HStopflag,HRemark,HRate,HStandard,HUSEORGID) " +
                    " Values('" + lsmain[0].HItemID + "','" + lsmain[0].HNumber + "','" + lsmain[0].HName + "','" + lsmain[0].HHelpCode + "','" + lsmain[0].HShortNumber + "'," + lsmain[0].HParentID.ToString() +
                    "," + lsmain[0].HLevel.ToString() + "," + Convert.ToString(lsmain[0].HEndFlag ? 1 : 0) + "," + Convert.ToString(lsmain[0].HStopflag ? 1 : 0) + ",'" + lsmain[0].HRemark +
                    "'," + lsmain[0].HRate.ToString() + "," + DBUtility.ClsPub.BoolToString(lsmain[0].HStandard) + "," + lsmain[0].HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                //修改上级为非末级代码
                sql = "set identity_insert Gy_Unit off";
                oCN.RunProc(sql);
                oCN.Commit();

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "保存成功！";
                objJsonResult.data = 1;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败！" + e.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        /// <summary>
        /// è®¡é‡å•ä½èŽ·å–信息
        /// </summary>
@@ -330,7 +374,7 @@
        /// <returns></returns>
        [Route("DeltetGy_Unit")]
        [HttpGet]
        public object DeltetGy_Unit(string HItemID,string user)
        public object DeltetGy_Unit(string HItemID, string user)
        {
            DataSet ds;
            //string ModRightNameCheck = "Sc_ProcessReport_check";

 WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs

@@ -398,6 +398,50 @@
                return objJsonResult;
            }
        }

        [Route("Gy_Warehouse/SaveGy_WarehouseListApi")]
        [HttpPost]
        public object SaveGy_WarehouseListApi([FromBody] JObject msg)
        {
            try
            {
                var _value = msg["model"].ToString();
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                //反序列化
                _value = "[" + _value.ToString() + "]";
                List<Warehouse> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Warehouse>>(_value);
                string sql = string.Empty;
                //保存
                oCN.BeginTran();
                sql = $"delete Gy_Warehouse where HItemID = {list[0].HItemID}";
                oCN.RunProc(sql);
                sql = "set identity_insert Gy_Warehouse on";
                oCN.RunProc(sql);
                oCN.RunProc("Insert into Gy_Warehouse  " +
                       " (HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                       ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HAddress,HPhone,HUSEORGID) " +
                       " Values('" + list[0].HItemID + "','" + list[0].HNumber + "','" +list[0].HName + "','" + list[0].HHelpCode + "','" + list[0].HShortNumber + "'," + list[0].HParentID.ToString() +
                       "," + list[0].HLevel.ToString() + "," + Convert.ToString(list[0].HEndFlag ? 1 : 0) + "," + Convert.ToString(list[0].HStopflag ? 1 : 0) + ",'" + list[0].HRemark + "'," + list[0].HEmpID.ToString() + ",'" + list[0].HAddress + "','" + list[0].HPhone + "','" + list[0].HUSEORGID + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                //修改上级为非末级代码
                sql = "set identity_insert Gy_Warehouse off";
                oCN.RunProc(sql);
                oCN.Commit();

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "保存成功！";
                objJsonResult.data = 1;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败！" + e.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        /// <summary>
        /// ä»“库列表删除功能
        /// </summary>

 WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs

@@ -383,7 +383,7 @@
            {

                //得到信息
                ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillQuerySub_Mould  where hmainid= " + HProcExchHinteID , "h_v_Sc_ProcessExchangeBillQuerySub_Mould");
                ds = oCN.RunProcReturn("select  * from h_v_Sc_ProcessExchangeBillQuerySub_Mould  where hmainid= " + HProcExchHinteID , "h_v_Sc_ProcessExchangeBillQuerySub_Mould");
                //写入信息
                //if (ds == null || ds.Tables[0].Rows.Count == 0)
                //{
@@ -697,6 +697,7 @@
                objJsonResult.list = columnNameList;
                objJsonResult.Message = "获取信息成功！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
@@ -704,8 +705,8 @@
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
            return objJsonResult;
        }
        #endregion
    }

 WebAPI/Controllers/POStockInBillController.cs

@@ -2345,7 +2345,7 @@
                string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);//客户名称
                string sql = string.Empty;
                if (FCusName.Contains("安瑞"))
                    sql = $"select HItemID,HSourceBillNo,HQty,HSourceInterID,HSourceEntryID from  Gy_BarCodeBill where HSourceInterID ={HInterID} and HBarCode = '{HBarcode}' and HBarCodeType ='箱号内条码'";
                    sql = $"select top 1 HItemID,HSourceBillNo,HQty,HSourceInterID,HSourceEntryID from  Gy_BarCodeBill where HSourceInterID =(select distinct HSourceInterID from Cg_POInStockBillSub where HInterID ={HInterID}) and HBarCode = '{HBarcode}' and HBarCodeType ='箱号内条码'";
                else
                    sql = $"select HItemID,HSourceBillNo,HQty,HSourceInterID,HSourceEntryID 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");

 WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs

@@ -44,22 +44,12 @@
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_EquipMaintainPlan");
                }

                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
               
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
                //}
                //else
                //{
                //objJsonResult.code = "0";
                //objJsonResult.count = 0;
                //objJsonResult.Message = "无数据";
                //objJsonResult.data = null;
                //return objJsonResult;
                //}
            }
            catch (Exception ex)
            {

 WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs

@@ -237,6 +237,7 @@
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string msg4 = sArray[2].ToString();
            string msg5 = sArray[3].ToString();


            //string UserName = "";
@@ -330,6 +331,30 @@
                    oBill.DetailColl.Add(oItemSub);

                }

                //配件表体数据
                //按 },{来拆分数组 //去掉【和】
                //msg5 = msg5.Substring(1, msg5.Length - 2);
                msg5 = msg5.Replace("\\", "");
                msg5 = msg5.Replace("\n", "");  //\n
                                                //msg2 = msg2.Replace("'", "’");
                List<Model.ClsSb_EquipRepairWorkBillSub_Mater> ls1 = new List<Model.ClsSb_EquipRepairWorkBillSub_Mater>();
                ls1 = JsonConvert.DeserializeObject<List<Model.ClsSb_EquipRepairWorkBillSub_Mater>>(msg5);
                int j = 0;
                foreach (Model.ClsSb_EquipRepairWorkBillSub_Mater oItemSub in ls1)
                {

                    j++;
                    oItemSub.HEntryID = i;
                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    oItemSub.HCloseType = false;   //关闭类型                   
                    oItemSub.HSourceInterID = 0;     // æºå•ä¸»å†…码
                    oItemSub.HSourceEntryID = 0;   //源单子内码    
                    oItemSub.HRelationQty = 0;     //关联数量
                    oBill.DetailColl_Mater.Add(oItemSub);

                }

                //保存
                //保存完毕后处理
                bool bResult;
@@ -386,35 +411,37 @@
        }
        #endregion

        #region[设备维修列表编辑时获取表体数据]
        #region[设备维修列表编辑时获取表体数据(维修列表、配件列表)]
        [Route("Sb_EqpRepairWorkBill/Sb_EqpRepairWorkBillListProjectDetai")]
        [HttpGet]
        public object Sb_EqpRepairWorkBillListProjectDetai(string sqlWhere)
        public object Sb_EqpRepairWorkBillListProjectDetai(string HInterID)
        {
            DataSet ds;
            DataSet ds, ds1;
            List<object> list = new List<object>();
            string sqlWhere = "";
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sqlWhere == null || sqlWhere.Equals(""))
                if (HInterID != "" || HInterID != null)
                {
                    //ds = oCN.RunProcReturn("select HRepairID,HRepairExplanation,HManagerID,HMoney,HRemark   from Sc_MouldRepairWorkBillSub", "Sc_MouldRepairWorkBillSub");
                    ds = oCN.RunProcReturn("select HRepairID,维修项目代码 HRepairCode,维修项目 HRepairName,HManagerID1 HManagerID,表体负责人代码 HManagerCode,表体负责人 HManagerName,HRepairID1 HRepairID, è¡¨ä½“维修项目代码 HRepairCode,表体维修项目 HRepairName,表体维修要求 HRepairExplanation,表体备注 HRemark,源单主内码 HSourceInterID,源单子内码 HSourceEntryID,源单单号 HSourceBillNo,源单类型 HSourceBillType  from h_v_Sc_EquipRepairWorkBillList_Edit", "h_v_Sc_EquipRepairWorkBillList_Edit");
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.data = ds.Tables[0];
                    sqlWhere = " and hmainid='" + HInterID + "'";
                }
                else
                {
                    //string sql1 = "select HRepairID,HRepairExplanation,HManagerID,HMoney,HRemark  from Sc_MouldRepairWorkBillSub where 1 = 1 ";
                    string sql1 = "select HRepairID,维修项目代码 HRepairCode,维修项目 HRepairName,HManagerID1 HManagerID,表体负责人代码 HManagerCode,表体负责人 HManagerName,HRepairID1 HRepairID, è¡¨ä½“维修项目代码 HRepairCode,表体维修项目 HRepairName,表体维修要求 HRepairExplanation,表体备注 HRemark ,源单主内码 HSourceInterID,源单子内码 HSourceEntryID,源单单号 HSourceBillNo,源单类型 HSourceBillType from h_v_Sc_EquipRepairWorkBillList_Edit where 1 = 1 ";
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_EquipRepairWorkBillList_Edit");
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.data = ds.Tables[0];
                    sqlWhere = HInterID;
                }
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
              
                ds = oCN.RunProcReturn("select HRepairID,维修项目代码 HRepairCode,维修项目 HRepairName,HManagerID1 HManagerID,表体负责人代码 HManagerCode,表体负责人 HManagerName,HRepairID1 HRepairID, è¡¨ä½“维修项目代码 HRepairCode,表体维修项目 HRepairName,表体维修要求 HRepairExplanation,表体备注 HRemark,源单主内码 HSourceInterID,源单子内码 HSourceEntryID,源单单号 HSourceBillNo,源单类型 HSourceBillType  from h_v_Sc_EquipRepairWorkBillList_Edit where 1 = 1 " + sqlWhere , "h_v_Sc_EquipRepairWorkBillList_Edit");
                string sql1 = "select * from h_v_Sb_EquipRepairWorkBillSub_Mater where 1 = 1 " + sqlWhere;
                ds1 = oCN.RunProcReturn(sql1, "h_v_Sb_EquipRepairWorkBillSub_Mater");
                list.Add(ds.Tables[0]);
                list.Add(ds1.Tables[0]);

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功！";
                objJsonResult.list = list;

            }
            catch (Exception e)
            {

 WebAPI/Controllers/Sc_MouldRepairInBillListController.cs

@@ -280,22 +280,13 @@

                ds = Sc_MouldDotCheckPlanBillList_s(sWhere);

                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
               
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
                //}
                //else
                //{
                //objJsonResult.code = "0";
                //objJsonResult.count = 0;
                //objJsonResult.Message = "无数据";
                //objJsonResult.data = null;
                //return objJsonResult;
                //}
              
            }
            catch (Exception ex)
            {

 WebAPI/Controllers/WebAPIController.cs

@@ -1345,6 +1345,114 @@
        }

        /// <summary>
        /// èŽ·å–销售方式列表
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetSellStyleList_Json")]
        [HttpGet]
        public object GetSellStyleList_Json(string SellStyle)
        {
            if (SellStyle != "")
            {
                sWhere = sWhere + " and ( HNumber like '%" + SellStyle + "%' or HName like '%" + SellStyle + "%' ) ";
            }
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName  from Gy_SellStyle where HStopflag=0 Order by HItemID ", "Gy_SellStyle");
                }
                else
                {
                    string sql1 = "Select HItemID,HNumber ,HName  from Gy_SellStyle where HStopflag=0 and HEndFlag=1 ";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "Gy_SellStyle");
                }              

                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "0";
                    objjson.count = 1;
                    objjson.Message = "获取成功!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
            }
            catch (Exception ex)
            {

                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + ex.ToString();
                objjson.data = null;
                return objjson;
            }         
        }

        /// <summary>
        /// èŽ·å–结算方式列表
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetSettleStyleList_Json")]
        [HttpGet]
        public object GetSettleStyleList_Json(string SettleStyle)
        {
            if (SettleStyle != "")
            {
                sWhere = sWhere + " and ( HNumber like '%" + SettleStyle + "%' or HName like '%" + SettleStyle + "%' ) ";
            }
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName  from Gy_SettleStyle where HStopflag=0 Order by HItemID ", "Gy_SettleStyle");
                }
                else
                {
                    string sql1 = "Select HItemID,HNumber ,HName  from Gy_SettleStyle where HStopflag=0 and HEndFlag=1 ";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "Gy_SettleStyle");
                }

                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "0";
                    objjson.count = 1;
                    objjson.Message = "获取成功!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
            }
            catch (Exception ex)
            {

                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + ex.ToString();
                objjson.data = null;
                return objjson;
            }
        }

        /// <summary>
        /// èŽ·å–客户列表
        /// </summary>
        /// <returns></returns>
@@ -3179,9 +3287,9 @@
        /// <returns></returns>
        [Route("Web/GetMaintainItemtemByEquipProjectID")]
        [HttpGet]
        public object GetMaintainItemtemByEquipProjectID(int EquipProjectID)
        public object GetMaintainItemtemByEquipProjectID(string EquipProjectID)
        {
            if (EquipProjectID <= 0)
            if (EquipProjectID == null)
            {
                objjson.code = "0";
                objjson.count = 0;

 WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json;
using Model;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
@@ -156,6 +157,249 @@
            }
        }

        #region é”€å”®è®¢å• ä¿å­˜/编辑功能
        [Route("Xs_SeOrder/SeOrderBillEdit")]
        [HttpPost]
        public object SeOrderBillEdit([FromBody] JObject sMainSub)
        {
            try
            {
                var _value = sMainSub["sMainSub"].ToString();
                string msg1 = _value.ToString();
                oCN.BeginTran();
                //保存主表
                objJsonResult = AddBillMain(msg1);
                if (objJsonResult.code == "0")
                {
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = objJsonResult.Message;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "单据保存成功！";
                objJsonResult.data = null;
                return objJsonResult;

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

        public json AddBillMain(string msg1)
        {
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString(); //主表数据
            string msg3 = sArray[1].ToString(); //子表数据
            int OperationType = int.Parse(sArray[2].ToString()); // æ•°æ®ç±»åž‹ 1添加 3修改
            string user = sArray[3].ToString();
            string msg_allVal = sArray[4].ToString(); //主表+子表所有数据

            try
            {
                msg2 = "[" + msg2.ToString() + "]";
                List<ClsXs_SeOrderBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_SeOrderBillMain>>(msg2);

                long HInterID = mainList[0].HInterID;//递入type得到的单据ID
                string HBillNo = mainList[0].HBillNo;//递入type得到的单据号
                long HPRDORGID = mainList[0].HPRDORGID;//组织
                DateTime HDate = mainList[0].HDate;//日期
                string HRemark = mainList[0].HRemark;//备注
                long HCusID = mainList[0].HCusID;//客户
                long HEmpID = mainList[0].HEmpID;//业务员
                long HDeptID = mainList[0].HDeptID;//部门
                long HCurID = mainList[0].HCurID;//币别
                Single HExRate = mainList[0].HExRate;//汇率
                long HManagerID = mainList[0].HManagerID;//主管
                long HSellSID = mainList[0].HSellSID;//销售方式
                long HSSID = mainList[0].HSSID;//结算方式
                DateTime HSSDate = mainList[0].HSSDate;//结算日期
                string HMaker = user;//制单人
                string HAddress = mainList[0].HAddress;//地址

                List<ClsXs_SeOrderBillMain> mainList2 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_SeOrderBillMain>>(msg2);
                DateTime dt = DateTime.Now;
                long HYear = mainList2[0].HYear == null ? 0 : mainList2[0].HYear;
                long HPeriod = mainList2[0].HPeriod == null ? 0 : mainList2[0].HPeriod;
                string HBillType = mainList2[0].HBillType == null ? "''" : mainList2[0].HBillType;
                string HBillSubType = mainList2[0].HBillSubType == null ? "''" : mainList2[0].HBillSubType;
                int HBillStatus = mainList2[0].HBillStatus == null ? 0 : mainList2[0].HBillStatus;
                string HChecker = mainList2[0].HChecker == null ? "''" : mainList2[0].HChecker;
                string HCheckDate = mainList2[0].HCheckDate == null ? "''" : mainList2[0].HCheckDate;
                string HMakeDate = mainList2[0].HMakeDate == null ? "''" : mainList2[0].HMakeDate;
                string HCloseMan = mainList2[0].HCloseMan == null ? "''" : mainList2[0].HCloseMan;
                string HCloseDate = mainList2[0].HCloseDate == null ? "''" : mainList2[0].HCloseDate;
                long HERPInterID = mainList2[0].HERPInterID == null ? 0 : mainList2[0].HERPInterID;
                string HERPBillType = mainList2[0].HERPBillType == null ? "''" : mainList2[0].HERPBillType;
                long HSALEORGID = mainList2[0].HSALEORGID == null ? 0 : mainList2[0].HSALEORGID;

        ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList where hmainid=" + HInterID + " and å•æ®å·='" + HBillNo + "'", "h_v_IF_SeOrderBillList");

                if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//新增
                {
                    DataSet Ds;
                    Int64 NewHInterID = 1;
                    Ds = oCN.RunProcReturn("select MAX(HInterID)HInterID from Xs_SeOrderBillMain", "Xs_SeOrderBillMain");
                    if (Ds.Tables[0].Rows.Count != 0 && ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"].ToString()) != 0)
                    {
                        NewHInterID = ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"].ToString());
                        NewHInterID += 1;
                    }
                    //主表
                    oCN.RunProc(@"Insert Into Xs_SeOrderBillMain   
                        (HBillType,HInterID,HBillNo,HDate
                        ,HYear,HPeriod,HRemark,HMaker,HMakeDate
                        ,HEmpID,HCusID
                        ,HBillSubType,HAddress,HSSDate,HSSID,HSellSID,HCurID,HExRate, HManagerID,HDeptID
                        ,HExplanation,HCheckFlow,HBillStatus,HInnerBillNo
                        ,HICMOFlag,HChangeMan,HSALEORGID,HERPInterID,HERPBillType
                        ,HCloseDate,HCloseMan)
                        values(" + "1401," + HInterID + ",'" + HBillNo + "','" + HDate + "','" +
                    DateTime.Now.Year + "','" + DateTime.Now.Month + "','" + HRemark + "','" + HMaker + "','" + HMakeDate + 
                    "'," + HEmpID + "," + HCusID + ",'" + HBillType + "','" + HAddress + "','" + HSSDate +
                    "'," + HSSID + "," + HSellSID + "," + HCurID + "," +  HExRate + "," + HManagerID + "," + HDeptID + ",'" + "''" + "'," + "0," + HBillStatus + ",'" + "''" + "'," +
                    0 + ",'" + "''" + "'," + HSALEORGID + "," + HERPInterID + ",'" + HERPBillType + "','" + HCloseDate + "','" + HCloseMan + "')");
                }
                else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
                { //修改
                    oCN.RunProc("update Xs_SeOrderBillMain  set " +
                                "HRemark='" + HRemark + "', HChecker='" + HMaker + "', HCheckDate=getdate()" +
                                 ", HEmpID=" + HEmpID + ", HCusID=" + HCusID + ",HAddress='" + HAddress + "',HDeptID=" + HDeptID
                                 + ",HCurID=" + HCurID + ",HExRate=" + HExRate + ",HManagerID=" + HManagerID + ",HSellSID=" + HSellSID 
                                 + ",HSSID=" + HSSID + ",HSSDate='" + HSSDate + "' where HInterID=" + HInterID);

                    //删除子表
                    oCN.RunProc("delete from Xs_SeOrderBillSub where HInterID='" + HInterID + "'");
                }
                //保存子表
                objJsonResult = AddBillSub(msg3, HInterID, OperationType);

                if (objJsonResult.code == "0")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = objJsonResult.Message;
                    objJsonResult.data = null;
                    return objJsonResult;
                }

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

        public json AddBillSub(string msg3, long HInterID, int OperationType)
        {
            List<ClsXs_SeOrderBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_SeOrderBillSub>>(msg3);

            List<ClsXs_SeOrderBillSub> DetailColl2 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsXs_SeOrderBillSub>>(msg3);

            long HSourceInterID = DetailColl2[0].HSourceInterID == null ? 0 : DetailColl2[0].HSourceInterID;
            long HSourceEntryID = DetailColl2[0].HSourceEntryID == null ? 0 : DetailColl2[0].HSourceEntryID;
            string HSourceBillNo = DetailColl2[0].HSourceBillNo == null ? "''" : DetailColl2[0].HSourceBillNo;
            string HSourceBillType = DetailColl2[0].HSourceBillType == null ? "''" : DetailColl2[0].HSourceBillType;
            double HRelationQty = DetailColl2[0].HRelationQty == null ? 0 : DetailColl2[0].HRelationQty;
            long HPropertyID = DetailColl2[0].HPropertyID == null ? 0 : DetailColl2[0].HPropertyID;
            string HBatChNo = DetailColl2[0].HBatChNo == null ? "''" : DetailColl2[0].HBatChNo;
            long HAuxPropID = DetailColl2[0].HAuxPropID == null ? 0 : DetailColl2[0].HAuxPropID;
            string HMTONo = DetailColl2[0].HMTONo == null ? "''" : DetailColl2[0].HMTONo;
            long HERPInterID = DetailColl2[0].HERPInterID == null ? 0 : DetailColl2[0].HERPInterID;
            long HERPEntryID = DetailColl2[0].HERPEntryID == null ? 0 : DetailColl2[0].HERPEntryID;
            decimal HBackRelationQty = DetailColl2[0].HBackRelationQty == null ? 0 : DetailColl2[0].HBackRelationQty;
            long HWhID = DetailColl2[0].HWhID == null ? 0 : DetailColl2[0].HWhID;
            long HSPID = DetailColl2[0].HSPID == null ? 0 : DetailColl2[0].HSPID;

            int i = 0;
            foreach (ClsXs_SeOrderBillSub oSub in DetailColl)
            {
                i++;
                if (oSub.HQty <= 0 || oSub.HQty == null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "第" + i + "行，数量不能为0或者小于0";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (oSub.HMaterID == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "第" + i + "行，物料不能为空";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //if (oSub.HSourceID == 0)
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "第" + i + "行，生产资源不能为空";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                if (oSub.HUnitID == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "第" + i + "行，计量单位不能为空";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                DataSet Cs;
                Int64 NewHEntryID = 1;
                Cs = oCN.RunProcReturn("select MAX(HEntryID)HEntryID from Xs_SeOrderBillSub", "Xs_SeOrderBillSub");
                if (Cs.Tables[0].Rows.Count != 0 && ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString()) != 0)
                {
                    NewHEntryID = ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString());
                    NewHEntryID += 1;
                }

                oCN.RunProc($@"Insert into Xs_SeOrderBillSub 
                (HInterID,HENTRYID,HQty,HMaterID,HUnitID,HRemark
                ,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType
                ,HRelationQty,HRelationMoney,HPrice,HTaxPrice,HMoney,HDiscountRate
                ,HRelTaxPrice,HTaxRate,HTaxMoney,HlineTotal,HlineTotalBB,HDate,HOutStockQty,HInvoiceQty
                ,HPropertyID,HBatChNo,HAuxPropID,HMTONo,HERPInterID,HERPEntryID,HBackRelationQty,HWhID,HSPID) 
                 values({HInterID},{NewHEntryID},{(oSub.HQty == null ? 0 : oSub.HQty)}
                ,{oSub.HMaterID},{oSub.HUnitID},'{oSub.HRemark}',{HSourceInterID},{HSourceEntryID},{HSourceBillNo},{HSourceBillType},{HRelationQty},0,{oSub.HPrice},{oSub.HTaxPrice},{oSub.HMoney},{oSub.HDiscountRate},{oSub.HRelTaxPrice},{oSub.HTaxRate},{oSub.HTaxMoney},{oSub.HlineTotal},{oSub.HlineTotalBB},getdate(),{oSub.HOutStockQty},{oSub.HInvoiceQty},{HPropertyID},{HBatChNo},{HAuxPropID},
                  {HMTONo},{HERPInterID},{HERPEntryID},{HBackRelationQty},{HWhID},{HSPID})");
            }

            objJsonResult.code = "1";
            objJsonResult.count = 1;
            objJsonResult.Message = null;
            objJsonResult.data = null;
            return objJsonResult;
        }

        #endregion

        /// <summary>
        ///删除功能
        /// </summary>

 WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs

@@ -9,6 +9,7 @@
    {
        public Models.ClsSb_EquipRepairWorkBillMain omodel = new Models.ClsSb_EquipRepairWorkBillMain();
        public List<Models.ClsSb_EquipRepairWorkBillSub> DetailColl = new List<Models.ClsSb_EquipRepairWorkBillSub>();
        public List<Model.ClsSb_EquipRepairWorkBillSub_Mater> DetailColl_Mater = new List<Model.ClsSb_EquipRepairWorkBillSub_Mater>();

        public ClsSb_EquipRepairWorkBill()
        {
@@ -71,6 +72,8 @@
                DeleteRelation(ref sReturn, lngBillKey);
                //删除子表
                DeleteBillSub(lngBillKey);
                //删除配件数据
                oCn.RunProc("delete from Sb_EquipRepairWorkBillSub_Mater where HInterID="+ lngBillKey);
                //插入子表
                omodel.HInterID = lngBillKey;
                foreach (Models.ClsSb_EquipRepairWorkBillSub oSub in DetailColl)
@@ -85,6 +88,22 @@
                      "," + oSub.HRepairID.ToString() + ",'"+ oSub.HManagerID.ToString() + "','" + oSub.HRepairExplanation + "'," + oSub.HEmpID.ToString() + 
                       ") ");
                }

                foreach (Model.ClsSb_EquipRepairWorkBillSub_Mater oSub in DetailColl_Mater)
                {
                    oCn.RunProc("Insert into Sb_EquipRepairWorkBillSub_Mater " +
                      " (HInterID,HEntryID," +
                      "HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
                      "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney," +
                      "HQty,HMaterID,HUnitID,HQtyMust," +
                      "HManagerID ) values(" +
                      omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() +
                      ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                      "," + oSub.HQty.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() +
                      "," + oSub.HManagerID.ToString() + ") ");
                }

                //
                //foreach (Model.ClsSb_EquipRepairWorkBillSub oSub in DetailColl)
                //{
@@ -153,6 +172,21 @@
                      "," + oSub.HRepairID.ToString() + ",'"+ oSub.HManagerID.ToString() + "','" + oSub.HRepairExplanation + "'," + oSub.HEmpID.ToString() +
                       ") ");
                }

                foreach (Model.ClsSb_EquipRepairWorkBillSub_Mater oSub in DetailColl_Mater)
                {
                    oCn.RunProc("Insert into Sb_EquipRepairWorkBillSub_Mater " +
                      " (HInterID,HEntryID," +
                      "HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
                      "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney," +
                      "HQty,HMaterID,HUnitID,HQtyMust," +
                      "HManagerID ) values(" +
                      omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() +
                      ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                      "," + oSub.HQty.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() +
                      "," + oSub.HManagerID.ToString() + ") ");
                }
                //
                //foreach (Model.ClsSb_EquipRepairWorkBillSub oSub in DetailColl)
                //{

 WebAPI/Models/Supplier.cs

@@ -8,6 +8,7 @@
    public class Supplier
    {
        public long HInterID { get; set; }
        public long HItemID { get; set; }
        public string HNumber { get; set; }
        public string HShortNumber { get; set; }
        public string HName { get; set; }