MES-WEB-API.git

			@@ -18,8 +18,8 @@
			base.MvarItemKeySub4 = "";
			base.MvarItemKey = "WW_EntrustWorkOrderBillMain";
			base.MvarReportTitle = "å§å¤å å·¥å";
			base.BillType = "1602";
			base.HBillSubType = "1602";
			base.BillType = "3740";
			base.HBillSubType = "3740";

			}

			@@ -41,7 +41,7 @@
			oCn.BeginTran();
			//å é¤å³è
			DeleteRelation(ref sReturn, lngBillKey);
			oCn.RunProc("exec h_p_WW_EntrustWorkOrderToProcExch_Del " + lngBillKey.ToString());
			//oCn.RunProc("exec h_p_WW_EntrustWorkOrderToProcExch_Del " + lngBillKey.ToString());
			//å é¤æç»è¡¨
			DeleteBillSub(lngBillKey);
			DeleteBillSub2(lngBillKey);
			@@ -66,6 +66,22 @@
			{
			try
			{

			//ä¿ååæ§å¶=========================================
			string HBillNote = "";
			DataSet ds = oCn.RunProcReturn("Exec h_p_WW_EntrustWorkOrderBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_WW_EntrustWorkOrderBill_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();
			//æ´æ°ä¸»è¡¨
			@@ -82,9 +98,9 @@
			",HSupID=" + omodel.HSupID.ToString() +
			",HOrderProcNO='" + omodel.HOrderProcNO + "'" +
			" where HInterID=" + lngBillKey.ToString());
			//å é¤å³è
			DeleteRelation(ref sReturn, lngBillKey);
			oCn.RunProc("exec h_p_WW_EntrustWorkOrderToProcExch_Del " + lngBillKey.ToString());
			////å é¤å³è
			//DeleteRelation(ref sReturn, lngBillKey);
			//oCn.RunProc("exec h_p_WW_EntrustWorkOrderToProcExch_Del " + lngBillKey.ToString());

			//å é¤åè¡¨
			DeleteBillSub(lngBillKey);
			@@ -97,40 +113,57 @@
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
			",HOrderBillNo,HMaterLenModel,HMaterQty,HMaterID,HQty" +
			",HEntrustType,HNextProcName,HPrice,HOutQty,HInQty" +
			",HBackSupDate,HInDate,HWorkProcFlow,HProcID,HLeftMater" +
			",HInDate,HWorkProcFlow,HProcID,HLeftMater" +
			") values("
			+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + 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.HOrderBillNo + "','" + oSub.HMaterLenModel + "'," + oSub.HMaterQty.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HQty.ToString() +
			",'" + oSub.HEntrustType + "','" + oSub.HNextProcName + "'," + oSub.HPrice.ToString() + "," + oSub.HOutQty.ToString() + "," + oSub.HInQty.ToString() +
			",'" + oSub.HBackSupDate.ToShortDateString() + "','" + oSub.HInDate.ToShortDateString() + "','" + oSub.HWorkProcFlow + "'," + oSub.HProcID.ToString() +",'" + oSub.HLeftMater + "'" +
			",'" + oSub.HInDate.ToShortDateString() + "','" + oSub.HWorkProcFlow + "'," + oSub.HProcID.ToString() +",'" + oSub.HLeftMater + "'" +
			") ");
			}
			//æ ¹æ®åç å§å¤å·¥åè¡¨å¤´ä¾åºå åå¡«å¯¹åºæµè½¬å¡ ä¾åºåï¼æå§å¤æ è®°æåå¡«
			oCn.RunProc("exec h_p_WW_EntrustWorkOrderToProcExch " + omodel.HInterID.ToString());
			////æ ¹æ®åç å§å¤å·¥åè¡¨å¤´ä¾åºå åå¡«å¯¹åºæµè½¬å¡ ä¾åºåï¼æå§å¤æ è®°æåå¡«
			//oCn.RunProc("exec h_p_WW_EntrustWorkOrderToProcExch " + omodel.HInterID.ToString());
			////
			////
			//DataSet Ds;
			//Ds = oCn.RunProcReturn("exec h_p_WW_EntrustWorkOrderToProcExch_QtyCtrl " + omodel.HInterID.ToString() + "", "h_p_WW_EntrustWorkOrderToProcExch_QtyCtrl");
			//if (Ds == null)
			//{
			// sReturn = "å¤ææ°éå¤±è´¥ï¼";
			// oCn.RollBack();
			// return false;
			//}
			//if (Ds.Tables[0].Rows.Count == 0)
			//{
			// sReturn = "å¤ææ°éå¤±è´¥ï¼";
			// oCn.RollBack();
			// return false;
			//}
			//if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "2")
			//{
			// sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]);
			// oCn.RollBack();
			// return false;
			//}
			//
			//
			DataSet Ds;
			Ds = oCn.RunProcReturn("exec h_p_WW_EntrustWorkOrderToProcExch_QtyCtrl " + omodel.HInterID.ToString() + "", "h_p_WW_EntrustWorkOrderToProcExch_QtyCtrl");
			if (Ds == null)


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

			sReturn = "ä¿®æ¹åæ®æåï¼";
			oCn.Commit();
			@@ -150,6 +183,22 @@
			{
			//å¾å°mainid
			omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);

			//ä¿ååæ§å¶=========================================
			string HBillNote = "";
			DataSet ds = oCn.RunProcReturn("Exec h_p_WW_EntrustWorkOrderBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_WW_EntrustWorkOrderBill_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;
			}
			//=========================================================

			//omodel.HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
			//è¥MAINDIéå¤åéæ°è·å
			//if (IsExistBillNo(ref DBUtility.ClsPub.sExeReturnInfo, omodel.HBillNo, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew, omodel.HInterID))
			@@ -169,8 +218,8 @@
			",HDeptID,HSupID,HOrderProcNO" +
			") " +
			" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
			", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
			", " + omodel.HDeptID.ToString() + "," + omodel.HSupID.ToString() + ",'" + omodel.HOrderProcNO + "'" +
			", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "','" + omodel.HDate+
			"', " + omodel.HDeptID.ToString() + "," + omodel.HSupID.ToString() + ",'" + omodel.HOrderProcNO + "'" +
			") ");
			//æå¥åè¡¨
			foreach (Model.ClsWW_EntrustWorkOrderBillSub oSub in DetailColl)
			@@ -180,40 +229,58 @@
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
			",HOrderBillNo,HMaterLenModel,HMaterQty,HMaterID,HQty" +
			",HEntrustType,HNextProcName,HPrice,HOutQty,HInQty" +
			",HBackSupDate,HInDate,HWorkProcFlow,HProcID,HLeftMater" +
			",HInDate,HWorkProcFlow,HProcID,HLeftMater" +
			") values("
			+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + 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.HOrderBillNo + "','" + oSub.HMaterLenModel + "'," + oSub.HMaterQty.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HQty.ToString() +
			",'" + oSub.HEntrustType + "','" + oSub.HNextProcName + "'," + oSub.HPrice.ToString() + "," + oSub.HOutQty.ToString() + "," + oSub.HInQty.ToString() +
			",'" + oSub.HBackSupDate.ToShortDateString() + "','" + oSub.HInDate.ToShortDateString() + "','" + oSub.HWorkProcFlow + "'," + oSub.HProcID.ToString() + ",'" + oSub.HLeftMater + "'" +
			",'" + oSub.HInDate.ToShortDateString() + "','" + oSub.HWorkProcFlow + "'," + oSub.HProcID.ToString() + ",'" + oSub.HLeftMater + "'" +
			") ");
			}

			//æ ¹æ®åç å§å¤å·¥åè¡¨å¤´ä¾åºå åå¡«å¯¹åºæµè½¬å¡ ä¾åºåï¼æå§å¤æ è®°æåå¡«..å¹¶ä¸åå¡« å³èæ°é
			oCn.RunProc("exec h_p_WW_EntrustWorkOrderToProcExch " + omodel.HInterID.ToString());
			//oCn.RunProc("exec h_p_WW_EntrustWorkOrderToProcExch " + omodel.HInterID.ToString());
			//
			DataSet Ds;
			Ds = oCn.RunProcReturn("exec h_p_WW_EntrustWorkOrderToProcExch_QtyCtrl " + omodel.HInterID.ToString() + "", "h_p_WW_EntrustWorkOrderToProcExch_QtyCtrl");
			if (Ds == null)
			{
			sReturn = "å¤ææ°éå¤±è´¥ï¼";
			oCn.RollBack();
			return false;
			}
			if (Ds.Tables[0].Rows.Count == 0)
			{
			sReturn = "å¤ææ°éå¤±è´¥ï¼";
			oCn.RollBack();
			return false;
			}
			if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "2")
			{
			sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]);
			oCn.RollBack();
			return false;
			}
			//DataSet Ds;
			//Ds = oCn.RunProcReturn("exec h_p_WW_EntrustWorkOrderToProcExch_QtyCtrl " + omodel.HInterID.ToString() + "", "h_p_WW_EntrustWorkOrderToProcExch_QtyCtrl");
			//if (Ds == null)
			//{
			// sReturn = "å¤ææ°éå¤±è´¥ï¼";
			// oCn.RollBack();
			// return false;
			//}
			//if (Ds.Tables[0].Rows.Count == 0)
			//{
			// sReturn = "å¤ææ°éå¤±è´¥ï¼";
			// oCn.RollBack();
			// return false;
			//}
			//if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBack"]) == "2")
			//{
			// sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBackRemark"]);
			// oCn.RollBack();
			// return false;
			//}
			//

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