Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

wtt

21 小时以前 f0b6386d27d625ee2b7080878ece230998deac98

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

 SyntacticSugar/bin/Debug/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/bin/Debug/SyntacticSugar.pdb

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt

@@ -1,6 +1,37 @@
D:\GIT仓库\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\GIT仓库\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\GIT仓库\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
D:\GIT仓库\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\GIT仓库\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\GIT仓库\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
D:\WMES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\WMES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\WMES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\WMES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\WMES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\GitHub\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\GitHub\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb

 SyntacticSugar/obj/Debug/SyntacticSugar.dll

Binary files differ

 SyntacticSugar/obj/Debug/SyntacticSugar.pdb

Binary files differ

 WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs

@@ -4,7 +4,9 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Linq;
using System.Text;
using System.Web;
using System.Web.Http;
using WebAPI.Models;
@@ -894,5 +896,151 @@
            }
        }
        #endregion

        #region å•æ®ç¿»è¯‘ æ˜ å°„ JSON文件
        internal Dictionary<string, string> LanguageDictionary = new Dictionary<string, string>
        {
            { "zh-Hans", "HFieldName"},
            { "zh-Hant", "HFieldName"},
            { "en", "HTranslationText_English"},
            { "es", "HTranslationText_Spain"}
        };

        /// <summary>
        /// 
        /// </summary>
        /// <param name="language">语言</param>
        /// <param name="forceUpdate">是否强制更新</param>
        /// <returns></returns>
        [Route("Xt_grdAlignment_WMES/SelectMESLanguage_JSON")]
        [HttpGet]
        public object SelectMESLanguage_JSON(string language, bool forceUpdate)
        {
            try
            {
                // èŽ·å–项目根目录
                string path = HttpContext.Current.Server.MapPath($"~/LanguagePack"); ;
                string lang;
                bool langSuccess = LanguageDictionary.TryGetValue(language, out lang);
                if(langSuccess == false)
                {
                    // è®¾ç½®é»˜è®¤è¯­è¨€ä¸ºä¸­æ–‡
                    language = "zh-Hans";
                    lang = "HFieldName";
                }
                ds = oCN.RunProcReturn("select * from  h_v_Xt_LanModuleList where 1=1", "h_v_Xt_LanModuleList");

                // å¦‚果目录不存在则创建目录
                if (!Directory.Exists(path))
                {
                    Directory.CreateDirectory(path);
                }
                // å¦‚果语言包不存在则创建新语言包
                if(File.Exists($@"{path}\{language}.json") == false)
                {
                    File.WriteAllText($@"{path}\{language}.json", "{}");
                }
                

                LogService.Write("语言包地址: " + Path.Combine(path, $"{language}.json"));
                string JsonStr1 = "";
                
                using (StreamReader sr = new StreamReader(Path.Combine(path, $"{language}.json"), Encoding.UTF8))
                {
                    string lines;
                    while ((lines = sr.ReadLine()) != null)//一行一行去读，如果读取这一行赋值lines,并且lines= null证明读取完了

                    {
                        JsonStr1 += lines;
                    }
                }
                JObject languagePack = JObject.Parse(JsonStr1);

                // åˆ¤æ–­ç‰ˆæœ¬å· çŽ°åœ¨MSSQL对应表中 æ— ç‰ˆæœ¬å·å­—段 ä½¿ç”¨æ•°æ®æ¡ç›®æ•°æ›¿ä»£
                if(languagePack["_Version"] == null)
                {
                    languagePack["_Version"] = 0;
                }
                LogService.Write("语言包中数据条数: " + languagePack["_Version"].ToString() + "\n数据库中数据条数: " + ds.Tables[0].Rows.Count.ToString());
                if (languagePack["_Version"].Value<int>() != ds.Tables[0].Rows.Count || forceUpdate == true)
                {
                    // æ›´æ–°ç‰ˆæœ¬å·(数据条目数)
                    languagePack["_Version"] = ds.Tables[0].Rows.Count;
                    // ç»Ÿè®¡æ¯ä¸ªå­—符模块中 å­—段码出现的次数 å¦‚果出现多次，则映射为JArray类型
                    Dictionary<string, int> HFieldCodeDict = ds.Tables[0].AsEnumerable()
                    .GroupBy(row => new
                    {
                        HModuleCode = row.Field<string>("HModuleCode"), 
                        HFieldCode = row.Field<string>("HFieldCode") 
                    })
                    .Select(group => new {
                        HModuleCode = group.Key.HModuleCode, 
                        HFieldCode = group.Key.HFieldCode,  
                        rowNum = group.Count()              
                    }).ToDictionary(
                        keySelector: p => $@"{p.HModuleCode}_{p.HFieldCode}",
                        elementSelector:  p => p.rowNum
                    );

                    // ç‰ˆæœ¬å·ä¸ä¸€è‡´ åˆ™è¯»å–数据库中的字段，将字段写入到json对象中
                    foreach (DataRow row in ds.Tables[0].Rows)
                    {
                        // èŽ·å–所在模块字符串
                        string HModuleCode = row["HModuleCode"].ToString();
                        // æ²¡æœ‰æ¨¡å—对象的话，则新建一个模块对象
                        if(languagePack[HModuleCode] == null)
                        {
                            languagePack[HModuleCode] = new JObject();
                        }

                        string HFieldCode = row["HFieldCode"].ToString();
                        int rowNum = 1;
                        HFieldCodeDict.TryGetValue($@"{row["HModuleCode"]}_{row["HFieldCode"]}", out rowNum);
                        // åˆ¤æ–­å­—段码映射中，模块对应的字段码 æ˜¯å¦ å”¯ä¸€
                        if (rowNum == 1)
                        {
                            languagePack[HModuleCode][HFieldCode] = row[lang].ToString();
                        }else
                        {
                            if(languagePack[HModuleCode][HFieldCode] == null)
                            {
                                languagePack[HModuleCode][HFieldCode] = new JArray();
                            }

                            var targetJArray = (JArray)languagePack[HModuleCode][HFieldCode];
                            targetJArray.Add(row[lang].ToString());
                        }
                        
                    }

                    // å…¨é‡å†™å…¥åˆ°json文件中
                    File.WriteAllText($"{path}/{language}.json", languagePack.ToString(), System.Text.Encoding.UTF8);

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Success！";
                    objJsonResult.data = languagePack.ToString();
                    return objJsonResult;
                } else
                {
                    // ç‰ˆæœ¬å·ä¸€è‡´ï¼Œ åˆ™ç›´æŽ¥è¿”回读取的Json字符串
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Success！";
                    objJsonResult.data = JsonStr1;
                    return objJsonResult;
                }
            }
            catch(Exception e)
            {
                LogService.Write("Exception！" + e.ToString());
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.Message.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}

 WebAPI/Controllers/POStockInBillController.cs

@@ -3389,9 +3389,9 @@
                Dss = oCN.RunProcReturn(" select HNumber from h_v_CLD_ORGANIZATIONSList where HItemID= " + HOrgID, "h_v_CLD_ORGANIZATIONSList");
                string HOrgNumber = Pub_Class.ClsPub.isStrNull(Dss.Tables[0].Rows[0]["HNumber"]);
                   
                // æ ¹æ®é‡‡è´­è®¢å•å·èŽ·å– æ”¶æ–™é€šçŸ¥å• å’Œ ç‰©æ–™ä¿¡æ¯
                // æ ¹æ®æ”¶æ–™é€šçŸ¥å•å· èŽ·å– ç‰©æ–™ä¿¡æ¯
                DataSet Dss2;
                Dss2 = oCn.RunProcReturn(" select fid,FMATERIALID,FENTRYID,FBILLNO from h_v_RECEIVEQuery where FSRCBILLNO= '" + HBarCode + "'", "h_v_RECEIVEQuery");
                Dss2 = oCn.RunProcReturn(" select fid,FMATERIALID,FENTRYID,FBILLNO from h_v_RECEIVEQuery where FBILLNO= '" + HBarCode + "'", "h_v_RECEIVEQuery");
                
                if(Dss2 == null || Dss2.Tables[0].Rows.Count == 0)
                {
@@ -5703,5 +5703,6 @@

        }
        #endregion

    }
}

 WebAPI/Controllers/Sc_ProcessMangementController.cs

@@ -1859,7 +1859,7 @@


                result1 = InvokeHelper.Submit("QM_InspectBill", JsonConvert.SerializeObject(json));//提交
                //result2 = InvokeHelper.Audit("QM_InspectBill", JsonConvert.SerializeObject(json));//审核
                // result2 = InvokeHelper.Audit("QM_InspectBill", JsonConvert.SerializeObject(json));//审核
                if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                {
                    oCN.RollBack();
@@ -1901,6 +1901,7 @@
                               " \"AliasFileName\":\"test\"," +
                               " \"SendByte\":\"" + a + "\"" +
                           "}";
                        // ä¸‹é¢çš„方式适用于 é‡‘蝶云 8.0以上版本
                        string _vlog = InvokeHelper.UpLoad("QM_InspectBill", jsonStr);
                        LogService.Write("json:" + jsonStr);
                        LogService.Write("_vlog:" + _vlog);
@@ -1914,20 +1915,12 @@
                            objJsonResult.data = null;
                            return objJsonResult;
                        }

                        // ä¸‹é¢çš„方式适用于 é‡‘蝶云 8.0以下版本
                        // var ret = client.AttachmentUpload(jsonStr);
                    }


                    //string jsonStr = "{" +
                    //   " \"FileName\":\"" + HFileName + "\"," +
                    //       " \"FormId\":\"QM_InspectBill\"," +
                    //       " \"IsLast\":\"true\"," +
                    //       " \"InterId\":\"" + HInterID + "\"," +
                    //       " \"BillNO\":\"" + HBillNo + "\"," +
                    //       " \"AliasFileName\":\"test\"," +
                    //       " \"SendByte\":\"" + a + "\"," +
                    //   "}";

                    //var ret = client.AttachmentUpload(jsonStr);
                }

                oCN.Commit();

 WebAPI/Controllers/²Ö´æ¹ÜÀí/µ÷²¦Å̵ã/Kf_MoveStockRequestBillController.cs

@@ -321,7 +321,7 @@
                ,HICMOInterID,HICMOEntryID,HICMOBillNo,HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo
                ,HSTOCKORGID,HOWNERID,HOWNERTYPEID,HSTOCKORGINID,HOWNERINID,HOWNERTYPEINID,HPRODUCEDATE,HExpiryDate,HBASEUNITID,HEXTAUXUNITID,HSECQTY) 
                 values({HInterID},{NewHEntryID},'{oSub.HBillNo_bak}','{oSub.HRemark}','{oSub.HMTONo}'
                ,'{oSub.HPlanMode}',{oSub.HERPInterID},{oSub.HERPEntryID},{oSub.HMaterID},{oSub.HUnitID},{oSub.HSecUnitID},{oSub.HPropertyID},{oSub.HAuxPropID},'{oSub.HBatchNO}',{oSub.HWHID},{oSub.HSCWHID},{oSub.HSPID},{oSub.HSCSPID},{oSub.HQtyMust},{(oSub.HQty == null ? 0 : oSub.HQty)},{oSub.HRelationQty},{oSub.HRelationMoney},{oSub.HSecUnitRate},{oSub.HPrice},{oSub.HMoney},{oSub.HOutPrice},{oSub.HOutMoney}
                ,'{oSub.HPlanMode}',{oSub.HERPInterID},{oSub.HERPEntryID},{oSub.HMaterID},{oSub.HUnitID},{oSub.HSecUnitID},{oSub.HAuxPropID},{oSub.HAuxPropID},'{oSub.HBatchNO}',{oSub.HWHID},{oSub.HSCWHID},{oSub.HSPID},{oSub.HSCSPID},{oSub.HQtyMust},{(oSub.HQty == null ? 0 : oSub.HQty)},{oSub.HRelationQty},{oSub.HRelationMoney},{oSub.HSecUnitRate},{oSub.HPrice},{oSub.HMoney},{oSub.HOutPrice},{oSub.HOutMoney}
                ,{oSub.HSourceInterID},{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',{oSub.HICMOInterID},{oSub.HICMOEntryID},'{oSub.HICMOBillNo}',{oSub.HPOOrderInterID},{oSub.HPOOrderEntryID}
                ,'{oSub.HPOOrderBillNo}',{oSub.HSeOrderInterID},{oSub.HSeOrderEntryID},'{oSub.HSeOrderBillNo}',{oSub.HSTOCKORGID},{oSub.HOWNERID},'{oSub.HOWNERTYPEID}',{oSub.HSTOCKORGINID},{oSub.HOWNERINID}
                ,'{oSub.HOWNERTYPEINID}','{oSub.HPRODUCEDATE}','{oSub.HExpiryDate}',{oSub.HBASEUNITID},{oSub.HEXTAUXUNITID},{oSub.HSECQTY})");

 WebAPI/InvokeHelper.cs

@@ -247,7 +247,7 @@
        }

        /// <summary>
        /// é™„件上传
        /// é™„件上传 é€‚用于 8.0 ä»¥ä¸Šç‰ˆæœ¬
        /// </summary>
        /// <param name="formId"></param>
        /// <param name="content"></param>

 WebAPI/Web.config

@@ -8,7 +8,7 @@



  <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
  <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
   <section name="WebAPI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
  </sectionGroup>
 </configSections>
@@ -40,7 +40,7 @@
        <!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--斯莫尔-->
        <!--<add key="surl" value="http://192.168.0.113/WEBS-WMS/Webservice1.asmx" />三升本地配置-->
        <!--<add key="surl" value="http://36.134.2.30:200/WEBS-WMS/WebService1.asmx" />-->    <!--金帅-->
        <add key="sUrl" value="http://localhost:8082/WEBS/WebService1.asmx"/>   
        <add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx" />   
        
        <add key="webpages:Version" value="3.0.0.0" />
        <add key="webpages:Enabled" value="false" />
@@ -58,7 +58,7 @@
    <system.web>
        <customErrors mode="Off" />
        <compilation debug="true" targetFramework="4.5" />
        <httpRuntime maxQueryStringLength="102400" maxRequestLength="1048576"/>
        <httpRuntime maxQueryStringLength="102400" maxRequestLength="1048576" />
        <pages controlRenderingCompatibilityVersion="4.0" />
    </system.web>

@@ -109,13 +109,13 @@
            </basicHttpBinding>
        </bindings>
        <client>
            <endpoint address="http://localhost:8082/WEBS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
            <endpoint address="http://47.96.97.237/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
        </client>
    </system.serviceModel>
 <applicationSettings>
  <WebAPI.Properties.Settings>
   <setting name="WebAPI_WebS_WebService1" serializeAs="String">
    <value>http://localhost:8082/WEBS/WebService1.asmx</value>
    <value>http://47.96.97.237/WEBS-WMS/WebService1.asmx</value>
   </setting>
  </WebAPI.Properties.Settings>
 </applicationSettings>

 WebAPI/WebAPI.csproj.user

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />

 WebAPI/packages.config

@@ -16,6 +16,7 @@
  <package id="Grpc.Core.Api" version="2.45.0" targetFramework="net45" />
  <package id="jQuery" version="1.10.2" targetFramework="net45" />
  <package id="jQuery.Validation" version="1.11.1" targetFramework="net45" />
  <package id="LiteDB" version="5.0.16" targetFramework="net45" />
  <package id="Microsoft.AspNet.Cors" version="5.2.7" targetFramework="net45" />
  <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />