智云MES后端API代码
parent: 84db846c | 补丁 | 提交 | ignore whitespace
1
yusijie
2024-06-05 02ed844296290416cbaaf2801fdc3a0858f5964f 
1
2个文件已修改
42 ■■■■■ 已修改文件
WebAPI/Controllers/WebAPIController.cs 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Web.config 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WebAPI/Controllers/WebAPIController.cs


@@ -11999,8 +11999,8 @@


                string sql1 = string.Format(@"select * from h_v_Sc_MouldMaintainRuleBillSub_Item where hmainid=" + MouldMaintainRuleID);


                string sql2 = string.Format(@"select * from h_v_Sc_MouldMaintainRuleBillSub where hmainid=" + MouldMaintainRuleID);




                ds1 = oCN.RunProcReturn(sql1, "Sc_MouldMaintainRuleBillMain");//保养


                ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//配件


                ds1 = oCN.RunProcReturn(sql1, "h_v_Sc_MouldMaintainRuleBillSub_Item");//保养


                ds2 = oCN.RunProcReturn(sql2, "h_v_Sc_MouldMaintainRuleBillSub");//配件


                list.Add(ds1.Tables[0]);


                list.Add(ds2.Tables[0]);


                objJsonResult.code = "0";


@@ -12134,19 +12134,22 @@


                List<object> list = new List<object>();


                DataSet ds2;


                DataSet ds1;


                string sql1 = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark


                                                from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID 


                                                left join Gy_Maintain m on m.HItemID=t.HMaintainItemID


                                                left join Gy_Employee e on e.HItemID=t.HManagerID


                                                where a.HInterID=" + EquipProjectID);


                string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a  


                                                left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID 


                                                left join h_v_IF_Material m on b.HMaterID=m.HItemID


                                                left join h_v_IF_Unit u on b.HUnitID=u.HItemID


                                                where a.HInterID=" + EquipProjectID);


            //    string sql1 = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark


            //                                    from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID 


            //                                    left join Gy_Maintain m on m.HItemID=t.HMaintainItemID


            //                                    left join Gy_Employee e on e.HItemID=t.HManagerID


            //                                    where a.HInterID=" + EquipProjectID);


            //    string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a  


                                                //left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID 


            //                                    left join h_v_IF_Material m on b.HMaterID=m.HItemID


                                                //left join h_v_IF_Unit u on b.HUnitID=u.HItemID


            //                                    where a.HInterID=" + EquipProjectID);




                ds1 = oCN.RunProcReturn(sql1, "Sb_EquipMaintainRuleBillMain");//保养


                ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//配件


                string sql1 = string.Format(@"select * from h_v_Sb_EquipMaintainRuleBillList where HInterID=" + EquipProjectID);


                string sql2 = string.Format(@"select * from h_v_Sb_EquipMaintainRuleSub where hmainid=" + EquipProjectID);




                ds1 = oCN.RunProcReturn(sql1, "h_v_Sb_EquipMaintainRuleBillList");//保养


                ds2 = oCN.RunProcReturn(sql2, "h_v_Sb_EquipMaintainRuleSub");//配件


                list.Add(ds1.Tables[0]);


                list.Add(ds2.Tables[0]);


                objJsonResult.code = "0";




 WebAPI/Web.config


@@ -22,7 +22,7 @@


        <!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->


        <!--<add key="FileIP" value="http://localhost:8080/" />-->


        <!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/>    -->


        <add key="sUrl" value="http://192.168.0.81/WEBS-WMS/WebService1.asmx"/>   <!--颜台式机-->


        <!--<add key="sUrl" value="http://192.168.0.81/WEBS-WMS/WebService1.asmx"/>   --><!--颜台式机-->


        <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 夏宝-->


        <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->


        <!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/>    博日科技-->


@@ -35,9 +35,10 @@


        <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> -->    <!--测试服务器-->


        <!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/>    本地-->


        <!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>-->    <!--陈雯静本地配置-->


        <add key="surl" value="http://localhost/webs-web/webservice1.asmx"/>    <!--翁涛涛本地配置-->


        <!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx"/>    --><!--翁涛涛本地配置-->


        <!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>九菱-->




        <add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/><!--斯莫尔-->


		


        <add key="webpages:Version" value="3.0.0.0" />


        <add key="webpages:Enabled" value="false" />


        <add key="ClientValidationEnabled" value="true" />


@@ -105,7 +106,7 @@


            </basicHttpBinding>


        </bindings>


        <client>


            <endpoint address="http://192.168.0.81/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"


            <endpoint address="http://61.130.182.102:18181/WEBSCS/WebService1.asmx" binding="basicHttpBinding"


     bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap"


     name="WebService1Soap" />


        </client>


@@ -114,7 +115,7 @@


 <applicationSettings>


  <WebAPI.Properties.Settings>


   <setting name="WebAPI_WebS_WebService1" serializeAs="String">


    <value>http://192.168.0.81/WEBS-WMS/WebService1.asmx</value>


    <value>http://61.130.182.102:18181/WEBSCS/WebService1.asmx</value>


   </setting>


  </WebAPI.Properties.Settings>


 </applicationSettings>