智云MES后端API代码
parent: d59ceb9c | 补丁 | 提交 | show whitespace
llj
5 天以前 2f33b2da0791ed73c41c16dc6d6768e6b8fe31aa 
生成条码新增根据单据号金蝶同步
6个文件已修改
74764 ■■■■■ 已修改文件
WebAPI/Controllers/WebAPIController.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Web References/WebS/Reference.cs 64628 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Web References/WebS/Reference.map 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Web References/WebS/WebService1.disco 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Web References/WebS/WebService1.wsdl 10082 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WebAPI/Controllers/WebAPIController.cs


@@ -24449,7 +24449,7 @@




                StringBuilder sb = new StringBuilder();


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


                sb.AppendLine($"sqlRes = $\"INSERT INTO [{TableName}] ({columnsStr})");


                sb.AppendLine($"string sqlRes = $\"INSERT INTO [{TableName}] ({columnsStr})");


                sb.AppendLine("                VALUES (");




                // 2. æ‹¼æŽ¥ VALUES é‡Œé¢çš„参数


@@ -24514,7 +24514,7 @@


                }


                StringBuilder sb = new StringBuilder();




                sb.Append($"sqlRes =$\"Update {TableName} set ");


                sb.Append($"string sqlRes =$\"Update {TableName} set ");




                int count = ds.Tables[1].Rows.Count;


                int setFieldCount = 0;




 WebAPI/Controllers/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Sc_BarCodeController.cs


@@ -10,9 +10,11 @@


using System.Linq;


using System.Net;


using System.Net.Http;


using System.Text.RegularExpressions;


using System.Web;


using System.Web.Http;


using WebAPI.Models;


using WebAPI.WebS;




namespace WebAPI.Controllers.仓存管理.条码生成


{


@@ -166,7 +168,7 @@


        #region [通过源单类型查找不通单据信息]


        [Route("Sc_BarCode/ReportFromBillList")]


        [HttpGet]


        public object ReportFromBillList(int page, int limit, string sWhere,string HSouceBillType,string HOrgID)


        public object ReportFromBillList(int page, int limit, string sWhere,string HSouceBillType,string HOrgID,string user)


        {


            oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo);


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


@@ -177,6 +179,21 @@


                int pageSize = limit;


                string sql = "";


                string tabname = "";


                string HBillNo = "";


                //" and å•æ®å· = 'adsads'"


                if (sWhere!=null && sWhere.Contains("单据号"))


                {


                    Match match = Regex.Match(sWhere, @"单据号\s*=\s*'([^']*)'");


                    if (match.Success)


                    {


                        HBillNo = match.Groups[1].Value;


                    }


                }












                if (sWhere == null || sWhere.Equals(""))


                {


                    sWhere = " where 1=1 and HOrgID='"+HOrgID+"' ";


@@ -196,8 +213,16 @@


                        }


                        else


                        {




                            //GetWebAPIToLocal_ICMO


                            if (HBillNo != "")


                            {


                                bool result = oWebs.GetWebAPIToLocal_ICMO(HBillNo, "3710", user, ref DBUtility.ClsPub.sErrInfo);


                                if (!result) throw new Exception();


                            }


                            count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IFCLD_ICMOBillList_Source " + sWhere + " and ä»»åŠ¡æ•°é‡>isnull(入库数量,0)  and çŠ¶æ€<>'结案' order by å•æ®å·", tabname).Tables[0].Rows.Count;


                            sql = string.Format(@"select * from(select row_number() over (order by å•æ®å·) as HRowNumber,* from h_v_IFCLD_ICMOBillList_Source " + sWhere + " and ä»»åŠ¡æ•°é‡>isnull(入库数量,0)  and çŠ¶æ€<>'结案')   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");




                        }                                              


                        break;


                    case "生产汇报单":


@@ -211,6 +236,7 @@


                        sql = string.Format(@"select * from(select row_number() over (order by å•æ®å· desc,hsubid) as HRowNumber,* from h_v_IF_POOrderBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");


                        break;


                    case "收料通知单":




                        tabname = "h_v_IF_POInStockBillList_Source";


                        if (oSystemParameter.omodel.WMS_CampanyName == "瑞与祺")


                        {


@@ -219,6 +245,11 @@


                        }


                        else


                        {


                            if (HBillNo != "")


                            {


                                bool result= oWebs.GetWebAPIToLocal_POInStock(HBillNo, "1103", user, ref DBUtility.ClsPub.sErrInfo);


                                if(!result) throw new Exception();


                            }


                            count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POInStockBillList_Source " + sWhere + " order by å•æ®å· desc,hsubid ", tabname).Tables[0].Rows.Count;


                            sql = string.Format(@"select * from(select row_number() over (order by å•æ®å· desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");


                        }


@@ -264,6 +295,13 @@


                        sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by å•æ®å· desc,hsubid) as HRowNumber,* from h_v_IF_MateOutBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");


                        break;


                    case "受托加工材料收料单":


                        if(HBillNo!="")


                        {


                            bool result= oWebs.GetWebAPIToLocal_InceptEntPOInStock(HBillNo, "1130", user, ref DBUtility.ClsPub.sErrInfo);


                            if (!result)


                                throw new Exception();


                            


                        }


                        tabname = "h_v_IF_InceptEntPOInStockBillList_Source";


                        count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_InceptEntPOInStockBillList_Source " + sWhere + " order by å•æ®å· desc,hsubid ", tabname).Tables[0].Rows.Count;


                        sql = string.Format(@"select * from(select row_number() over (order by å•æ®å· desc,hsubid) as HRowNumber,* from h_v_IF_InceptEntPOInStockBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");




 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://192.168.0.11/WEBS-WMS/WebService1.asmx?wsdl" filename="WebService1.wsdl" />


    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://192.168.0.11/WEBS-WMS/WebService1.asmx?disco" filename="WebService1.disco" />


    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.DiscoveryDocumentReference" url="http://localhost:8082/webs/webservice1.asmx?disco" filename="webservice1.disco" />


    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost:8082/webs/webservice1.asmx?wsdl" filename="webservice1.wsdl" />


  </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://192.168.0.11/WEBS-WMS/WebService1.asmx?wsdl" docRef="http://192.168.0.11/WEBS-WMS/WebService1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />


  <soap address="http://192.168.0.11/WEBS-WMS/WebService1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />


  <soap address="http://192.168.0.11/WEBS-WMS/WebService1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />


  <contractRef ref="http://localhost:8082/webs/webservice1.asmx?wsdl" docRef="http://localhost:8082/webs/webservice1.asmx" xmlns="http://schemas.xmlsoap.org/disco/scl/" />


  <soap address="http://localhost:8082/webs/webservice1.asmx" xmlns:q1="http://tempuri.org/" binding="q1:WebService1Soap" xmlns="http://schemas.xmlsoap.org/disco/soap/" />


  <soap address="http://localhost:8082/webs/webservice1.asmx" xmlns:q2="http://tempuri.org/" binding="q2:WebService1Soap12" xmlns="http://schemas.xmlsoap.org/disco/soap/" />


</discovery>




 WebAPI/Web References/WebS/WebService1.wsdl


Diff too large