MES-WEB-API.git

parent: d9d0587b | 补丁 | 提交 | show whitespace

Administrator

2023-08-18 dc0692d47e61532e67f0b487c27e99532d936357

生产订单生产汇报单增加保存前和保存后控制

2个文件已修改

	DAL/生产管理/ClsSc_ICMOBill.cs	41 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DAL/生产管理/ClsSc_ICMOReportBill.cs	34 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 DAL/Éú²ú¹ÜÀí/ClsSc_ICMOBill.cs

@@ -101,6 +101,9 @@
                throw (e);
            }
        }



        //æ°å¢åæ®
        public override bool AddBill(ref string sReturn)
        {
@@ -108,7 +111,22 @@
            {
                //å¾å°mainid
                omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                //è¥MAINDIéå¤åéæ°è·å

                //ä¿ååæ§å¶=========================================
                string HBillNote = "";
                DataSet ds = oCn.RunProcReturn("Exec h_p_Sc_ICMOBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '"+ omodel.HBillNo +"','" + HBillNote + "' ", "h_p_Sc_ICMOBill_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();
                //ä¸»è¡¨
                oCn.RunProc("Insert Into Sc_ICMOBillMain   " +
@@ -137,6 +155,25 @@
                //      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                //      ") ");
                //}


                //=========================ä¿ååæ§å¶  
                DataSet ds2 = oCn.RunProcReturn("Exec h_p_Sc_ICMOBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "' ", "h_p_Sc_ICMOBill_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;
@@ -148,6 +185,8 @@
                throw (e);
            }
        }


        //æ¾ç¤ºåæ®
        public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
        {

 DAL/Éú²ú¹ÜÀí/ClsSc_ICMOReportBill.cs

@@ -143,7 +143,21 @@
            {
                //å¾å°mainid
                omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                //è¥MAINDIéå¤åéæ°è·å
                //ä¿ååæ§å¶=========================================
                string HBillNote = "";
                DataSet ds = oCn.RunProcReturn("Exec h_p_Sc_ICMOReport_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "' ", "h_p_Sc_ICMOReport_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();
                //ä¸»è¡¨
                oCn.RunProc("Insert Into Sc_ICMOReportBillMain   " +
@@ -189,6 +203,24 @@
                //    }
                //}
                //

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

			@@ -101,6 +101,9 @@
			throw (e);
			}
			}



			//æ°å¢åæ®
			public override bool AddBill(ref string sReturn)
			{
			@@ -108,7 +111,22 @@
			{
			//å¾å°mainid
			omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
			//è¥MAINDIéå¤åéæ°è·å

			//ä¿ååæ§å¶=========================================
			string HBillNote = "";
			DataSet ds = oCn.RunProcReturn("Exec h_p_Sc_ICMOBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '"+ omodel.HBillNo +"','" + HBillNote + "' ", "h_p_Sc_ICMOBill_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();
			//ä¸»è¡¨
			oCn.RunProc("Insert Into Sc_ICMOBillMain " +
			@@ -137,6 +155,25 @@
			// "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
			// ") ");
			//}


			//=========================ä¿ååæ§å¶
			DataSet ds2 = oCn.RunProcReturn("Exec h_p_Sc_ICMOBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "' ", "h_p_Sc_ICMOBill_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;
			@@ -148,6 +185,8 @@
			throw (e);
			}
			}


			//æ¾ç¤ºåæ®
			public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
			{

			@@ -143,7 +143,21 @@
			{
			//å¾å°mainid
			omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
			//è¥MAINDIéå¤åéæ°è·å
			//ä¿ååæ§å¶=========================================
			string HBillNote = "";
			DataSet ds = oCn.RunProcReturn("Exec h_p_Sc_ICMOReport_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "' ", "h_p_Sc_ICMOReport_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();
			//ä¸»è¡¨
			oCn.RunProc("Insert Into Sc_ICMOReportBillMain " +
			@@ -189,6 +203,24 @@
			// }
			//}
			//

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