MES-WEB-API.git

			@@ -264,39 +264,11 @@
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (sID == null \|\| sID == "")
			{
			sql = string.Format(@"select k.HBarCode æ¡ç ,m.HBillNo å¨å·ç¼å·,s.HName çç¹æ¹æ¡,
			case when k.HCorrespondentTypeID=1 then 'ä¾åºå' when k.HCorrespondentTypeID=2 then 'å®¢æ·' when k.HCorrespondentTypeID=4 then 'ä»åº' end å®éä½ç½®ç±»å,
			case when k.HCorrespondentTypeID=1 then p.HName when k.HCorrespondentTypeID=2 then c.HName when k.HCorrespondentTypeID=4 then w.HName end å®éä½ç½®,
			case when m.HNowSupTypeID=1 then 'ä¾åºå' when m.HNowSupTypeID=2 then 'å®¢æ·' when m.HNowSupTypeID=4 then 'ä»åº' end è´¦é¢ä½ç½®ç±»å,
			case when m.HNowSupTypeID=1 then p1.HName when m.HNowSupTypeID=2 then c1.HName when m.HNowSupTypeID=4 then w1.HName end è´¦é¢ä½ç½®
			from Sc_MouldStockBillMain_Temp k
			left join Gy_MouldFileMain m on k.HBarCode=m.HBarCode
			left join Gy_StockCheckItem s on k.HSourceInterID=s.HItemID
			left join Gy_Supplier p on k.HCorrespondentID=p.HItemID
			left join Gy_Supplier p1 on m.HNowSupID=p1.HItemID
			left join Gy_Customer c on k.HCorrespondentID=c.HItemID
			left join Gy_Customer c1 on m.HNowSupID=c1.HItemID
			left join Gy_Warehouse w on k.HCorrespondentID=w.HItemID
			left join Gy_Warehouse w1 on m.HNowSupID=w1.HItemID
			where " + sWhere);
			sql = string.Format(@"select * from h_v_Sc_MouldInventoryAnalysisList where " + sWhere);
			}
			else
			{
			sql = string.Format(@"select k.HBarCode æ¡ç ,m.HBillNo å¨å·ç¼å·,s.HName çç¹æ¹æ¡,
			case when k.HCorrespondentTypeID=1 then 'ä¾åºå' when k.HCorrespondentTypeID=2 then 'å®¢æ·' when k.HCorrespondentTypeID=4 then 'ä»åº' end å®éä½ç½®ç±»å,
			case when k.HCorrespondentTypeID=1 then p.HName when k.HCorrespondentTypeID=2 then c.HName when k.HCorrespondentTypeID=4 then w.HName end å®éä½ç½®,
			case when m.HNowSupTypeID=1 then 'ä¾åºå' when m.HNowSupTypeID=2 then 'å®¢æ·' when m.HNowSupTypeID=4 then 'ä»åº' end è´¦é¢ä½ç½®ç±»å,
			case when m.HNowSupTypeID=1 then p1.HName when m.HNowSupTypeID=2 then c1.HName when m.HNowSupTypeID=4 then w1.HName end è´¦é¢ä½ç½®
			from Sc_MouldStockBillMain_Temp k
			left join Gy_MouldFileMain m on k.HBarCode=m.HBarCode
			left join Gy_StockCheckItem s on k.HSourceInterID=s.HItemID
			left join Gy_Supplier p on k.HCorrespondentID=p.HItemID
			left join Gy_Supplier p1 on m.HNowSupID=p1.HItemID
			left join Gy_Customer c on k.HCorrespondentID=c.HItemID
			left join Gy_Customer c1 on m.HNowSupID=c1.HItemID
			left join Gy_Warehouse w on k.HCorrespondentID=w.HItemID
			left join Gy_Warehouse w1 on m.HNowSupID=w1.HItemID
			where " + sWhere + " and k.HSourceInterID=(select HItemID from Gy_StockCheckItem where HItemID=" + sID + ") and k.HMakeDate<=(select HEndDate from Gy_StockCheckItem where HItemID=" + sID + ")");
			sql = string.Format(@"select * from h_v_Sc_MouldInventoryAnalysisList where " + sWhere + " and HSourceInterID=(select HItemID from Gy_StockCheckItem where HItemID=" + sID + ") and HMakeDate<=(select HEndDate from Gy_StockCheckItem where HItemID=" + sID + ")");
			}
			ds = oCN.RunProcReturn(sql, "Sc_MouldStockBillMain_Temp");
			list.Add(ds.Tables[0]);
			@@ -317,42 +289,137 @@
			}
			#endregion

			#region çç¹è®°å½åè¡¨
			[Route("Gy_StockCheckItemBill/Get_MouldStockBillMainTemp")]
			[HttpGet]
			public object Get_MouldStockBillMainTemp(string sWhere)
			{
			try
			{
			ds = MouldStockBillMainTemp(sWhere);
			if (ds == null)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¥è¯¢æ°æ®å¼å¸¸ï¼è¯·ä¸ç®¡çåèç³»ï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "è¿åè®°å½æåï¼";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception ex)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¥è¯¢æ°æ®å¼å¸¸ï¼è¯·ä¸ç®¡çåèç³»ï¼" + ex.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			public static DataSet MouldStockBillMainTemp(string sWhere)
			{
			string sql1 = string.Format(@"select * from h_v_Gy_MouldStockBillMainTempList where 1=1 ");
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + " order by å¶åæ¥æ desc", "h_v_Gy_MouldStockBillMainTempList");
			}
			else
			{
			string sql = sql1 + sWhere + "order by å¶åæ¥æ desc";
			return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Gy_MouldStockBillMainTempList");
			}
			}
			#endregion

			#region [çç¹è®°å½å é¤åè½]
			[Route("Gy_StockCheckItemBill/set_DeleteBill_Temp")]
			[HttpGet]
			public object set_DeleteBill_Temp(string HItemID)
			{
			Int64 lngBillKey = 0;
			lngBillKey = DBUtility.ClsPub.isLong(HItemID);
			if (lngBillKey == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åæ®IDä¸ºç©ºï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			ds = oCn.RunProcReturn("select * from Sc_MouldStockBillMain_Temp where HItemID=" + lngBillKey, "Sc_MouldStockBillMain_Temp");
			if (ds != null)
			{
			oCn.RunProc("Delete from Sc_MouldStockBillMain_Temp where HItemID=" + lngBillKey);
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "å é¤æåï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¤åæ®ä¸åå¨ï¼è¯·æ¥çæ¯å¦éå¤å é¤";
			objJsonResult.data = null;
			return objJsonResult;
			}

			}

			#endregion

			#region çç¹åæå®¡æ ¸
			#region è°æ¨âç´æ¥è°æ¨
			[Route("Gy_StockCheckItemBill/MakeProdMove")]
			[Route("Gy_StockCheckItemBill/MakeProdMove")]
			[HttpGet]
			public object MakeProdMove(string HBarCode, string user, string userID)
			public object MakeProdMove(string HBarCode, string user, string userID,string HItemID)
			{
			try
			{
			string HBillNo = "";
			Int64 HInterID = 0;//æ¾ç¤ºçåæ®µ
			DataSet ds1 = new DataSet();
			ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
			ds1 = oCn.RunProcReturn("select top 1 * from Sc_MouldStockBillMain_Temp where HBarCode='" + HBarCode + "' and HItemID='"+ HItemID+"'", "Sc_MouldStockBillMain_Temp");
			DataRow dr = ds.Tables[0].Rows[0];
			DataRow dr1 = ds1.Tables[0].Rows[0];
			HInterID = DBUtility.ClsPub.CreateBillID("3814", ref DBUtility.ClsPub.sExeReturnInfo);
			HBillNo = DBUtility.ClsPub.CreateBillCode("3814", ref DBUtility.ClsPub.sExeReturnInfo, true);

			string sql = "Insert Into Sc_MouldStockBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
			",HMaker,HMakeDate" + /"HYear, HPeriod,"/
			",HMaker,HMakeDate" +
			",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
			",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
			") " +
			" values('3814','3814'," + HInterID + ",'" + HBillNo + "',getdate()" +
			" values('3814','3814'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
			", '" + user + "',getdate()" +
			", " + dr["HSupID"].ToString() + ", 1," + dr["HWhID"].ToString() + ",0,0,0,0" +
			", " + dr["HSupID"].ToString() + ", 1," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
			", 0," + dr["HDeptID"].ToString() + ",' ',0" +

			") ";
			string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
			HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
			HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
			HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
			"0,0," + dr["HInterID"].ToString() + ",0,0,0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr["HProdQty"].ToString() + ",0," +
			"0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr["HWHID"].ToString() + ",0," + dr["HSPID"].ToString() + ",0,0"
			+ ",0,0," + userID + ",0,0,'')");
			"0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
			"0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
			+ ",0,0,0," + userID + ",0,100005,'')");
			//ä¸»è¡¨

			oCn.BeginTran();
			oCn.RunProc(sql);
			oCn.RunProc(sql1);
			oCn.RunProc("update KF_PonderationBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
			oCn.Commit();

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -363,9 +430,10 @@
			}
			catch (Exception e)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åå§åå¤±è´¥ï¼";
			objJsonResult.Message = e.Message;
			objJsonResult.data = null;
			}
			return objJsonResult;
			@@ -376,38 +444,43 @@
			#region ççâå¶ä»å¥åºå
			[Route("Gy_StockCheckItemBill/MakeOtherIn")]
			[HttpGet]
			public object MakeOtherIn(string HBarCode, string user, string userID)
			public object MakeOtherIn(string HBarCode, string user, string userID, string HItemID)
			{
			try
			{
			string HBillNo = "";
			Int64 HInterID = 0;//æ¾ç¤ºçåæ®µ
			DataSet ds1 = new DataSet();
			ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
			ds1 = oCn.RunProcReturn("select top 1 * from Sc_MouldStockBillMain_Temp where HBarCode='" + HBarCode + "' and HItemID='" + HItemID + "'", "Sc_MouldStockBillMain_Temp");
			DataRow dr = ds.Tables[0].Rows[0];
			DataRow dr1 = ds1.Tables[0].Rows[0];
			HInterID = DBUtility.ClsPub.CreateBillID("3827", ref DBUtility.ClsPub.sExeReturnInfo);
			HBillNo = DBUtility.ClsPub.CreateBillCode("3827", ref DBUtility.ClsPub.sExeReturnInfo, true);
			string sql = "Insert Into Sc_MouldStockBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
			",HMaker,HMakeDate" + /"HYear, HPeriod,"/
			",HMaker,HMakeDate" +
			",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
			",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
			") " +
			" values('3827','3827'," + HInterID + ",'" + HBillNo + "',getdate()" +
			" values('3827','3827'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
			", '" + user + "',getdate()" +
			", " + dr["HSupID"].ToString() + ", 1," + dr["HWhID"].ToString() + ",0,0,0,0" +
			", " + dr1["HCorrespondentID"].ToString() + ","+ dr1["HCorrespondentTypeID"].ToString() + ","+ dr["HNowSupID"].ToString() + ",0,0,0,0" +
			", 0," + dr["HDeptID"].ToString() + ",' ',0" +

			") ";
			string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
			HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
			HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
			HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
			"0,0," + dr["HInterID"].ToString() + ",0,0,0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr["HProdQty"].ToString() + ",0," +
			"0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr["HWHID"].ToString() + ",0," + dr["HSPID"].ToString() + ",0,0"
			+ ",0,0," + userID + ",0,0,'')");
			"0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
			"0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
			+ ",0,0,0," + userID + ",0,100005,'')");
			//ä¸»è¡¨
			oCn.BeginTran();
			oCn.RunProc(sql);
			oCn.RunProc(sql1);
			oCn.RunProc("update KF_PonderationBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
			oCn.Commit();

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -418,9 +491,10 @@
			}
			catch (Exception e)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åå§åå¤±è´¥ï¼";
			objJsonResult.Message = e.Message;
			objJsonResult.data = null;
			}
			return objJsonResult;
			@@ -431,38 +505,45 @@
			#region çäºâå¤çåºåºå
			[Route("Gy_StockCheckItemBill/MakeScrapOut")]
			[HttpGet]
			public object MakeScrapOut(string HBarCode, string user, string userID)
			public object MakeScrapOut(string HBarCode, string user, string userID, string HItemID)
			{
			try
			{
			string HBillNo = "";
			Int64 HInterID = 0;//æ¾ç¤ºçåæ®µ
			DataSet ds1 = new DataSet();
			ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
			ds1 = oCn.RunProcReturn("select top 1 * from Sc_MouldStockBillMain_Temp where HBarCode='" + HBarCode + "' and HItemID='" + HItemID + "'", "Sc_MouldStockBillMain_Temp");
			DataRow dr = ds.Tables[0].Rows[0];
			DataRow dr1 = ds1.Tables[0].Rows[0];
			HInterID = DBUtility.ClsPub.CreateBillID("3832", ref DBUtility.ClsPub.sExeReturnInfo);
			HBillNo = DBUtility.ClsPub.CreateBillCode("3832", ref DBUtility.ClsPub.sExeReturnInfo, true);

			string sql = "Insert Into Sc_MouldStockBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
			",HMaker,HMakeDate" + /"HYear, HPeriod,"/
			",HMaker,HMakeDate" +
			",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
			",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
			") " +
			" values('3832','3832'," + HInterID + ",'" + HBillNo + "',getdate()" +
			" values('3827','3827'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
			", '" + user + "',getdate()" +
			", " + dr["HSupID"].ToString() + ", 1," + dr["HWhID"].ToString() + ",0,0,0,0" +
			", " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
			", 0," + dr["HDeptID"].ToString() + ",' ',0" +

			") ";
			string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
			HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
			HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
			HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
			"0,0," + dr["HInterID"].ToString() + ",0,0,0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr["HProdQty"].ToString() + ",0," +
			"0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr["HWHID"].ToString() + ",0," + dr["HSPID"].ToString() + ",0,0"
			+ ",0,0," + userID + ",0,0,'')");
			"0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
			"0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
			+ ",0,0,0," + userID + ",0,100005,'')");

			//ä¸»è¡¨
			oCn.BeginTran();
			oCn.RunProc(sql);
			oCn.RunProc(sql1);
			oCn.RunProc("update KF_PonderationBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
			oCn.Commit();

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -473,9 +554,10 @@
			}
			catch (Exception e)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åå§åå¤±è´¥ï¼";
			objJsonResult.Message = e.Message;
			objJsonResult.data = null;
			}
			return objJsonResult;
			@@ -486,38 +568,44 @@
			#region åºåºâé¢ç¨åºåºå
			[Route("Gy_StockCheckItemBill/MakeProdOut")]
			[HttpGet]
			public object MakeProdOut(string HBarCode, string user, string userID)
			public object MakeProdOut(string HBarCode, string user, string userID, string HItemID)
			{
			try
			{
			string HBillNo = "";
			Int64 HInterID = 0;//æ¾ç¤ºçåæ®µ
			DataSet ds1 = new DataSet();
			ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
			ds1 = oCn.RunProcReturn("select top 1 * from Sc_MouldStockBillMain_Temp where HBarCode='" + HBarCode + "' and HItemID='" + HItemID + "'", "Sc_MouldStockBillMain_Temp");
			DataRow dr = ds.Tables[0].Rows[0];
			DataRow dr1 = ds1.Tables[0].Rows[0];
			HInterID = DBUtility.ClsPub.CreateBillID("3802", ref DBUtility.ClsPub.sExeReturnInfo);
			HBillNo = DBUtility.ClsPub.CreateBillCode("3802", ref DBUtility.ClsPub.sExeReturnInfo, true);

			string sql = "Insert Into Sc_MouldStockBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
			",HMaker,HMakeDate" + /"HYear, HPeriod,"/
			",HMaker,HMakeDate" +
			",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
			",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
			") " +
			" values('3802','3802'," + HInterID + ",'" + HBillNo + "',getdate()" +
			" values('3827','3827'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
			", '" + user + "',getdate()" +
			", " + dr["HSupID"].ToString() + ", 1," + dr["HWhID"].ToString() + ",0,0,0,0" +
			", " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
			", 0," + dr["HDeptID"].ToString() + ",' ',0" +

			") ";
			string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
			HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
			HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
			HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
			"0,0," + dr["HInterID"].ToString() + ",0,0,0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr["HProdQty"].ToString() + ",0," +
			"0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr["HWHID"].ToString() + ",0," + dr["HSPID"].ToString() + ",0,0"
			+ ",0,0," + userID + ",0,0,'')");
			"0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
			"0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
			+ ",0,0,0," + userID + ",0,100005,'')");
			//ä¸»è¡¨
			oCn.BeginTran();
			oCn.RunProc(sql);
			oCn.RunProc(sql1);
			oCn.RunProc("update KF_PonderationBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
			oCn.Commit();

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -528,9 +616,10 @@
			}
			catch (Exception e)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åå§åå¤±è´¥ï¼";
			objJsonResult.Message = e.Message;
			objJsonResult.data = null;
			}
			return objJsonResult;
			@@ -541,38 +630,45 @@
			#region éåºâé¢ç¨éåºå
			[Route("Gy_StockCheckItemBill/MakeProdBack")]
			[HttpGet]
			public object MakeProdBack(string HBarCode, string user, string userID)
			public object MakeProdBack(string HBarCode, string user, string userID, string HItemID)
			{
			try
			{
			string HBillNo = "";
			Int64 HInterID = 0;//æ¾ç¤ºçåæ®µ
			DataSet ds1 = new DataSet();
			ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
			ds1 = oCn.RunProcReturn("select top 1 * from Sc_MouldStockBillMain_Temp where HBarCode='" + HBarCode + "' and HItemID='" + HItemID + "'", "Sc_MouldStockBillMain_Temp");
			DataRow dr = ds.Tables[0].Rows[0];
			DataRow dr1 = ds1.Tables[0].Rows[0];
			HInterID = DBUtility.ClsPub.CreateBillID("3803", ref DBUtility.ClsPub.sExeReturnInfo);
			HBillNo = DBUtility.ClsPub.CreateBillCode("3803", ref DBUtility.ClsPub.sExeReturnInfo, true);

			string sql = "Insert Into Sc_MouldStockBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
			",HMaker,HMakeDate" + /"HYear, HPeriod,"/
			",HMaker,HMakeDate" +
			",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
			",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
			") " +
			" values('3803','3803'," + HInterID + ",'" + HBillNo + "',getdate()" +
			" values('3827','3827'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
			", '" + user + "',getdate()" +
			", " + dr["HSupID"].ToString() + ", 1," + dr["HWhID"].ToString() + ",0,0,0,0" +
			", " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
			", 0," + dr["HDeptID"].ToString() + ",' ',0" +

			") ";
			string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
			HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
			HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
			HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
			"0,0," + dr["HInterID"].ToString() + ",0,0,0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr["HProdQty"].ToString() + ",0," +
			"0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr["HWHID"].ToString() + ",0," + dr["HSPID"].ToString() + ",0,0"
			+ ",0,0," + userID + ",0,0,'')");
			"0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
			"0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
			+ ",0,0,0," + userID + ",0,100005,'')");

			//ä¸»è¡¨
			oCn.BeginTran();
			oCn.RunProc(sql);
			oCn.RunProc(sql1);
			oCn.RunProc("update KF_PonderationBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
			oCn.Commit();

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			@@ -583,9 +679,10 @@
			}
			catch (Exception e)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åå§åå¤±è´¥ï¼";
			objJsonResult.Message = e.Message;
			objJsonResult.data = null;
			}
			return objJsonResult;
			@@ -596,83 +693,20 @@
			#region åé¢ç¨éåºåé¢ç¨åºåº
			[Route("Gy_StockCheckItemBill/MakeProdOutBack")]
			[HttpGet]
			public object MakeProdOutBack(string HBarCode, string user, string userID)
			public object MakeProdOutBack(string HBarCode, string user, string userID, string HItemID)
			{
			try
			{
			string HBillNo = "";
			Int64 HInterID = 0;//æ¾ç¤ºçåæ®µ
			ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
			DataRow dr = ds.Tables[0].Rows[0];
			//åºåº
			HInterID = DBUtility.ClsPub.CreateBillID("3802", ref DBUtility.ClsPub.sExeReturnInfo);
			HBillNo = DBUtility.ClsPub.CreateBillCode("3802", ref DBUtility.ClsPub.sExeReturnInfo, true);
			string sql = "Insert Into Sc_MouldStockBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
			",HMaker,HMakeDate" + /"HYear, HPeriod,"/
			",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
			",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
			") " +
			" values('3802','3802'," + HInterID + ",'" + HBillNo + "',getdate()" +
			", '" + user + "',getdate()" +
			", " + dr["HSupID"].ToString() + ", 1," + dr["HWhID"].ToString() + ",0,0,0,0" +
			", 0," + dr["HDeptID"].ToString() + ",' ',0" +

			") ";
			string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
			HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
			HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
			HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
			"0,0," + dr["HInterID"].ToString() + ",0,0,0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr["HProdQty"].ToString() + ",0," +
			"0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr["HWHID"].ToString() + ",0," + dr["HSPID"].ToString() + ",0,0"
			+ ",0,0," + userID + ",0,0,'')");

			//éåº
			HInterID = DBUtility.ClsPub.CreateBillID("3803", ref DBUtility.ClsPub.sExeReturnInfo);
			HBillNo = DBUtility.ClsPub.CreateBillCode("3803", ref DBUtility.ClsPub.sExeReturnInfo, true);
			string sql2 = "Insert Into Sc_MouldStockBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
			",HMaker,HMakeDate" + /"HYear, HPeriod,"/
			",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
			",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
			") " +
			" values('3803','3803'," + HInterID + ",'" + HBillNo + "',getdate()" +
			", '" + user + "',getdate()" +
			", " + dr["HSupID"].ToString() + ", 1," + dr["HWhID"].ToString() + ",0,0,0,0" +
			", 0," + dr["HDeptID"].ToString() + ",' ',0" +

			") ";
			string sql3 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
			HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
			HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
			HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
			"0,0," + dr["HInterID"].ToString() + ",0,0,0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr["HProdQty"].ToString() + ",0," +
			"0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr["HWHID"].ToString() + ",0," + dr["HSPID"].ToString() + ",0,0"
			+ ",0,0," + userID + ",0,0,'')");
			//ä¸»è¡¨
			oCn.RunProc(sql);
			oCn.RunProc(sql1);
			oCn.RunProc(sql2);
			oCn.RunProc(sql3);

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸æåï¼";
			//WebAPIController.Add_Log("éè´§åä¸æ¨", UserName, "çæéè´§å");
			objJsonResult.data = 1;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "åå§åå¤±è´¥ï¼";
			objJsonResult.data = null;
			}
			MakeProdBack(HBarCode, user, userID, HItemID);
			MakeProdOut(HBarCode, user, userID, HItemID);
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸æåï¼";
			//WebAPIController.Add_Log("éè´§åä¸æ¨", UserName, "çæéè´§å");
			objJsonResult.data = 1;
			return objJsonResult;

			}
			#endregion


			#endregion
			}
			}