工序出站-合并

zgq

2021-04-23 742d2d8cc10f2fe886688ac1bf9b7e851c6c449c

工序出站-合并

 WebAPI/Controllers/Sc_ProcessMangementController.cs

@@ -783,7 +783,7 @@
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            
            string UserName;
            ListModels oListModels = new ListModels();
            try
            {
@@ -794,8 +794,8 @@
                lsmain = oListModels.getObjectByJson_Reportlist(msg2);
                foreach (Model.ClsSc_ProcessReportMain oItem in lsmain)
                {
                    //oItem.HMaker = "";
                    //UserName = oItem.HMaker;
                    UserName = oItem.HMaker;
                    oItem.HMaker = UserName;
                    oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
@@ -1166,8 +1166,18 @@
        public object CloseProcessReportList(int HInterID,int IsClose,string CurUserName) 
        {
            DataSet ds;
             string ModRightNameCheck = "Sc_ProcessReport_check";
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "审核失败！无权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (HInterID <= 0)
                {
@@ -1187,9 +1197,19 @@
                    objJsonResult.data = null;
                    return objJsonResult; ;
                }
                var HChecker = ds.Tables[0].Rows[0]["HChecker"].ToString();
                var HCloseMan = ds.Tables[0].Rows[0]["HCloseMan"].ToString();
           
                if (IsClose == 0)
                {

                    if (HCloseMan.Trim() != "" || HChecker.Trim() == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据未审核、已关闭、已作废状态下不允许关闭！！！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    oCN.RunProc("update  Sc_ProcessReportMain set HCloseMan='" + CurUserName + "' ,HCloseDate=GETDATE() where HInterID=" + HInterID);
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
@@ -1199,6 +1219,14 @@
                } 
                else if(IsClose==1)
                {
                    if (HCloseMan.Trim() == "" || HChecker.Trim() == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据未审核、未关闭、已作废状态下不允许撤销关闭！！！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }

                    oCN.RunProc("update  Sc_ProcessReportMain set HCloseMan='' ,HCloseDate=null where HInterID=" + HInterID);
                    objJsonResult.code = "0";
@@ -1240,8 +1268,19 @@
        public object AuditProcessReportList(int HInterID, int IsAudit, string CurUserName)
        {
            DataSet ds;
            string ModRightNameCheck = "Sc_ProcessReport_check";
            var a = DBUtility.ClsPub.CurUserName;
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "审核失败！无权限！";
                    objJsonResult.data = null;
                    return objJsonResult; 
                }
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (HInterID <= 0)
                {
@@ -1251,7 +1290,6 @@
                    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)
                {
@@ -1259,27 +1297,46 @@
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有这个单据，无法审核！";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                    return objJsonResult; 
                }
                var HChecker = ds.Tables[0].Rows[0]["HChecker"].ToString();//取审核人
                var HMaker=ds.Tables[0].Rows[0]["HMaker"].ToString();//取制单人
                var HCloseMan=ds.Tables[0].Rows[0]["HCloseMan"].ToString();//取关闭人
                if (IsAudit == 0)
                {
                    if (HChecker.Trim() != "" || HChecker.Trim() == HMaker || HCloseMan != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据已审核、已关闭、已作废状态不允许审核！！！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }

                    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; ;
                    return objJsonResult; 
                }
                else if (IsAudit == 1)
                {
                    if (HChecker.Trim() == "" || HChecker.Trim() == CurUserName || HCloseMan != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据未审核、已关闭、已作废状态下不允许反审核！！！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }

                    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; ;
                    return objJsonResult; 
                }
                else
                {
@@ -1287,7 +1344,7 @@
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据无法审核！";
                    objJsonResult.data = null;
                    return objJsonResult; ;
                    return objJsonResult; 
                }



 WebAPI/DLL/ClsSc_ProcessReport.cs

@@ -140,7 +140,7 @@
                "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HDeptID.ToString() + ",'" + omodel.HDeptNumber + "'," + omodel.HGroupID.ToString() +
                ",'" + omodel.HGroupNumber + "'," + omodel.HMaterID.ToString() + ",'" + omodel.HMaterNumber + "'," + omodel.HUnitID.ToString() + ",'" + omodel.HUnitNumber + "'" +
                ", " + omodel.HPlanQty.ToString() + "," + omodel.HInStockQty.ToString() + "," + omodel.HSumTimes.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HRemark + "'" +
                ",'" + omodel.HInnerBillNo  + "','" + DBUtility.ClsPub.CurUserName + "',getdate()," + omodel.HSupID.ToString() + ",'" + omodel.HMarker + "'" +
                ",'" + omodel.HInnerBillNo  + "','" + omodel.HMaker.ToString() + "',getdate()," + omodel.HSupID.ToString() + ",'" + omodel.HMarker + "'" +
                ") ");
                //插入子表
                foreach (Model.ClsSc_ProcessReportSub oSub in DetailColl)

 WebAPI/Properties/PublishProfiles/API.pubxml.user

@@ -11,7 +11,7 @@
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="bin/Antlr3.Runtime.dll">
      <publishTime>02/22/2013 08:43:40</publishTime>
@@ -20,19 +20,19 @@
      <publishTime>02/22/2013 08:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 14:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
      <publishTime>09/20/2018 19:23:20</publishTime>
@@ -50,7 +50,7 @@
      <publishTime>07/25/2012 11:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="bin/Newtonsoft.Json.dll">
      <publishTime>08/03/2014 20:33:56</publishTime>
@@ -59,13 +59,13 @@
      <publishTime>01/04/2011 13:48:18</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>05/21/2020 10:51:50</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/15/2015 17:57:08</publishTime>
@@ -131,7 +131,7 @@
      <publishTime>11/28/2018 13:01:00</publishTime>
    </File>
    <File Include="bin/System.Web.Http.WebHost.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="bin/System.Web.Mvc.dll">
      <publishTime>01/28/2015 04:02:18</publishTime>
@@ -164,10 +164,10 @@
      <publishTime>11/24/2014 11:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>04/23/2021 14:25:28</publishTime>
      <publishTime>04/22/2021 20:00:19</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>04/23/2021 14:25:28</publishTime>
      <publishTime>04/22/2021 20:00:19</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>02/04/2021 21:35:21</publishTime>
@@ -185,163 +185,163 @@
      <publishTime>03/26/2019 14:23:20</publishTime>
    </File>
    <File Include="Content/bootstrap.css">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Content/bootstrap.min.css">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Content/Site.css">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="DLL/BLL.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="DLL/DAL.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="DLL/DBUtility.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="DLL/Model.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="DLL/Newtonsoft.Json.Net35.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="DLL/Pub_Class.dll">
      <publishTime>05/21/2020 10:51:50</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="DLL/Pub_Control.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="DLL/SQLHelper.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.eot">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.svg">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.ttf">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.woff">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Global.asax">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Index.html">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>01/21/2021 13:19:40</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.min.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.map">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.min.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Views/Scripts/modernizr-2.6.2.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Views/Shared/Error.cshtml">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Views/Shared/_Layout.cshtml">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Views/web.config">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Views/_ViewStart.cshtml">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
      <publishTime>02/22/2021 09:25:21</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
      <publishTime>02/22/2021 09:25:21</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
      <publishTime>02/22/2021 09:25:21</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
      <publishTime>02/22/2021 09:25:21</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>03/26/2021 14:35:48</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>04/23/2021 14:25:47</publishTime>
      <publishTime>04/22/2021 20:00:25</publishTime>
    </File>
  </ItemGroup>
</Project>