~yxj/MES-WEB-API.git

			@@ -290,7 +290,37 @@
			}
			#endregion

			#region çç¹åæåè¡¨ å é¤ ä¸éè¦çæ°æ®
			[Route("Gy_StockCheckItemBill/StockItemSubDel")]
			[HttpGet]
			public object StockItemSubDel(string sID)
			{
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			//oCn.BeginTran();

			//oCN.RunProc("exec h_p_StockItemSubDel " + sID);

			//oCn.Commit();

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "å é¤æåï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception ex)
			{
			oCn.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ¥è¯¢æ°æ®å¼å¸¸ï¼è¯·ä¸ç®¡çåèç³»ï¼" + ex.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region çç¹åæåè¡¨
			[Route("Gy_StockCheckItemBill/Get_InventoryAnalysisList")]
			@@ -477,19 +507,19 @@

			string sql = "Insert Into Sc_MouldStockBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
			",HMaker,HMakeDate" +
			",HMaker,HMakeDate,HRemark" +
			",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
			",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
			") " +
			" values('3814','3814'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
			", '" + user + "','" + HDate+
			"', " + dr["HSupID"].ToString() + ", 1," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
			", '" + user + "','" + HDate + "','" + sName + "'" +
			", " + 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,'',''," +
			HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'" + sName.ToString() + "',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,'')");
			@@ -499,9 +529,11 @@
			oCn.RunProc(sql);
			oCn.RunProc(sql1);
			oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
			//ä¿®æ¹å¨å·æ¡£æ¡ä½ç½®
			string sql2 = string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{HInterID.ToString()}' ");
			oCn.RunProc(sql2);
			oCn.Commit();
			}

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸æåï¼";
			@@ -563,20 +595,20 @@
			HBillNo = DBUtility.ClsPub.CreateBillCode("3827", ref DBUtility.ClsPub.sExeReturnInfo, true);
			string sql = "Insert Into Sc_MouldStockBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
			",HMaker,HMakeDate" +
			",HMaker,HMakeDate,HRemark" +
			",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
			",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
			") " +
			" values('3827','3827'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
			", '" + user + "','" +HDate+
			"', " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + ",isnull('" + dr["HNowSupID"].ToString() + "',0),0,0,0,0" +
			", '" + user + "','" +HDate + "','" + sName + "'" +
			", " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + ",isnull('" + dr["HNowSupID"].ToString() + "',0),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,'',''," +
			HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'" + sName.ToString() + "',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,'')");
			@@ -586,9 +618,12 @@
			oCn.RunProc(sql);
			oCn.RunProc(sql1);
			oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
			//ä¿®æ¹å¨å·æ¡£æ¡ä½ç½®
			string sql2 = string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{HInterID.ToString()}' ");
			oCn.RunProc(sql2);
			oCn.Commit();
			}


			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "å®¡æ ¸æåï¼";
			@@ -692,12 +727,14 @@
			+ ",0,0,0," + userID + ",0,100005,'')");
			}


			//ä¸»è¡¨
			oCn.BeginTran();
			oCn.RunProc(sql);
			oCn.RunProc(sql1);
			oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
			//ä¿®æ¹å¨å·æ¡£æ¡ä½ç½®
			string sql2 = string.Format($"exec h_p_Sc_MouldChangeFileStatus 'out','{HInterID.ToString()}' ");
			oCn.RunProc(sql2);
			oCn.Commit();
			}
			objJsonResult.code = "0";
			@@ -761,19 +798,19 @@

			string sql = "Insert Into Sc_MouldStockBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
			",HMaker,HMakeDate" +
			",HMaker,HMakeDate,HRemark" +
			",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
			",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
			") " +
			" values('3802','3802'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
			", '" + user + "','" +HDate+
			"', " + dr1["HCorrespondentID"].ToString() + "," + dr1["HCorrespondentTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
			", '" + user + "','" +HDate + "','" + sName + "'" +
			", " + 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,'',''," +
			HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'" + sName.ToString() + "',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() + ",'1548785'," + dr["HNowSupID"].ToString() + ",0,0"
			+ ",0,0,0," + userID + ",0,100005,'')");
			@@ -783,6 +820,9 @@
			oCn.RunProc(sql);
			oCn.RunProc(sql1);
			oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
			//ä¿®æ¹å¨å·æ¡£æ¡ä½ç½®
			string sql2 = string.Format($"exec h_p_Sc_MouldChangeFileStatus 'out','{HInterID.ToString()}' ");
			oCn.RunProc(sql2);
			oCn.Commit();
			}

			@@ -846,19 +886,19 @@

			string sql = "Insert Into Sc_MouldStockBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
			",HMaker,HMakeDate" +
			",HMaker,HMakeDate,HRemark" +
			",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
			",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
			") " +
			" values('3803','3803'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
			", '" + user + "','" +HDate+
			"', " + dr["HNowSupID"].ToString() + "," + dr["HNowSupTypeID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
			", '" + user + "','" +HDate + "','" + sName + "'" +
			", " + dr["HNowSupID"].ToString() + "," + dr["HNowSupTypeID"].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,'',''," +
			HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'" + sName.ToString() + "',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,'')");
			@@ -868,6 +908,9 @@
			oCn.RunProc(sql);
			oCn.RunProc(sql1);
			oCn.RunProc("update Sc_MouldStockBillMain_Temp set HCheckStatus=1 where HitemID=" + HItemID);
			//ä¿®æ¹å¨å·æ¡£æ¡ä½ç½®
			string sql2 = string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{HInterID.ToString()}' ");
			oCn.RunProc(sql2);
			oCn.Commit();
			}