生产资源，工序冲突合并

yusijie

2025-03-11 c2c81f518deb22140121bbb1c76c672d69d533c8

 DAL/»ù´¡×ÊÁÏ/ÆäËû»ù´¡×ÊÁÏ/ClsGy_WorkShift_Ctl.cs

@@ -77,18 +77,35 @@
        {
            try
            {
                //保存前控制=========================================
                DataSet ds = oCn.RunProcReturn("Exec h_p_Gy_WorkShift_BeforeSaveCtrl " + omodel.HMakeEmp + ",'2'", "h_p_Gy_WorkShift_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("UpDate Gy_WorkShift set  " +
                "HNumber='" + omodel.HNumber + "'" +
                ",HModifyEmp='" + DBUtility.ClsPub.CurUserName + "'" +
                ",HModifyTime=getdate()" +
                ",HName='" + omodel.HName + "'" +
                ",HNote='" + omodel.HNote + "'" +
                ",HDeptID=" + omodel.HDeptID.ToString() +
                ",HUSEORGID=" + omodel.HUSEORGID.ToString() +
                ",HWorkCenterID=" + omodel.HWorkCenterID.ToString() +
                ",HWorkTimes=" + omodel.HWorkTimes.ToString() +
                ",HStopflag='" + DBUtility.ClsPub.BoolToString(omodel.HStopflag) + "'" +
                ",HRemark='" + omodel.HRemark + "'" +
                ",HUseFlag='" + omodel.HUseFlag + "'" +
                ",HPlanShutdownTimes='" + omodel.HPlanShutdownTimes + "'" +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
@@ -105,6 +122,23 @@
                        + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HSno.ToString() +
                        ",'" + oSub.HStartDate.ToShortTimeString() + "','" + oSub.HEndDate.ToShortTimeString() + "'," + Convert.ToString(oSub.HOverDay ? 1 : 0) + ") ");
                }

                //保存后控制=========================================
                DataSet ds2 = oCn.RunProcReturn("Exec h_p_Gy_WorkShift_AfterSaveCtrl " + omodel.HMakeEmp + ",'2'", "h_p_Gy_WorkShift_AfterSaveCtrl");
                if (ds2 == null)
                {
                    sReturn = "保存后判断失败！";
                    oCn.RollBack();
                    return false;
                }
                if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
                {
                    sReturn = "" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
                    oCn.RollBack();
                    return false;
                }
                //=========================================================

                sReturn = "修改单据成功！";
                oCn.Commit();
                return true;
@@ -121,6 +155,20 @@
        {
            try
            {
                //保存前控制=========================================
                DataSet ds = oCn.RunProcReturn("Exec h_p_Gy_WorkShift_BeforeSaveCtrl " + omodel.HMakeEmp+ ",'1'", "h_p_Gy_WorkShift_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;
                }
                //=========================================================

                //得到mainid
                omodel.HInterID = DBUtility.ClsPub.CreateBillID(MvarItemKey, ref DBUtility.ClsPub.sExeReturnInfo);
                //若MAINDI重复则重新获取
@@ -130,11 +178,12 @@
                "(HInterID,HNumber,HName,HNote" +
                ",HDeptID,HWorkCenterID,HWorkTimes,HStopflag,HRemark" +
                ",HPlanShutdownTimes" +
                ",HMakeEmp,HMakeTime,HUSEORGID,HCreateORGID,HUseFlag" +
                ") " +
                " values(" + omodel.HInterID.ToString() + ",'" + omodel.HNumber + "','" + omodel.HName + "','" + omodel.HNote + "'" +
                "," + omodel.HDeptID.ToString() + "," + omodel.HWorkCenterID.ToString() + "," + omodel.HWorkTimes.ToString() + "," + Convert.ToString(omodel.HStopflag ? 1 : 0) + ",'" + omodel.HRemark + "'" +
                ","+ omodel.HPlanShutdownTimes.ToString() +
                ") ");
                ",'"+ omodel.HMakeEmp.ToString() + "',getdate(),"+ omodel.HUSEORGID.ToString() + "," + omodel.HCREATEORGID.ToString() + ",'"+ omodel.HUseFlag.ToString() + "') ");
                //插入子表
                foreach (Model.ClsGy_WorkShiftSub oSub in DetailColl)
                {
@@ -145,6 +194,23 @@
                        + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HSno.ToString() +
                        ",'" + oSub.HStartDate.ToShortTimeString() + "','" + oSub.HEndDate.ToShortTimeString() + "'," + Convert.ToString(oSub.HOverDay ? 1 : 0) + ") ");
                }

                //保存后控制=========================================
                DataSet ds2 = oCn.RunProcReturn("Exec h_p_Gy_WorkShift_AfterSaveCtrl " + omodel.HMakeEmp + ",'1'", "h_p_Gy_WorkShift_AfterSaveCtrl");
                if (ds2 == null)
                {
                    sReturn = "保存后判断失败！";
                    oCn.RollBack();
                    return false;
                }
                if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
                {
                    sReturn = "" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
                    oCn.RollBack();
                    return false;
                }
                //=========================================================

                sReturn = "新增单据成功！";
                oCn.Commit();
                return true;