MES-WEB-API.git

			@@ -63,7 +63,7 @@

			//保存前控制=========================================
			string HBillNote = "";
			DataSet ds = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',2 ", "h_p_Gy_QCVerificationBill_BeforeSaveCtrl");
			DataSet ds = oCn.RunProcReturn("Exec h_p_WL_YayBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',2 ", "h_p_Gy_QCVerificationBill_BeforeSaveCtrl");
			if (ds == null)
			{
			sReturn = "保存前判断失败！";
			@@ -175,7 +175,7 @@
			}

			//=========================保存后控制
			DataSet ds2 = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',2 ", "h_p_Gy_QCVerificationBill_AfterSaveCtrl");
			DataSet ds2 = oCn.RunProcReturn("Exec h_p_WL_YayBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',2 ", "h_p_Gy_QCVerificationBill_AfterSaveCtrl");


			if (ds2 == null)
			@@ -213,7 +213,7 @@

			//保存前控制=========================================
			string HBillNote = "";
			DataSet ds = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Gy_QCVerificationBill_BeforeSaveCtrl");
			DataSet ds = oCn.RunProcReturn("Exec h_p_WL_YayBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Gy_QCVerificationBill_BeforeSaveCtrl");
			if (ds == null)
			{
			sReturn = "保存前判断失败！";
			@@ -231,95 +231,57 @@
			// 获取当前日期时间，用于空日期字段的默认值
			// 获取当前日期时间
			string currentDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
			string safeDateTime = "2000-01-01";
			string safeDateTime = "null";
			// 辅助方法：安全转换为字符串，处理null和空字符串


			string sql = "Insert Into WL_YayBillMain " +
			"(HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillNo,HBillStatus," +
			"HCheckItemNowID,HCheckItemNextID,HCheckFlowID,HRemark,HBacker,HBackDate," +
			"HBackRemark,HChecker,HCheckDate,HMaker,HMakeDate,HUpDater,HUpDateDate," +
			"HCloseMan,HCloseDate,HCloseType,HDeleteMan,HDeleteDate," +
			"HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo," +
			"HPrintQty,HOrgID,HCusID,HBeginAddr,HEndAddr,HPickAddr," +
			"HArriverAddr,HTransType,HCarTypeID,HCarTypeMaxVolume,HTotalVolume," +
			"HRemark,HMaker,HMakeDate,HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo," +
			"HOrgID,HCusID,HBeginAddr,HEndAddr,HPickAddr,HArriverAddr,HTransType,HCarTypeID,HCarTypeMaxVolume,HTotalVolume," +
			"HLoadingRate,HContractTransportInterID,HContractTransportEntryID," +
			"HContractTransportBillNo,HCarrierID,HDistance,HTransportTimes," +
			"HTransportTyep,HSSID,HCurID,HMoney,HDateForRequestedPick," +
			"HDataForRequestedArrived,HCarryStatus,HDate_CarrierSure," +
			"HDate_AllocationDriver,HCarID,HDriverID,HSurer_Arrive,HDate_Arrive," +
			"HSurer_Pick,HDate_Pick,HSurer_Trans,HDate_Trans,HSurer_Receive,HExRate," +
			"HDate_Receive,HSurer_Accounting,HDate_Accounting) " +
			"values(" +
			SafeInt(omodel.HInterID.ToString(), 0) + "," + // HInterID
			"0,0," + // HYear, HPeriod - 需要从HDate计算，这里先给0
			"'" + SafeString(this.BillType) + "'," +
			"'" + SafeString(this.HBillSubType) + "'," +
			SafeDateTime(omodel.HDate.ToString(), "'" + currentDateTime + "'") + "," +
			"'" + SafeString(omodel.HBillNo) + "'," +
			SafeInt(omodel.HBillStatus.ToString(), 1) + "," + // HBillStatus
			SafeInt(omodel.HCheckItemNowID.ToString(), 0) + "," + // HCheckItemNowID
			SafeInt(omodel.HCheckItemNextID.ToString(), 0) + "," + // HCheckItemNextID
			SafeInt(omodel.HCheckFlowID.ToString(), 0) + "," + // HCheckFlowID
			"'" + SafeString(omodel.HRemark) + "'," +
			"'" + SafeString(omodel.HBacker) + "'," +
			SafeDateTime(omodel.HBackDate?.ToString(), "NULL") + "," +
			"'" + SafeString(omodel.HBackRemark) + "'," +
			"'" + SafeString(omodel.HChecker) + "'," +
			SafeDateTime(omodel.HCheckDate?.ToString(), "NULL") + "," +
			"'" + SafeString(omodel.HMaker) + "',getdate()," + // HMaker, HMakeDate
			"'" + SafeString(omodel.HUpDater) + "'," +
			SafeDateTime(omodel.HUpDateDate?.ToString(), "NULL") + "," +
			"'" + SafeString(omodel.HCloseMan) + "'," +
			SafeDateTime(omodel.HCloseDate?.ToString(), "NULL") + "," +
			(omodel.HCloseType.ToString() == "1" ? "1" : "0") + "," + // HCloseType
			"'" + SafeString(omodel.HDeleteMan) + "'," +
			SafeDateTime(omodel.HDeleteDate?.ToString(), "NULL") + "," +
			"'" + SafeString(omodel.HMainSourceBillType) + "'," +
			SafeInt(omodel.HMainSourceInterID.ToString(), 0) + "," + // HMainSourceInterID
			SafeInt(omodel.HMainSourceEntryID.ToString(), 0) + "," + // HMainSourceEntryID
			"'" + SafeString(omodel.HMainSourceBillNo) + "'," +
			SafeInt(omodel.HPrintQty.ToString(), 0) + "," + // HPrintQty
			SafeInt(omodel.HOrgID.ToString(), 0) + "," + // HOrgID
			SafeInt(omodel.HCusID?.ToString(), 0) + "," + // HCusID
			SafeInt(omodel.HBeginAddr?.ToString(), 0) + "," + // HBeginAddr
			SafeInt(omodel.HEndAddr?.ToString(), 0) + "," + // HEndAddr
			"'" + SafeString(omodel.HPickAddr) + "'," +
			"'" + SafeString(omodel.HArriverAddr) + "'," +
			"'" + SafeString(omodel.HTransType) + "'," +
			SafeInt(omodel.HCarTypeID?.ToString(), 0) + "," + // HCarTypeID
			SafeDecimal(omodel.HCarTypeMaxVolume?.ToString(), 0) + "," + // HCarTypeMaxVolume
			SafeDecimal(omodel.HTotalVolume?.ToString(), 0) + "," + // HTotalVolume
			SafeDecimal(omodel.HLoadingRate?.ToString(), 0) + "," + // HLoadingRate
			SafeInt(omodel.HContractTransportInterID?.ToString(), 0) + "," + // HContractTransportInterID
			SafeInt(omodel.HContractTransportEntryID?.ToString(), 0) + "," + // HContractTransportEntryID
			"'" + SafeString(omodel.HContractTransportBillNo) + "'," +
			SafeInt(omodel.HCarrierID?.ToString(), 0) + "," + // HCarrierID
			SafeDecimal(omodel.HDistance?.ToString(), 0) + "," + // HDistance
			SafeDecimal(omodel.HTransportTimes?.ToString(), 0) + "," + // HTransportTimes
			"'" + SafeString(omodel.HTransportTyep) + "'," +
			SafeInt(omodel.HSSID?.ToString(), 0) + "," + // HSSID
			SafeInt(omodel.HCurID?.ToString(), 0) + "," + // HCurID
			SafeDecimal(omodel.HMoney?.ToString(), 0) + "," + // HMoney
			SafeDateTime(omodel.HDateForRequestedPick?.ToString(), "'" + currentDateTime + "'") + "," +
			SafeDateTime(omodel.HDataForRequestedArrived?.ToString(), "'" + currentDateTime + "'") + "," +
			SafeInt(omodel.HCarryStatus?.ToString(), 1) + "," + // HCarryStatus
			SafeDateTime(omodel.HDate_CarrierSure?.ToString(), "'" + safeDateTime + "'") + "," +
			SafeDateTime(omodel.HDate_AllocationDriver?.ToString(), "'" + currentDateTime + "'") + "," +
			SafeInt(omodel.HCarID?.ToString(), 0) + "," + // HCarID
			SafeInt(omodel.HDriverID?.ToString(), 0) + "," + // HDriverID
			"'" + SafeString(omodel.HSurer_Arrive) + "'," +
			SafeDateTime(omodel.HDate_Arrive?.ToString(), "'" + safeDateTime + "'") + "," +
			"'" + SafeString(omodel.HSurer_Pick) + "'," +
			SafeDateTime(omodel.HDate_Pick?.ToString(), "'" + safeDateTime + "'") + "," +
			"'" + SafeString(omodel.HSurer_Trans) + "'," +
			SafeDateTime(omodel.HDate_Trans?.ToString(), "'" + safeDateTime + "'") + "," +
			"'" + SafeString(omodel.HSurer_Receive) + "'," +
			"'" + omodel.HExRate + "'," +
			SafeDateTime(omodel.HDate_Receive?.ToString(), "'" + safeDateTime + "'") + "," +
			"'" + SafeString(omodel.HSurer_Accounting) + "'," +
			SafeDateTime(omodel.HDate_Accounting?.ToString(), "'" + safeDateTime + "'") + ")";

			"HDataForRequestedArrived,HExRate" +
			") values(" +
			"" + omodel.HInterID + "" +
			"," + "year(getdate())" + "" +
			"," + "month(getdate())" + "" +
			",'" + this.BillType + "'" +
			",'" + this.HBillSubType + "'" +
			",'" + omodel.HDate + "'" +
			",'" + omodel.HBillNo + "'" +
			"," + 1 + "" +
			",'" + omodel.HRemark + "'" +
			",'" + omodel.HMaker + "'" +
			"," + "getdate()" + "" +
			",'" + omodel.HMainSourceBillType + "'" +
			",'" + omodel.HMainSourceInterID + "'" +
			",'" + omodel.HMainSourceEntryID + "'" +
			",'" + omodel.HMainSourceBillNo + "'" +
			",'" + omodel.HOrgID + "'" +
			",'" + omodel.HCusID + "'" +
			",'" + omodel.HBeginAddr + "'" +
			",'" + omodel.HEndAddr + "'" +
			",'" + omodel.HPickAddr + "'" +
			",'" + omodel.HArriverAddr + "'" +
			",'" + omodel.HTransType + "'" +
			",'" + omodel.HCarTypeID + "'" +
			",'" + omodel.HCarTypeMaxVolume + "'" +
			",'" + omodel.HTotalVolume + "'" +
			",'" + omodel.HLoadingRate + "'" +
			",'" + omodel.HContractTransportInterID + "'" +
			",'" + omodel.HContractTransportEntryID + "'" +
			",'" + omodel.HContractTransportBillNo + "'" +
			",'" + omodel.HCarrierID + "'" +
			",'" + omodel.HDistance + "'" +
			",'" + omodel.HTransportTimes + "'" +
			",'" + omodel.HTransportTyep + "'" +
			",'" + omodel.HSSID + "'" +
			",'" + omodel.HCurID + "'" +
			",'" + omodel.HMoney + "'" +
			",'" + omodel.HDateForRequestedPick + "'" +
			",'" + omodel.HDataForRequestedArrived + "'" +
			",'" + omodel.HExRate + "'" +
			")";
			oCn.RunProc(sql);
			//主表
			//插入子表
			@@ -359,7 +321,7 @@
			oCn.RunProc(sql);
			}
			//=========================保存后控制
			DataSet ds2 = oCn.RunProcReturn("Exec h_p_Gy_QCVerificationBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1", "h_p_Gy_QCVerificationBill_AfterSaveCtrl");
			DataSet ds2 = oCn.RunProcReturn("Exec h_p_WL_YayBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1", "h_p_Gy_QCVerificationBill_AfterSaveCtrl");

			if (ds2 == null)
			{