~yxj/MES-WEB-API.git

			@@ -444,6 +444,42 @@
			return GetObjectJson(ds);
			}


			/// <summary>
			/// 返回不合格评审列表
			/// </summary>
			/// <param name="sWhere"></param>
			/// <returns></returns>
			[Route("Sc_ProcessMangement/MES_QC_NoPassProdCheckBill_Json")]
			[HttpGet]
			public object MES_QC_NoPassProdCheckBill_Json(string sWhere)
			{
			DataSet ds;
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select top 500 * from h_v_QC_NoPassProdCheckBillList ", "h_v_QC_NoPassProdCheckBillList");
			}
			else
			{
			string sql1 = "select * from h_v_QC_NoPassProdCheckBillList where 1 = 1 ";
			string sql = sql1 + sWhere;
			ds = oCN.RunProcReturn(sql, "h_v_QC_NoPassProdCheckBillList");
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			return GetObjectJson(ds);
			}

			/// <summary>
			/// PDA工序汇报单保存
			/// </summary>
			@@ -693,76 +729,158 @@
			msg3 = msg3.Substring(1, msg3.Length - 2);
			msg3 = msg3.Replace("\\", "");
			msg3 = msg3.Replace("\n", ""); //\n
			//msg2 = msg2.Replace("'", "’");
			//List<Model.ClsCg_POInStockBillSub> ls = new List<Model.ClsCg_POInStockBillSub>();
			//ls = oListModels.getObjectByJson_POInStockSub(msg3);
			//int i = 0;
			//foreach (Model.ClsCg_POInStockBillSub oItemSub in ls)
			//{
			// i++;
			// if (oItemSub.HQty <= 0)
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "保存失败！第" + i.ToString() + "行数量不大于0无法保存！";
			// objJsonResult.data = 1;
			// return objJsonResult;
			// }
			// if (oItemSub.HQty > oItemSub.HRQty)
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "保存失败！第" + i.ToString() + "行数量不能大于未关联数量！";
			// objJsonResult.data = 1;
			// return objJsonResult;
			// }
			// if (DBUtility.ClsPub.isStrNull(oItemSub.HBatChNo) == "")
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "保存失败！第" + i.ToString() + "行未填写批号！";
			// objJsonResult.data = 1;
			// return objJsonResult;
			// }
			msg2 = msg2.Replace("'", "’");
			List<WebAPI.Models.Sc_ProcessSendWorkViewModel> ls = new List<WebAPI.Models.Sc_ProcessSendWorkViewModel>();
			ls = oListModels.getObjectByJson_ViewReportlist(msg3);
			int i = 0;
			//定义汇报单子表集合用于存放下推派工单的多行数据
			List<Model.ClsSc_ProcessReportSub> lsReportSub = new List<Model.ClsSc_ProcessReportSub>();
			foreach (WebAPI.Models.Sc_ProcessSendWorkViewModel ItemView in ls)
			{

			i++;
			Model.ClsSc_ProcessReportSub reportSub = new Model.ClsSc_ProcessReportSub();
			if (ItemView.数量 <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！第" + i.ToString() + "行数量不大于0无法保存！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			if ((double)ItemView.数量 < ReportModel.omodel.HPlanQty)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！工序汇报单累计汇报数量不能大于源单数量！";
			objJsonResult.data = 1;
			return objJsonResult;
			}

			// oItemSub.HEntryID = i;
			// oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
			// oItemSub.HRemark = "";
			// oItemSub.HCloseMan = "";
			// oItemSub.HCloseType = false;
			// oBill.DetailColl.Add(oItemSub);

			//}
			reportSub.HEntryID = i;
			reportSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
			reportSub.HRemark = "";
			reportSub.HCloseMan = "";
			reportSub.HCloseType = false;
			reportSub.HEmpID =0;
			reportSub.HICMOBillNo ="";
			reportSub.HICMOInterID = (long)ItemView.HICMOInterID;
			reportSub.HEntryID = i;
			reportSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
			reportSub.HRemark = "";
			reportSub.HCloseMan = "";
			reportSub.HCloseType = false;
			reportSub.HSourceBillType = "3712";
			reportSub.HQty = (double)ItemView.数量;
			reportSub.HProcID = (long)ItemView.HprocID;
			reportSub.HProcNumber = ItemView.工序代码;
			reportSub.HOutPrice = 0;
			reportSub.HOutMoney = 0;
			reportSub.HSourceID = (long)ItemView.HSourceID;
			reportSub.HEmpNumber = "";
			reportSub.HRelBeginDate = DateTime.Now;
			reportSub.HRelEndDate = DateTime.Now;
			reportSub.HTimes = 3;
			reportSub.HSeOrderInterID = 0;
			reportSub.HSeOrderEntryID = 0;
			reportSub.HSeOrderBillNo = "";
			reportSub.HProcPlanInterID = 0;
			reportSub.HProcPlanBillNo = "";
			reportSub.HSourceInterID = 0;
			reportSub.HSourceBillNo = "";
			reportSub.HRelationQty = 0;
			reportSub.HRelationMoney = 0;
			reportSub.HMaterID = (long)ItemView.HMaterID;
			reportSub.HMaterNumber = ItemView.物料代码;
			reportSub.HCheckQty = 0;
			reportSub.HBadCount = 0;
			reportSub.HWasterQty = 0;
			reportSub.HWasterQty2 = 0;
			reportSub.HPrice = 0;
			reportSub.HMoney = 0;
			reportSub.HProcPlanInterID = 0;
			reportSub.HProcPlanEntryID = 0;
			reportSub.HProcPlanBillNo = "";
			reportSub.HSourceEntryID = 0;
			reportSub.HSourceBillType = "";
			reportSub.HRelationQty = 0;
			reportSub.HRelationMoney = 0;
			reportSub.HBadPrirce = 0;
			reportSub.HBadMoney = 0;
			reportSub.HWasterPrice = 0;
			reportSub.HWasterMoney = 0;
			reportSub.HQualityRate = 0;
			reportSub.HSecUnitQty1 = 0;
			reportSub.HSecUnitRate1 = 0;
			reportSub.HSecUnitQty2 = 0;
			reportSub.HSecUnitRate2 = 0;
			reportSub.HUsingQty = 0;
			reportSub.HSelfBadCount = 0;
			reportSub.HPreBadCount = 0;
			reportSub.HPayMentQty = 0;
			reportSub.HOtherDeduct = 0;
			reportSub.HRelPay = 0;
			reportSub.HOtherItem1 = "";
			reportSub.HOtherItem2 = "";
			reportSub.HOtherItem3 = "";
			reportSub.HOtherItem4 = "";
			reportSub.HOtherItem5 = "";
			reportSub.HPackType = "";
			reportSub.HCheckEmpID = 0;
			reportSub.HWeight = 0;
			reportSub.HBatchNo = "";

			lsReportSub.Add(reportSub);

			}
			if (lsReportSub.Count>0)
			{
			//然后在循环保存到汇报但子表
			foreach (Model.ClsSc_ProcessReportSub item in lsReportSub)
			{

			ReportModel.DetailColl.Add(item);
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！lsReportSub集合小于0";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			////保存前判断(单据号重复，笔录项目)
			////保存
			////保存完毕后处理
			//bool bResult;
			//if (oBill.omodel.HInterID == 0)
			//{
			// // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			//}
			//else
			//{
			// bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			//}
			//if (bResult)
			//{
			// objJsonResult.code = "0";
			// 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;
			//}
			bool bResult;
			if (ReportModel.omodel.HInterID == 0)
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = ReportModel.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			bResult = ReportModel.ModifyBill(ReportModel.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			}
			if (bResult)
			{
			objJsonResult.code = "0";
			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;
			}


			}
			@@ -778,6 +896,179 @@
			}


			/// <summary>
			/// 保存不良评审单信息
			/// </summary>
			/// <param name="msg"></param>
			/// <returns></returns>
			[Route("SaveBadReasonList")]
			[HttpPost]
			public object SaveBadReasonList([FromBody] JObject msg)
			{
			var _value = msg["msg"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();


			string UserName="";
			ListModels oListModels = new ListModels();
			try
			{
			DLL.ClsQC_NoPassProdCheckBill oBill = new DLL.ClsQC_NoPassProdCheckBill();
			List<Model.ClsQC_NoPassProdCheckBillMain> lsmain = new List<Model.ClsQC_NoPassProdCheckBillMain>();
			msg2 = msg2.Replace("\\", "");
			msg2 = msg2.Replace("\n", ""); //\n
			lsmain = oListModels.getObjectByJson_NoPassProdCheckMain(msg2);
			foreach (Model.ClsQC_NoPassProdCheckBillMain oItem in lsmain)
			{
			//oItem.HMaker = "";
			UserName=oItem.HMaker;
			oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
			oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
			oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
			oItem.HBillType = "7509";
			oItem.HBillSubType = "7509";
			oItem.HBillStatus = 1;
			oItem.HPeriod = 0;
			oItem.HGroupName ="";
			oItem.HSourceID = 0;
			oItem.HICMOInterID = 0;
			oItem.HICMOBillNo = "";
			oItem.HInStockQty = 0;
			oItem.HCheckQty = 0;
			oItem.HRightQty = 0;
			oItem.HBadPNL = 0;
			oItem.HPlanPNL = 0;
			oItem.HFirstCheckEmp = 0;
			oItem.HCheckerResult = "";
			oItem.HWorkCenterID = 0;
			oItem.HProcExchInterID = 0;
			oItem.HProcExchEntryID = 0;
			oItem.HProcExchBillNo = "";
			oItem.HOrderProcNo = "";
			oItem.HProcExchQty = 0;
			oItem.HMainSourceInterID = oItem.HInterID;
			oItem.HInterID = 0;
			//oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
			if (DBUtility.ClsPub.isStrNull(oItem.HDate)=="")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！没有单据日期，无法保存！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			oBill.omodel = oItem;
			}
			//表体数据
			//按 },{来拆分数组 //去掉【和】
			msg3 = msg3.Substring(1, msg3.Length - 2);
			msg3 = msg3.Replace("\\", "");
			msg3 = msg3.Replace("\n", ""); //\n
			//msg2 = msg2.Replace("'", "’");
			List<Model.ClsQC_NoPassProdCheckBillSub> ls = new List<Model.ClsQC_NoPassProdCheckBillSub>();
			ls = oListModels.getObjectByJson_NoPassProdCheckSub(msg3);
			int i = 0;
			foreach (Model.ClsQC_NoPassProdCheckBillSub oItemSub in ls)
			{
			i++;
			if (string.IsNullOrWhiteSpace(oItemSub.HWasterReasonName))
			{
			break;
			}
			//将前台临时存放的值传过来的值赋给对应的不良数量字段
			oItemSub.HBadQty = Convert.ToDecimal( oItemSub.HMRBChecker);
			if (oItemSub.HBadQty<=0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！第" + i.ToString() + "行不良评审数量不大于0无法保存！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			if ((double)oItemSub.HBadQty >oBill.omodel.HPlanQty )
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！第" + i.ToString() + "行数量不能大于不良数量！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			if (DBUtility.ClsPub.isStrNull(oItemSub.HWasterReasonName)=="")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！第" + i.ToString() + "行未填写不良原因！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			oItemSub.HSourceEntryID = oBill.omodel.HMainSourceEntryID;
			oItemSub.HSourceInterID = oBill.omodel.HMainSourceInterID;
			oItemSub.HEntryID = i;
			oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
			oItemSub.HCloseType = false;
			oItemSub.HBillNo_bak = oBill.omodel.HBillNo;
			oItemSub.HMRBChecker = "";
			oItemSub.HSourceBillNo = oBill.omodel.HMainSourceBillNo;
			oItemSub.HSourceBillType = "3715";
			oItemSub.HRelationQty = 0;
			oItemSub.HRelationMoney = 0;
			oItemSub.HMaterID = oBill.omodel.HMaterID;
			oItemSub.HUnitID = 0;
			oItemSub.HMustQty = 0;
			oItemSub.HDisposeNote = "";
			oItemSub.HPunishmentBillNo = "";
			oItemSub.HBadPCSQty = 0;
			oItemSub.HQCResultID = 0;
			oBill.DetailColl.Add(oItemSub);

			}
			//保存前判断(单据号重复，笔录项目)
			//保存
			//保存完毕后处理
			bool bResult;
			if (oBill.omodel.HInterID == 0)
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			}
			if (bResult)
			{
			objJsonResult.code = "0";
			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;
			}
			}





			}
			}