~yxj/MES-WEB-API.git

			@@ -1298,7 +1298,7 @@
			"-",
			num23.ToString()
			}));
			DataSet dataSet16 = clsCN3.RunProcReturn(" select * from Gy_BarCodeBill where HBarCode= '" + text1 + "'", "Gy_BarCodeBill");
			DataSet dataSet16 = clsCN3.RunProcReturn(" select * from Gy_BarCodeBill where HBarCode= '" + text1 + "'", "Gy_BarCodeBill");
			bool flag10 = dataSet16.Tables[0].Rows.Count > 0;
			if (flag10)
			{
			@@ -1323,6 +1323,7 @@
			}
			else
			{
			//可能和他们的登录组织有关系
			string billCode3 = "85";
			long num32 = ClsPub.CreateBillID_Prod(billCode3, ref ClsPub.sExeReturnInfo);
			long num33 = 0L;
			@@ -3917,8 +3918,8 @@
			List<Model.ClsKf_POStockInBillMain> lsmain = new List<Model.ClsKf_POStockInBillMain>();
			ListModels oListModels = new ListModels();
			lsmain = oListModels.getPOStockInBillMainByJson(msg1);
			lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
			lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
			//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_POStockInBillMain websLsmain = new WebS.ClsKf_POStockInBillMain();
			@@ -3950,7 +3951,8 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "成功！单据号为：";
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //成功！
			//objJsonResult.Message = "成功！单据号为：";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -3958,7 +3960,8 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "上传失败！" + DBUtility.ClsPub.sErrInfo;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //失败！
			//objJsonResult.Message = "上传失败！" + DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -4307,6 +4310,14 @@
			{
			DataSet dataSet = this.oCn.RunProcReturn("exec h_p_ReceiveBill_Fast " + hinterID, "h_p_ReceiveBill_Fast");
			DataRow dataRow = dataSet.Tables[0].Rows[0];
			if (dataSet.Tables[0].Rows.Count == 1 && dataSet.Tables[0].Rows[0]["FRECEIVENumber"].ToString() == "0")
			{
			this.objJsonResult.code = "0";
			this.objJsonResult.count = 0;
			this.objJsonResult.Message = "存在多个采购订单单据类型，不允许提交！";
			this.objJsonResult.data = null;
			return this.objJsonResult;
			}
			bool flag4 = dataSet.Tables[0].Rows.Count <= 0;
			bool flag5 = flag4;
			bool flag6 = flag5;