制程陷阱测试趋势图、PPM绩效趋势图报表调用方法新增，单位换算同步调用方法修改

yxj

2024-08-23 b6b0cca1863c2ca0c6c3df68ebddad5de827bf7e

 DAL/Éú²ú¹ÜÀí/Ä£¾ß¹ÜÀí/ClsSc_MouldDotCheckBill.cs

@@ -60,7 +60,11 @@
                ",HExplanation='" + omodel.HExplanation + "'" +
                ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +


                ",HLastResult='" + omodel.HLastResult + "'" +
                ",HErrNote='" + omodel.HErrNote + "'" +
                ",HBigSafeNote='" + omodel.HBigSafeNote + "'" +
                ",HShiftsID=" + omodel.HShiftsID +
                ",HDotCheckNote='" + omodel.HDotCheckNote + "'" +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
@@ -73,18 +77,19 @@
                foreach (Model.ClsSc_MouldDotCheckBillSub oSub in DetailColl)
                {
                    oCn.RunProc("Insert into Sc_MouldDotCheckBillSub " +
                      " (HInterID,HEntryID" +
                      ",HManagerID" +
                      ",HDotCheckItemID,HDotCheckItem,HDotCheckPart,HClaim" +
                      ",HCloseMan,HCloseType,HRemark" +
                      ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                      ") values("
                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() +
                      "," + oSub.HManagerID.ToString() + "," + oSub.HDotCheckItemID.ToString() +
                      ",'" + oSub.HDotCheckItem + "','" + oSub.HDotCheckPart + "','" + oSub.HClaim + "'" +
                      ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                      ") ");
                     " (HInterID,HEntryID" +
                     ",HManagerID" +
                     ",HDotCheckItemID,HDotCheckItem,HDotCheckPart,HClaim" +
                     ",HCloseMan,HCloseType,HRemark" +
                     ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                     ",HDotCheckItemClassID,HDotCheckItemMethodID,HDotCheckResult" +
                     ") values("
                     + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() +
                     "," + oSub.HManagerID.ToString() + "," + oSub.HDotCheckItemID.ToString() +
                     ",'" + oSub.HDotCheckItem + "','" + oSub.HDotCheckPart + "','" + oSub.HClaim + "'" +
                     ",'" + oSub.HCloseMan + "'," + 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.HDotCheckItemClassID + "," + oSub.HDotCheckItemMethodID + ",'" + oSub.HDotCheckResult + "'" +
                     ") ");
                }

                ////配件项目
@@ -132,6 +137,22 @@
            {
                //得到mainid
                omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);

                //保存前控制=========================================
                string HBillNote = "";
                DataSet ds = oCn.RunProcReturn("Exec h_p_Sc_MouldDotCheckBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1,1 ", "h_p_Sc_MouldDotCheckBill_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;
                }
                //=========================================================

                //若MAINDI重复则重新获取
                oCn.BeginTran();
                //主表
@@ -141,12 +162,13 @@
                ",HMouldID,HBeginDate"+
                ",HEndDate,HPlanNo,HPlanInterID" +
                ",HInnerBillNo,HExplanation,HMouldDotCheckRuleID" +
                ",HLastResult,HErrNote,HBigSafeNote,HShiftsID,HDotCheckNote" +
                ") " +
                " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
                "," + omodel.HMouldID.ToString() + ",'" + omodel.HBeginDate + "'" +
                ",'" + omodel.HEndDate + "','" + omodel.HPlanNo + "'," + omodel.HPlanInterID.ToString() +
                ",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation + "'," + omodel.HMouldDotCheckRuleID +
                ",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation + "'," + omodel.HMouldDotCheckRuleID + ",'" + omodel.HLastResult + "','" + omodel.HErrNote + "','" + omodel.HBigSafeNote + "'," + omodel.HShiftsID + ",'" + omodel.HDotCheckNote + "'" +
                ") ");
                //插入子表
                foreach (Model.ClsSc_MouldDotCheckBillSub oSub in DetailColl)
@@ -157,14 +179,18 @@
                      ",HDotCheckItemID,HDotCheckItem,HDotCheckPart,HClaim" +
                      ",HCloseMan,HCloseType,HRemark" +
                      ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                      ",HDotCheckItemClassID,HDotCheckItemMethodID,HDotCheckResult" +
                      ") values("
                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() +
                      "," + oSub.HManagerID.ToString() +","+ oSub.HDotCheckItemID.ToString()+
                      ",'" + oSub.HDotCheckItem + "','" + oSub.HDotCheckPart + "','" + oSub.HClaim + "'" +
                      ",'" + oSub.HCloseMan + "'," + 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.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + oSub.HDotCheckItemClassID + "," + oSub.HDotCheckItemMethodID + ",'" + oSub.HDotCheckResult + "'" +
                      ") ");
                }

                //点检完成，反写器具点检计划单子表是否点检标记
                oCn.RunProc("exec h_p_Sc_MouldDotCheck_AfterSaveCtrl " + omodel.HMouldDotCheckPlanInterID + "," + omodel.HMouldDotCheckPlanEntryID);

                ////配件项目
                //foreach (Model.ClsSc_MouldDotCheckBillSub_Item oSub in DetailCol)
@@ -194,6 +220,23 @@
                //    }
                //}
                //

                //=========================保存后控制  
                DataSet ds2 = oCn.RunProcReturn("Exec h_p_Sc_MouldDotCheckBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1,1 ", "h_p_Sc_MouldDotCheckBill_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;