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

yangle

2023-02-06 38189dd485d2d171bcca2e0ced35d6c8d187bdd3

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

 DAL/DAL.csproj

@@ -611,6 +611,7 @@
    <Compile Include="生产管理\设备管理\设备投产\ClsSb_EquipStockInCheckBill.cs" />
    <Compile Include="生产管理\设备管理\ClsSb_EquipStatusChangeBill.cs" />
    <Compile Include="生产管理\设备管理\设备投产\ClsSb_EquipWorkBeforeCheckBill.cs" />
    <Compile Include="系统公用\ClsXt_BillSubType_Ctl.cs" />
    <Compile Include="质检管理\ClsQC_FirstPieceCheckBill.cs" />
    <Compile Include="质检管理\ClsQC_LastPieceCheckBill.cs" />
    <Compile Include="质检管理\ClsQC_NoPassProdCheckBill.cs" />

 DAL/ϵͳ¹«ÓÃ/ClsXt_BillSubType_Ctl.cs

New file
@@ -0,0 +1,104 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Data;

namespace DAL
{
    public class ClsXt_BillSubType_Ctl : DBUtility.ClsGy_Base_Ctl
    {
        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
        //原代码 ç”¨äºŽ æ›¿æ¢å­é¡¹ç›®
        public string HOldNumber;
        public Model.ClsXt_BillSubType_Model oModel = new Model.ClsXt_BillSubType_Model();
        //新增
        public override bool AddNew()
        {

            try
            {
                oCn.BeginTran();
                oCn.RunProc($@"insert into Xt_BillSubType(HNumber ,HName ,HShortNumber ,HParentID ,HLevel 
                                ,HEndFlag  ,HStopflag  ,HRemark ,HHelpCode ,HUseFlag
                                 ,HMakeTime ,HMakeEmp ,HCheckEmp ,HCheckTime ,HModifyEmp 
                                 ,HModifyTime ,HStopEmp ,HStopTime ,HUSEORGID,HCREATEORGID ,HBillType ,HIsDefault ,HBillTypeID)
                                values('{oModel.HNumber}','{oModel.HName}','{oModel.HShortNumber}',{oModel.HParentID},
                                {oModel.HLevel},{(oModel.HEndFlag == true ? 1 : 0)},{(oModel.HStopflag == true ? 1 : 0)},
                                '{oModel.HRemark}','{oModel.HHelpCode}','{oModel.HUseFlag}',GETDATE(),'{oModel.HMakeEmp}','','',''
                                ,'','','',{oModel.HUSEORGID},{oModel.HCREATEORGID},{oModel.HBillType},{0},'')"
                                , ref DBUtility.ClsPub.sExeReturnInfo);
                //修改上级为非末级代码
                oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                oCn.RollBack();
                throw (e);
            }
        }

        //修改
        public override bool ModifyByID(Int64 sItemID)
        {
            try
            {
                oCn.BeginTran();
                oCn.RunProc("Update " + MvarItemKey + " set " +
                    " HNumber='" + oModel.HNumber + "'" +
                    ",HName='" + oModel.HName + "'" +
                     ",HBillType='" + oModel.HBillType + "'" +
                    ",HShortNumber='" + oModel.HShortNumber + "'" +
                    ",HParentID=" + oModel.HParentID.ToString() +
                    ",HLevel=" + oModel.HLevel.ToString() +
                    ",HEndflag=" + Convert.ToString(oModel.HEndFlag ? 1 : 0) +
                    ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
                    ",HRemark= '" + oModel.HRemark + "'" +
                    ",HHelpCode='" + oModel.HHelpCode + "'" +
                     ",HModifyEmp ='" + oModel.HMakeEmp + "'" +
                      ",HModifyTime   =getdate()" +
                  " Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                //修改子项目代码
                //oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
                //将上级 ä¸ºéžæœ«çº§
                oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                //
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                oCn.RollBack();
                throw (e);
            }
        }
        //根据代码判断信息
        public override bool HavParentCode(string sCode, Int64 sItemID)
        {
            DataSet DS;
            try
            {
                DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HStopflag=0 and HNumber='" + sCode + "' and HItemID<>" + sItemID, MvarItemKey, ref Pub_Class.ClsPub.sExeReturnInfo);
                if (DS.Tables[0].Rows.Count == 0)
                    return false;
                else
                {
                    oModel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]);
                    return true;
                }
            }
            catch (Exception e)
            {
                throw (e);
            }
        }
        //构造函数
        public ClsXt_BillSubType_Ctl()
        {
            MvarItemKey = "Xt_BillSubType";
            MvarReportTitle = "单据子类型";
            oModel = new Model.ClsXt_BillSubType_Model();
        }
    }
}

 Model/Model.csproj

@@ -619,6 +619,7 @@
    <Compile Include="系统公用\ClsOA_EmpMessageBillModSub.cs" />
    <Compile Include="系统公用\ClsOA_FieldToChangeMain.cs" />
    <Compile Include="系统公用\ClsOA_FieldToChangeSub.cs" />
    <Compile Include="系统公用\ClsXt_BillSubType_Model.cs" />
    <Compile Include="系统公用\ClsXt_BillType_Model.cs" />
    <Compile Include="系统公用\ClsXt_ModuleParameterMain.cs" />
    <Compile Include="系统公用\ClsXt_ModuleParameterSub.cs" />

 Model/ϵͳ¹«ÓÃ/ClsXt_BillSubType_Model.cs

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

namespace Model
{
    public class ClsXt_BillSubType_Model : DBUtility.ClsGy_Base_Model
    {
        public DateTime HMakeTime; //建立时间(getdate())
        public string HMakeEmp; //创建人
        public string HCheckEmp; //审核人
        public DateTime HCheckTime; //审核时间
        public string HModifyEmp; //修改人
        public DateTime HModifyTime; //修改时间
        public string HStopEmp; //禁用人
        public DateTime HStopTime; //禁用时间
        public Int64 HUSEORGID; //使用组织（Xt_ORGANIZATIONS）
        public Int64 HCREATEORGID; //创建组织（Xt_ORGANIZATIONS）
        public string HBillType;
    }
}

 WebAPI/Controllers/BLL/Xt_BillSubTypeController.cs

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

namespace WebAPI.Controllers
{
    public class Xt_BillSubTypeController : ApiController
    {
        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;

        #region  å•æ®å­ç±»åž‹ åˆ—表
        [Route("Xt_BillSubType/List")]
        [HttpGet]
        public object Xt_BillSubTypeList(string sWhere, string user, string Organization)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //编辑权限
                //if (!DBUtility.ClsPub.Security_Log_second("Xt_BillSubType_Query", 1, false, user))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无查看权限！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                string sql1 = string.Format(@"select * from h_v_Xt_BillSubTypeList where 1='" + 1 + "'");

                string sql = sql1 + sWhere;
                ds = oCN.RunProcReturn(sql, "h_v_Xt_BillSubTypeList");

                //添加列名
                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;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region  å•æ®å­ç±»åž‹ ç¼–辑
        [Route("Xt_BillSubType/Edit")]
        [HttpPost]
        public object Xt_BillSubTypeEdit([FromBody] JObject msg)
        {
            DataSet ds;
            var _value = msg["msg"].ToString();
            string msg3 = _value.ToString();
            string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg1 = sArray[0].ToString();
            string msg2 = sArray[1].ToString();
            //string msg_HUSEORGID = sArray[2].ToString();
            Int64 HItemID = 0;
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

            ////编辑权限
            //if (!DBUtility.ClsPub.Security_Log_second("Xt_BillSubType_Edit", 1, false, msg2))
            //{
            //    objJsonResult.code = "0";
            //    objJsonResult.count = 0;
            //    objJsonResult.Message = "无保存权限！";
            //    objJsonResult.data = null;
            //    return objJsonResult;
            //}

            ListModels oListModels = new ListModels();

            try
            {
                DAL.ClsXt_BillSubType_Ctl oBill = new DAL.ClsXt_BillSubType_Ctl();
                List<Model.ClsXt_BillSubType_Model> lsmain = new List<Model.ClsXt_BillSubType_Model>();
                msg1 = msg1.Replace("\\", "");
                msg1 = msg1.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Xt_BillSubType(msg1);
                foreach (Model.ClsXt_BillSubType_Model oItem in lsmain)
                {
                    if (oItem.HNumber.Trim() == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败！代码不能为空！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    if (oItem.HName.Trim() == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败！名称不能为空！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }

                    //查询数据中是否存在重复代码
                    ds = oCN.RunProcReturn("select * from  Xt_BillSubType where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Xt_BillSubType");
                    if (oItem.HItemID == 0)
                    {
                        if (ds.Tables[0].Rows.Count > 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "保存失败！代码重复！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                    else
                    {
                        if (ds.Tables[0].Rows.Count > 0)
                        {
                            if (ds.Tables[0].Rows[0]["HItemID"].ToString() != oItem.HItemID.ToString())
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "保存失败！代码重复！";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
                        }
                    }


                    //新增时判断
                    
                    if (oItem.HItemID == 0)
                    {
                        if (ds == null || ds.Tables[0].Rows.Count > 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "保存失败！代码重复！";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }
                        //检查父级是否存在
                        string sParent;
                        sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
                        if (sParent.Trim() == "")
                        {
                            oBill.oModel.HParentID = 0;
                        }
                        else
                        {
                            if (oBill.HavParentCode(sParent.Trim(), HItemID))
                            {
                                oBill.oModel.HParentID = oBill.oModel.HItemID;
                            }
                            else
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "保存失败！上级代码不存在或被禁用！";
                                objJsonResult.data = 1;
                                return objJsonResult;
                            }
                        }
                    }
                    else//编辑时判断
                    {
                        //检查父级是否存在
                        string sParent;
                        sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
                        if (sParent.Trim() == "")
                        {
                            oBill.oModel.HParentID = 0;
                        }
                        else
                        {
                            if (oBill.HavParentCode(sParent.Trim(), oItem.HItemID))
                            {
                                oBill.oModel.HParentID = oBill.oModel.HItemID;
                            }
                            else
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "保存失败！上级代码不存在或被禁用！";
                                objJsonResult.data = 1;
                                return objJsonResult;
                            }
                        }
                    }
                    
                    //得到短代码
                    string sShortNumber;
                    sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
                    if (sShortNumber.Trim() == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败！短代码为空！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    //oItem.HUSEORGID = Convert.ToInt32(msg_HUSEORGID); //组织id
                    oItem.HShortNumber = sShortNumber;//短代码
                    oItem.HEndFlag = true;//末级标志
                    oItem.HLevel = 1; //等级 DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim())
                    oBill.oModel = oItem;
                }
                //保存
                //保存完毕后处理
                bool bResult;
                if (oBill.oModel.HItemID == 0)
                {
                    bResult = oBill.AddNew();
                }
                else
                {
                    bResult = oBill.ModifyByID(oBill.oModel.HItemID);
                }
                if (bResult)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功！";
                    //WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败！" + e.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        #endregion

        #region  å•æ®å­ç±»åž‹ åˆ é™¤
        [Route("Xt_BillSubType/Delete")]
        [HttpGet]
        public object Delete(string HItemID, string user)
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ////删除权限
                //if (!DBUtility.ClsPub.Security_Log("Xt_BillSubType_Drop", 1, false, user))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无删除权限";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                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 Xt_BillSubType where HItemID=" + HItemID, "Xt_BillSubType");
                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;
                }

                oCN.RunProc("delete from Xt_BillSubType 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/Controllers/CGGL/Cg_POOrderBillController.cs

@@ -962,8 +962,7 @@
        {
            try
            {
                LogService.Write("采购订单同步,保存方法执行完成异常：" + sMainSub.ToString());

                //LogService.Write("采购订单同步,保存方法执行完成异常：" + sMainSub.ToString());
                var model = sMainSub["model"].ToString();
                var entry = sMainSub["model"]["HENTRY"].ToString();


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

@@ -1,4 +1,5 @@
using Newtonsoft.Json;
using DBUtility;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -14,6 +15,9 @@
{
    public class Gy_StaffController : ApiController
    {
        //获取系统参数
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();

        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;
@@ -391,5 +395,173 @@
            }
        }
        #endregion

        #region [同步基础资料]
        [Route("Gy_Staff/Gy_StaffViewApi")]
        [HttpGet]
        public json Gy_StaffViewApi(string Number, string Type)
        {
            string sql = string.Empty;
            string sReturn = "";
            if (oSystemParameter.ShowBill(ref sReturn) == true)
            {
                //系统参数是否为私有云模式,N为公有云模式，Y为私有云模式
                if (oSystemParameter.omodel.WMS_CloudMode == "Y")
                {
                    #region [私有云模式，直接调用数据库存储过程更新]
                    try
                    {
                        oCN.BeginTran();
                        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                        DataSet DS = oCn.RunProcReturn("exec h_p_WMS_ERPBasicInfoToLocal '" + Number + "','" + Type + "'", "h_p_WMS_ERPBasicInfoToLocal");
                        if (DS == null)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "基础资料同步失败";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        else
                        {
                            if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HBack"]) == "2")
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "ERP中不存在该代码";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
                            else
                            {
                                objJsonResult.code = "1";
                                objJsonResult.count = 1;
                                objJsonResult.Message = "基础资料同步成功";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
                        }

                    }
                    catch (Exception e)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "Exception！" + e.ToString();
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    #endregion
                }
                else
                {
                    #region [公有云模式，调用WEBAPI的方式进行更新]
                    var json = new
                    {
                        CreateOrgId = 0,
                        Number = Number,
                        Id = ""
                    };
                    #region [金蝶部分]
                    //登录金蝶
                    var loginRet = InvokeHelper.Login();
                    var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
                    //判断是否登录成功
                    if (isSuccess < 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = loginRet;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //查看 èŽ·å–数据                    
                    var _result = InvokeHelper.View("BD_Empinfo", JsonConvert.SerializeObject(json));
                    var _saveObj = JObject.Parse(_result);
                    //判断数据是否获取成功
                    if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "金蝶员工同步失败jsonRoot：" + _result;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }

                    #endregion
                    //获取数据
                    DataSet Ds;
                    Ds = oCN.RunProcReturn("select * from Gy_Staff where HNumber = '" + Number + "'", "Gy_Staff");
                    if (Ds.Tables[0].Rows.Count != 0 && ClsPub.isLong(Ds.Tables[0].Rows[0]["HItemID"].ToString()) != 0)
                    {

                    }

                    #region [表数据赋值]
                    var jsonData = new
                    {
                        HItemID = _saveObj["Result"]["Result"]["Id"],
                        HNumber = _saveObj["Result"]["Result"]["Number"],
                        HName          = _saveObj["Result"]["Result"]["Name"][0]["Value"],
                        HShortNumber   = _saveObj["Result"]["Result"]["Number"],
                        HParentID      = 0,
                        HLevel         = 1,
                        HEndFlag       = 1,
                        HStopflag      = _saveObj["Result"]["Result"]["ForbidStatus"].ToString() == "A" ? 0 : 1,
                        HRemark        = "CLD-ERP导入",
                        HUseFlag       = "已使用",
                        HCREATEORGID   = _saveObj["Result"]["Result"]["CreateOrgId_Id"],
                        HUSEORGID      = _saveObj["Result"]["Result"]["UseOrgId_Id"],
                        HPERSONID      = _saveObj["Result"]["Result"]["PersonId_Id"],
                        HPOSTID        = _saveObj["Result"]["Result"]["FPostId_Id"],
                        HFIRSTCARDID   = _saveObj["Result"]["Result"]["FirstCardID_Id"],
                        HDeptID        = _saveObj["Result"]["Result"]["PostEntity"][0]["Post"]["FDept_Id"],
                        HSTAFFNUMBER = _saveObj["Result"]["Result"]["FStaffNumber"]
                    };
                    #endregion
                    // åˆ é™¤ä¸»è¡¨å¯¹åº”数据
                    sql = $"delete from Gy_Staff where HItemID = " + jsonData.HItemID + " and HNumber = '" + Number + "'";
                    oCN.RunProc(sql);

                    sql = "set identity_insert Gy_Staff on";
                    oCN.RunProc(sql);

                    //插入表
                    sql = $@"
                insert into Gy_Staff
                (HItemID,HNumber,HName,HShortNumber,HParentID,HLevel
                ,HEndFlag,HStopflag,HRemark,HUseFlag,HCREATEORGID,HUSEORGID
                ,HPERSONID,HPOSTID,HFIRSTCARDID,HDeptID,HSTAFFNUMBER
                 )
                values
                ({jsonData.HItemID},'{jsonData.HNumber}','{jsonData.HName}',
                '{jsonData.HShortNumber}',{jsonData.HParentID},{jsonData.HLevel},{jsonData.HEndFlag},{jsonData.HStopflag},'{jsonData.HRemark}','{jsonData.HUseFlag}',{jsonData.HCREATEORGID},{jsonData.HUSEORGID},
                  {jsonData.HPERSONID},{jsonData.HPOSTID},{jsonData.HFIRSTCARDID},{jsonData.HDeptID},'{jsonData.HSTAFFNUMBER}')";

                    oCN.RunProc(sql);

                    sql = "set identity_insert Gy_Staff off";
                    oCN.RunProc(sql);

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "员工同步成功！";
                    objJsonResult.data = null;
                    return objJsonResult;

                    #endregion
                }
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "基础资料读取失败！";
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

    }
}

 WebAPI/Controllers/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillController.cs

@@ -251,6 +251,7 @@
        {
            try
            {
                //LogService.Write(sMainSub.ToString());
                var model = sMainSub["model"].ToString();
                var entry = sMainSub["model"]["HENTRY"].ToString();
                var _model = sMainSub["model"]["HPPBOMMAINENTRY"].ToString();
@@ -321,7 +322,7 @@
                ,HBackRelationQty,HNumerator,HDenominator,HBASEUNITID,HProcessID,HICMOENTRYSEQ,HPROJECTNO
                ,HOPERID,HSEQ,HSTOCKSTATUSID,HLOT,HOPTQUEUE,HRESERVETYPE,HSelPickedQty,HSELPRCDRETURNQTY,HProcName) 
                 values('{oSub.HInterID}','{oSub.HEntryID}','{oSub.HMaterID}','{oSub.HMaterNumber}','{oSub.HUnitID}','{oSub.HUnitNumber}','{oSub.HSPID}','{oSub.HQty}'
                ,'{oSub.HQtyMust}','{oSub.HWHID}','{oSub.HRemark}','{oSub.HSourceInterID}','{oSub.HSourceEntryID}','{oSub.HSourceBillNo}','{oSub.HSourceBillType}','{oSub.HICMOInterID}','{oSub.HICMOEntryID}','{oSub.HICMOBillNo}','{oSub.HCHILDSUPPLYORGID}','{oSub.HSUPPLYORGID}','{oSub.HENTRUSTPICKORGID}','{oSub.HSRCTRANSORGID}','{oSub.HGROUPBYOWNERID}','{oSub.HOWNERID}','{oSub.HOWNERTYPEID}','{oSub.HRelationQty}','{oSub.HMoveStockQty}','{oSub.HAuxPropID}','{oSub.HBatchNO}','{oSub.HMTONo}','{oSub.HQtyScrap}','{oSub.HERPInterID}','{oSub.HERPEntryID}','{oSub.HBackRelationQty}','{oSub.HNumerator}','{oSub.HDenominator}','{oSub.HBASEUNITID}','{oSub.HProcessID}','{oSub.HICMOENTRYSEQ}','{oSub.HPROJECTNO}','{oSub.HOPERID}','{oSub.HSEQ}','{oSub.HSTOCKSTATUSID}','{oSub.HLOT}','{oSub.HOPTQUEUE}','{oSub.HRESERVETYPE}','{oSub.HSelPickedQty}','{oSub.HSELPRCDRETURNQTY}','{oSub.HProcName}')");
                ,'{oSub.HQtyMust}','{oSub.HWHID}','{oSub.HRemark}','{oSub.HSourceInterID}','{oSub.HSourceEntryID}','{oSub.HSourceBillNo}','{oSub.HSourceBillType}','{oSub.HICMOInterID}','{oSub.HICMOEntryID}','{oSub.HICMOBillNo}','{oSub.HCHILDSUPPLYORGID}','{oSub.HSUPPLYORGID}','{oSub.HENTRUSTPICKORGID}','{oSub.HSRCTRANSORGID}','{oSub.HGROUPBYOWNERID}','{oSub.HOWNERID}','{oSub.HOWNERTYPEID}','{oSub.HRelationQty}','{oSub.HMoveStockQty}','{oSub.HAuxPropID}','{oSub.HBatchNO}','{oSub.HMTONo}','{Convert.ToDecimal(oSub.HQtyScrap)}','{oSub.HERPInterID}','{oSub.HERPEntryID}','{oSub.HBackRelationQty}','{oSub.HNumerator}','{oSub.HDenominator}','{oSub.HBASEUNITID}','{oSub.HProcessID}','{oSub.HICMOENTRYSEQ}','{oSub.HPROJECTNO}','{oSub.HOPERID}','{oSub.HSEQ}','{oSub.HSTOCKSTATUSID}','{oSub.HLOT}','{oSub.HOPTQUEUE}','{oSub.HRESERVETYPE}','{oSub.HSelPickedQty}','{oSub.HSELPRCDRETURNQTY}','{oSub.HProcName}')");
                }
                oCN.Commit();
                objJsonResult.code = "1";
@@ -333,6 +334,7 @@
            }
            catch (Exception e)
            {
                LogService.Write(e.Message.ToString());
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
@@ -340,6 +342,7 @@
                objJsonResult.data = null;
                return objJsonResult;
            }
          
        }



 WebAPI/ListModels.cs

@@ -1123,7 +1123,19 @@
            List<Model.ClsXt_BillType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXt_BillType_Model>>(jsonString);
            return list;
        }
        

        /// <summary>
        /// å¤„理单据子类型表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsXt_BillSubType_Model> getObjectByJson_Xt_BillSubType(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsXt_BillSubType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXt_BillSubType_Model>>(jsonString);
            return list;
        }

        /// <summary>
        /// å¤„理收款条件表的json
        /// </summary>

 WebAPI/WebAPI.csproj

@@ -365,6 +365,7 @@
    <Compile Include="Controllers\BaseSet\Xt_grdAlignment_WMESController.cs" />
    <Compile Include="Controllers\BaseSet\Xt_ORGANIZATIONSController.cs" />
    <Compile Include="Controllers\BLL\Xt_AccountPeriodController.cs" />
    <Compile Include="Controllers\BLL\Xt_BillSubTypeController.cs" />
    <Compile Include="Controllers\BLL\Xt_BillTypeController.cs" />
    <Compile Include="Controllers\BLL\Xt_UserGroupController.cs" />
    <Compile Include="Controllers\BLL\Xt_XtgnbController.cs" />
@@ -974,6 +975,7 @@
    <Folder Include="Views\Sc_WorkBillAutoSortBillMain\" />
    <Folder Include="Views\Sc_WorkBillSortBill\" />
    <Folder Include="Views\Sc_WorkDemandPlanBill\" />
    <Folder Include="Views\Xt_BillSubType\" />
    <Folder Include="Views\Xt_CheckFlowBill\" />
    <Folder Include="Views\Xt_CheckItem\" />
    <Folder Include="Views\Xt_grdAlignment_WMES\" />