王 垚
2022-09-26 aff470c8e269009a173be026bf23f0207b4c001f
下架找货单 委外入库 产品入库 增加班组和职员
11个文件已修改
13个文件已删除
2473 ■■■■ 已修改文件
WebAPI/Controllers/Kf_EntrustInBillController.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/LookingForBillController.cs 35 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/ProductInController.cs 214 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/WebAPIController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/BLL20201111.rar 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/DAL20200624.zip 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/DAL20200818.zip 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/DAL20210109.zip 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/Model20200818.zip 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/Newtonsoft.Json.zip 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/调用工程文件.zip 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/调用工程文件/BLL.dll 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/调用工程文件/DBUtility.dll 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/调用工程文件/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/调用工程文件/Pub_Class.dll 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/调用工程文件/Pub_Control.dll 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/调用工程文件/SQLHelper.dll 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/LookingForBill.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Web References/WebS/Reference.cs 2058 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Web References/WebS/Reference.map 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Web References/WebS/WebService1.disco 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Web References/WebS/WebService1.wsdl 142 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Kf_EntrustInBillController.cs
@@ -289,6 +289,8 @@
                websLsmain.HMangerID = lsmain[0].HMangerID;
                websLsmain.HWHID = lsmain[0].HWHID;
                websLsmain.HExplanation = lsmain[0].HExplanation;
                websLsmain.HGroupID = lsmain[0].HGroupID;
                websLsmain.HJiaYe = lsmain[0].HJiaYe;
                string sSourceBillType = "1103";
WebAPI/Controllers/LookingForBillController.cs
@@ -36,16 +36,16 @@
                    return objJsonResult;
                }
                else
                {
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "扫码成功!";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                    return objJsonResult;
                }
            }
            catch (Exception ex)
            {
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + ex.ToString();
@@ -175,43 +175,44 @@
        /// <returns></returns>
        [Route("LookingFor/set_SaveLookingForBill_Json")]
        [HttpPost]
        public object set_SaveLookingForBill_Json([FromBody]JObject oMain)
        public object set_SaveLookingForBill_Json([FromBody] JObject oMain)
        {
            string oMainData = oMain["oMain"].ToString();
            oMainData = oMainData.Substring(8,oMainData.Length-9);
            string HJiaYe = oMain["HJiaYe"].ToString();
            oMainData = oMainData.Substring(8, oMainData.Length - 9);
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            try
            {
                oCN.BeginTran();
                List<LookingForBill> lsmain = new List<LookingForBill>();
                ListModels oListModels = new ListModels();
                List<LookingForBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<LookingForBill>>(oMainData);
                oCN.BeginTran();
                //var mainSql1 = "Insert Into Kf_LookingForReturnBillMain " +
                //    "(HInterID,HBillNo,HSourceInterID,HSourceBillNo,HCreateBy)" +
                //    " values" +
                //    "(" + list[0].HInterID + ",'" + list[0].HBillNo + "'," + list[0].HSourceInterID + ",'" + list[0].HSourceBillNo + "','" + list[0].HMaker + "')";
                var mainSql = "Insert Into Kf_LookingForBillMain " +
                    "(HInterID,HBillNo,HSourceInterID,HSourceBillNo,HWhID,HWhName,HSPID,HSPName,HGroupID,HGroup" +
                    ",HSourceID,HSource,HCreateBy)" +
                    ",HSourceID,HSource,HCreateBy,HJiaYe)" +
                    " values" +
                    "(" + list[0].HInterID + ",'" + list[0].HBillNo + "'," + list[0].HSourceInterID+ ",'" + list[0].HSourceBillNo + "'," + list[0].HWHID + ",'" + list[0].HWHName + "'," + list[0].HSPID + ",'" + list[0].HSPName + "'," + list[0].HGroupID + ",'" + list[0].HGroup + "',"
                    + list[0].HSourceID + ",'" + list[0].HSource + "','" + list[0].HMaker + "')";
                    "(" + list[0].HInterID + ",'" + list[0].HBillNo + "'," + list[0].HSourceInterID + ",'" + list[0].HSourceBillNo + "'," + list[0].HWHID + ",'" + list[0].HWHName + "'," + list[0].HSPID + ",'" + list[0].HSPName + "'," + list[0].HGroupID + ",'" + list[0].HGroup + "',"
                    + list[0].HSourceID + ",'" + list[0].HSource + "','" + list[0].HMaker + "','" + HJiaYe + "')";
                oCN.RunProc(mainSql);
                for (int i = 0; i < list.Count; i++)
                {
                    var subSql = "Insert Into Kf_LookingForBillSub " +
                    "(HWHID,HWHName,HSPID,HSPName,HMTONo,HQty,HMaterID,HMaterName,HMaterNumber,HMaterModel,HBarCode,HGroupID,HGroup,HSourceID,HSource,HCreateBy,HMainItemID)" +
                    " values" +
                    "(" + list[i].HWHID + ",'" + list[i].HWHName + "'," + list[i].HSPID + ",'" + list[i].HSPName + "','" + list[i].HMTONo + "',"+ list[i].HQty + ","
                    + list[i].HMaterID + ",'"+ list[i].HMaterName + "','"+ list[i].HMaterNumber + "','"+ list[i].HMaterModel + "','" + list[i].HBarCode + "',"
                    + list[i].HGroupID + ",'"+ list[i].HGroup + "',"+ list[i].HSourceID + ",'" + list[i].HSource + "','"+ list[i].HMaker + "',(select HItemID from Kf_LookingForBillMain where HBillNo = '" + list[i].HBillNo + "'))";
                    "(" + list[i].HWHID + ",'" + list[i].HWHName + "'," + list[i].HSPID + ",'" + list[i].HSPName + "','" + list[i].HMTONo + "'," + list[i].HQty + ","
                    + list[i].HMaterID + ",'" + list[i].HMaterName + "','" + list[i].HMaterNumber + "','" + list[i].HMaterModel + "','" + list[i].HBarCode + "',"
                    + list[i].HGroupID + ",'" + list[i].HGroup + "'," + list[i].HSourceID + ",'" + list[i].HSource + "','" + list[i].HMaker + "',(select HItemID from Kf_LookingForBillMain where HBillNo = '" + list[i].HBillNo + "'))";
                    oCN.RunProc(subSql);
                    var barCodeSql = "update Gy_BarCodeBill set HStatus='裁切中-" + list[i].HSource + "' where HBarCode = '"+ list[i].HBarCode + "'";
                    var barCodeSql = "update Gy_BarCodeBill set HStatus='裁切中-" + list[i].HSource + "' where HBarCode = '" + list[i].HBarCode + "'";
                    oCN.RunProc(barCodeSql);
                }
                oCN.Commit();
                //反写金蝶销售订单的找货组和找货时间
                oCN.RunProc("exec h_p_IFCLD_DataBackToSeOrderFindGoodsTime "+ list[0].HInterID);
                oCN.RunProc("exec h_p_IFCLD_DataBackToSeOrderFindGoodsTime " + list[0].HInterID);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "生成找货单成功!单据号为:" + list[0].HBillNo;
@@ -505,7 +506,7 @@
        public static DataSet getPackUnionBillList_s(string HBarCode_Pack)
        {
            return new SQLHelper.ClsCN().RunProcReturn("EXEC h_p_Kf_getPackUnionBillList " + "'"+HBarCode_Pack+"'", "h_p_Kf_getPackUnionBillList");
            return new SQLHelper.ClsCN().RunProcReturn("EXEC h_p_Kf_getPackUnionBillList " + "'" + HBarCode_Pack + "'", "h_p_Kf_getPackUnionBillList");
        }
        public static DataSet getPackUnionBillListDetailed_s(string HBarCode)
@@ -516,7 +517,7 @@
        public static DataSet getSellOrderList_s(string HSourceBillNo)
        {
            //同步销售订单
            new SQLHelper.ClsCN().RunProcReturn("EXEC h_p_IFCLD_ERPSourceBillToLocal_SEOrderToICMO '" + HSourceBillNo+ "'", "h_p_IFCLD_ERPSourceBillToLocal_SEOrderToICMO");
            new SQLHelper.ClsCN().RunProcReturn("EXEC h_p_IFCLD_ERPSourceBillToLocal_SEOrderToICMO '" + HSourceBillNo + "'", "h_p_IFCLD_ERPSourceBillToLocal_SEOrderToICMO");
            string sWhere = " Where HSourceBillNo = '" + HSourceBillNo.Trim() + "'";
            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_getSellOrderList_s " + sWhere, "h_v_getSellOrderList_s");
        }
@@ -589,7 +590,7 @@
            DataSet ds;
            ds = new SQLHelper.ClsCN().RunProcReturn("EXEC h_p_Xs_SellOutFindSP '" + HbillNo + "'", "h_p_Xs_SellOutFindSP");
            if (Pub_Class.ClsPub.isLong(ds.Tables[0].Rows.Count) >= 0 )
            if (Pub_Class.ClsPub.isLong(ds.Tables[0].Rows.Count) >= 0)
            {
                objJsonResult.code = "1";
                objJsonResult.count = 1;
WebAPI/Controllers/ProductInController.cs
@@ -37,16 +37,16 @@
        public bool sRedBlueFlag = false;
        public bool SourceFlag = false;
        //public string sSourceType = "3710";
        public WebServer webserver =new WebServer();
        public DataSet ds =new DataSet();
        public ClsGy_BarCodeBill_WMS_Model_View oView =new ClsGy_BarCodeBill_WMS_Model_View();
        public WebServer webserver = new WebServer();
        public DataSet ds = new DataSet();
        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();
        //public ClsKf_ICStockBill_WMS oBar = new ClsKf_ICStockBill_WMS();
        public double sRelQty = 0;
       // private DataBaseServices objDataBaseServices = new DataBaseServices();
        // private DataBaseServices objDataBaseServices = new DataBaseServices();
        private json objJsonResult = new json();
       // private string msgModel = "{{\"count\":{0},\"code\":{0},\"message\":\"{1}\",\"result\":{2}}}";
        // private string msgModel = "{{\"count\":{0},\"code\":{0},\"message\":\"{1}\",\"result\":{2}}}";
        public static string GetSession(string sMsg)
        {
            try
@@ -106,7 +106,7 @@
            {
                HBillType = "1245";
            }
            oBar = webserver.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID,sExpressNumber,ref DBUtility.ClsPub.sErrInfo);
            oBar = webserver.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
            if (oBar == null)
            {
                objJsonResult.code = "0";
@@ -212,8 +212,8 @@
        {
            try
            {
               // DataSet ds = new DataSet();
               // WebServer webserver = new WebServer();
                // DataSet ds = new DataSet();
                // WebServer webserver = new WebServer();
                string sWhere = " Where å•据号 like '%" + HSourceBillNo.Trim() + "%'";
                if (HSourceBillType == "3710")
                {
@@ -265,7 +265,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!"+ex.ToString();
                objJsonResult.Message = "没有返回任何记录!" + ex.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -356,115 +356,107 @@
//        /// <summary>
//        /// æ‰«æç‰©æ–™æ¡ç ï¼Œå°†ç‰©æ–™æ¡ç ä¿¡æ¯å†™å…¥æ¡ç ä¸´æ—¶è¡¨
//        /// </summary>
//        /// <param name="sBarCode"></param>
//        /// <param name="sInterID"></param>
//        /// <param name="sBillNo"></param>
//        /// <param name="sQty"></param>
//        /// <returns></returns>
//        [Route("ProductIn/SetMaterBarCode_Webs_Json")]
//        [HttpGet]
//        public object SetMaterBarCode_Webs_Json(string sBarCode, Int64 HBillID, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Double HQty, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HOWNERID, ref string sErrMsg)
//        {
//            ClsKf_ICStockBill_WMS oBar = new ClsKf_ICStockBill_WMS();
//            try
//            {
//                if (sBarCode.Trim() == "")
//                {
//                    objJsonResult.code = "0";
//                    objJsonResult.count = 0;
//                    objJsonResult.Message = "条码为空!";
//                    objJsonResult.data = null;
//                    return objJsonResult;
//                }
        //        /// <summary>
        //        /// æ‰«æç‰©æ–™æ¡ç ï¼Œå°†ç‰©æ–™æ¡ç ä¿¡æ¯å†™å…¥æ¡ç ä¸´æ—¶è¡¨
        //        /// </summary>
        //        /// <param name="sBarCode"></param>
        //        /// <param name="sInterID"></param>
        //        /// <param name="sBillNo"></param>
        //        /// <param name="sQty"></param>
        //        /// <returns></returns>
        //        [Route("ProductIn/SetMaterBarCode_Webs_Json")]
        //        [HttpGet]
        //        public object SetMaterBarCode_Webs_Json(string sBarCode, Int64 HBillID, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Double HQty, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HOWNERID, ref string sErrMsg)
        //        {
        //            ClsKf_ICStockBill_WMS oBar = new ClsKf_ICStockBill_WMS();
        //            try
        //            {
        //                if (sBarCode.Trim() == "")
        //                {
        //                    objJsonResult.code = "0";
        //                    objJsonResult.count = 0;
        //                    objJsonResult.Message = "条码为空!";
        //                    objJsonResult.data = null;
        //                    return objJsonResult;
        //                }
//                //根据条码前缀走 ä¸åŒæ–¹æ³•(仓库、仓位、部门)(源单、物料条码)
//                oBar = webserver.get_CheckTypeByBarCode(sBarCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, sRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
//                if (oBar == null)
//                {
//                    objJsonResult.code = "0";
//                    objJsonResult.count = 0;
//                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
//                    objJsonResult.data = null;
//                    return objJsonResult;
//                }
//                else
//                {
//                    //----------创建虚表------------------------
//                    DataTable dt_Main = new DataTable("Json");
//                    dt_Main.Columns.Add("HBarType", typeof(string));
//                    dt_Main.Columns.Add("HSourceBillType", typeof(string));
//                    dt_Main.Columns.Add("HSourceBillNo", typeof(string));
//                    dt_Main.Columns.Add("HSupID", typeof(int));
//                    dt_Main.Columns.Add("HSupName", typeof(string));
//                    dt_Main.Columns.Add("HDeptID", typeof(int));
//                    dt_Main.Columns.Add("HDeptNumber", typeof(string));
//                    dt_Main.Columns.Add("HDeptName", typeof(string));
//                    dt_Main.Columns.Add("HWhID", typeof(int));
//                    dt_Main.Columns.Add("HWhNumber", typeof(string));
//                    dt_Main.Columns.Add("HWhName", typeof(string));
//                    dt_Main.Columns.Add("HSPFlag", typeof(bool));
//                    dt_Main.Columns.Add("HSPID", typeof(int));
//                    dt_Main.Columns.Add("HSPNumber", typeof(string));
//                    dt_Main.Columns.Add("HSPName", typeof(string));
//                    dt_Main.Columns.Add("SourceFlag", typeof(bool));
//                    //---------创建新行------------------------
//                    DataRow dr_main = dt_Main.NewRow();//创建新行
//                    dt_Main.Rows.Add(dr_main);//将新行加入到表中
//                    dr_main["HBarType"] = oBar.HBarType;
//                    dr_main["HSourceBillType"] = oBar.HSourceBillType;
//                    dr_main["HSourceBillNo"] = oBar.HSourceBillNo;
//                    dr_main["HSupID"] = oBar.HSupID;
//                    dr_main["HSupName"] = oBar.HSupName;
//                    dr_main["HDeptID"] = oBar.HDeptID;
//                    dr_main["HDeptNumber"] = oBar.HDeptNumber;
//                    dr_main["HDeptName"] = oBar.HDeptName;
//                    dr_main["HWhID"] = oBar.HWhID;
//                    dr_main["HWhNumber"] = oBar.HWhNumber;
//                    dr_main["HWhName"] = oBar.HWhName;
//                    dr_main["HSPFlag"] = oBar.HSPFlag;
//                    dr_main["HSPID"] = oBar.HSPID;
//                    dr_main["HSPNumber"] = oBar.HSPNumber;
//                    dr_main["HSPName"] = oBar.HSPName;
//                    dr_main["SourceFlag"] = true;
        //                //根据条码前缀走 ä¸åŒæ–¹æ³•(仓库、仓位、部门)(源单、物料条码)
        //                oBar = webserver.get_CheckTypeByBarCode(sBarCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, sRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
        //                if (oBar == null)
        //                {
        //                    objJsonResult.code = "0";
        //                    objJsonResult.count = 0;
        //                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
        //                    objJsonResult.data = null;
        //                    return objJsonResult;
        //                }
        //                else
        //                {
        //                    //----------创建虚表------------------------
        //                    DataTable dt_Main = new DataTable("Json");
        //                    dt_Main.Columns.Add("HBarType", typeof(string));
        //                    dt_Main.Columns.Add("HSourceBillType", typeof(string));
        //                    dt_Main.Columns.Add("HSourceBillNo", typeof(string));
        //                    dt_Main.Columns.Add("HSupID", typeof(int));
        //                    dt_Main.Columns.Add("HSupName", typeof(string));
        //                    dt_Main.Columns.Add("HDeptID", typeof(int));
        //                    dt_Main.Columns.Add("HDeptNumber", typeof(string));
        //                    dt_Main.Columns.Add("HDeptName", typeof(string));
        //                    dt_Main.Columns.Add("HWhID", typeof(int));
        //                    dt_Main.Columns.Add("HWhNumber", typeof(string));
        //                    dt_Main.Columns.Add("HWhName", typeof(string));
        //                    dt_Main.Columns.Add("HSPFlag", typeof(bool));
        //                    dt_Main.Columns.Add("HSPID", typeof(int));
        //                    dt_Main.Columns.Add("HSPNumber", typeof(string));
        //                    dt_Main.Columns.Add("HSPName", typeof(string));
        //                    dt_Main.Columns.Add("SourceFlag", typeof(bool));
        //                    //---------创建新行------------------------
        //                    DataRow dr_main = dt_Main.NewRow();//创建新行
        //                    dt_Main.Rows.Add(dr_main);//将新行加入到表中
        //                    dr_main["HBarType"] = oBar.HBarType;
        //                    dr_main["HSourceBillType"] = oBar.HSourceBillType;
        //                    dr_main["HSourceBillNo"] = oBar.HSourceBillNo;
        //                    dr_main["HSupID"] = oBar.HSupID;
        //                    dr_main["HSupName"] = oBar.HSupName;
        //                    dr_main["HDeptID"] = oBar.HDeptID;
        //                    dr_main["HDeptNumber"] = oBar.HDeptNumber;
        //                    dr_main["HDeptName"] = oBar.HDeptName;
        //                    dr_main["HWhID"] = oBar.HWhID;
        //                    dr_main["HWhNumber"] = oBar.HWhNumber;
        //                    dr_main["HWhName"] = oBar.HWhName;
        //                    dr_main["HSPFlag"] = oBar.HSPFlag;
        //                    dr_main["HSPID"] = oBar.HSPID;
        //                    dr_main["HSPNumber"] = oBar.HSPNumber;
        //                    dr_main["HSPName"] = oBar.HSPName;
        //                    dr_main["SourceFlag"] = true;
//                    objJsonResult.code = "0";
//                    objJsonResult.count = 1;
//                    objJsonResult.Message = "扫码成功!";
//                    objJsonResult.data = dt_Main;
//                    return objJsonResult;
//                }
//            }
//            catch (Exception e)
//            {
//                objJsonResult.code = "0";
//                objJsonResult.count = 0;
//                objJsonResult.Message = "写入临时表信息失败!" + e.Message + DBUtility.ClsPub.sErrInfo;
//                objJsonResult.data = null;
//                return objJsonResult;
//            }
//        }
        //                    objJsonResult.code = "0";
        //                    objJsonResult.count = 1;
        //                    objJsonResult.Message = "扫码成功!";
        //                    objJsonResult.data = dt_Main;
        //                    return objJsonResult;
        //                }
        //            }
        //            catch (Exception e)
        //            {
        //                objJsonResult.code = "0";
        //                objJsonResult.count = 0;
        //                objJsonResult.Message = "写入临时表信息失败!" + e.Message + DBUtility.ClsPub.sErrInfo;
        //                objJsonResult.data = null;
        //                return objJsonResult;
        //            }
        //        }
        /// <summary>
        /// ç”Ÿæˆäº§å“å…¥åº“单
        /// ç”Ÿæˆäº§å“å…¥åº“单(产品入库提交)
        /// </summary>
        /// <returns></returns>
        [Route("ProductIn/set_SaveProductInBill_Json")]
        [HttpPost]
        public object set_SaveProductInBill_Json([FromBody]JObject oMain)
        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);
            try
            {
                List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>();
@@ -475,7 +467,6 @@
                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;
@@ -486,6 +477,11 @@
                websLsmain.HWHID = lsmain[0].HWHID;
                websLsmain.HSupID = lsmain[0].HSupID;
                websLsmain.HExplanation = lsmain[0].HExplanation;
                websLsmain.HGroupID = lsmain[0].HGroupID;
                websLsmain.HJiaYe = lsmain[0].HJiaYe;
                //public Int64 HGroupID;//
                //public string HJiaYe;//
                if (webserver.set_SaveProductInBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
WebAPI/Controllers/WebAPIController.cs
@@ -631,7 +631,7 @@
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ds = oCN.RunProcReturn("Select HItemID,HNumber ç­ç»„代码,HName ç­ç»„ from h_v_IF_Group where HStopflag=0 " + sWhere + " Order by HItemID ", "h_v_IF_Group");
                ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName  from h_v_IF_Group where HStopflag=0 " + sWhere + " Order by HItemID ", "h_v_IF_Group");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
WebAPI/DLL/BLL20201111.rar
Binary files differ
WebAPI/DLL/DAL20200624.zip
Binary files differ
WebAPI/DLL/DAL20200818.zip
Binary files differ
WebAPI/DLL/DAL20210109.zip
Binary files differ
WebAPI/DLL/Model.dll
Binary files differ
WebAPI/DLL/Model20200818.zip
Binary files differ
WebAPI/DLL/Newtonsoft.Json.zip
Binary files differ
WebAPI/DLL/µ÷Óù¤³ÌÎļþ.zip
Binary files differ
WebAPI/DLL/µ÷Óù¤³ÌÎļþ/BLL.dll
Binary files differ
WebAPI/DLL/µ÷Óù¤³ÌÎļþ/DBUtility.dll
Binary files differ
WebAPI/DLL/µ÷Óù¤³ÌÎļþ/Model.dll
Binary files differ
WebAPI/DLL/µ÷Óù¤³ÌÎļþ/Pub_Class.dll
Binary files differ
WebAPI/DLL/µ÷Óù¤³ÌÎļþ/Pub_Control.dll
Binary files differ
WebAPI/DLL/µ÷Óù¤³ÌÎļþ/SQLHelper.dll
Binary files differ
WebAPI/Models/LookingForBill.cs
@@ -27,5 +27,6 @@
        public string HMaterModel { get; set; }//规格型号
        public string HIsStatus { get; set; }//是否扫码
        public string HBillType { get; set; }//单据类型
        public string HJiaYe { get; set; }//操作员
    }
}
WebAPI/Web References/WebS/Reference.cs
Diff too large
WebAPI/Web References/WebS/Reference.map
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
  <Results>
    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx?wsdl" filename="WebService1.wsdl" />
    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx?disco" filename="WebService1.disco" />
    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://124.70.129.242/cloudweb/WebService1.asmx?wsdl" filename="WebService1.wsdl" />
    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://124.70.129.242/cloudweb/WebService1.asmx?disco" filename="WebService1.disco" />
  </Results>
</DiscoveryClientResultsFile>
WebAPI/Web References/WebS/WebService1.disco
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
  <contractRef ref="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx?wsdl" docRef="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
  <soap address="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
  <soap address="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
  <contractRef ref="http://124.70.129.242/cloudweb/WebService1.asmx?wsdl" docRef="http://124.70.129.242/cloudweb/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
  <soap address="http://124.70.129.242/cloudweb/WebService1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
  <soap address="http://124.70.129.242/cloudweb/WebService1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />
</discovery>
WebAPI/Web References/WebS/WebService1.wsdl
@@ -2,6 +2,22 @@
<wsdl:definitions xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="http://tempuri.org/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
  <wsdl:types>
    <s:schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/">
      <s:element name="CheckUser">
        <s:complexType>
          <s:sequence>
            <s:element minOccurs="0" maxOccurs="1" name="sUserName" type="s:string" />
            <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
          </s:sequence>
        </s:complexType>
      </s:element>
      <s:element name="CheckUserResponse">
        <s:complexType>
          <s:sequence>
            <s:element minOccurs="1" maxOccurs="1" name="CheckUserResult" type="s:boolean" />
            <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
          </s:sequence>
        </s:complexType>
      </s:element>
      <s:element name="get_TestStr">
        <s:complexType />
      </s:element>
@@ -1165,6 +1181,8 @@
              <s:element minOccurs="0" maxOccurs="1" name="HExplanation" type="s:string" />
              <s:element minOccurs="0" maxOccurs="1" name="HInnerBillNo" type="s:string" />
              <s:element minOccurs="1" maxOccurs="1" name="HRedBlueFlag" type="s:boolean" />
              <s:element minOccurs="1" maxOccurs="1" name="HGroupID" type="s:long" />
              <s:element minOccurs="0" maxOccurs="1" name="HJiaYe" type="s:string" />
            </s:sequence>
          </s:extension>
        </s:complexContent>
@@ -2850,6 +2868,24 @@
          </s:sequence>
        </s:complexType>
      </s:element>
      <s:element name="get_MaxBillID">
        <s:complexType>
          <s:sequence>
            <s:element minOccurs="0" maxOccurs="1" name="HTranType" type="s:string" />
            <s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" />
            <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
          </s:sequence>
        </s:complexType>
      </s:element>
      <s:element name="get_MaxBillIDResponse">
        <s:complexType>
          <s:sequence>
            <s:element minOccurs="1" maxOccurs="1" name="get_MaxBillIDResult" type="s:boolean" />
            <s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" />
            <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
          </s:sequence>
        </s:complexType>
      </s:element>
      <s:element name="CheckModRight">
        <s:complexType>
          <s:sequence>
@@ -2886,22 +2922,6 @@
                </s:sequence>
              </s:complexType>
            </s:element>
          </s:sequence>
        </s:complexType>
      </s:element>
      <s:element name="CheckUser">
        <s:complexType>
          <s:sequence>
            <s:element minOccurs="0" maxOccurs="1" name="sUserName" type="s:string" />
            <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
          </s:sequence>
        </s:complexType>
      </s:element>
      <s:element name="CheckUserResponse">
        <s:complexType>
          <s:sequence>
            <s:element minOccurs="1" maxOccurs="1" name="CheckUserResult" type="s:boolean" />
            <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
          </s:sequence>
        </s:complexType>
      </s:element>
@@ -3967,6 +3987,8 @@
              <s:element minOccurs="0" maxOccurs="1" name="HExplanation" type="s:string" />
              <s:element minOccurs="0" maxOccurs="1" name="HInnerBillNo" type="s:string" />
              <s:element minOccurs="1" maxOccurs="1" name="HRedBlueFlag" type="s:boolean" />
              <s:element minOccurs="1" maxOccurs="1" name="HGroupID" type="s:long" />
              <s:element minOccurs="0" maxOccurs="1" name="HJiaYe" type="s:string" />
            </s:sequence>
          </s:extension>
        </s:complexContent>
@@ -9978,6 +10000,12 @@
      </s:element>
    </s:schema>
  </wsdl:types>
  <wsdl:message name="CheckUserSoapIn">
    <wsdl:part name="parameters" element="tns:CheckUser" />
  </wsdl:message>
  <wsdl:message name="CheckUserSoapOut">
    <wsdl:part name="parameters" element="tns:CheckUserResponse" />
  </wsdl:message>
  <wsdl:message name="get_TestStrSoapIn">
    <wsdl:part name="parameters" element="tns:get_TestStr" />
  </wsdl:message>
@@ -10656,6 +10684,12 @@
  <wsdl:message name="get_MaxBillNoAndID_NewSoapOut">
    <wsdl:part name="parameters" element="tns:get_MaxBillNoAndID_NewResponse" />
  </wsdl:message>
  <wsdl:message name="get_MaxBillIDSoapIn">
    <wsdl:part name="parameters" element="tns:get_MaxBillID" />
  </wsdl:message>
  <wsdl:message name="get_MaxBillIDSoapOut">
    <wsdl:part name="parameters" element="tns:get_MaxBillIDResponse" />
  </wsdl:message>
  <wsdl:message name="CheckModRightSoapIn">
    <wsdl:part name="parameters" element="tns:CheckModRight" />
  </wsdl:message>
@@ -10667,12 +10701,6 @@
  </wsdl:message>
  <wsdl:message name="get_UserSoapOut">
    <wsdl:part name="parameters" element="tns:get_UserResponse" />
  </wsdl:message>
  <wsdl:message name="CheckUserSoapIn">
    <wsdl:part name="parameters" element="tns:CheckUser" />
  </wsdl:message>
  <wsdl:message name="CheckUserSoapOut">
    <wsdl:part name="parameters" element="tns:CheckUserResponse" />
  </wsdl:message>
  <wsdl:message name="GetSc_StdWorkQtyBill_HICMOInterIDSoapIn">
    <wsdl:part name="parameters" element="tns:GetSc_StdWorkQtyBill_HICMOInterID" />
@@ -12433,6 +12461,10 @@
    <wsdl:part name="parameters" element="tns:GetSc_ICMOReportBillListResponse" />
  </wsdl:message>
  <wsdl:portType name="WebService1Soap">
    <wsdl:operation name="CheckUser">
      <wsdl:input message="tns:CheckUserSoapIn" />
      <wsdl:output message="tns:CheckUserSoapOut" />
    </wsdl:operation>
    <wsdl:operation name="get_TestStr">
      <wsdl:input message="tns:get_TestStrSoapIn" />
      <wsdl:output message="tns:get_TestStrSoapOut" />
@@ -12885,6 +12917,10 @@
      <wsdl:input message="tns:get_MaxBillNoAndID_NewSoapIn" />
      <wsdl:output message="tns:get_MaxBillNoAndID_NewSoapOut" />
    </wsdl:operation>
    <wsdl:operation name="get_MaxBillID">
      <wsdl:input message="tns:get_MaxBillIDSoapIn" />
      <wsdl:output message="tns:get_MaxBillIDSoapOut" />
    </wsdl:operation>
    <wsdl:operation name="CheckModRight">
      <wsdl:input message="tns:CheckModRightSoapIn" />
      <wsdl:output message="tns:CheckModRightSoapOut" />
@@ -12892,10 +12928,6 @@
    <wsdl:operation name="get_User">
      <wsdl:input message="tns:get_UserSoapIn" />
      <wsdl:output message="tns:get_UserSoapOut" />
    </wsdl:operation>
    <wsdl:operation name="CheckUser">
      <wsdl:input message="tns:CheckUserSoapIn" />
      <wsdl:output message="tns:CheckUserSoapOut" />
    </wsdl:operation>
    <wsdl:operation name="GetSc_StdWorkQtyBill_HICMOInterID">
      <wsdl:input message="tns:GetSc_StdWorkQtyBill_HICMOInterIDSoapIn" />
@@ -14072,6 +14104,15 @@
  </wsdl:portType>
  <wsdl:binding name="WebService1Soap" type="tns:WebService1Soap">
    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
    <wsdl:operation name="CheckUser">
      <soap:operation soapAction="http://tempuri.org/CheckUser" style="document" />
      <wsdl:input>
        <soap:body use="literal" />
      </wsdl:input>
      <wsdl:output>
        <soap:body use="literal" />
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="get_TestStr">
      <soap:operation soapAction="http://tempuri.org/get_TestStr" style="document" />
      <wsdl:input>
@@ -15089,6 +15130,15 @@
        <soap:body use="literal" />
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="get_MaxBillID">
      <soap:operation soapAction="http://tempuri.org/get_MaxBillID" style="document" />
      <wsdl:input>
        <soap:body use="literal" />
      </wsdl:input>
      <wsdl:output>
        <soap:body use="literal" />
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="CheckModRight">
      <soap:operation soapAction="http://tempuri.org/CheckModRight" style="document" />
      <wsdl:input>
@@ -15100,15 +15150,6 @@
    </wsdl:operation>
    <wsdl:operation name="get_User">
      <soap:operation soapAction="http://tempuri.org/get_User" style="document" />
      <wsdl:input>
        <soap:body use="literal" />
      </wsdl:input>
      <wsdl:output>
        <soap:body use="literal" />
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="CheckUser">
      <soap:operation soapAction="http://tempuri.org/CheckUser" style="document" />
      <wsdl:input>
        <soap:body use="literal" />
      </wsdl:input>
@@ -17756,6 +17797,15 @@
  </wsdl:binding>
  <wsdl:binding name="WebService1Soap12" type="tns:WebService1Soap">
    <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
    <wsdl:operation name="CheckUser">
      <soap12:operation soapAction="http://tempuri.org/CheckUser" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
      <wsdl:output>
        <soap12:body use="literal" />
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="get_TestStr">
      <soap12:operation soapAction="http://tempuri.org/get_TestStr" style="document" />
      <wsdl:input>
@@ -18773,6 +18823,15 @@
        <soap12:body use="literal" />
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="get_MaxBillID">
      <soap12:operation soapAction="http://tempuri.org/get_MaxBillID" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
      <wsdl:output>
        <soap12:body use="literal" />
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="CheckModRight">
      <soap12:operation soapAction="http://tempuri.org/CheckModRight" style="document" />
      <wsdl:input>
@@ -18784,15 +18843,6 @@
    </wsdl:operation>
    <wsdl:operation name="get_User">
      <soap12:operation soapAction="http://tempuri.org/get_User" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
      <wsdl:output>
        <soap12:body use="literal" />
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="CheckUser">
      <soap12:operation soapAction="http://tempuri.org/CheckUser" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -21440,10 +21490,10 @@
  </wsdl:binding>
  <wsdl:service name="WebService1">
    <wsdl:port name="WebService1Soap" binding="tns:WebService1Soap">
      <soap:address location="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx" />
      <soap:address location="http://124.70.129.242/cloudweb/WebService1.asmx" />
    </wsdl:port>
    <wsdl:port name="WebService1Soap12" binding="tns:WebService1Soap12">
      <soap12:address location="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx" />
      <soap12:address location="http://124.70.129.242/cloudweb/WebService1.asmx" />
    </wsdl:port>
  </wsdl:service>
</wsdl:definitions>
WebAPI/WebAPI.csproj
@@ -223,10 +223,15 @@
    <Content Include="DLL\DBUtility.dll" />
    <Content Include="DLL\Kingdee.BOS.WebApi.Client.dll" />
    <Content Include="DLL\Model.dll" />
    <Content Include="DLL\Newtonsoft.Json.dll" />
    <Content Include="DLL\Newtonsoft.Json.Net35.dll" />
    <Content Include="DLL\Pub_Class.dll" />
    <Content Include="DLL\Pub_Control.dll" />
    <Content Include="DLL\SQLHelper.dll" />
    <Content Include="DLL\System.Net.Http.Formatting.dll" />
    <Content Include="DLL\System.Web.Http.dll" />
    <Content Include="DLL\System.Web.Http.WebHost.dll" />
    <Content Include="DLL\System.Web.Mvc.dll" />
    <Content Include="fonts\glyphicons-halflings-regular.svg" />
    <Content Include="Global.asax" />
    <Content Include="Index.html" />
@@ -417,10 +422,10 @@
    <WebReferences Include="Web References\" />
  </ItemGroup>
  <ItemGroup>
    <WebReferenceUrl Include="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx">
    <WebReferenceUrl Include="http://124.70.129.242/cloudweb/WebService1.asmx">
      <UrlBehavior>Static</UrlBehavior>
      <RelPath>Web References\WebS\</RelPath>
      <UpdateFromURL>http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx</UpdateFromURL>
      <UpdateFromURL>http://124.70.129.242/cloudweb/WebService1.asmx</UpdateFromURL>
      <ServiceLocationURL>
      </ServiceLocationURL>
      <CachedDynamicPropName>