MES-WEB-API.git

parent: 444f4d69 | 补丁 | 提交 | ignore whitespace

yangle

2022-12-29 97c43d459cb96e768948a44d9845a0b439bc2adc

设备点检计划 记录  设备保养记录单

5个文件已修改

	DAL/生产管理/设备管理/ClsSb_EquipDotCheckBill.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DAL/生产管理/设备管理/ClsSb_EquipDotCheckPlanBill.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Model/生产管理/设备管理/ClsSb_EquipDotCheckPlanBillMain.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs	28 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/SBGL/Sb_EquipMaintainRuleBillController.cs	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 DAL/Éú²ú¹ÜÀí/Éè±¸¹ÜÀí/ClsSb_EquipDotCheckBill.cs

@@ -41,7 +41,7 @@
                //æ´æ°ä¸»è¡¨
                oCn.RunProc("UpDate Sb_EquipDotCheckBillMain set  " +
                " HBillNo='" + omodel.HBillNo + "'" +  //åºå®èµå¼===============
                ",HDate='" + omodel.HDate + "'" +
                //",HDate='" + omodel.HDate + "'" +
                ",HYear='" + omodel.HYear.ToString() + "'" +
                ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
                ",HRemark='" + omodel.HRemark + "'" +

 DAL/Éú²ú¹ÜÀí/Éè±¸¹ÜÀí/ClsSb_EquipDotCheckPlanBill.cs

@@ -41,7 +41,6 @@
                //æ´æ°ä¸»è¡¨
                oCn.RunProc("UpDate Sb_EquipDotCheckPlanBillMain set  " +
                " HBillNo='" + omodel.HBillNo + "'" +  //åºå®èµå¼===============
                ",HDate='" + omodel.HDate + "'" +
                ",HYear='" + omodel.HYear.ToString() + "'" +
                ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
                ",HRemark='" + omodel.HRemark + "'" +
@@ -51,6 +50,7 @@
                ",HEquipID=" + omodel.HEquipID.ToString() +
                ",HBeginDate='" + omodel.HBeginDate + "'" +
                ",HEndDate='" + omodel.HEndDate+"'" +
                ",HMouldDotCheckRuleID='" + omodel.HMouldDotCheckRuleID + "'" +
                ",HCycleUnit='" + omodel.HCycleUnit + "'" +
                ",HCheckCycle=" + omodel.HCheckCycle.ToString() +
                ",HExplanation='" + omodel.HExplanation+"'" +
@@ -114,11 +114,11 @@
                oCn.RunProc("Insert Into Sb_EquipDotCheckPlanBillMain   " +
                "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
                ",HYear,HPeriod,HRemark,HEquipID" +
                ",HBeginDate,HEndDate,HCheckCycle,HCycleUnit,HExplanation,HInnerBillNo" +
                ",HBeginDate,HEndDate,HCheckCycle,HCycleUnit,HExplanation,HInnerBillNo,HMouldDotCheckRuleID" +
                ") "+
                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'," + omodel.HEquipID.ToString() +
                ",'" + omodel.HBeginDate +"','" +omodel.HEndDate + "'," + omodel.HCheckCycle.ToString() +",'"+ omodel.HCycleUnit + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo +"'" +
                ",'" + omodel.HBeginDate +"','" +omodel.HEndDate + "'," + omodel.HCheckCycle.ToString() +",'"+ omodel.HCycleUnit + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo +"','" + omodel.HMouldDotCheckRuleID + "'"+
                ") ");
                //æå¥åè¡¨
                foreach (Model.ClsSb_EquipDotCheckPlanBillSub oSub in DetailColl)

 Model/Éú²ú¹ÜÀí/Éè±¸¹ÜÀí/ClsSb_EquipDotCheckPlanBillMain.cs

@@ -13,6 +13,7 @@
        public Int64 HCheckCycle;
        public string HExplanation;
        public string HInnerBillNo;
        public int HMouldDotCheckRuleID;//è®¾å¤ç¹æ£è§ç¨id
        
        
    }

 WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs

@@ -173,24 +173,16 @@
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sqlWhere == null || sqlWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select ç¹æ£é¡¹ç®ID HDotCheckItemID,ç¹æ£é¡¹ç® HDotCheckItem,ç¹æ£é¨ä½ HDotCheckPart,å·ä½è¦æ± HClaim,è´è´£äººID HManagerID,è´è´£äººä»£ç  HManagerNumber,è´è´£äºº HManagerName,åå¤æ³¨ HRemark from h_v_Sb_EquipDotCheckRuleList", "h_v_Sb_EquipDotCheckRuleList");
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "è·åä¿¡æ¯æåï¼";
                    objJsonResult.data = ds.Tables[0];
                }
                else
                {
                    string sql1 = "select ç¹æ£é¡¹ç®ID HDotCheckItemID,ç¹æ£é¡¹ç® HDotCheckItem,ç¹æ£é¨ä½ HDotCheckPart,å·ä½è¦æ± HClaim,è´è´£äººID HManagerID,è´è´£äººä»£ç  HManagerNumber,è´è´£äºº HManagerName,åå¤æ³¨ HRemark from h_v_Sb_EquipDotCheckRuleList where 1 = 1 ";
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipDotCheckRuleList");
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "è·åä¿¡æ¯æåï¼";
                    objJsonResult.data = ds.Tables[0];
                }

                string sql1 = @"select ç¹æ£é¡¹ç®ID HDotCheckItemID,ç¹æ£é¡¹ç® HDotCheckItem,ç¹æ£é¨ä½ HDotCheckPart,å·ä½è¦æ± HClaim,è´è´£äººID HManagerID,è´è´£äººä»£ç  HManagerNumber,è´è´£äºº HManagerName,åå¤æ³¨ HRemark,b.HNumber ç¹æ£é¡¹ç®ä»£ç   from h_v_Sb_EquipDotCheckRuleList a
                        left join Gy_QCCheckItem b  on a.ç¹æ£é¡¹ç®ID =b.HItemID where 1 = 1 ";
                string sql = sql1 + sqlWhere;
                ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipDotCheckRuleList");
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "è·åä¿¡æ¯æåï¼";
                objJsonResult.data = ds.Tables[0];

            }
            catch (Exception e)
            {

 WebAPI/Controllers/SBGL/Sb_EquipMaintainRuleBillController.cs

@@ -55,23 +55,13 @@
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnåå¯¹è±¡çåå
                }
                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
              
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucessï¼";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
                //}
                //else
                //{
                //objJsonResult.code = "0";
                //objJsonResult.count = 0;
                //objJsonResult.Message = "æ æ°æ®";
                //objJsonResult.data = null;
                //return objJsonResult;
                //}
            }
            catch (Exception ex)
            {

			@@ -41,7 +41,7 @@
			//æ´æ°ä¸»è¡¨
			oCn.RunProc("UpDate Sb_EquipDotCheckBillMain set " +
			" HBillNo='" + omodel.HBillNo + "'" + //åºå®èµå¼===============
			",HDate='" + omodel.HDate + "'" +
			//",HDate='" + omodel.HDate + "'" +
			",HYear='" + omodel.HYear.ToString() + "'" +
			",HPeriod='" + omodel.HPeriod.ToString() + "'" +
			",HRemark='" + omodel.HRemark + "'" +

			@@ -41,7 +41,6 @@
			//æ´æ°ä¸»è¡¨
			oCn.RunProc("UpDate Sb_EquipDotCheckPlanBillMain set " +
			" HBillNo='" + omodel.HBillNo + "'" + //åºå®èµå¼===============
			",HDate='" + omodel.HDate + "'" +
			",HYear='" + omodel.HYear.ToString() + "'" +
			",HPeriod='" + omodel.HPeriod.ToString() + "'" +
			",HRemark='" + omodel.HRemark + "'" +
			@@ -51,6 +50,7 @@
			",HEquipID=" + omodel.HEquipID.ToString() +
			",HBeginDate='" + omodel.HBeginDate + "'" +
			",HEndDate='" + omodel.HEndDate+"'" +
			",HMouldDotCheckRuleID='" + omodel.HMouldDotCheckRuleID + "'" +
			",HCycleUnit='" + omodel.HCycleUnit + "'" +
			",HCheckCycle=" + omodel.HCheckCycle.ToString() +
			",HExplanation='" + omodel.HExplanation+"'" +
			@@ -114,11 +114,11 @@
			oCn.RunProc("Insert Into Sb_EquipDotCheckPlanBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
			",HYear,HPeriod,HRemark,HEquipID" +
			",HBeginDate,HEndDate,HCheckCycle,HCycleUnit,HExplanation,HInnerBillNo" +
			",HBeginDate,HEndDate,HCheckCycle,HCycleUnit,HExplanation,HInnerBillNo,HMouldDotCheckRuleID" +
			") "+
			" values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
			"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'," + omodel.HEquipID.ToString() +
			",'" + omodel.HBeginDate +"','" +omodel.HEndDate + "'," + omodel.HCheckCycle.ToString() +",'"+ omodel.HCycleUnit + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo +"'" +
			",'" + omodel.HBeginDate +"','" +omodel.HEndDate + "'," + omodel.HCheckCycle.ToString() +",'"+ omodel.HCycleUnit + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo +"','" + omodel.HMouldDotCheckRuleID + "'"+
			") ");
			//æå¥åè¡¨
			foreach (Model.ClsSb_EquipDotCheckPlanBillSub oSub in DetailColl)

			@@ -13,6 +13,7 @@
			public Int64 HCheckCycle;
			public string HExplanation;
			public string HInnerBillNo;
			public int HMouldDotCheckRuleID;//è®¾å¤ç¹æ£è§ç¨id


			}

			@@ -173,24 +173,16 @@
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (sqlWhere == null \|\| sqlWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select ç¹æ£é¡¹ç®ID HDotCheckItemID,ç¹æ£é¡¹ç® HDotCheckItem,ç¹æ£é¨ä½ HDotCheckPart,å·ä½è¦æ± HClaim,è´è´£äººID HManagerID,è´è´£äººä»£ç HManagerNumber,è´è´£äºº HManagerName,åå¤æ³¨ HRemark from h_v_Sb_EquipDotCheckRuleList", "h_v_Sb_EquipDotCheckRuleList");
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "è·åä¿¡æ¯æåï¼";
			objJsonResult.data = ds.Tables[0];
			}
			else
			{
			string sql1 = "select ç¹æ£é¡¹ç®ID HDotCheckItemID,ç¹æ£é¡¹ç® HDotCheckItem,ç¹æ£é¨ä½ HDotCheckPart,å·ä½è¦æ± HClaim,è´è´£äººID HManagerID,è´è´£äººä»£ç HManagerNumber,è´è´£äºº HManagerName,åå¤æ³¨ HRemark from h_v_Sb_EquipDotCheckRuleList where 1 = 1 ";
			string sql = sql1 + sqlWhere;
			ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipDotCheckRuleList");
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "è·åä¿¡æ¯æåï¼";
			objJsonResult.data = ds.Tables[0];
			}

			string sql1 = @"select ç¹æ£é¡¹ç®ID HDotCheckItemID,ç¹æ£é¡¹ç® HDotCheckItem,ç¹æ£é¨ä½ HDotCheckPart,å·ä½è¦æ± HClaim,è´è´£äººID HManagerID,è´è´£äººä»£ç HManagerNumber,è´è´£äºº HManagerName,åå¤æ³¨ HRemark,b.HNumber ç¹æ£é¡¹ç®ä»£ç from h_v_Sb_EquipDotCheckRuleList a
			left join Gy_QCCheckItem b on a.ç¹æ£é¡¹ç®ID =b.HItemID where 1 = 1 ";
			string sql = sql1 + sqlWhere;
			ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipDotCheckRuleList");
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "è·åä¿¡æ¯æåï¼";
			objJsonResult.data = ds.Tables[0];

			}
			catch (Exception e)
			{

			@@ -55,23 +55,13 @@
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//è·åå°DataColumnåå¯¹è±¡çåå
			}
			//if (ds.Tables[0].Rows.Count != 0 \|\| ds != null)
			//{

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucessï¼";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			//}
			//else
			//{
			//objJsonResult.code = "0";
			//objJsonResult.count = 0;
			//objJsonResult.Message = "æ æ°æ®";
			//objJsonResult.data = null;
			//return objJsonResult;
			//}
			}
			catch (Exception ex)
			{