三升添加完工日期导入功能

wtt

4 天以前 311ff7d5a864a1e966848412df6d7880804db491

 WebAPI/Controllers/ProductInController.cs

@@ -42,6 +42,7 @@
        public ClsGy_BarCodeBill_WMS_Model_View oView =new ClsGy_BarCodeBill_WMS_Model_View();
        public ClsKF_PonderationBillMain_Temp model = new ClsKF_PonderationBillMain_Temp();
        public ClsKf_ICStockBill_WMS oBar = new Model.ClsKf_ICStockBill_WMS();
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
        //public ClsKf_ICStockBill_WMS oBar = new ClsKf_ICStockBill_WMS();
        public double sRelQty = 0;
       // private DataBaseServices objDataBaseServices = new DataBaseServices();
@@ -127,6 +128,89 @@
        }


        //刷新表体  返回出入库条码临时表（领料出库简洁版）
        [Route("ProductIn/DisBillEntryList_Webs_New_Json1")]
        [HttpGet]
        public object DisBillEntryList_Webs_New_Json1(long HBillID, string HBillNo, string HBillType, string sMouldManagerCtl, string sFIFOCtl)
        {
            try
            {
                WebS.WebService1 oWebs = new WebS.WebService1();
                ds = oWebs.GetBillEntry_TmpList(HBillID, HBillNo, HBillType, ref sMouldManagerCtl, ref sFIFOCtl, ref DBUtility.ClsPub.sErrInfo);
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！";
                    objJsonResult.data = null;
                    return objJsonResult;
                    //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.data = new
                    {
                        list = ds.Tables[0],
                        list2 = ds.Tables[4]
                    };
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        //缓存列表查询功能
        [Route("ProductInBillList/list1")]
        [HttpGet]
        public object list1(string BillType, string HBillNo, string HSourceBillNo)
        {
            try
            {
                if (HSourceBillNo == null)
                {
                    HSourceBillNo = "";
                }
                WebS.WebService1 oWebs = new WebS.WebService1();
                ds = oWebs.GetKf_ICStockBillQueryList(BillType, HBillNo, HSourceBillNo);
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！";
                    objJsonResult.data = null;
                    return objJsonResult;
                    //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }


        /// <summary>
        /// 其他出库校验扫描单据号/直接调用webservice
        /// </summary>
@@ -165,18 +249,27 @@
        }

        /// <summary>
        /// 其他出库校验扫描条码/直接调用webservice
        /// 生产领料校验扫描单据号/直接调用webservice
        /// </summary>
        /// <returns></returns>
        [Route("OtherOutBill_Check_New/get_InfoByBarCode_Source_Json")]
        //[Route("OtherOutBill_Check_New/BillNo")]
        [Route("MateBill/BillNo1")]
        [HttpGet]
        public Object get_InfoByBarCode_Source_Json(string sCode, Int64 sInterID, string HBillType,string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Int64 sQty, Int64 HOWNERID)
        public Object BillNo1(string HBillNo, string HBillType, string HMaker, Int64 HOwnerID)
        {
            //if (sRedBlue == true)
            //{
            //    HBillType = "1245";
            //}
            //oBar = webserver.get_CheckTypeByBarCode(sCode, sInterID, sBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
            WebS.WebService1 oWebs = new WebS.WebService1();
            WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
            string sExpressNumber = "";
            //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
            WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sCode, sInterID, HBillType, sBillNo, sMaker,  WhID,  SPID,  sQty,  HOWNERID, ref DBUtility.ClsPub.sErrInfo);

            Kf_MateOutBillController obill = new Kf_MateOutBillController();
            //重新同步生产领料单
            objJsonResult = obill.GetKf_MateOutBill_Sync_Json(HBillNo, HBillType);

            WebSoBar = oWebs.get_BillBarCode_MateOutCheck(HBillNo, HBillType, HMaker, HOwnerID, ref DBUtility.ClsPub.sErrInfo);
            if (WebSoBar == null)
            {
                objJsonResult.code = "0";
@@ -191,6 +284,198 @@
                objJsonResult.count = 1;
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                objJsonResult.data = WebSoBar;
                return objJsonResult;
            }
        }

        /// <summary>
        /// 直接调拨单校验扫描单据号/直接调用webservice
        /// </summary>
        /// <returns></returns>
        //[Route("OtherOutBill_Check_New/BillNo")]
        [Route("MoveStockBill/BillNo2")]
        [HttpGet]
        public Object BillNo2(string HBillNo, string HBillType, string HMaker, Int64 HOwnerID)
        {
            //if (sRedBlue == true)
            //{
            //    HBillType = "1245";
            //}
            //oBar = webserver.get_CheckTypeByBarCode(sCode, sInterID, sBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
            WebS.WebService1 oWebs = new WebS.WebService1();
            WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();

            Kf_MoveStockBillController obill = new Kf_MoveStockBillController();
            //重新同步直接调拨单
            objJsonResult = obill.GetKf_MoveStockBill_Sync_Json(HBillNo, HBillType);

            WebSoBar = oWebs.get_BillBarCode_MoveStockCheck(HBillNo, HBillType, HMaker, HOwnerID, ref DBUtility.ClsPub.sErrInfo);
            if (WebSoBar == null)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                objJsonResult.data = null;
                return objJsonResult;
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                objJsonResult.data = WebSoBar;
                return objJsonResult;
            }
        }

        /// <summary>
        /// 其他出库校验扫描条码/直接调用webservice
        /// </summary>
        /// <returns></returns>
        [Route("OtherOutBill_Check_New/get_InfoByBarCode_Source_Json")]
        [HttpGet]
        //public Object get_InfoByBarCode_Source_Json(string sCode, Int64 sInterID, string HBillType,string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Int64 sQty, Int64 HOWNERID)
        //{
        //    WebS.WebService1 oWebs = new WebS.WebService1();
        //    WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
        //    string sExpressNumber = "";

        //    var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker);
        //    //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
        //    WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sJXCode, sInterID, HBillType, sBillNo, sMaker,  WhID,  SPID,  sQty,  HOWNERID, ref DBUtility.ClsPub.sErrInfo);
        //    if (WebSoBar == null)
        //    {
        //        objJsonResult.code = "0";
        //        objJsonResult.count = 0;
        //        objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
        //        objJsonResult.data = null;
        //        return objJsonResult;
        //    }
        //    else
        //    {
        //        objJsonResult.code = "0";
        //        objJsonResult.count = 1;
        //        objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
        //        objJsonResult.data = WebSoBar;
        //        return objJsonResult;
        //    }
        //}

        public object get_InfoByBarCode_Source_Json(string sCode, long sInterID, string HBillType, string sBillNo, string sMaker, long WhID, long SPID, long sQty, long HOWNERID)
        {
            WebS.WebService1 oWebs = new WebS.WebService1();
            WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
            //获取系统参数
            string sErrMsg = "";
            string sJXCode = "";
            if (oSystemParameter.ShowBill(ref sErrMsg) == true)
            {
                if (oSystemParameter.omodel.WMS_CampanyName == "安瑞") //系统参数  客户定制化名称     空白为通用
                {
                    sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker);
                }
                else
                {
                    sJXCode = sCode;
                }
                try
                {
                    WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, (double)sQty, HOWNERID, ref ClsPub.sErrInfo);
                    if (WebSoBar == null)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                        objJsonResult.data = WebSoBar;
                        return objJsonResult;
                    }
                }
                catch (Exception e)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "扫描条码失败！" + e.ToString();
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "获取系统参数失败！ " + sErrMsg;
                objJsonResult.data = null;
                return objJsonResult;
            }
        }


        /// <summary>
        /// 直接调拨校验扫描条码/直接调用webservice
        /// </summary>
        /// <returns></returns>
        [Route("MoveStockBill_Check_New/get_InfoByBarCode_Source_Json1")]
        [HttpGet]
        public Object get_InfoByBarCode_Source_Json1(string sCode, Int64 sInterID, string HBillType, string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Int64 SCWhID, Int64 SCSPID, Int64 sQty, Int64 HOWNERID)
        {
            WebS.WebService1 oWebs = new WebS.WebService1();
            WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
            //获取系统参数
            string sErrMsg = "";
            string sJXCode = "";
            if (oSystemParameter.ShowBill(ref sErrMsg) == true)
            {
                if (oSystemParameter.omodel.WMS_CampanyName == "安瑞") //系统参数  客户定制化名称     空白为通用
                {
                    sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker);
                }
                else
                {
                    sJXCode = sCode;
                }
                try
                {
                    WebSoBar = oWebs.get_BarCode_MoveStockBillCheck(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, SCWhID, SCSPID, sQty, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
                    if (WebSoBar == null)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                        objJsonResult.data = WebSoBar;
                        return objJsonResult;
                    }
                }
                catch (Exception e)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "扫描条码失败！" + e.ToString();
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "获取系统参数失败！ " + sErrMsg;
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
@@ -491,7 +776,17 @@
        {
            try
            {
                ds = webserver.GetBarCode_Temp(HInterID, HMaterID, HAuxPropID, HMTONo, HWhID, HSPID, HSCWhID, HSCSPID, HBatchNo, HSourceInterID, HSourceEntryID, sBillType, sWhere);

                if (HMTONo == null)
                {
                    HMTONo = "";
                }
                if (HBatchNo == null)
                {
                    HBatchNo = "";
                }
                WebS.WebService1 oWebs = new WebS.WebService1();
                ds = oWebs.GetBarCode_Temp(HInterID, HMaterID, HAuxPropID, HMTONo, HWhID, HSPID, HSCWhID, HSCSPID, HBatchNo, HSourceInterID, HSourceEntryID, sBillType, sWhere);
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
@@ -520,6 +815,47 @@
                return objJsonResult;
            }
        }



        #region 点击编辑按钮返回参数信息
        /// <summary>
        /// 点击编辑按钮返回参数信息
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Kf_BarCodeEditDlg/Kf_BarCodeEditDlg_Json")]
        [HttpGet]
        public object Kf_BarCodeEditDlg_Json(string sWhere)
        {
            DataSet ds;
            try
            {

                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
               
                    string sql1 = "select * from KF_PonderationBillMain_Temp Where HQty<>0 ";
                    string sql = sql1 + sWhere + " order by hinterid desc";
                    ds = oCN.RunProcReturn(sql, "KF_PonderationBillMain_Temp");

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #endregion


        //点击编辑  公用窗体删除方法
        [Route("Kf_BarCodeEditDlg/DeltetBill")]
@@ -645,7 +981,6 @@
        [HttpGet]
        public object set_SavePonderationBillMain_Temp_Source_Fast_Json(string HSourceBillType, string HSourceBillNo, Int64 sInterID, string sBillNo)
        {
            string aa = "";
            try
            {
               // DataSet ds = new DataSet();
@@ -653,10 +988,9 @@
                string sWhere = " Where 单据号 like '%" + HSourceBillNo.Trim() + "%'";
                if (HSourceBillType == "3710")
                {
                    aa = "执行了";
                    ds = webserver.GetSc_ICMOBillList(sWhere + "  ");
                }
                if (HSourceBillType == "3711")
                else if (HSourceBillType == "3711")
                {
                    ds = webserver.GetSc_ICMOReportBillList(sWhere + "  ");
                }
@@ -664,7 +998,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录,源单类型有错误！"+aa;
                    objJsonResult.Message = "没有返回任何记录,源单类型有错误！";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }
@@ -896,66 +1230,143 @@
        [HttpPost]
        public object set_SaveProductInBill_Json([FromBody]JObject oMain)
        {
            var _value = oMain["oMain"].ToString();
            string msg1 = _value.ToString();
            //List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
            //ListModels oListModels = new ListModels();
            //lsmain = oListModels.getProductInBillMainByJson(msg1);
            //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
            //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
            //string sSourceBillType = lsmain[0].HBillType;
            //BLL.ClsKf_ProductInBill bll = new BLL.ClsKf_ProductInBill();
            //return bll.set_SaveProductInBill_New(lsmain[0], sSourceBillType, ref DBUtility.ClsPub.sErrInfo);
            
            //var _value = oMain["oMain"].ToString();
            //string msg1 = _value.ToString();
            ////List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
            ////ListModels oListModels = new ListModels();
            ////lsmain = oListModels.getProductInBillMainByJson(msg1);
            ////lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
            ////lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
            ////string sSourceBillType = lsmain[0].HBillType;
            ////BLL.ClsKf_ProductInBill bll = new BLL.ClsKf_ProductInBill();
            ////return bll.set_SaveProductInBill_New(lsmain[0], sSourceBillType, ref DBUtility.ClsPub.sErrInfo);

            //try
            //{
            //    List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
            //    ListModels oListModels = new ListModels();
            //    lsmain = oListModels.getProductInBillMainByJson(msg1);
            //    //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
            //    //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
            //    string sSourceBillType = lsmain[0].HBillType;

            //    WebAPI.WebS.ClsKf_ProductInBillMain websLsmain = new WebS.ClsKf_ProductInBillMain();

            //    websLsmain.HInterID = lsmain[0].HInterID;
            //    websLsmain.HDate = lsmain[0].HDate;
            //    websLsmain.HBillNo = lsmain[0].HBillNo;
            //    websLsmain.HDeptID = lsmain[0].HDeptID;
            //    websLsmain.HEmpID = lsmain[0].HEmpID;
            //    websLsmain.HKeeperID= lsmain[0].HKeeperID;
            //    websLsmain.HRemark = lsmain[0].HRemark;
            //    websLsmain.HMaker = lsmain[0].HMaker;
            //    websLsmain.HWHID = lsmain[0].HWHID;
            //    websLsmain.HSupID = lsmain[0].HSupID;
            //    websLsmain.HExplanation = lsmain[0].HExplanation;
            //    websLsmain.HBillType = "1202";//固定值


            //    if (webserver.set_SaveProductInBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
            //    {
            //        objJsonResult.code = "0";
            //        objJsonResult.count = 1;
            //        objJsonResult.Message = "生成产品入库单成功！单据号为：";
            //        objJsonResult.data = null;
            //        return objJsonResult;
            //    }
            //    else
            //    {
            //        objJsonResult.code = "0";
            //        objJsonResult.count = 0;
            //        objJsonResult.Message = "上传失败！" + DBUtility.ClsPub.sErrInfo;
            //        objJsonResult.data = null;
            //        return objJsonResult;
            //    }
            //}
            //catch (Exception e)
            //{
            //    objJsonResult.code = "0";
            //    objJsonResult.count = 0;
            //    objJsonResult.Message = "上传失败！" + e.ToString();
            //    objJsonResult.data = null;
            //    return objJsonResult;
            //}





            string text = oMain["oMain"].ToString();
            string jsonString = text.ToString();
            object result;
            try
            {
                List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
                ListModels oListModels = new ListModels();
                lsmain = oListModels.getProductInBillMainByJson(msg1);
                lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
                string sSourceBillType = lsmain[0].HBillType;

                WebAPI.WebS.ClsKf_ProductInBillMain websLsmain = new WebS.ClsKf_ProductInBillMain();

                websLsmain.HInterID = lsmain[0].HInterID;
                websLsmain.HDate = lsmain[0].HDate;
                websLsmain.HBillNo = lsmain[0].HBillNo;
                websLsmain.HDeptID = lsmain[0].HDeptID;
                websLsmain.HEmpID = lsmain[0].HEmpID;
                websLsmain.HKeeperID= lsmain[0].HKeeperID;
                websLsmain.HRemark = lsmain[0].HRemark;
                websLsmain.HMaker = lsmain[0].HMaker;
                websLsmain.HWHID = lsmain[0].HWHID;
                websLsmain.HSupID = lsmain[0].HSupID;
                websLsmain.HExplanation = lsmain[0].HExplanation;


                if (webserver.set_SaveProductInBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
                List<ClsKf_ProductInBillMain> list = new List<ClsKf_ProductInBillMain>();
                ListModels listModels = new ListModels();
                list = listModels.getProductInBillMainByJson(jsonString);
                //list[0].HYear = ClsPub.isLong(DateTime.Now.Year);
                //list[0].HDate = ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
                string hbillType = list[0].HBillType;
                WebAPI.WebS.ClsKf_ProductInBillMain clsKf_ProductInBillMain = new WebAPI.WebS.ClsKf_ProductInBillMain();
                clsKf_ProductInBillMain.HInterID = list[0].HInterID;
                clsKf_ProductInBillMain.HDate = list[0].HDate;
                clsKf_ProductInBillMain.HBillNo = list[0].HBillNo;
                clsKf_ProductInBillMain.HDeptID = list[0].HDeptID;
                clsKf_ProductInBillMain.HEmpID = list[0].HEmpID;
                clsKf_ProductInBillMain.HKeeperID = list[0].HKeeperID;
                clsKf_ProductInBillMain.HSecManagerID = list[0].HSecManagerID;
                clsKf_ProductInBillMain.HRemark = list[0].HRemark;
                clsKf_ProductInBillMain.HMaker = list[0].HMaker;
                clsKf_ProductInBillMain.HBillerID = list[0].HBillerID;
                clsKf_ProductInBillMain.HWHID = list[0].HWHID;
                clsKf_ProductInBillMain.HSupID = list[0].HSupID;
                clsKf_ProductInBillMain.HExplanation = list[0].HExplanation;
                clsKf_ProductInBillMain.HBillType = "1202";
                if (list[0].HBillType == "3714")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "生成产品入库单成功！单据号为：";
                    objJsonResult.data = null;
                    return objJsonResult;
                    clsKf_ProductInBillMain.HMainSourceBillType = "工序汇报单";
                }
                else if (list[0].HBillType == "3711")
                {
                    clsKf_ProductInBillMain.HMainSourceBillType = "生产汇报单";
                }
                else if (list[0].HBillType == "3710")
                {
                    clsKf_ProductInBillMain.HMainSourceBillType = "生产订单";
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "上传失败！" + DBUtility.ClsPub.sErrInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                    clsKf_ProductInBillMain.HMainSourceBillType = "手工录入";
                }
                bool flag = this.webserver.set_SaveProductInBill_New(clsKf_ProductInBillMain, hbillType, ref ClsPub.sErrInfo);
                if (flag)
                {
                    this.objJsonResult.code = "0";
                    this.objJsonResult.count = 1;
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //成功！
                    //this.objJsonResult.Message = "生成产品入库单成功！单据号为：";
                    this.objJsonResult.data = null;
                    result = this.objJsonResult;
                }
                else
                {
                    this.objJsonResult.code = "0";
                    this.objJsonResult.count = 0;
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;  //失败！
                    //this.objJsonResult.Message = "上传失败！" + ClsPub.sErrInfo;
                    this.objJsonResult.data = null;
                    result = this.objJsonResult;
                }
            }
            catch (Exception e)
            catch (Exception ex)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "上传失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
                this.objJsonResult.code = "0";
                this.objJsonResult.count = 0;
                this.objJsonResult.Message = "上传失败！" + ex.ToString();
                this.objJsonResult.data = null;
                result = this.objJsonResult;
            }
            return result;
        }

        /// <summary>
@@ -998,6 +1409,133 @@
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "其他出库单校验成功！单据号为：";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "上传失败！" + DBUtility.ClsPub.sErrInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "上传失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }



        /// <summary>
        /// 生产领料校验
        /// </summary>
        /// <returns></returns>
        [Route("MateOutBill_Check_New/set_SaveMateOutBill_Check_New_Json")]
        [HttpPost]
        public object set_SaveMateOutBill_Check_New_Json([FromBody] JObject oMain)
        {
            var _value = oMain["oMain"].ToString();
            string msg1 = _value.ToString();
            //List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
            //ListModels oListModels = new ListModels();
            //lsmain = oListModels.getProductInBillMainByJson(msg1);
            //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
            //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
            //string sSourceBillType = lsmain[0].HBillType;
            //BLL.ClsKf_ProductInBill bll = new BLL.ClsKf_ProductInBill();
            //return bll.set_SaveProductInBill_New(lsmain[0], sSourceBillType, ref DBUtility.ClsPub.sErrInfo);

            try
            {
                List<Model.ClsKf_MateOutBillMain> lsmain = new List<Model.ClsKf_MateOutBillMain>();
                ListModels oListModels = new ListModels();
                lsmain = oListModels.getMateOutBillMainByJson(msg1);
                //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
                //string sSourceBillType = lsmain[0].HBillType;

                WebAPI.WebS.ClsKf_MateOutBillMain websLsmain = new WebS.ClsKf_MateOutBillMain();

                websLsmain.HInterID = lsmain[0].HInterID;
                websLsmain.HBillNo = lsmain[0].HBillNo;
                websLsmain.HBillType = "1204";

                WebS.WebService1 oWebs = new WebS.WebService1();
                if (oWebs.set_SaveMateOutBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "生产领料单校验成功！单据号为：";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "上传失败！" + DBUtility.ClsPub.sErrInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "上传失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }


        /// <summary>
        /// 生产调拨校验
        /// </summary>
        /// <returns></returns>
        [Route("MoveStockBill_Check_New/set_SaveMoveStockBill_Check_Json")]
        [HttpPost]
        public object set_SaveMoveStockBill_Check_Json([FromBody] JObject oMain)
        {
            var _value = oMain["oMain"].ToString();
            string msg1 = _value.ToString();
            //List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
            //ListModels oListModels = new ListModels();
            //lsmain = oListModels.getProductInBillMainByJson(msg1);
            //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
            //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
            //string sSourceBillType = lsmain[0].HBillType;
            //BLL.ClsKf_ProductInBill bll = new BLL.ClsKf_ProductInBill();
            //return bll.set_SaveProductInBill_New(lsmain[0], sSourceBillType, ref DBUtility.ClsPub.sErrInfo);

            try
            {
                List<Model.ClsKf_MoveStockBillMain> lsmain = new List<Model.ClsKf_MoveStockBillMain>();
                ListModels oListModels = new ListModels();
                lsmain = oListModels.getMoveStockBillMainByJson(msg1);
                //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
                //string sSourceBillType = lsmain[0].HBillType;

                WebAPI.WebS.ClsKf_MoveStockBillMain websLsmain = new WebS.ClsKf_MoveStockBillMain();

                websLsmain.HInterID = lsmain[0].HInterID;
                websLsmain.HBillNo = lsmain[0].HBillNo;
                websLsmain.HBillType = "1207";

                WebS.WebService1 oWebs = new WebS.WebService1();
                if (oWebs.set_SaveMoveStockBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "直接调拨单校验成功！单据号为：";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -1204,6 +1742,92 @@
        }


        /// <summary>
        /// 条码编辑界面 编辑按钮方法
        /// </summary>
        /// <returns></returns>
        [Route("Kf_BarCodeEditDlg/GetCheckQtyByBarCodeBill")]
        [HttpGet]
        public object GetCheckQtyByBarCodeBill(Int64 HInterID, string HBillType, string sBatchNo,string sBarCode,Int64 sSCWhID
            ,Int64 sSCSPID, Int64 sAuxPropID,string sMTONo,double iQty,Int64 HMaterID
            ,Int64 sWhID,Int64 sSPID,Int64 HSourceInterID,Int64 HSourceEntryID, double EndQty, double sQty)
        {
            try
            {
                if (sBatchNo == null)
                {
                    sBatchNo = "";
                }
                if (sMTONo == null)
                {
                    sMTONo = "";
                }
                if ( HBillType == "1204" || HBillType == "1205" || HBillType == "1206" || HBillType == "1211" || HBillType == "1213")
                {
                    WebS.WebService1 oWebs = new WebS.WebService1();
                    if (webserver.Get_CheckQtyByBarCode(sBarCode, sWhID, sSPID, sAuxPropID, sBatchNo, sMTONo, iQty, ref sRelQty))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "库存足够！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else if (sRelQty == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "无库存！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        EndQty = sRelQty - sQty;
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "库存不足，已获取实际库存数量！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                else if (HBillType == "1203" || HBillType == "1205" || HBillType == "1202")
                {
                    WebS.WebService1 oWebs = new WebS.WebService1();
                 if (oWebs.set_SavePonderationBillMain_Temp_ChangGui(HInterID, HMaterID, sAuxPropID, sMTONo, sWhID, sSPID, sSCWhID, sSCSPID, sBatchNo, HSourceInterID, HSourceEntryID, sBarCode, HBillType, EndQty, ref DBUtility.ClsPub.sErrInfo))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "调整成功";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "调整失败" + DBUtility.ClsPub.sErrInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                }
                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;
            }
        }


    }
}