智云MES后端API代码
parent: 1ae7a525 | 补丁 | 提交 | ignore whitespace
zrg
2024-08-08 54329f0ab6bf4d87d95e37a553ffdf0b14fa4bea 
产品工艺参数清单， 增加 字段 HTechParamClassID int //工艺参数大类（Gy_TechnologyParameterClass） HSNO int //工艺次序 HStdNextTimes money //理论次序间隔 HTechParamIDStd int //对应设定值工艺参数(Gy_TechnologyParameter) （都是非必录）,修改出战斗获取模具
6个文件已修改
143 ■■■■■ 已修改文件
DAL/计划管理/ClsGy_MaterialTechParamBillMain.cs 79 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/计划管理/ClsGy_MaterialTechParamBillSub.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/ClsSc_MESBeginWorkBill.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml.user 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 DAL/¼Æ»®¹ÜÀí/ClsGy_MaterialTechParamBillMain.cs


@@ -5,7 +5,7 @@




namespace DAL


{


    public  class ClsGy_MaterialTechParamBillMain : DBUtility.ClsXt_BaseBill


    public class ClsGy_MaterialTechParamBillMain : DBUtility.ClsXt_BaseBill


    {


        public Model.ClsGy_MaterialTechParamBillMain omodel = new Model.ClsGy_MaterialTechParamBillMain();


        public List<Model.ClsGy_MaterialTechParamBillSub> DetailColl = new List<Model.ClsGy_MaterialTechParamBillSub>();


@@ -16,9 +16,9 @@


            base.MvarItemKeySub2 = "";


            base.MvarItemKeySub3 = "";


            base.MvarItemKeySub4 = "";


            base.MvarItemKey= "Gy_MaterialTechParamBillMain";


            base.MvarReportTitle= "产品工艺参数清单";


            base.BillType="3334";


            base.MvarItemKey = "Gy_MaterialTechParamBillMain";


            base.MvarReportTitle = "产品工艺参数清单";


            base.BillType = "3334";


            base.HBillSubType = "3334";




        }


@@ -46,7 +46,7 @@


                    "', HUpDater = '" + omodel.HUpDater +


                    "', HUpDateDate = getdate()" +


                     //===============================================================


                    




                     ", HDeptID = '" + omodel.HDeptID +


                    "', HEmpID = '" + omodel.HEmpID +


                    "', HMaterID = '" + omodel.HMaterID +


@@ -65,30 +65,32 @@




                //插入子表


                omodel.HInterID = lngBillKey;


                //插入子表


                foreach (Model.ClsGy_MaterialTechParamBillSub oSub in DetailColl)


                {


                    string subSql = "insert into Gy_MaterialTechParamBillSub" +


                            "" +


                            "" +


                            "" +


                            "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +


                            ",HTechParamID,HTechParamUnitID,HStd,HMax,HMin,HDataForm,HDataUnit,HDataTimes) " +


                            " values(" +


                            "" + omodel.HInterID.ToString() +


                            "," + oSub.HEntryID.ToString() +


                            "," + oSub.HSourceInterID +


                            "," + oSub.HSourceEntryID +


                            ",'" + oSub.HSourceBillNo +


                            "','" + oSub.HSourceBillType +


                            "','" + oSub.HTechParamID +


                             "','" + oSub.HTechParamUnitID +


                            "'," + oSub.HStd +


                            "," + oSub.HMax +


                            ",'" + oSub.HMin +


                            "','" + oSub.HDataForm +


                            "','" + oSub.HDataUnit +


                           "'," + oSub.HDataTimes +


                            ")";


                           "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +


                           ",HTechParamID,HTechParamUnitID,HStd,HMax,HMin,HDataForm,HDataUnit,HDataTimes,HTechParamClassID,HSNO,HStdNextTimes,HTechParamIDStd) " +


                           " values(" +


                           "" + omodel.HInterID.ToString() +


                           "," + oSub.HEntryID.ToString() +


                           "," + oSub.HSourceInterID +


                           "," + oSub.HSourceEntryID +


                           ",'" + oSub.HSourceBillNo +


                           "','" + oSub.HSourceBillType +


                           "','" + oSub.HTechParamID +


                           "','" + oSub.HTechParamUnitID +


                           "'," + oSub.HStd +


                           "," + oSub.HMax +


                           ",'" + oSub.HMin +


                           "','" + oSub.HDataForm +


                           "','" + oSub.HDataUnit +


                           "','" + oSub.HDataTimes +


                           "','" + oSub.HTechParamClassID +


                           "','" + oSub.HSNO +


                           "','" + oSub.HStdNextTimes +


                           "','" + oSub.HTechParamIDStd +


                           "')";


                    oCn.RunProc(subSql);


                }




@@ -97,7 +99,7 @@


                return true;


            }


            catch (Exception e)


            {


            { 


                sReturn = e.Message;


                oCn.RollBack();


                throw (e);


@@ -119,7 +121,7 @@


                while (true)


                {


                    ds = oCn.RunProcReturn("select * from Gy_MaterialTechParamBillMain where HInterID = " + omodel.HInterID, "Gy_MaterialTechParamBillMain");


                    if(ds!=null && ds.Tables[0].Rows.Count > 0)


                    if (ds != null && ds.Tables[0].Rows.Count > 0)


                    {


                        omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);


                    }


@@ -160,11 +162,8 @@


                foreach (Model.ClsGy_MaterialTechParamBillSub oSub in DetailColl)


                {


                    string subSql = "insert into Gy_MaterialTechParamBillSub" +


                           "" +


                           "" +


                           "" +


                           "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +


                           ",HTechParamID,HTechParamUnitID,HStd,HMax,HMin,HDataForm,HDataUnit,HDataTimes) " +


                           ",HTechParamID,HTechParamUnitID,HStd,HMax,HMin,HDataForm,HDataUnit,HDataTimes,HTechParamClassID,HSNO,HStdNextTimes,HTechParamIDStd) " +


                           " values(" +


                           "" + omodel.HInterID.ToString() +


                           "," + oSub.HEntryID.ToString() +


@@ -173,14 +172,18 @@


                           ",'" + oSub.HSourceBillNo +


                           "','" + oSub.HSourceBillType +


                           "','" + oSub.HTechParamID +


                            "','" + oSub.HTechParamUnitID +


                           "','" + oSub.HTechParamUnitID +


                           "'," + oSub.HStd +


                           "," + oSub.HMax +


                           ",'" + oSub.HMin +


                           "','" + oSub.HDataForm +


                            "','" + oSub.HDataUnit +


                           "'," + oSub.HDataTimes +


                           ")";


                           "','" + oSub.HDataUnit +


                           "','" + oSub.HDataTimes +


                           "','" + oSub.HTechParamClassID +


                           "','" + oSub.HSNO +


                           "','" + oSub.HStdNextTimes +


                           "','" + oSub.HTechParamIDStd +


                           "')";


                    oCn.RunProc(subSql);


                }


                sReturn = "新增单据成功！";


@@ -239,7 +242,7 @@


                //========================================================




                omodel.HOrgID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOrgID"]);


               




                //




                //循环


@@ -263,7 +266,7 @@


                    oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);


                    oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();


                    //===================================================


                 




                    DetailColl.Add(oSub);


                }


                sReturn = "显示单据成功！";




 Model/¼Æ»®¹ÜÀí/ClsGy_MaterialTechParamBillSub.cs


@@ -15,5 +15,9 @@


        public string HDataForm;         //采集来源


        public string HDataUnit;         //采集时间单位


        public int HDataTimes;         //采集周期频率


        public int HTechParamClassID;         //工艺参数大类（Gy_TechnologyParameterClass）


        public int HSNO;         //工艺次序


        public int HStdNextTimes;         //理论次序间隔


        public int HTechParamIDStd;         //对应设定值工艺参数(Gy_TechnologyParameter)


    }


}


}




 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs


@@ -3683,11 +3683,7 @@


        {


            try


            {


                string sql = @"SELECT  b.HMouldID,c.HMouldNo æ¨¡å…·ç¼–码,c.HName æ¨¡å…·åç§°,c.HModel æ¨¡å…·åž‹å· FROM Sc_ICMOBillStatus_Tmp a  LEFT JOIN(


                            SELECT *, ROW_NUMBER() OVER(PARTITION BY HSourceID ORDER BY HScanDate DESC) AS RowNum FROM Sc_MouldUpperBillSub


                            ) b ON a.HSourceID = b.HSourceID AND b.RowNum = 1 left join Gy_MouldFileMain c on b.HMouldID = c.HInterID


                            where b.HMouldID is not null and a.HSourceInterID ='" + HInterID + "' and  a.HSourceEntryID ='" + HEntryID + "' and  a.HSourceBillNo ='" + HBillNo + "'";


                ds = oCN.RunProcReturn(sql, "Sc_ICMOBillStatus_Tmp");


                ds = oCN.RunProcReturn("exec h_p_StationOutBill_Model  '" + HInterID + "','"+ HEntryID + "' ,'" + HBillNo + "'", "h_p_StationOutBill_Model");




                if (ds.Tables[0].Rows.Count != 0 && ds != null)


                {




 WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs


@@ -875,7 +875,7 @@


                if (oBill.omodel.HInterID == 0)


                {




                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);


                        bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);


                    if (bResult)


                    {


                        objJsonResult.HInterID = DBUtility.ClsPub.sExeReturnInfo; //返回主ID




 WebAPI/DLL/ClsSc_MESBeginWorkBill.cs


@@ -349,14 +349,22 @@


                    string HSourceID = ds.Tables[0].Rows[0]["HSourceID"].ToString();




                    ds = oCn.RunProcReturn(@"select  HMouldID from Sc_MouldUpperBillMain a


inner join Sc_MouldUpperBillSub b on a.HInterID = b.HInterID where HICMOInterID=" + HICMOInterID + " and HICMOEntryID=" + HICMOEntryID + " and HProcExchInterID=" + HSourceInterID + " and  HProcExchEntryID=" + HSourceEntryID + " and HSourceID=" + HSourceID + " order by HMakeDate desc", "Sc_MouldUpperBillMain");


                        inner join Sc_MouldUpperBillSub b on a.HInterID = b.HInterID where HICMOInterID=" + HICMOInterID + " and HICMOEntryID=" + HICMOEntryID + " and HProcExchInterID=" + HSourceInterID + " and  HProcExchEntryID=" + HSourceEntryID + " and HSourceID=" + HSourceID + " order by HMakeDate desc", "Sc_MouldUpperBillMain");


                    if (ds.Tables[0].Rows.Count > 0)


                    {


                        oCn.RunProc("update Sc_ICMOBillStatus_Tmp set HMouldID= " + ds.Tables[0].Rows[0]["HMouldID"].ToString() + " where HInterID=" + omodel.HMainSourceInterID.ToString());


                    }




                    else


                    {


                        ds = oCn.RunProcReturn(@"select  HMouldID from Sc_MouldUpperBillMain a


                        inner join Sc_MouldUpperBillSub b on a.HInterID = b.HInterID where  HSourceID=" + HSourceID + " order by HMakeDate desc", "Sc_MouldUpperBillMain");


                        if (ds.Tables[0].Rows.Count > 0)


                        {


                            oCn.RunProc("update Sc_ICMOBillStatus_Tmp set HMouldID= " + ds.Tables[0].Rows[0]["HMouldID"].ToString() + " where HInterID=" + omodel.HMainSourceInterID.ToString());


                        }


                    }


                }


               




                sReturn = omodel.HInterID.ToString();


                oCn.Commit();


                return true;




 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-07T06:54:25.8394649Z;True|2024-08-07T14:50:30.7287125+08:00;True|2024-08-07T14:47:58.1033886+08:00;True|2024-08-07T14:42:04.7937203+08:00;False|2024-08-07T14:41:11.1166410+08:00;True|2024-08-07T14:40:06.2944968+08:00;True|2024-08-06T17:31:51.1577940+08:00;True|2024-08-06T15:58:21.9478483+08:00;True|2024-08-06T15:52:25.5671153+08:00;False|2024-08-06T15:51:36.2108945+08:00;True|2024-08-06T14:35:38.9800527+08:00;True|2024-08-06T14:25:56.9168610+08:00;True|2024-08-06T14:18:02.5135044+08:00;True|2024-08-06T14:06:42.1692600+08:00;True|2024-08-06T14:05:29.0677989+08:00;True|2024-08-06T13:37:17.0765163+08:00;True|2024-08-06T13:31:19.5058940+08:00;True|2024-08-06T10:32:58.9689049+08:00;True|2024-08-06T10:20:27.5609081+08:00;True|2024-08-05T17:16:04.0580512+08:00;True|2024-08-05T14:15:37.7606467+08:00;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>


    <History>True|2024-08-08T03:02:37.2677877Z;True|2024-08-07T17:10:36.0727818+08:00;True|2024-08-07T16:48:57.8261661+08:00;True|2024-08-07T15:58:57.7021790+08:00;True|2024-08-07T15:57:11.6698959+08:00;True|2024-08-07T15:56:55.4052340+08:00;True|2024-08-07T14:54:25.8394649+08:00;True|2024-08-07T14:50:30.7287125+08:00;True|2024-08-07T14:47:58.1033886+08:00;True|2024-08-07T14:42:04.7937203+08:00;False|2024-08-07T14:41:11.1166410+08:00;True|2024-08-07T14:40:06.2944968+08:00;True|2024-08-06T17:31:51.1577940+08:00;True|2024-08-06T15:58:21.9478483+08:00;True|2024-08-06T15:52:25.5671153+08:00;False|2024-08-06T15:51:36.2108945+08:00;True|2024-08-06T14:35:38.9800527+08:00;True|2024-08-06T14:25:56.9168610+08:00;True|2024-08-06T14:18:02.5135044+08:00;True|2024-08-06T14:06:42.1692600+08:00;True|2024-08-06T14:05:29.0677989+08:00;True|2024-08-06T13:37:17.0765163+08:00;True|2024-08-06T13:31:19.5058940+08:00;True|2024-08-06T10:32:58.9689049+08:00;True|2024-08-06T10:20:27.5609081+08:00;True|2024-08-05T17:16:04.0580512+08:00;True|2024-08-05T14:15:37.7606467+08:00;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/07/2024 14:54:12</publishTime>


      <publishTime>08/08/2024 10:53:04</publishTime>


    </File>


    <File Include="bin/BLL.pdb">


      <publishTime>08/07/2024 14:54:12</publishTime>


      <publishTime>08/08/2024 10:53:04</publishTime>


    </File>


    <File Include="bin/BouncyCastle.Crypto.dll">


      <publishTime>12/18/2020 05:32:28</publishTime>


    </File>


    <File Include="bin/DAL.dll">


      <publishTime>08/07/2024 14:54:11</publishTime>


      <publishTime>08/08/2024 10:53:02</publishTime>


    </File>


    <File Include="bin/DAL.pdb">


      <publishTime>08/07/2024 14:54:11</publishTime>


      <publishTime>08/08/2024 10:53:02</publishTime>


    </File>


    <File Include="bin/Dapper.dll">


      <publishTime>07/22/2016 22:52:40</publishTime>


    </File>


    <File Include="bin/DBUtility.dll">


      <publishTime>08/07/2024 14:54:09</publishTime>


      <publishTime>08/08/2024 10:53:00</publishTime>


    </File>


    <File Include="bin/DBUtility.pdb">


      <publishTime>08/07/2024 14:54:09</publishTime>


      <publishTime>08/08/2024 10:53:00</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/07/2024 14:54:09</publishTime>


      <publishTime>08/08/2024 10:53:01</publishTime>


    </File>


    <File Include="bin/Model.pdb">


      <publishTime>08/07/2024 14:54:09</publishTime>


      <publishTime>08/08/2024 10:53:01</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/07/2024 14:54:08</publishTime>


      <publishTime>08/08/2024 10:52:59</publishTime>


    </File>


    <File Include="bin/Pub_Class.pdb">


      <publishTime>08/07/2024 14:54:08</publishTime>


      <publishTime>08/08/2024 10:52:59</publishTime>


    </File>


    <File Include="bin/Pub_Control.dll">


      <publishTime>08/07/2024 14:54:08</publishTime>


      <publishTime>08/08/2024 10:53:00</publishTime>


    </File>


    <File Include="bin/Pub_Control.pdb">


      <publishTime>08/07/2024 14:54:08</publishTime>


      <publishTime>08/08/2024 10:53:00</publishTime>


    </File>


    <File Include="bin/RestSharp.dll">


      <publishTime>08/31/2012 06:22:50</publishTime>


    </File>


    <File Include="bin/SQLHelper.dll">


      <publishTime>08/07/2024 14:54:08</publishTime>


      <publishTime>08/08/2024 10:53:00</publishTime>


    </File>


    <File Include="bin/SQLHelper.pdb">


      <publishTime>08/07/2024 14:54:08</publishTime>


      <publishTime>08/08/2024 10:53:00</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/07/2024 14:54:16</publishTime>


      <publishTime>08/08/2024 10:53:08</publishTime>


    </File>


    <File Include="bin/WebAPI.pdb">


      <publishTime>08/07/2024 14:54:16</publishTime>


      <publishTime>08/08/2024 10:53:08</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/07/2024 14:54:25</publishTime>


      <publishTime>08/08/2024 11:02:36</publishTime>


    </File>


  </ItemGroup>


</Project>