增加异常反馈,签到,接收,处理,验收,反写异常反馈单的状态, 异常反馈单 增加 字段 HErrLev varchar(100) --影响面程度（无法判...

zrg

2024-08-05 ba09093a626f018ca0778819674165a609976530

增加异常反馈,签到,接收,处理,验收,反写异常反馈单的状态,
异常反馈单 增加 字段 HErrLev varchar(100) --影响面程度（无法判断、停线、批量不良、偶发不良） 增加 异常反馈分析报表

 DAL/ÐÅϢƽ̨/ClsOA_ErrMsgBackCheckBill.cs

@@ -195,7 +195,7 @@
                oCn.RunProc(sql);

                //验收单反写异常反馈单,为已完成
                oCn.RunProc("update OA_ErrMsgBackBillMain set HCloseFlag='1' where HInterID=" + omodel.HErrMsgBackInterID);
                oCn.RunProc("update OA_ErrMsgBackBillMain set HCloseFlag='1',HBillStatus='10' where HInterID=" + omodel.HErrMsgBackInterID);

                //=========================保存后控制  
                DataSet ds2 = oCn.RunProcReturn("Exec h_p_OA_ErrMsgBackCheckBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_OA_ErrMsgBackCheckBill_AfterSaveCtrl");

 DAL/ÐÅϢƽ̨/ClsOA_ErrMsgBackHandleBill.cs

@@ -194,6 +194,10 @@
                //主表
                oCn.RunProc(sql);

                //反馈处理单保存后,更新异常反馈单的状态
                string sql1 = "update OA_ErrMsgBackBillMain set HBillStatus='9' where HBillNo='" + omodel.HErrMsgBackBillNo + "' ";
                oCn.RunProc(sql1);

                //=========================保存后控制  
                DataSet ds2 = oCn.RunProcReturn("Exec h_p_OA_ErrMsgBackHandleBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_OA_ErrMsgBackHandleBill_AfterSaveCtrl");
                if (ds2 == null)

 DAL/ÐÅϢƽ̨/ClsOA_ErrMsgBackReceiveBill.cs

@@ -190,8 +190,8 @@
                oCn.RunProc(sql);

                //反馈接收单保存后,更新异常反馈单的指派处理人
                string sql1 = "update OA_ErrMsgBackBillMain set HHandleEmpID='" + omodel.HHandleEmpID.ToString() + "' where HBillNo='" + omodel.HMainSourceBillNo + "' ";
                oCn.RunProc(sql1);
                string sql1 = "update OA_ErrMsgBackBillMain set HHandleEmpID='" + omodel.HHandleEmpID.ToString() + "', HBillStatus='14' where HBillNo='" + omodel.HMainSourceBillNo + "' ";
                oCn.RunProc(sql1);               
                //=========================保存后控制  
                DataSet ds2 = oCn.RunProcReturn("Exec h_p_OA_ErrMsgBackReceiveBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_OA_ErrMsgBackReceiveBill_AfterSaveCtrl");
                if (ds2 == null)

 DAL/ÐÅϢƽ̨/ClsOA_ErrMsgBackSignBill.cs

@@ -192,6 +192,10 @@
                //主表
                oCn.RunProc(sql);

                //反馈签到单保存后,更新异常反馈单的状态
                string sql1 = "update OA_ErrMsgBackBillMain set HBillStatus='13' where HBillNo='" + omodel.HErrMsgBackBillNo + "' ";
                oCn.RunProc(sql1);

                //=========================保存后控制  
                DataSet ds2 = oCn.RunProcReturn("Exec h_p_OA_ErrMsgBackSignBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_OA_ErrMsgBackSignBill_AfterSaveCtrl");
                if (ds2 == null)

 WebAPI/Controllers/Æ·ÖʹÜÀí/ÖÊÁ¿±¨±í/QC_QualityReportsController.cs

@@ -978,5 +978,51 @@
            }
        }
        #endregion

        #region è´¨é‡æ¨¡å—   å¼‚常反馈分析报表  æŸ¥è¯¢

        [Route("QC_CustomerAppealReport/getOA_ErrMsgBackBillList_Query")]
        [HttpGet]
        public object getOA_ErrMsgBackBillList_Query(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_OA_ErrMsgBackBillList_Query order by æ—¥æœŸ desc", "h_v_OA_ErrMsgBackBillList_Query");
                }
                else
                {
                    string sql1 = "select * from h_v_OA_ErrMsgBackBillList_Query where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by æ—¥æœŸ ";
                    ds = oCN.RunProcReturn(sql, "h_v_OA_ErrMsgBackBillList_Query");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

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

 WebAPI/DLL/ClsOA_ErrMsgBackBill.cs

@@ -74,6 +74,7 @@
                ",HQEMan='" + omodel.HQEMan.ToString() + "'" +
                ",HSourceID='" + omodel.HSourceID.ToString() + "'" +
                ",HShiftsID='" + omodel.HShiftsID.ToString()+ "'" +
                 ",HErrLev ='" + omodel.HErrLev.ToString() + "'" +
                ",HHandleEmpID=" + omodel.HHandleEmpID.ToString() +

                " where HInterID=" + lngBillKey.ToString());
@@ -146,7 +147,7 @@
                ",HCopyMan,HHasten,HLevel,HReTransmitMan,HBillTypeName"+
                ",HPlanBillNo,HMaterName,HMaterModel,HQty,HSendType"+
                ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRecDeptID,HMaterNumber,HErrMsgBackTypeID,HHandleEmpID,HCloseFlag" +
                ",HForm,HChangeNote,HNote,HBadProcMan,HQEMan,HSourceID,HShiftsID" +
                ",HForm,HChangeNote,HNote,HBadProcMan,HQEMan,HSourceID,HShiftsID,HErrLev" +
                ") " +
                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
@@ -155,7 +156,7 @@
                ",'" + omodel.HPlanBillNo + "','" + omodel.HMaterName + "','" + omodel.HMaterModel + "'," + omodel.HQty.ToString() + ",'" + omodel.HSendType + "'" +
                ",'" + omodel.HMainSourceInterID + "','" + omodel.HMainSourceEntryID + "','" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'" +
                "," + omodel.HRecDeptID + ",'" + omodel.HMaterNumber + "'," + omodel.HErrMsgBackTypeID +", " + omodel.HHandleEmpID + ", '"+ "0"+
                "','" + omodel.HForm + "','" + omodel.HChangeNote + "','" + omodel.HNote + "','" + omodel.HBadProcMan + "','" + omodel.HQEMan + "','" + omodel.HSourceID + "','" + omodel.HShiftsID + "') ");
                "','" + omodel.HForm + "','" + omodel.HChangeNote + "','" + omodel.HNote + "','" + omodel.HBadProcMan + "','" + omodel.HQEMan + "','" + omodel.HSourceID + "','" + omodel.HShiftsID + "','" + omodel.HErrLev+ "') ");
                //插入子表
                //foreach (Models.ClsOA_ErrMsgBackBillSub oSub in DetailColl)
                //{

 WebAPI/Models/ClsOA_ErrMsgBackBillMain.cs

@@ -35,5 +35,6 @@
        public Int64 HQEMan; //int --QE责任人 
        public Int64 HSourceID; // int --生产资源 
        public Int64 HShiftsID; // int --生产班次（Gy_Shifts） 
        public string HErrLev; // varchar(100) --影响面程度（停线、批量不良、偶发不良、无法判断）
    }
}

 WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml.user

@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
    <History>True|2024-08-02T06:51:56.4523731Z;True|2024-08-02T11:15:21.6141517+08:00;True|2024-08-02T11:02:47.2279329+08:00;True|2024-08-02T10:12:26.2043659+08:00;True|2024-08-02T10:06:59.9131305+08:00;True|2024-08-01T15:48:47.0889207+08:00;True|2024-08-01T15:41:57.2619074+08:00;False|2024-08-01T15:38:42.2210774+08:00;True|2024-08-01T15:26:38.2209058+08:00;True|2024-08-01T15:20:30.4979113+08:00;True|2024-08-01T15:18:30.8515336+08:00;True|2024-08-01T14:39:01.4083319+08:00;True|2024-08-01T14:33:31.9930824+08:00;True|2024-08-01T10:59:53.5042176+08:00;True|2024-08-01T10:58:17.7670138+08:00;True|2024-07-31T10:42:25.9690193+08:00;True|2024-07-31T10:39:22.9657733+08:00;</History>
    <History>True|2024-08-05T06:15:37.7606467Z;True|2024-08-05T10:38:17.0385673+08:00;True|2024-08-02T15:30:55.2850118+08:00;True|2024-08-02T14:51:56.4523731+08:00;True|2024-08-02T11:15:21.6141517+08:00;True|2024-08-02T11:02:47.2279329+08:00;True|2024-08-02T10:12:26.2043659+08:00;True|2024-08-02T10:06:59.9131305+08:00;True|2024-08-01T15:48:47.0889207+08:00;True|2024-08-01T15:41:57.2619074+08:00;False|2024-08-01T15:38:42.2210774+08:00;True|2024-08-01T15:26:38.2209058+08:00;True|2024-08-01T15:20:30.4979113+08:00;True|2024-08-01T15:18:30.8515336+08:00;True|2024-08-01T14:39:01.4083319+08:00;True|2024-08-01T14:33:31.9930824+08:00;True|2024-08-01T10:59:53.5042176+08:00;True|2024-08-01T10:58:17.7670138+08:00;True|2024-07-31T10:42:25.9690193+08:00;True|2024-07-31T10:39:22.9657733+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
@@ -21,28 +21,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>08/02/2024 14:51:21</publishTime>
      <publishTime>08/05/2024 14:15:23</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>08/02/2024 14:51:21</publishTime>
      <publishTime>08/05/2024 14:15:23</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>08/02/2024 14:51:19</publishTime>
      <publishTime>08/05/2024 14:15:22</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>08/02/2024 14:51:19</publishTime>
      <publishTime>08/05/2024 14:15:22</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>08/02/2024 14:51:16</publishTime>
      <publishTime>08/05/2024 14:15:19</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>08/02/2024 14:51:16</publishTime>
      <publishTime>08/05/2024 14:15:19</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -87,10 +87,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>08/02/2024 14:51:17</publishTime>
      <publishTime>08/05/2024 14:15:19</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>08/02/2024 14:51:17</publishTime>
      <publishTime>08/05/2024 14:15:19</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>05/25/2024 09:46:41</publishTime>
@@ -123,25 +123,25 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>08/02/2024 14:51:13</publishTime>
      <publishTime>08/05/2024 14:15:17</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>08/02/2024 14:51:13</publishTime>
      <publishTime>08/05/2024 14:15:17</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>08/02/2024 14:51:14</publishTime>
      <publishTime>08/05/2024 14:15:18</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>08/02/2024 14:51:14</publishTime>
      <publishTime>08/05/2024 14:15:18</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>08/02/2024 14:51:15</publishTime>
      <publishTime>08/05/2024 14:15:18</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>08/02/2024 14:51:15</publishTime>
      <publishTime>08/05/2024 14:15:18</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
@@ -255,10 +255,10 @@
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>08/02/2024 14:51:28</publishTime>
      <publishTime>08/05/2024 14:15:29</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>08/02/2024 14:51:28</publishTime>
      <publishTime>08/05/2024 14:15:29</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -453,7 +453,7 @@
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>08/02/2024 14:51:55</publishTime>
      <publishTime>08/05/2024 14:15:36</publishTime>
    </File>
  </ItemGroup>
</Project>