MES-WEB-API.git

			@@ -37,6 +37,22 @@
			{
			try
			{

			//ä¿ååæ§å¶=========================================
			string HBillNote = "";
			DataSet ds = oCn.RunProcReturn("Exec h_p_Kf_MoveStockBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Kf_MoveStockBill_BeforeSaveCtrl");
			if (ds == null)
			{
			sReturn = "ä¿ååå¤æå¤±è´¥ï¼";
			return false;
			}
			if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
			{
			sReturn = "ä¿åå¤±è´¥ï¼" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
			return false;
			}
			//=========================================================

			//
			oCn.BeginTran();
			//æ´æ°ä¸»è¡¨
			@@ -72,23 +88,23 @@
			//å é¤åè¡¨
			DeleteBillSub(lngBillKey);
			//æå¥åè¡¨
			omodel.HInterID = lngBillKey;
			// omodel.HInterID = lngBillKey;
			foreach (Model.ClsKf_MoveStockBillSub oSub in DetailColl)
			{
			oCn.RunProc("Insert into Kf_ICStockBillSub " +
			" (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
			" (HInterID,HEntryID,HCloseMan,HCloseType,HRemark" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
			",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
			",HQty,HPrice,HMoney,HWHID,HSCWHID" +
			",HSPID,HSCSPID,HBatchNo" +
			",HSPID,HSCSPID,HBatchNo,HOutPrice,HOutMoney" +
			",HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo" +
			",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
			") values("
			+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
			+ omodel.HInterID.ToString() + "," + oSub.HEntryID.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.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() +
			"," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() +
			"," + oSub.HSPID.ToString() + "," + oSub.HSCSPID.ToString() + ",'" + oSub.HBatchNo + "'" +
			"," + oSub.HSPID.ToString() + "," + oSub.HSCSPID.ToString() + ",'" + oSub.HBatchNo + "','" + oSub.HOutPrice + "','" + oSub.HOutMoney + "'" +
			"," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'" +
			"," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
			") ");
			@@ -105,6 +121,24 @@
			// return false;
			// }
			//}

			//=========================ä¿ååæ§å¶
			DataSet ds2 = oCn.RunProcReturn("Exec h_p_Kf_MoveStockBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Kf_MoveStockBill_AfterSaveCtrl");
			if (ds2 == null)
			{
			sReturn = "ä¿ååæ§å¶å¤æå¤±è´¥ï¼";
			oCn.RollBack();
			return false;
			}
			if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
			{
			sReturn = "ä¿åå¤±è´¥2ï¼" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
			oCn.RollBack();
			return false;
			}
			//============================


			sReturn = "ä¿®æ¹åæ®æåï¼";
			oCn.Commit();
			return true;
			@@ -133,6 +167,22 @@
			{
			omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
			}

			//ä¿ååæ§å¶=========================================
			string HBillNote = "";
			DataSet ds = oCn.RunProcReturn("Exec h_p_Kf_MoveStockBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Kf_MoveStockBill_BeforeSaveCtrl");
			if (ds == null)
			{
			sReturn = "ä¿ååå¤æå¤±è´¥ï¼";
			return false;
			}
			if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
			{
			sReturn = "ä¿åå¤±è´¥ï¼" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
			return false;
			}
			//=========================================================

			//
			oCn.BeginTran();
			//ä¸»è¡¨
			@@ -155,19 +205,19 @@
			foreach (Model.ClsKf_MoveStockBillSub oSub in DetailColl)
			{
			oCn.RunProc("Insert into Kf_ICStockBillSub " +
			" (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
			" (HInterID,HEntryID,HCloseMan,HCloseType,HRemark" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
			",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
			",HQty,HPrice,HMoney,HWHID,HSCWHID" +
			",HSPID,HSCSPID,HBatchNo" +
			",HSPID,HSCSPID,HBatchNo,HOutPrice,HOutMoney" +
			",HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo" +
			",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
			") values("
			+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
			+ omodel.HInterID.ToString() + "," + oSub.HEntryID.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.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() +
			"," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() +
			"," + oSub.HSPID.ToString() + "," + oSub.HSCSPID.ToString() + ",'" + oSub.HBatchNo + "'" +
			"," + oSub.HSPID.ToString() + "," + oSub.HSCSPID.ToString() + ",'" + oSub.HBatchNo + "','" + oSub.HOutPrice + "','" + oSub.HOutMoney + "'" +
			"," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'" +
			"," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
			") ");
			@@ -185,6 +235,24 @@
			// }
			//}
			//

			//=========================ä¿ååæ§å¶
			DataSet ds2 = oCn.RunProcReturn("Exec h_p_Kf_MoveStockBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Kf_MoveStockBill_AfterSaveCtrl");
			if (ds2 == null)
			{
			sReturn = "ä¿ååæ§å¶å¤æå¤±è´¥ï¼";
			oCn.RollBack();
			return false;
			}
			if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
			{
			sReturn = "ä¿åå¤±è´¥2ï¼" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
			oCn.RollBack();
			return false;
			}
			//============================


			sReturn = "æ°å¢åæ®æåï¼";
			oCn.Commit();
			return true;