WebAPI/Controllers/Kf_EntrustInBillController.cs
@@ -289,6 +289,8 @@ websLsmain.HMangerID = lsmain[0].HMangerID; websLsmain.HWHID = lsmain[0].HWHID; websLsmain.HExplanation = lsmain[0].HExplanation; websLsmain.HGroupID = lsmain[0].HGroupID; websLsmain.HJiaYe = lsmain[0].HJiaYe; string sSourceBillType = "1103"; WebAPI/Controllers/LookingForBillController.cs
@@ -178,24 +178,25 @@ public object set_SaveLookingForBill_Json([FromBody]JObject oMain) { string oMainData = oMain["oMain"].ToString(); string HJiaYe = oMain["HJiaYe"].ToString(); oMainData = oMainData.Substring(8,oMainData.Length-9); SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); try { oCN.BeginTran(); List<LookingForBill> lsmain = new List<LookingForBill>(); ListModels oListModels = new ListModels(); List<LookingForBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<LookingForBill>>(oMainData); oCN.BeginTran(); //var mainSql1 = "Insert Into Kf_LookingForReturnBillMain " + // "(HInterID,HBillNo,HSourceInterID,HSourceBillNo,HCreateBy)" + // " values" + // "(" + list[0].HInterID + ",'" + list[0].HBillNo + "'," + list[0].HSourceInterID + ",'" + list[0].HSourceBillNo + "','" + list[0].HMaker + "')"; var mainSql = "Insert Into Kf_LookingForBillMain " + "(HInterID,HBillNo,HSourceInterID,HSourceBillNo,HWhID,HWhName,HSPID,HSPName,HGroupID,HGroup" + ",HSourceID,HSource,HCreateBy)" + ",HSourceID,HSource,HCreateBy,HJiaYe)" + " values" + "(" + list[0].HInterID + ",'" + list[0].HBillNo + "'," + list[0].HSourceInterID+ ",'" + list[0].HSourceBillNo + "'," + list[0].HWHID + ",'" + list[0].HWHName + "'," + list[0].HSPID + ",'" + list[0].HSPName + "'," + list[0].HGroupID + ",'" + list[0].HGroup + "'," + list[0].HSourceID + ",'" + list[0].HSource + "','" + list[0].HMaker + "')"; + list[0].HSourceID + ",'" + list[0].HSource + "','" + list[0].HMaker + "','" + HJiaYe + "')"; oCN.RunProc(mainSql); for (int i = 0; i < list.Count; i++) { WebAPI/Controllers/ProductInController.cs
@@ -448,7 +448,7 @@ // } /// <summary> /// çæäº§åå ¥åºå /// çæäº§åå ¥åºå(产åå ¥åºæäº¤) /// </summary> /// <returns></returns> [Route("ProductIn/set_SaveProductInBill_Json")] @@ -457,14 +457,6 @@ { var _value = oMain["oMain"].ToString(); string msg1 = _value.ToString(); //List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>(); //ListModels oListModels = new ListModels(); //lsmain = oListModels.getProductInBillMainByJson(msg1); //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year); //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); //string sSourceBillType = lsmain[0].HBillType; //BLL.ClsKf_ProductInBill bll = new BLL.ClsKf_ProductInBill(); //return bll.set_SaveProductInBill_New(lsmain[0], sSourceBillType, ref DBUtility.ClsPub.sErrInfo); try { List<Model.ClsKf_ProductInBillMain> lsmain = new List<Model.ClsKf_ProductInBillMain>(); @@ -475,7 +467,6 @@ string sSourceBillType = lsmain[0].HBillType; WebAPI.WebS.ClsKf_ProductInBillMain websLsmain = new WebS.ClsKf_ProductInBillMain(); websLsmain.HInterID = lsmain[0].HInterID; websLsmain.HDate = lsmain[0].HDate; websLsmain.HBillNo = lsmain[0].HBillNo; @@ -486,6 +477,11 @@ websLsmain.HWHID = lsmain[0].HWHID; websLsmain.HSupID = lsmain[0].HSupID; websLsmain.HExplanation = lsmain[0].HExplanation; websLsmain.HGroupID = lsmain[0].HGroupID; websLsmain.HJiaYe = lsmain[0].HJiaYe; //public Int64 HGroupID;// //public string HJiaYe;// if (webserver.set_SaveProductInBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo)) WebAPI/Controllers/WebAPIController.cs
@@ -631,7 +631,7 @@ try { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); ds = oCN.RunProcReturn("Select HItemID,HNumber çç»ä»£ç ,HName çç» from h_v_IF_Group where HStopflag=0 " + sWhere + " Order by HItemID ", "h_v_IF_Group"); ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName from h_v_IF_Group where HStopflag=0 " + sWhere + " Order by HItemID ", "h_v_IF_Group"); if (ds == null || ds.Tables[0].Rows.Count <= 0) { objjson.code = "0"; WebAPI/DLL/BLL20201111.rarBinary files differ
WebAPI/DLL/DAL20200624.zipBinary files differ
WebAPI/DLL/DAL20200818.zipBinary files differ
WebAPI/DLL/DAL20210109.zipBinary files differ
WebAPI/DLL/Model.dllBinary files differ
WebAPI/DLL/Model20200818.zipBinary files differ
WebAPI/DLL/Newtonsoft.Json.zipBinary files differ
WebAPI/DLL/µ÷Óù¤³ÌÎļþ.zipBinary files differ
WebAPI/DLL/µ÷Óù¤³ÌÎļþ/BLL.dllBinary files differ
WebAPI/DLL/µ÷Óù¤³ÌÎļþ/DBUtility.dllBinary files differ
WebAPI/DLL/µ÷Óù¤³ÌÎļþ/Model.dllBinary files differ
WebAPI/DLL/µ÷Óù¤³ÌÎļþ/Pub_Class.dllBinary files differ
WebAPI/DLL/µ÷Óù¤³ÌÎļþ/Pub_Control.dllBinary files differ
WebAPI/DLL/µ÷Óù¤³ÌÎļþ/SQLHelper.dllBinary files differ
WebAPI/Models/LookingForBill.cs
@@ -27,5 +27,6 @@ public string HMaterModel { get; set; }//è§æ ¼åå· public string HIsStatus { get; set; }//æ¯å¦æ«ç public string HBillType { get; set; }//åæ®ç±»å public string HJiaYe { get; set; }//æä½å } } WebAPI/Web References/WebS/Reference.cs
Diff too large WebAPI/Web References/WebS/Reference.map
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <Results> <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx?wsdl" filename="WebService1.wsdl" /> <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx?disco" filename="WebService1.disco" /> <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://124.70.129.242/cloudweb/WebService1.asmx?wsdl" filename="WebService1.wsdl" /> <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://124.70.129.242/cloudweb/WebService1.asmx?disco" filename="WebService1.disco" /> </Results> </DiscoveryClientResultsFile> WebAPI/Web References/WebS/WebService1.disco
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/"> <contractRef ref="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx?wsdl" docRef="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" /> <soap address="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" /> <soap address="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" /> <contractRef ref="http://124.70.129.242/cloudweb/WebService1.asmx?wsdl" docRef="http://124.70.129.242/cloudweb/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" /> <soap address="http://124.70.129.242/cloudweb/WebService1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" /> <soap address="http://124.70.129.242/cloudweb/WebService1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" /> </discovery> WebAPI/Web References/WebS/WebService1.wsdl
@@ -2,6 +2,22 @@ <wsdl:definitions xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="http://tempuri.org/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> <wsdl:types> <s:schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/"> <s:element name="CheckUser"> <s:complexType> <s:sequence> <s:element minOccurs="0" maxOccurs="1" name="sUserName" type="s:string" /> <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" /> </s:sequence> </s:complexType> </s:element> <s:element name="CheckUserResponse"> <s:complexType> <s:sequence> <s:element minOccurs="1" maxOccurs="1" name="CheckUserResult" type="s:boolean" /> <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" /> </s:sequence> </s:complexType> </s:element> <s:element name="get_TestStr"> <s:complexType /> </s:element> @@ -1165,6 +1181,8 @@ <s:element minOccurs="0" maxOccurs="1" name="HExplanation" type="s:string" /> <s:element minOccurs="0" maxOccurs="1" name="HInnerBillNo" type="s:string" /> <s:element minOccurs="1" maxOccurs="1" name="HRedBlueFlag" type="s:boolean" /> <s:element minOccurs="1" maxOccurs="1" name="HGroupID" type="s:long" /> <s:element minOccurs="0" maxOccurs="1" name="HJiaYe" type="s:string" /> </s:sequence> </s:extension> </s:complexContent> @@ -2850,6 +2868,24 @@ </s:sequence> </s:complexType> </s:element> <s:element name="get_MaxBillID"> <s:complexType> <s:sequence> <s:element minOccurs="0" maxOccurs="1" name="HTranType" type="s:string" /> <s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" /> <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" /> </s:sequence> </s:complexType> </s:element> <s:element name="get_MaxBillIDResponse"> <s:complexType> <s:sequence> <s:element minOccurs="1" maxOccurs="1" name="get_MaxBillIDResult" type="s:boolean" /> <s:element minOccurs="1" maxOccurs="1" name="HInterID" type="s:long" /> <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" /> </s:sequence> </s:complexType> </s:element> <s:element name="CheckModRight"> <s:complexType> <s:sequence> @@ -2886,22 +2922,6 @@ </s:sequence> </s:complexType> </s:element> </s:sequence> </s:complexType> </s:element> <s:element name="CheckUser"> <s:complexType> <s:sequence> <s:element minOccurs="0" maxOccurs="1" name="sUserName" type="s:string" /> <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" /> </s:sequence> </s:complexType> </s:element> <s:element name="CheckUserResponse"> <s:complexType> <s:sequence> <s:element minOccurs="1" maxOccurs="1" name="CheckUserResult" type="s:boolean" /> <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" /> </s:sequence> </s:complexType> </s:element> @@ -3967,6 +3987,8 @@ <s:element minOccurs="0" maxOccurs="1" name="HExplanation" type="s:string" /> <s:element minOccurs="0" maxOccurs="1" name="HInnerBillNo" type="s:string" /> <s:element minOccurs="1" maxOccurs="1" name="HRedBlueFlag" type="s:boolean" /> <s:element minOccurs="1" maxOccurs="1" name="HGroupID" type="s:long" /> <s:element minOccurs="0" maxOccurs="1" name="HJiaYe" type="s:string" /> </s:sequence> </s:extension> </s:complexContent> @@ -9978,6 +10000,12 @@ </s:element> </s:schema> </wsdl:types> <wsdl:message name="CheckUserSoapIn"> <wsdl:part name="parameters" element="tns:CheckUser" /> </wsdl:message> <wsdl:message name="CheckUserSoapOut"> <wsdl:part name="parameters" element="tns:CheckUserResponse" /> </wsdl:message> <wsdl:message name="get_TestStrSoapIn"> <wsdl:part name="parameters" element="tns:get_TestStr" /> </wsdl:message> @@ -10656,6 +10684,12 @@ <wsdl:message name="get_MaxBillNoAndID_NewSoapOut"> <wsdl:part name="parameters" element="tns:get_MaxBillNoAndID_NewResponse" /> </wsdl:message> <wsdl:message name="get_MaxBillIDSoapIn"> <wsdl:part name="parameters" element="tns:get_MaxBillID" /> </wsdl:message> <wsdl:message name="get_MaxBillIDSoapOut"> <wsdl:part name="parameters" element="tns:get_MaxBillIDResponse" /> </wsdl:message> <wsdl:message name="CheckModRightSoapIn"> <wsdl:part name="parameters" element="tns:CheckModRight" /> </wsdl:message> @@ -10667,12 +10701,6 @@ </wsdl:message> <wsdl:message name="get_UserSoapOut"> <wsdl:part name="parameters" element="tns:get_UserResponse" /> </wsdl:message> <wsdl:message name="CheckUserSoapIn"> <wsdl:part name="parameters" element="tns:CheckUser" /> </wsdl:message> <wsdl:message name="CheckUserSoapOut"> <wsdl:part name="parameters" element="tns:CheckUserResponse" /> </wsdl:message> <wsdl:message name="GetSc_StdWorkQtyBill_HICMOInterIDSoapIn"> <wsdl:part name="parameters" element="tns:GetSc_StdWorkQtyBill_HICMOInterID" /> @@ -12433,6 +12461,10 @@ <wsdl:part name="parameters" element="tns:GetSc_ICMOReportBillListResponse" /> </wsdl:message> <wsdl:portType name="WebService1Soap"> <wsdl:operation name="CheckUser"> <wsdl:input message="tns:CheckUserSoapIn" /> <wsdl:output message="tns:CheckUserSoapOut" /> </wsdl:operation> <wsdl:operation name="get_TestStr"> <wsdl:input message="tns:get_TestStrSoapIn" /> <wsdl:output message="tns:get_TestStrSoapOut" /> @@ -12885,6 +12917,10 @@ <wsdl:input message="tns:get_MaxBillNoAndID_NewSoapIn" /> <wsdl:output message="tns:get_MaxBillNoAndID_NewSoapOut" /> </wsdl:operation> <wsdl:operation name="get_MaxBillID"> <wsdl:input message="tns:get_MaxBillIDSoapIn" /> <wsdl:output message="tns:get_MaxBillIDSoapOut" /> </wsdl:operation> <wsdl:operation name="CheckModRight"> <wsdl:input message="tns:CheckModRightSoapIn" /> <wsdl:output message="tns:CheckModRightSoapOut" /> @@ -12892,10 +12928,6 @@ <wsdl:operation name="get_User"> <wsdl:input message="tns:get_UserSoapIn" /> <wsdl:output message="tns:get_UserSoapOut" /> </wsdl:operation> <wsdl:operation name="CheckUser"> <wsdl:input message="tns:CheckUserSoapIn" /> <wsdl:output message="tns:CheckUserSoapOut" /> </wsdl:operation> <wsdl:operation name="GetSc_StdWorkQtyBill_HICMOInterID"> <wsdl:input message="tns:GetSc_StdWorkQtyBill_HICMOInterIDSoapIn" /> @@ -14072,6 +14104,15 @@ </wsdl:portType> <wsdl:binding name="WebService1Soap" type="tns:WebService1Soap"> <soap:binding transport="http://schemas.xmlsoap.org/soap/http" /> <wsdl:operation name="CheckUser"> <soap:operation soapAction="http://tempuri.org/CheckUser" style="document" /> <wsdl:input> <soap:body use="literal" /> </wsdl:input> <wsdl:output> <soap:body use="literal" /> </wsdl:output> </wsdl:operation> <wsdl:operation name="get_TestStr"> <soap:operation soapAction="http://tempuri.org/get_TestStr" style="document" /> <wsdl:input> @@ -15089,6 +15130,15 @@ <soap:body use="literal" /> </wsdl:output> </wsdl:operation> <wsdl:operation name="get_MaxBillID"> <soap:operation soapAction="http://tempuri.org/get_MaxBillID" style="document" /> <wsdl:input> <soap:body use="literal" /> </wsdl:input> <wsdl:output> <soap:body use="literal" /> </wsdl:output> </wsdl:operation> <wsdl:operation name="CheckModRight"> <soap:operation soapAction="http://tempuri.org/CheckModRight" style="document" /> <wsdl:input> @@ -15100,15 +15150,6 @@ </wsdl:operation> <wsdl:operation name="get_User"> <soap:operation soapAction="http://tempuri.org/get_User" style="document" /> <wsdl:input> <soap:body use="literal" /> </wsdl:input> <wsdl:output> <soap:body use="literal" /> </wsdl:output> </wsdl:operation> <wsdl:operation name="CheckUser"> <soap:operation soapAction="http://tempuri.org/CheckUser" style="document" /> <wsdl:input> <soap:body use="literal" /> </wsdl:input> @@ -17756,6 +17797,15 @@ </wsdl:binding> <wsdl:binding name="WebService1Soap12" type="tns:WebService1Soap"> <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" /> <wsdl:operation name="CheckUser"> <soap12:operation soapAction="http://tempuri.org/CheckUser" style="document" /> <wsdl:input> <soap12:body use="literal" /> </wsdl:input> <wsdl:output> <soap12:body use="literal" /> </wsdl:output> </wsdl:operation> <wsdl:operation name="get_TestStr"> <soap12:operation soapAction="http://tempuri.org/get_TestStr" style="document" /> <wsdl:input> @@ -18773,6 +18823,15 @@ <soap12:body use="literal" /> </wsdl:output> </wsdl:operation> <wsdl:operation name="get_MaxBillID"> <soap12:operation soapAction="http://tempuri.org/get_MaxBillID" style="document" /> <wsdl:input> <soap12:body use="literal" /> </wsdl:input> <wsdl:output> <soap12:body use="literal" /> </wsdl:output> </wsdl:operation> <wsdl:operation name="CheckModRight"> <soap12:operation soapAction="http://tempuri.org/CheckModRight" style="document" /> <wsdl:input> @@ -18784,15 +18843,6 @@ </wsdl:operation> <wsdl:operation name="get_User"> <soap12:operation soapAction="http://tempuri.org/get_User" style="document" /> <wsdl:input> <soap12:body use="literal" /> </wsdl:input> <wsdl:output> <soap12:body use="literal" /> </wsdl:output> </wsdl:operation> <wsdl:operation name="CheckUser"> <soap12:operation soapAction="http://tempuri.org/CheckUser" style="document" /> <wsdl:input> <soap12:body use="literal" /> </wsdl:input> @@ -21440,10 +21490,10 @@ </wsdl:binding> <wsdl:service name="WebService1"> <wsdl:port name="WebService1Soap" binding="tns:WebService1Soap"> <soap:address location="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx" /> <soap:address location="http://124.70.129.242/cloudweb/WebService1.asmx" /> </wsdl:port> <wsdl:port name="WebService1Soap12" binding="tns:WebService1Soap12"> <soap12:address location="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx" /> <soap12:address location="http://124.70.129.242/cloudweb/WebService1.asmx" /> </wsdl:port> </wsdl:service> </wsdl:definitions> WebAPI/WebAPI.csproj
@@ -223,10 +223,15 @@ <Content Include="DLL\DBUtility.dll" /> <Content Include="DLL\Kingdee.BOS.WebApi.Client.dll" /> <Content Include="DLL\Model.dll" /> <Content Include="DLL\Newtonsoft.Json.dll" /> <Content Include="DLL\Newtonsoft.Json.Net35.dll" /> <Content Include="DLL\Pub_Class.dll" /> <Content Include="DLL\Pub_Control.dll" /> <Content Include="DLL\SQLHelper.dll" /> <Content Include="DLL\System.Net.Http.Formatting.dll" /> <Content Include="DLL\System.Web.Http.dll" /> <Content Include="DLL\System.Web.Http.WebHost.dll" /> <Content Include="DLL\System.Web.Mvc.dll" /> <Content Include="fonts\glyphicons-halflings-regular.svg" /> <Content Include="Global.asax" /> <Content Include="Index.html" /> @@ -417,10 +422,10 @@ <WebReferences Include="Web References\" /> </ItemGroup> <ItemGroup> <WebReferenceUrl Include="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx"> <WebReferenceUrl Include="http://124.70.129.242/cloudweb/WebService1.asmx"> <UrlBehavior>Static</UrlBehavior> <RelPath>Web References\WebS\</RelPath> <UpdateFromURL>http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx</UpdateFromURL> <UpdateFromURL>http://124.70.129.242/cloudweb/WebService1.asmx</UpdateFromURL> <ServiceLocationURL> </ServiceLocationURL> <CachedDynamicPropName>