新增工序出站、进站模块-合并

zgq

2021-04-22 2d33e01ccb5085171653876daf630f8c09909d76

新增工序出站、进站模块-合并

 WebAPI/Controllers/Sc_ProcessMangementController.cs

@@ -128,6 +128,97 @@
        }

        /// <summary>
        /// 返回生产汇报单主表详情信息
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Sc_ProcessMangement/MES_DetailSc_ProcessReportList_Json")]
        [HttpGet]
        public object MES_DetailSc_ProcessReportList_Json(int HInterID)
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (HInterID<=0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID小于0！" ;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {

                    string sql1 = @"select s1.HInterID,s1.HBillNo,s1.HDeptID,s2.HName,s1.HDate,s1.HPlanQty,s1.HICMOBillNo,s1.HRemark,s2.HNumber
,s1.HMaker,s1.HMakeDate,s1.HChecker,s1.HCheckDate,s1.HUpDater,s1.HUpDateDate,s1.HCloseMan,s1.HCloseDate
from Sc_ProcessReportMain s1 
    inner join Gy_Department s2 on s1.HDeptID=s2.HItemID and s1.HInterID=" + HInterID;

                    ds = oCN.RunProcReturn(sql1, "Sc_ProcessReportMain");
           
                }
       
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
            return GetObjectJson(ds);
        }

        /// <summary>
        /// 返回生产派工单关联详情信息
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Sc_ProcessMangement/MES_h_v_Sc_ProcessSendWorkList_Json")]
        [HttpGet]
        public object MES_h_v_Sc_ProcessSendWorkList_Json(int HInterID)
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (HInterID <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID小于0！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {

                    string sql1 =@"select [hmainid], [日期], [单据号], [HDeptID], [部门代码], [部门], [HMaterID], [物料代码], [物料名称], [规格型号], [HUnitID], [计量单位代码], [计量单位], [HprocID], 
[工序代码], [工序], [HGroupID], [班组代码], [班组名称], [HSourceID], [资源代码], [生产资源], [HWorkerID], [职员代码], [职员], [hsubid], [数量], [计划开工日期], 
[计划完工日期], [计划工时], [表体备注], [HICMOInterID], [生产任务单号], [HSeOrderInterID], [销售订单号], [表头备注], [制单人], [制单日期], [审核人], [审核日期], [修改人],
[修改日期], [关闭人], [关闭日期], [作废人], [作废日期], [源单主内码], [源单子内码], [源单单号], [源单类型], [行关闭人], [HBillType], [HQtyDecimal], [HPriceDecimal] 
from h_v_Sc_ProcessSendWorkList 
where hmainid=(select HSourceID from Sc_ProcessReportSub where HInterID="+HInterID+")";

                    ds = oCN.RunProcReturn(sql1, "h_v_Sc_ProcessSendWorkList");

                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
            return GetObjectJson(ds);
        }

        /// <summary>
        /// 返回生产工序计划单列表
        ///参数：string sql。
        ///返回值：object。
@@ -761,23 +852,19 @@
                    reportSub.HEntryID = i;
                    reportSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    reportSub.HRemark = "";
                    reportSub.HCloseMan = "";
                    reportSub.HCloseMan = ReportModel.omodel.HCloseMan;
                    reportSub.HCloseType = false;
                    reportSub.HEmpID =0;
                    reportSub.HICMOBillNo ="";
                    reportSub.HICMOInterID = (long)ItemView.HICMOInterID;
                    reportSub.HEntryID = i;
                    reportSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                    reportSub.HRemark = "";
                    reportSub.HCloseMan = "";
                    reportSub.HCloseType = false;
                    reportSub.HSourceBillType = "3712";
                    reportSub.HQty = (double)ItemView.数量;
                    reportSub.HProcID = (long)ItemView.HprocID;
                    reportSub.HProcNumber = ItemView.工序代码;
                    reportSub.HOutPrice = 0;
                    reportSub.HOutMoney = 0;
                    reportSub.HSourceID = (long)ItemView.HSourceID;
                    reportSub.HSourceID = (long)ItemView.hmainid;
                    reportSub.HEmpNumber = "";
                    reportSub.HRelBeginDate = DateTime.Now;
                    reportSub.HRelEndDate = DateTime.Now;
@@ -787,8 +874,8 @@
                    reportSub.HSeOrderBillNo = "";
                    reportSub.HProcPlanInterID = 0;
                    reportSub.HProcPlanBillNo = "";
                    reportSub.HSourceInterID = 0;
                    reportSub.HSourceBillNo = "";
                    reportSub.HSourceInterID = (long)ItemView.hmainid;
                    reportSub.HSourceBillNo = ItemView.单据号;
                    reportSub.HRelationQty = 0;
                    reportSub.HRelationMoney = 0;
                    reportSub.HMaterID = (long)ItemView.HMaterID;
@@ -803,7 +890,7 @@
                    reportSub.HProcPlanEntryID = 0;
                    reportSub.HProcPlanBillNo = "";
                    reportSub.HSourceEntryID = 0;
                    reportSub.HSourceBillType = "";
                    reportSub.HSourceBillType = "3712";
                    reportSub.HRelationQty = 0;
                    reportSub.HRelationMoney = 0;
                    reportSub.HBadPrirce = 0;
@@ -1067,8 +1154,156 @@
        }


        /// <summary>
        /// 汇报单编辑关闭功能
        /// </summary>
        /// <param name="HInterID"></param>
        /// <param name="IsClose"></param>
        ///  <param name="CurUserName"></param>
        /// <returns></returns>
        [Route("CloseProcessReportList")]
        [HttpGet]
        public object CloseProcessReportList(int HInterID,int IsClose,string CurUserName) 
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (HInterID <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID小于0！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ds = oCN.RunProcReturn("select * from Sc_ProcessReportMain where HInterID=" + HInterID, "Sc_ProcessReportMain");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有这个单据，无法关闭！";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }
                if (IsClose == 0)
                {

                    oCN.RunProc("update  Sc_ProcessReportMain set HCloseMan='" + CurUserName + "' ,HCloseDate=GETDATE() where HInterID=" + HInterID);
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "* 单据关闭成功！";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                } 
                else if(IsClose==1)
                {

                    oCN.RunProc("update  Sc_ProcessReportMain set HCloseMan='' ,HCloseDate=null where HInterID=" + HInterID);
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "* 单据反关闭成功！";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据无法关闭！";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }

                
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "关闭失败或则反关闭失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        /// <summary>
        /// 汇报单编辑审核反审核功能
        /// </summary>
        /// <param name="HInterID"></param>
        /// <param name="IsAudit"></param>
        ///  <param name="CurUserName"></param>
        /// <returns></returns>
        [Route("AuditProcessReportList")]
        [HttpGet]
        public object AuditProcessReportList(int HInterID, int IsAudit, string CurUserName)
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (HInterID <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID小于0！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ds = oCN.RunProcReturn("select * from Sc_ProcessReportMain where HInterID=" + HInterID, "Sc_ProcessReportMain");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有这个单据，无法审核！";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }
                if (IsAudit == 0)
                {

                    oCN.RunProc("update  Sc_ProcessReportMain set HChecker='" + CurUserName + "' ,HCheckDate=GETDATE() where HInterID=" + HInterID);
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "* 单据审核成功！";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }
                else if (IsAudit == 1)
                {

                    oCN.RunProc("update  Sc_ProcessReportMain set HChecker='' ,HCheckDate=null where HInterID=" + HInterID);
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "* 单据反审核成功！";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据无法审核！";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }


     
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "审核失败或者反审核失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }




    }
}

 WebAPI/Properties/PublishProfiles/API.pubxml.user

@@ -164,10 +164,10 @@
      <publishTime>11/24/2014 11:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>04/22/2021 17:08:09</publishTime>
      <publishTime>04/19/2021 15:30:26</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>04/22/2021 17:08:09</publishTime>
      <publishTime>04/19/2021 15:30:26</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>02/04/2021 21:35:21</publishTime>
@@ -341,7 +341,7 @@
      <publishTime>02/22/2021 09:25:20</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>04/22/2021 17:08:27</publishTime>
      <publishTime>04/19/2021 15:30:33</publishTime>
    </File>
  </ItemGroup>
</Project>