修改生产报表查询方法,物料新增编辑增加事业部与项目保存字段

zrg

2024-09-05 b445defcf7e9dad85032a8279cca29a2892d3089

修改生产报表查询方法,物料新增编辑增加事业部与项目保存字段

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

@@ -956,14 +956,13 @@
                Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);

                string HYear = dic["HYear"].ToString();//å¹´
                string HDeptName = dic["HDeptName"].ToString();//部门
                string HProject = dic["HProject"].ToString();//项目号
                string HMaterNumber = dic["HMaterNumber"].ToString();//物料代码
                string HMaterName = dic["HMaterName"].ToString();//物料名称
                string HBatchWork = dic["HBatchWork"].ToString();//是否量产
                string HDivisionName = dic["HDivisionName"].ToString();//事业部

                ds = oCN.RunProcReturn("exec h_p_QC_ProcessPerformanceFirstPassList   '" + HYear + "','"+ HDeptName + "','" + HProject + "','" + HMaterNumber + "','" + HMaterName + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_ProcessPerformanceFirstPassList");
                ds = oCN.RunProcReturn("exec h_p_QC_ProcessPerformanceFirstPassList   '" + HYear + "','" + HProject + "','" + HMaterNumber + "','" + HMaterName + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_ProcessPerformanceFirstPassList");
              

                //添加列名
@@ -1005,14 +1004,13 @@
                Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);

                string HYear = dic["HYear"].ToString();//å¹´
                string HDeptName = dic["HDeptName"].ToString();//部门
                string HProject = dic["HProject"].ToString();//项目号
                string HMaterNumber = dic["HMaterNumber"].ToString();//物料代码
                string HMaterName = dic["HMaterName"].ToString();//物料名称
                string HBatchWork = dic["HBatchWork"].ToString();//是否量产
                string HDivisionName = dic["HDivisionName"].ToString();//事业部

                ds = oCN.RunProcReturn("exec h_p_QC_ProcessPerformancePassList  '" + HYear + "','" + HDeptName + "','" + HProject + "','" + HMaterNumber + "','" + HMaterName + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_ProcessPerformancePassList");
                ds = oCN.RunProcReturn("exec h_p_QC_ProcessPerformancePassList  '" + HYear + "','" + HProject + "','" + HMaterNumber + "','" + HMaterName + "','" + HBatchWork + "','" + HDivisionName + "'", "h_p_QC_ProcessPerformancePassList");


                //添加列名
@@ -1426,12 +1424,7 @@
        }
        #endregion

        #region è´¨é‡æ¨¡å— å…¨ç¨‹è´¨é‡è¿½æº¯
        /// <summary>
        /// è¿”回异常问题来源
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        #region è´¨é‡æ¨¡å— å…¨ç¨‹è´¨é‡è¿½æº¯       
        [Route("QC_CustomerAppealReport/Get_QC_FiveMenOneRingList")]
        [HttpGet]
        public object Get_QC_FiveMenOneRingList(string SN, string user)
@@ -1475,6 +1468,52 @@
                return objJsonResult;
            }
        }
        
        //点击主表格的流转卡,查询子表格数据
        [Route("QC_CustomerAppealReport/Get_QC_FiveMenOneRingList_Right")]
        [HttpGet]
        public object Get_QC_FiveMenOneRingList_Right(string linterid, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                ds = oCN.RunProcReturn("exec h_p_QC_FiveMenOneRingList_Query '" + linterid + "'", "h_p_QC_FiveMenOneRingList_Query");

                // éåŽ†æ‰€æœ‰è¡¨
                foreach (DataTable table in ds.Tables)
                {
                    List<object> tableColumnList = new List<object>();

                    // æ·»åŠ åˆ—名
                    foreach (DataColumn col in table.Columns)
                    {
                        Type dataType = col.DataType;
                        string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                        tableColumnList.Add(JsonConvert.DeserializeObject(ColmString));
                    }

                    // å°†æ¯ä¸ªè¡¨çš„列名列表添加到总列名列表
                    columnNameList.Add(new { TableName = table.TableName, Columns = tableColumnList });
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds;
                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

        #region è´¨é‡æ¨¡å— åˆ¶ç¨‹é™·é˜±æµ‹è¯•è¶‹åŠ¿å›¾æŠ¥è¡¨

 WebAPI/Controllers/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBillController.cs

@@ -1726,6 +1726,9 @@
            public string HName;
            public DateTime HBeginDate;
            public DateTime HEndDate;
            public string HProcName;
            public string HEquipName;
            public string HBactNo;
        }
        [Route("Sc_QualityReportBill/getSc_QualityReportBillDay")]
        [HttpGet]
@@ -1744,7 +1747,7 @@
                    return objJsonResult;
                }
                ReportWorkDemandPlanBill Report = JsonConvert.DeserializeObject<ReportWorkDemandPlanBill>(sWhere);
                ds = oCN.RunProcReturn($"exec h_p_Sc_StationOutBillMain  '{Report.HBeginDate}','{Report.HEndDate}','{Report.HNumber}','{Report.HName}'", "h_p_Sc_StationOutBillMain");
                ds = oCN.RunProcReturn($"exec h_p_Sc_StationOutBillMain  '{Report.HBeginDate}','{Report.HEndDate}','{Report.HNumber}','{Report.HName}','{Report.HProcName}','{Report.HEquipName}','{Report.HBactNo}'", "h_p_Sc_StationOutBillMain");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
@@ -1778,6 +1781,8 @@
            public string HYear;
            public string HWorkCenter;
            public string HName;
            public DateTime HBeginDate;
            public DateTime HEndDate;

        }
        [Route("Sc_QualityReportBill/getSc_QualityReportBillMonth")]
@@ -1797,7 +1802,7 @@
                    return objJsonResult;
                }
                ReportWorkDemandPlanBill1 Report = JsonConvert.DeserializeObject<ReportWorkDemandPlanBill1>(sWhere);
                ds = oCN.RunProcReturn($"exec h_p_Sc_StationOutBillMonth  '{Report.HYear}','{Report.HWorkCenter}','{Report.HName}'", "h_p_Sc_StationOutBillMonth");
                ds = oCN.RunProcReturn($"exec h_p_Sc_StationOutBillMonth  '{Report.HYear}','{Report.HWorkCenter}','{Report.HName}', '{Report.HBeginDate}','{Report.HEndDate}'", "h_p_Sc_StationOutBillMonth");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)

 WebAPI/DLL/ClsGy_Material_Ctl.cs

@@ -28,7 +28,7 @@
                    ",HSALEUNITID,HSALEPRICEUNITID,HBASEUNITID,HSTOREUNITID,HCHECKINCOMING,HCHECKPRODUCT,HPERUNITSTANDHOUR" +
                    ",HSTDLABORPREPARETIME,HSTDMACHINEPREPARETIME,HWidth,HWeight,HColorRemark,HQCSchemeID_Fst,HQCSchemeID_Proc,HQCSchemeID_Patrol" +
                    ",HMaterRuleType,HColorNo,HPieceMaxQty,HCommonUseFlag,HAvgStockPrice,HFootPrice,HTaxCost,HNoTaxCost,HOnceRightRate" +
                    ",HHeight_M,HInches_M,HAl1Long_M,HDensity_M,HTela_M,HUnderTela_M,HSizing_M,HQtyDec,HPriceDec,HMoneyDec,HTaxRate,HProfitRate" +
                    ",HHeight_M,HInches_M,HAl1Long_M,HDensity_M,HTela_M,HUnderTela_M,HSizing_M,HQtyDec,HPriceDec,HMoneyDec,HTaxRate,HProfitRate,HProjectBillMainID,HDivisionID" +
                    ") " +
                    " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
                    ", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
@@ -51,7 +51,9 @@
                       "," + oModel.HMoneyDec +
                       "," + oModel.HTaxRate +
                       "," + oModel.HProfitRate +
                       ")", ref DBUtility.ClsPub.sExeReturnInfo);
                       ",'" + oModel.HProjectBillMainID +
                       "','" + oModel.HDivisionID +
                       "')", ref DBUtility.ClsPub.sExeReturnInfo);
                //修改上级为非末级代码
                oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                oCn.Commit();
@@ -219,6 +221,8 @@
                    ",HMoneyDec=" + oModel.HMoneyDec.ToString() +
                    ",HTaxRate=" + oModel.HTaxRate.ToString() +
                    ",HProfitRate=" + oModel.HProfitRate.ToString() +
                    ",HProjectBillMainID='" + oModel.HProjectBillMainID + "'" +
                    ",HDivisionID='" + oModel.HDivisionID + "'" +
                    " Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                //修改子项目代码
                oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);

 WebAPI/Models/ClsGy_Material_Model.cs

@@ -105,5 +105,6 @@

        public double HProfitRate; // é»˜è®¤åˆ©æ¶¦çŽ‡ï¼ˆé»˜è®¤0）
        public int HProjectBillMainID; //项目号
        public int HDivisionID; //事业部
    }
}

 WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user

@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <History>True|2024-08-30T08:08:31.2415230Z;True|2024-08-30T15:18:36.6727666+08:00;True|2024-08-28T09:49:18.1543721+08:00;False|2024-08-28T09:49:11.7260337+08:00;True|2024-08-27T13:18:40.6234335+08:00;False|2024-08-27T13:18:33.9730040+08:00;True|2024-08-26T17:40:29.9158973+08:00;True|2024-08-26T17:21:30.8800173+08:00;True|2024-08-26T17:19:23.9260010+08:00;True|2024-08-26T14:27:20.8154004+08:00;True|2024-08-26T14:16:14.4482284+08:00;True|2024-08-26T13:12:42.9574127+08:00;True|2024-08-26T12:48:31.2107630+08:00;True|2024-08-26T11:07:15.1181342+08:00;False|2024-08-26T11:07:09.9429791+08:00;True|2024-08-26T10:49:20.8494484+08:00;True|2024-08-26T10:13:11.5222607+08:00;False|2024-08-26T10:12:59.1146882+08:00;True|2024-08-23T15:39:39.9842990+08:00;False|2024-08-23T15:39:33.9824708+08:00;True|2024-08-22T16:55:46.4689463+08:00;True|2024-08-22T16:44:25.0981764+08:00;True|2024-08-22T16:19:29.9801909+08:00;True|2024-08-22T14:25:13.5120259+08:00;True|2024-08-22T09:48:50.0760398+08:00;True|2024-08-21T16:09:41.0487181+08:00;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History>
    <History>True|2024-09-05T03:39:53.4537518Z;False|2024-09-05T11:39:04.6111418+08:00;True|2024-09-04T12:39:24.8111127+08:00;True|2024-09-04T12:12:57.9411095+08:00;False|2024-09-04T12:12:28.6748628+08:00;True|2024-09-03T14:45:30.8259459+08:00;False|2024-09-03T14:45:19.1997455+08:00;True|2024-08-30T16:08:31.2415230+08:00;True|2024-08-30T15:18:36.6727666+08:00;True|2024-08-28T09:49:18.1543721+08:00;False|2024-08-28T09:49:11.7260337+08:00;True|2024-08-27T13:18:40.6234335+08:00;False|2024-08-27T13:18:33.9730040+08:00;True|2024-08-26T17:40:29.9158973+08:00;True|2024-08-26T17:21:30.8800173+08:00;True|2024-08-26T17:19:23.9260010+08:00;True|2024-08-26T14:27:20.8154004+08:00;True|2024-08-26T14:16:14.4482284+08:00;True|2024-08-26T13:12:42.9574127+08:00;True|2024-08-26T12:48:31.2107630+08:00;True|2024-08-26T11:07:15.1181342+08:00;False|2024-08-26T11:07:09.9429791+08:00;True|2024-08-26T10:49:20.8494484+08:00;True|2024-08-26T10:13:11.5222607+08:00;False|2024-08-26T10:12:59.1146882+08:00;True|2024-08-23T15:39:39.9842990+08:00;False|2024-08-23T15:39:33.9824708+08:00;True|2024-08-22T16:55:46.4689463+08:00;True|2024-08-22T16:44:25.0981764+08:00;True|2024-08-22T16:19:29.9801909+08:00;True|2024-08-22T14:25:13.5120259+08:00;True|2024-08-22T09:48:50.0760398+08:00;True|2024-08-21T16:09:41.0487181+08:00;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>08/30/2024 16:08:17</publishTime>
      <publishTime>09/05/2024 11:38:42</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>08/30/2024 16:08:17</publishTime>
      <publishTime>09/05/2024 11:38:42</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>08/30/2024 16:08:16</publishTime>
      <publishTime>09/05/2024 11:38:40</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>08/30/2024 16:08:16</publishTime>
      <publishTime>09/05/2024 11:38:40</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>08/30/2024 16:08:13</publishTime>
      <publishTime>09/05/2024 11:38:38</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>08/30/2024 16:08:13</publishTime>
      <publishTime>09/05/2024 11:38:38</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>08/30/2024 16:08:14</publishTime>
      <publishTime>09/05/2024 11:38:38</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>08/30/2024 16:08:14</publishTime>
      <publishTime>09/05/2024 11:38:38</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>05/25/2024 09:46:41</publishTime>
@@ -147,25 +147,25 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>08/30/2024 16:08:11</publishTime>
      <publishTime>09/05/2024 11:38:35</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>08/30/2024 16:08:11</publishTime>
      <publishTime>09/05/2024 11:38:35</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>08/30/2024 16:08:12</publishTime>
      <publishTime>09/05/2024 11:38:36</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>08/30/2024 16:08:12</publishTime>
      <publishTime>09/05/2024 11:38:36</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>08/30/2024 16:08:13</publishTime>
      <publishTime>09/05/2024 11:38:37</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>08/30/2024 16:08:13</publishTime>
      <publishTime>09/05/2024 11:38:37</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
@@ -279,19 +279,19 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>08/30/2024 16:08:12</publishTime>
      <publishTime>09/05/2024 11:38:38</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>08/30/2024 16:08:12</publishTime>
      <publishTime>09/05/2024 11:38:38</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>08/30/2024 16:08:23</publishTime>
      <publishTime>09/05/2024 11:38:50</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>08/30/2024 16:08:23</publishTime>
      <publishTime>09/05/2024 11:38:50</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -486,7 +486,7 @@
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>08/30/2024 16:08:30</publishTime>
      <publishTime>09/05/2024 11:39:52</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebAPI/WebAPI.csproj.user

@@ -9,8 +9,8 @@
    <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\vs\项目代码\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile4.pubxml</NameOfLastUsedPublishProfile>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile10.pubxml</NameOfLastUsedPublishProfile>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />