~yxj/MES-WEB-API.git

			@@ -31,27 +31,48 @@
			/// </summary>
			[Route("Sc_ICMOReportBill/list")]
			[HttpGet]
			public object list(string sWhere)
			public object list(string sWhere, string user)
			{
			try
			{
			//判断是否有查询权限
			if (!DBUtility.ClsPub.Security_Log("Sc_ICMOReportBillQuery", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无权限查询!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_IF_ICMOReportBillList_Edit " + sWhere, "h_v_IF_ICMOReportBillList_Edit");
			ds = oCN.RunProcReturn("select * from h_v_IF_ICMOReportBillList_Edit order by hmainid desc ", "h_v_IF_ICMOReportBillList_Edit");
			}
			else
			{
			string sql1 = "select * from h_v_IF_ICMOReportBillList_Edit where 1 = 1 ";
			string sql = sql1 + sWhere;
			string sql = sql1 + sWhere + " order by hmainid desc ";
			ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOReportBillList_Edit");
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;


			//if (ds.Tables[0].Rows.Count != 0 \|\| ds != null)
			//{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			//}
			//else
			//{
			//objJsonResult.code = "0";
			//objJsonResult.count = 0;
			//objJsonResult.Message = "无数据";
			//objJsonResult.data = null;
			//return objJsonResult;
			//}

			}
			catch (Exception e)
			{
			@@ -146,21 +167,32 @@
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();
			string refSav = sArray[2].ToString();
			string user = sArray[3].ToString();

			string UserName = "";
			string s = "";
			ListModels oListModels = new ListModels();
			try
			{
			//判断是否有编辑权限
			if (!DBUtility.ClsPub.Security_Log("Sc_ICMOReportBill_Edit", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无权限编辑!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			DLL.ClsSc_ICMOReportBill oBill = new DLL.ClsSc_ICMOReportBill();
			List<Models.ClsSc_ICMOReportBillMain> lsmain = new List<Models.ClsSc_ICMOReportBillMain>();
			msg2 = msg2.Replace("\\", "");
			msg2 = msg2.Replace("\n", ""); //\n
			lsmain = oListModels.getObjectByJson_Gy_ICMOReportBillMain(msg2);


			foreach (Models.ClsSc_ICMOReportBillMain oItem in lsmain)
			{
			if (refSav == "Add")
			if (refSav == "Add")
			{
			//单据号是否重复
			if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
			@@ -183,7 +215,7 @@
			return objJsonResult;
			}
			//判断是否可编辑
			if (BillOld.omodel.HChecker != ""&& BillOld.omodel.HChecker != null)
			if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -263,7 +295,7 @@
			oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
			oItemSub.HCloseType = false; //关闭类型
			//oItemSub.HRemark = ""; //备注
			oItemSub.HSourceInterID =0; // 源单主内码
			oItemSub.HSourceInterID = 0; // 源单主内码
			oItemSub.HSourceEntryID = 0; //源单子内码
			//oItemSub.HSourceBillNo = ""; //源单单号
			//oItemSub.HSourceBillType = ""; //源单类型
			@@ -316,6 +348,92 @@
			}
			#endregion

			#region 生产汇报单保存api
			[Route("Sc_ICMOReportBill/Sc_ICMOReportBillSaveApi")]
			[HttpPost]
			public object Sc_ICMOReportBillSaveApi([FromBody] JObject sMainSub)
			{
			try
			{
			var model = sMainSub["model"].ToString();
			var entry = sMainSub["model"]["HENTRY"].ToString();

			model = "[" + model.ToString() + "]";
			List<ClsSc_ICMOReportBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSc_ICMOReportBillMain>>(model);
			List<ClsSc_ICMOReportBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSc_ICMOReportBillSub>>(entry);
			string sql = string.Empty;
			oCN.BeginTran();
			sql = $"delete Sc_ICMOReportBillMain where HinterID = {mainList[0].HInterID}";
			oCN.RunProc(sql);
			sql = $"delete Sc_ICMOReportBillSub where HinterID = {mainList[0].HInterID}";
			oCN.RunProc(sql);
			//主表
			sql = "Insert Into Sc_ICMOReportBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
			",HYear,HPeriod,HRemark,HEmpID,HEmpNumber" +
			",HGroupID,HDeptID,HDeptNumber" +
			",HMainSourceBillNo,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillType" +
			",HChecker,HCheckDate,HUpDater,HUpDateDate,HDeleteMan,HDeleteDate,HPrintQty,HCheckType" +
			",HERPInterID,HERPBillType,HPRDORGID" +
			") " +
			" values('" + mainList[0].HBillType + "','" + mainList[0].HBillSubType + "'," + mainList[0].HInterID.ToString() + ",'" + mainList[0].HBillNo + "','" + mainList[0].HDate + "','" + mainList[0].HMaker + "',getdate()" +
			"," + mainList[0].HYear.ToString() + "," + mainList[0].HPeriod.ToString() + ",'" + mainList[0].HRemark + "','" + mainList[0].HEmpID.ToString() + "','" + mainList[0].HEmpNumber +
			"','" + mainList[0].HGroupID.ToString() + "'," + mainList[0].HDeptID.ToString() + ",'" + mainList[0].HDeptNumber +
			"','" + mainList[0].HMainSourceBillNo.ToString() + "'," + mainList[0].HMainSourceInterID.ToString() + ",'" + mainList[0].HMainSourceEntryID + "','" + mainList[0].HMainSourceBillType + "','" + mainList[0].HChecker + "','" + mainList[0].HCheckDate + "','" + mainList[0].HUpDater +
			"','" + mainList[0].HUpDateDate + "','" + mainList[0].HDeleteMan + "','" + mainList[0].HDeleteDate + "'," + mainList[0].HPrintQty +
			",'" + mainList[0].HCheckType + "'," + mainList[0].HERPInterID + ",'" + mainList[0].HERPBillType + "'," + mainList[0].HPRDORGID +
			") ";
			oCN.RunProc(sql);
			//保存主表
			foreach (var oSub in subList)
			{
			sql = "Insert into Sc_ICMOReportBillSub " +
			" (HInterID,HEntryID,HMaterID,HMaterNumber" +
			",HQty,HUnitID,HUnitNumber,HTimes,HSourceID" +
			",HQtyMust,HWorkerID,HWorkerNumber,HBadCount,HWasterQty," +
			"HCloseMan,HCloseType,HRemark," +
			"HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
			",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
			",HICMOInterID,HICMOBillNo,HBarCode" +
			",HOWNERTYPEID,HISENTRUST,HSTOCKINORGID,HOWNERID,HCHECKPRODUCT,HQAIP,HCOSTRATE,HISBACKFLUSH" +
			",HREQSRC,HREQBILLNO,HREQBILLID,HREQENTRYSEQ,HREQENTRYID,HMOMAINENTRYID,HSTOCKINQUASELQTY" +
			",HPRODUCTTYPE,HPROJECTNO,HICMOENTRYSEQ,HSEQ,HPRODUCEDATE,HEXPIRYDATE,HBASEUNITID,HDEPTID" +
			",HGroupID,HDESCRIPTION" +
			",HSourceNumber,HQPQty,HICMOEntryID" +
			",HWhID,HSPID,HBatChNo,HAuxPropID,HMTONo,HPlanMode,HERPInterID,HERPEntryID" +
			") values("
			+ oSub.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + ",'" + oSub.HMaterNumber + "'" +
			"," + oSub.HQty.ToString() + "," + oSub.HUnitID.ToString() + ",'" + oSub.HUnitNumber + "'," + oSub.HTimes.ToString() + "," + oSub.HSourceID.ToString() +
			"," + oSub.HQtyMust.ToString() + "," + oSub.HWorkerID.ToString() + ",'" + oSub.HWorkerNumber + "'," + oSub.HBadCount.ToString() + "," + oSub.HWasterQty.ToString() +
			",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
			"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
			"," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
			"," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "','" + oSub.HBarCode + "','" + oSub.HOWNERTYPEID + "'," +
			oSub.HISENTRUST + "," + oSub.HSTOCKINORGID + "," + oSub.HOWNERID + "," + oSub.HCHECKPRODUCT + ",'" + oSub.HQAIP + "'," +
			oSub.HCOSTRATE + "," + oSub.HISBACKFLUSH + ",'" + oSub.HREQSRC + "','" + oSub.HREQBILLNO + "'," + oSub.HREQBILLID + "," +
			oSub.HREQENTRYSEQ + "," + oSub.HREQENTRYID + "," + oSub.HMOMAINENTRYID + "," + oSub.HSTOCKINQUASELQTY + "," + oSub.HPRODUCTTYPE + ",'" + oSub.HPROJECTNO + "'," + oSub.HICMOENTRYSEQ + "," + oSub.HSEQ + ",'" + oSub.HPRODUCEDATE + "','" + oSub.HEXPIRYDATE + "'," + oSub.HBASEUNITID + "," + oSub.HDEPTID + "," + oSub.HGroupID + ",'" + oSub.HDESCRIPTION + "','" + oSub.HSourceNumber + "'," + oSub.HQPQty + "," + oSub.HICMOEntryID + "," + oSub.HWhID + "," + oSub.HSPID + ",'" + oSub.HBatChNo + "'," + oSub.HAuxPropID + ",'" + oSub.HMTONo + "'," + oSub.HPlanMode + "," + oSub.HERPInterID + "," + oSub.HERPEntryID +
			") ";
			oCN.RunProc(sql);
			}
			oCN.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "单据保存成功！";
			objJsonResult.data = null;
			return objJsonResult;

			}
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			#region 生产汇报单删除功能
			/// <summary>
			/// 模具处理领用单删除功能
			@@ -323,17 +441,17 @@
			/// <returns></returns>
			[Route("Sc_ICMOReportBill/DeltetICMOReportBill")]
			[HttpGet]
			public object DeltetMouldLifeChangeBill(string HInterID)
			public object DeltetMouldLifeChangeBill(string HInterID, string user)
			{
			//编辑权限
			//if (!DBUtility.ClsPub.Security_Log("Sc_ICMOReportBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "无删除权限！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			if (!DBUtility.ClsPub.Security_Log_second("Sc_ICMOReportBill_Drop", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无删除权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			string s = "";
			Int64 lngBillKey = 0;
			@@ -357,7 +475,7 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (BillOld.omodel.HChecker != "")
			if (oBill.omodel.HChecker != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -420,7 +538,7 @@
			try
			{
			//审核权限
			if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
			if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;