MES-WEB-API.git

			@@ -25,6 +25,7 @@

			//è·åç³»ç»åæ°
			Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
			public DAL.ClsSc_ICMOBill BillOld = new DAL.ClsSc_ICMOBill();

			#region çäº§ä»»å¡å ä¿å/ç¼è¾åè½
			[Route("Sc_ICMOBill/ICMOBillEdit")]
			@@ -251,6 +252,7 @@
			{
			try
			{
			//LogService.Write(sMainSub.ToString());
			var model = sMainSub["model"].ToString();
			var entry = sMainSub["model"]["HENTRY"].ToString();
			var _model = sMainSub["model"]["HPPBOMMAINENTRY"].ToString();
			@@ -321,7 +323,7 @@
			,HBackRelationQty,HNumerator,HDenominator,HBASEUNITID,HProcessID,HICMOENTRYSEQ,HPROJECTNO
			,HOPERID,HSEQ,HSTOCKSTATUSID,HLOT,HOPTQUEUE,HRESERVETYPE,HSelPickedQty,HSELPRCDRETURNQTY,HProcName)
			values('{oSub.HInterID}','{oSub.HEntryID}','{oSub.HMaterID}','{oSub.HMaterNumber}','{oSub.HUnitID}','{oSub.HUnitNumber}','{oSub.HSPID}','{oSub.HQty}'
			,'{oSub.HQtyMust}','{oSub.HWHID}','{oSub.HRemark}','{oSub.HSourceInterID}','{oSub.HSourceEntryID}','{oSub.HSourceBillNo}','{oSub.HSourceBillType}','{oSub.HICMOInterID}','{oSub.HICMOEntryID}','{oSub.HICMOBillNo}','{oSub.HCHILDSUPPLYORGID}','{oSub.HSUPPLYORGID}','{oSub.HENTRUSTPICKORGID}','{oSub.HSRCTRANSORGID}','{oSub.HGROUPBYOWNERID}','{oSub.HOWNERID}','{oSub.HOWNERTYPEID}','{oSub.HRelationQty}','{oSub.HMoveStockQty}','{oSub.HAuxPropID}','{oSub.HBatchNO}','{oSub.HMTONo}','{oSub.HQtyScrap}','{oSub.HERPInterID}','{oSub.HERPEntryID}','{oSub.HBackRelationQty}','{oSub.HNumerator}','{oSub.HDenominator}','{oSub.HBASEUNITID}','{oSub.HProcessID}','{oSub.HICMOENTRYSEQ}','{oSub.HPROJECTNO}','{oSub.HOPERID}','{oSub.HSEQ}','{oSub.HSTOCKSTATUSID}','{oSub.HLOT}','{oSub.HOPTQUEUE}','{oSub.HRESERVETYPE}','{oSub.HSelPickedQty}','{oSub.HSELPRCDRETURNQTY}','{oSub.HProcName}')");
			,'{oSub.HQtyMust}','{oSub.HWHID}','{oSub.HRemark}','{oSub.HSourceInterID}','{oSub.HSourceEntryID}','{oSub.HSourceBillNo}','{oSub.HSourceBillType}','{oSub.HICMOInterID}','{oSub.HICMOEntryID}','{oSub.HICMOBillNo}','{oSub.HCHILDSUPPLYORGID}','{oSub.HSUPPLYORGID}','{oSub.HENTRUSTPICKORGID}','{oSub.HSRCTRANSORGID}','{oSub.HGROUPBYOWNERID}','{oSub.HOWNERID}','{oSub.HOWNERTYPEID}','{oSub.HRelationQty}','{oSub.HMoveStockQty}','{oSub.HAuxPropID}','{oSub.HBatchNO}','{oSub.HMTONo}','{Convert.ToDecimal(oSub.HQtyScrap)}','{oSub.HERPInterID}','{oSub.HERPEntryID}','{oSub.HBackRelationQty}','{oSub.HNumerator}','{oSub.HDenominator}','{oSub.HBASEUNITID}','{oSub.HProcessID}','{oSub.HICMOENTRYSEQ}','{oSub.HPROJECTNO}','{oSub.HOPERID}','{oSub.HSEQ}','{oSub.HSTOCKSTATUSID}','{oSub.HLOT}','{oSub.HOPTQUEUE}','{oSub.HRESERVETYPE}','{oSub.HSelPickedQty}','{oSub.HSELPRCDRETURNQTY}','{oSub.HProcName}')");
			}
			oCN.Commit();
			objJsonResult.code = "1";
			@@ -333,6 +335,7 @@
			}
			catch (Exception e)
			{
			LogService.Write(e.Message.ToString());
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -340,6 +343,7 @@
			objJsonResult.data = null;
			return objJsonResult;
			}

			}


			@@ -389,6 +393,7 @@
			string msg2 = sArray[0].ToString(); //ä¸»è¡¨æ°æ®
			int OperationType = int.Parse(sArray[1].ToString()); // æ°æ®ç±»å 1æ·»å 3ä¿®æ¹
			string user = sArray[2].ToString();
			int HEntryID = int.Parse(sArray[3].ToString());

			try
			{
			@@ -438,15 +443,15 @@
			else if (OperationType == 3 \|\| ds.Tables[0].Rows.Count != 0)
			{ //ä¿®æ¹
			oCN.RunProc("update Sc_ICMOBillMain set " +
			"HRemark='" + HRemark + "', HChecker='" + HMaker + "', HCheckDate=getdate()" +
			"HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" +
			", HSeOrderBillNo='" + HSeOrderBillNo + "', HSeOrderInterID=" + HSeOrderInterID + ", HSeOrderEntryID=" + HSeOrderEntryID + ", HEmpID=" + HEmpID + ", HCusID=" + HCusID + "" +
			", HCenterID=" + HCenterID + ",HBomID=" + HBomID + " where HInterID=" + HInterID);

			//å é¤åè¡¨
			oCN.RunProc("delete from Sc_ICMOBillSub where HInterID='" + HInterID + "'");
			oCN.RunProc("delete from Sc_ICMOBillSub where HInterID='" + HInterID + "' and HEntryID='" + HEntryID + "'");
			}
			//ä¿ååè¡¨
			objJsonResult = AddBillSub_NoTable(msg3, HInterID, OperationType);
			objJsonResult = AddBillSub_NoTable(msg3, HInterID, OperationType, HEntryID);

			if (objJsonResult.code == "0")
			{
			@@ -473,7 +478,7 @@
			}
			}

			public json AddBillSub_NoTable(string msg3, long HInterID, int OperationType)
			public json AddBillSub_NoTable(string msg3, long HInterID, int OperationType,int HEntryID)
			{
			ClsSc_ICMOBillSub oSub = Newtonsoft.Json.JsonConvert.DeserializeObject<ClsSc_ICMOBillSub>(msg3);
			if (oSub.HQty <= 0 \|\| oSub.HQty == null)
			@@ -512,14 +517,14 @@
			return objJsonResult;
			}

			if (oSub.HBomID == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "BOMä¸è½ä¸ºç©º";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//if (oSub.HBomID == 0)
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "BOMä¸è½ä¸ºç©º";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}

			oCN.RunProc($@"Insert into Sc_ICMOBillSub
			(HInterID,HENTRYID,HQty
			@@ -528,7 +533,7 @@
			,HMaterID,HUnitID,HRemark,HSourceID,HDeptID,HSTATUS
			,HBomID,HEntryCusID
			,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney)
			values({HInterID},1,{(oSub.HQty == null ? 0 : oSub.HQty)}
			values({HInterID},{HEntryID},{(oSub.HQty == null ? 0 : oSub.HQty)}
			,'{(oSub.HPlanBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HPlanBeginDate.ToString())}','{(oSub.HPlanEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HPlanEndDate.ToString())}'
			,'{(oSub.HBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HBeginDate.ToString())}','{(oSub.HEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HEndDate.ToString())}'
			,{oSub.HMaterID},{oSub.HUnitID},'{oSub.HRemark}',{oSub.HSourceID},{oSub.HDeptID},{oSub.HSTATUS}
			@@ -544,6 +549,241 @@
			}
			#endregion

			#region çäº§ä»»å¡åå®¡æ ¸/åå®¡æ ¸åè½
			[Route("Sc_ICMOBill/CheckSc_ICMOReportBill")]
			[HttpGet]
			public object CheckSc_ICMOReportBill(string HInterID,int Type, string user)
			{
			try
			{
			//å¤ææ¯å¦æå é¤æé
			if (!DBUtility.ClsPub.Security_Log("Sc_ICMOBill_Check", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ æéå®¡æ ¸!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (string.IsNullOrWhiteSpace(HInterID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HInterIDä¸ºç©ºï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ClsPub.CurUserName = user;
			oCN.BeginTran();//å¼å§äºå¡

			//Type 1 å®¡æ ¸ 2 åå®¡æ ¸
			if (Type == 1)
			{
			if (!BillOld.CheckBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			if (BillOld.AbandonCheck(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			DataSet DSet = oCn.RunProcReturn("exec h_p_Sc_ICMOBill_AbandonCheckCtrl " + int.Parse(HInterID), "h_p_Sc_ICMOBill_AbandonCheckCtrl");
			//if (DBUtility.ClsPub.isInt(DSet.Tables[0].Rows[0]["Hback"]) != 0)
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 1;
			// objJsonResult.Message = "è¯¥ä»»å¡åå·²ä¸æ¨æµè½¬å¡ï¼ä¸åè®¸åå®¡æ ¸" + DBUtility.ClsPub.isStrNull(DSet.Tables[0].Rows[0]["HBackRemark"]);
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸å¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			oCN.Commit();//æäº¤äºå¡

			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;
			}
			}
			#endregion

			#region çäº§ä»»å¡åå³é/åå³éåè½
			[Route("Sc_ICMOBill/CloseSc_ICMOReportBill")]
			[HttpGet]
			public object CloseSc_ICMOReportBill(string HInterID, int Type, string user)
			{
			try
			{
			//å¤ææ¯å¦æå é¤æé
			if (!DBUtility.ClsPub.Security_Log("Sc_ICMOBill_Close", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ æéå³é!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (string.IsNullOrWhiteSpace(HInterID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HInterIDä¸ºç©ºï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ClsPub.CurUserName = user;

			oCN.BeginTran();//å¼å§äºå¡

			//Type 1 å³é 2 åå³é
			if (Type == 1)
			{
			if (!BillOld.CloseBill(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å³éå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			if (!BillOld.CancelClose(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åå³éå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			oCN.Commit();//æäº¤äºå¡

			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;
			}
			}
			#endregion

			#region çäº§ä»»å¡åä½åº/åä½åºåè½
			[Route("Sc_ICMOBill/CancellSc_ICMOReportBill")]
			[HttpGet]
			public object CancellSc_ICMOReportBill(string HInterID, int Type, string user)
			{
			try
			{
			//å¤ææ¯å¦æå é¤æé
			if (!DBUtility.ClsPub.Security_Log("Sc_ICMOBill_Delete", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ æéä½åº!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (string.IsNullOrWhiteSpace(HInterID))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HInterIDä¸ºç©ºï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ClsPub.CurUserName = user;

			oCN.BeginTran();//å¼å§äºå¡

			//Type 1 ä½åº 2 åä½åº
			if (Type == 1)
			{
			if (!BillOld.Cancelltion(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "ä½åºå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			if (!BillOld.AbandonCancelltion(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "åä½åºå¤±è´¥!åå :" + ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			oCN.Commit();//æäº¤äºå¡

			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;
			}
			}
			#endregion


			#region çäº§ä»»å¡åå é¤åè½
			[Route("Sc_ICMOBill/DeltetSc_ICMOReportBill")]
			[HttpGet]