MES-WEB-API.git

			@@ -38,6 +38,23 @@
			{

			oCn.BeginTran();


			//ä¿ååæ§å¶=========================================
			string HBillNote = "";
			DataSet ds = oCn.RunProcReturn("Exec h_p_QC_WorkSelfCheckBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',2", "h_p_QC_WorkSelfCheckBill_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.RunProc("UpDate QC_WorkSelfCheckBillMain set " +
			" HBillNo='" + omodel.HBillNo + "'" + //åºå®èµå¼===============
			@@ -57,6 +74,7 @@
			",HProcExchEntryID=" + omodel.HProcExchEntryID.ToString() +
			",HProcExchBillNo='" + omodel.HProcExchBillNo + "'" +
			",HProcExchQty=" + omodel.HProcExchQty.ToString() +
			",HProcID=" + omodel.HProcID.ToString() +
			",HMaterID=" + omodel.HMaterID.ToString() +
			",HFirstCheckEmp=" + omodel.HFirstCheckEmp.ToString() +
			",HLastResult=" + DBUtility.ClsPub.BoolToString(omodel.HLastResult) +
			@@ -89,9 +107,24 @@
			",'" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "'" + "," + oSub.HSampleSchemeID + "," + oSub.HSampleQty +
			"," + oSub.HSampleDamageQty + "," + oSub.HAcceptQty + "," + oSub.HRejectQty + "," + oSub.HSampleUnRightQty + ",'" + oSub.HStatus +
			"'," + oSub.HUnitID + ",'" + oSub.HInspectValB + "','" + oSub.HInspectVal + "','" + oSub.HTargetValB + "','" + oSub.HTargetVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit +
			"','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "'," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" + ") ");
			"','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "','" + oSub.HKeyInspect + "','" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" + ") ");
			}

			//=========================ä¿ååæ§å¶
			DataSet ds2 = oCn.RunProcReturn("h_p_QC_WorkSelfCheckBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',2 ", "h_p_QC_WorkSelfCheckBill_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();
			@@ -109,12 +142,24 @@
			{
			try
			{
			//å¾å°mainid
			//omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
			//è¥MAINDIéå¤åéæ°è·å


			DataSet ds;
			oCn.BeginTran();

			//ä¿ååæ§å¶=========================================
			string HBillNote = "";
			ds = oCn.RunProcReturn("Exec h_p_QC_WorkSelfCheckBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_QC_WorkSelfCheckBill_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.RunProc("Insert Into QC_WorkSelfCheckBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
			@@ -122,12 +167,13 @@
			",HSourceID,HICMOInterID,HICMOBillNo,HICMOQty,HProcExchInterID,HProcExchEntryID" +
			",HProcExchBillNo,HProcExchQty,HMaterID,HFirstCheckEmp,HLastResult" +
			",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HICMOEntryID,HQCSchemeID,HShiftsID,HErrTreatment" +
			",HProcID" +
			") " +
			" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",'" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
			"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
			"," + omodel.HSourceID.ToString() + "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HICMOQty.ToString() + "," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() +
			",'" + omodel.HProcExchBillNo + "'," + omodel.HProcExchQty.ToString() + "," + omodel.HMaterID.ToString() + "," + omodel.HFirstCheckEmp.ToString() + ", " + DBUtility.ClsPub.BoolToString(omodel.HLastResult) +
			"," + omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'," + omodel.HICMOEntryID + "," + omodel.HQCSchemeID + "," + omodel.HShiftsID + ",'" + omodel.HErrTreatment + "'" +
			"," + omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'," + omodel.HICMOEntryID + "," + omodel.HQCSchemeID + "," + omodel.HShiftsID + ",'" + omodel.HErrTreatment + "','" + omodel.HProcID + "'" +
			") ");
			//æå¥åè¡¨
			foreach (Model.ClsQC_WorkSelfCheckBillSub oSub in DetailColl)
			@@ -148,10 +194,28 @@
			",'" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "'" + "," + oSub.HSampleSchemeID + "," + oSub.HSampleQty +
			"," + oSub.HSampleDamageQty + "," + oSub.HAcceptQty + "," + oSub.HRejectQty + "," + oSub.HSampleUnRightQty + ",'" + oSub.HStatus +
			"'," + oSub.HUnitID + ",'" + oSub.HInspectValB + "','" + oSub.HInspectVal + "','" + oSub.HTargetValB + "','" + oSub.HTargetVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit +
			"','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "'," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" + ") ");
			"','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "','" + oSub.HKeyInspect + "','" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" + ") ");
			}

			sReturn = "æ°å¢åæ®æåï¼";


			//=========================ä¿ååæ§å¶
			DataSet ds2 = oCn.RunProcReturn("h_p_QC_WorkSelfCheckBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_QC_WorkSelfCheckBill_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;
			}
			//============================

			oCn.Commit();
			return true;
			}