MES-WEB-API.git

parent: b9bdd104 | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yusijie

2024-06-05 84db846c094c1c8d39b560a122d0e1769825f646

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

5个文件已修改

	WebAPI/Controllers/CJGL/Qc_PreventErrMouldCheckBillController.cs	47 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/CJGL/Sc_WorkBeginDotCheckBillController.cs	63 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Models/Gy_RoutingBillSub.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebAPI/Controllers/CJGL/Qc_PreventErrMouldCheckBillController.cs

@@ -807,5 +807,52 @@
        }
        #endregion

        #region 报工台跳转获取数据
        [Route("Qc_PreventErrMouldCheckBill/Qc_PreventErrMouldCheckBillList")]
        [HttpGet]
        public object Qc_PreventErrMouldCheckBillList(string HMaterID, string User)
        {
            try
            {
                List<DataTable> tableList = new List<DataTable>();

                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Qc_PreventErrMouldCheckBillMain_Edit", 1, false, User))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查询失败!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (HMaterID == null || HMaterID.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "物料不能为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }               

                ds = oCN.RunProcReturn("exec h_p_PreventErrMouldCheck '" + HMaterID + "'", "h_p_PreventErrMouldCheck");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "查询成功！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

    }
}

 WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs

@@ -819,7 +819,7 @@
                                                工作中心 HCenterName,HSupID,供应商代码 HSupNumber,供应商 HSupName,isEntrust HSupFlag,计划数量 HQty,加工单价 HOutPrice, 表体备注 HRemark,
                                            进站关联数量 HRelationQty_In,出站关联数量 HRelationQty_Out,委外工单数量 HRelationQty_WWOrder,不合格数量 HRelationQty_Bad,超额比例 HOverRate,
                                            良率 HPassRate,累计良率 HSumPassRate,图纸编号 HPicNum,本工序确认记录 HProcCheckNote,工艺参数 HTechnologyParameter,HDeptID,
                                            加工车间代码 HDeptNumber,加工车间 HDeptName,出站报废关联数量 HRelationQty_OutBad
                                            加工车间代码 HDeptNumber,加工车间 HDeptName,出站报废关联数量 HRelationQty_OutBad,SN过站控制 HSNCtrl
                                            from h_v_Sc_ProcessExchangeBillQuerySub");
                ds = oCN.RunProcReturn(sql+ " where hmainid="+ HInterID + "  order by cast(流水号 as int) ", "h_v_Sc_ProcessExchangeBillQuerySub");
                objJsonResult.code = "0";

 WebAPI/Controllers/CJGL/Sc_WorkBeginDotCheckBillController.cs

@@ -761,6 +761,69 @@
        }
        #endregion

        #region 报工台跳转获取数据
        [Route("Sc_WorkBeginDotCheckBill/Sc_WorkBeginDotCheckBillList")]
        [HttpGet]
        public object Sc_WorkBeginDotCheckBillList(string HMaterID, string HProcID,string HSourceID,string User)
        {
            try
            {
                List<DataTable> tableList = new List<DataTable>();

                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Sc_WorkBeginDotCheckBillMain_Edit", 1, false, User))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查询失败!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (HMaterID == null || HMaterID.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "物料不能为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (HProcID == null || HProcID.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "工序不能为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (HSourceID == null || HSourceID.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "生产资源不能为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ds = oCN.RunProcReturn("exec h_p_WorkBeginDotCheckList '" + HMaterID + "','" + HProcID + "','" + HSourceID + "'", "h_p_WorkBeginDotCheckList");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "查询成功！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region 设备启动点检清单列表 查询       
        [Route("Sc_WorkBeginDotCheckBill/getGy_WorkBeginDotCheckListBillMainList")]
        [HttpGet]

 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs

@@ -473,7 +473,7 @@
                    ",HTechnologyParameter,HPicNum,HProcCheckNote" +
                    ",HOverRate,HProcWorkNum,HBadWHID,HWasterWHID, HWHID,HEstimate,HIsTime" +
                    ",HQCSchemeID_Fst,HQCSchemeID_Proc,HQCSchemeID_Patrol" +
                    ",HWorkTimes_S,HSortProcFlag " +
                    ",HWorkTimes_S,HSortProcFlag,HSNCtrl " +
                    ") values("
                    + HInterID + "," + i + "," + oSub.HProcID.ToString() + ",'" + oSub.HProcNo + "'," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
                    "," + oSub.HWorkQty.ToString() + "," + oSub.HCenterID.ToString() + ",'" + oSub.HTimeUnit.ToString() + "'," + oSub.HUnitTime.ToString() +
@@ -487,7 +487,7 @@
                   ",'" + oSub.HTechnologyParameter.ToString() + "','" + oSub.HPicNum.ToString() + "','" + oSub.HProcCheckNote.ToString() +
                   "', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'," + oSub.HBadWHID.ToString() + "," + oSub.HWasterWHID.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HEstimate.ToString() + "," + Convert.ToString(oSub.HIsTime ? 1 : 0) + "," + oSub.HQCSchemeID_Fst + "," +
                     oSub.HQCSchemeID_Proc + "," + oSub.HQCSchemeID_Patrol +
                   ", " + oSub.HWorkTimes_S.ToString() + "," + Convert.ToString(oSub.HSortProcFlag ? 1 : 0) +
                   ", " + oSub.HWorkTimes_S.ToString() + "," + Convert.ToString(oSub.HSortProcFlag ? 1 : 0) + "," + Convert.ToString(oSub.HSNCtrl ? 1 : 0) +
                    ") ");
                    //计价方式不为计时，则把计时暂估字段更新为空
                    if (oSub.HIsTime == false)

 WebAPI/Models/Gy_RoutingBillSub.cs

@@ -10,6 +10,7 @@
        public long HProcID { get; set; }//工序ID
        public string HProcNo { get; set; }//流水号
        public long HSupID { get; set; }//供应商ID
        public bool HSNCtrl { get; set; }//SN过站
        public bool HSupFlag { get; set; }//外协标记
        public double HWorkQty { get; set; }//加工数量
        public double HPassRate { get; set; }//良率

			@@ -807,5 +807,52 @@
			}
			#endregion

			#region 报工台跳转获取数据
			[Route("Qc_PreventErrMouldCheckBill/Qc_PreventErrMouldCheckBillList")]
			[HttpGet]
			public object Qc_PreventErrMouldCheckBillList(string HMaterID, string User)
			{
			try
			{
			List<DataTable> tableList = new List<DataTable>();

			//查看权限
			if (!DBUtility.ClsPub.Security_Log("Qc_PreventErrMouldCheckBillMain_Edit", 1, false, User))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "查询失败!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (HMaterID == null \|\| HMaterID.Equals(""))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "物料不能为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("exec h_p_PreventErrMouldCheck '" + HMaterID + "'", "h_p_PreventErrMouldCheck");

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "查询成功！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			}
			}

			@@ -819,7 +819,7 @@
			工作中心 HCenterName,HSupID,供应商代码 HSupNumber,供应商 HSupName,isEntrust HSupFlag,计划数量 HQty,加工单价 HOutPrice, 表体备注 HRemark,
			进站关联数量 HRelationQty_In,出站关联数量 HRelationQty_Out,委外工单数量 HRelationQty_WWOrder,不合格数量 HRelationQty_Bad,超额比例 HOverRate,
			良率 HPassRate,累计良率 HSumPassRate,图纸编号 HPicNum,本工序确认记录 HProcCheckNote,工艺参数 HTechnologyParameter,HDeptID,
			加工车间代码 HDeptNumber,加工车间 HDeptName,出站报废关联数量 HRelationQty_OutBad
			加工车间代码 HDeptNumber,加工车间 HDeptName,出站报废关联数量 HRelationQty_OutBad,SN过站控制 HSNCtrl
			from h_v_Sc_ProcessExchangeBillQuerySub");
			ds = oCN.RunProcReturn(sql+ " where hmainid="+ HInterID + " order by cast(流水号 as int) ", "h_v_Sc_ProcessExchangeBillQuerySub");
			objJsonResult.code = "0";

			@@ -761,6 +761,69 @@
			}
			#endregion

			#region 报工台跳转获取数据
			[Route("Sc_WorkBeginDotCheckBill/Sc_WorkBeginDotCheckBillList")]
			[HttpGet]
			public object Sc_WorkBeginDotCheckBillList(string HMaterID, string HProcID,string HSourceID,string User)
			{
			try
			{
			List<DataTable> tableList = new List<DataTable>();

			//查看权限
			if (!DBUtility.ClsPub.Security_Log("Sc_WorkBeginDotCheckBillMain_Edit", 1, false, User))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "查询失败!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (HMaterID == null \|\| HMaterID.Equals(""))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "物料不能为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (HProcID == null \|\| HProcID.Equals(""))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "工序不能为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (HSourceID == null \|\| HSourceID.Equals(""))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "生产资源不能为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("exec h_p_WorkBeginDotCheckList '" + HMaterID + "','" + HProcID + "','" + HSourceID + "'", "h_p_WorkBeginDotCheckList");

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "查询成功！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 设备启动点检清单列表查询
			[Route("Sc_WorkBeginDotCheckBill/getGy_WorkBeginDotCheckListBillMainList")]
			[HttpGet]

			@@ -473,7 +473,7 @@
			",HTechnologyParameter,HPicNum,HProcCheckNote" +
			",HOverRate,HProcWorkNum,HBadWHID,HWasterWHID, HWHID,HEstimate,HIsTime" +
			",HQCSchemeID_Fst,HQCSchemeID_Proc,HQCSchemeID_Patrol" +
			",HWorkTimes_S,HSortProcFlag " +
			",HWorkTimes_S,HSortProcFlag,HSNCtrl " +
			") values("
			+ HInterID + "," + i + "," + oSub.HProcID.ToString() + ",'" + oSub.HProcNo + "'," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
			"," + oSub.HWorkQty.ToString() + "," + oSub.HCenterID.ToString() + ",'" + oSub.HTimeUnit.ToString() + "'," + oSub.HUnitTime.ToString() +
			@@ -487,7 +487,7 @@
			",'" + oSub.HTechnologyParameter.ToString() + "','" + oSub.HPicNum.ToString() + "','" + oSub.HProcCheckNote.ToString() +
			"', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'," + oSub.HBadWHID.ToString() + "," + oSub.HWasterWHID.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HEstimate.ToString() + "," + Convert.ToString(oSub.HIsTime ? 1 : 0) + "," + oSub.HQCSchemeID_Fst + "," +
			oSub.HQCSchemeID_Proc + "," + oSub.HQCSchemeID_Patrol +
			", " + oSub.HWorkTimes_S.ToString() + "," + Convert.ToString(oSub.HSortProcFlag ? 1 : 0) +
			", " + oSub.HWorkTimes_S.ToString() + "," + Convert.ToString(oSub.HSortProcFlag ? 1 : 0) + "," + Convert.ToString(oSub.HSNCtrl ? 1 : 0) +
			") ");
			//计价方式不为计时，则把计时暂估字段更新为空
			if (oSub.HIsTime == false)

			@@ -10,6 +10,7 @@
			public long HProcID { get; set; }//工序ID
			public string HProcNo { get; set; }//流水号
			public long HSupID { get; set; }//供应商ID
			public bool HSNCtrl { get; set; }//SN过站
			public bool HSupFlag { get; set; }//外协标记
			public double HWorkQty { get; set; }//加工数量
			public double HPassRate { get; set; }//良率