From f0b6386d27d625ee2b7080878ece230998deac98 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 29 十二月 2025 09:21:08 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 43 +++++++++-
WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs | 148 +++++++++++++++++++++++++++++++++++++
SyntacticSugar/bin/Debug/SyntacticSugar.pdb | 0
WebAPI/WebAPI.csproj.user | 2
WebAPI/packages.config | 1
WebAPI/InvokeHelper.cs | 2
SyntacticSugar/obj/Debug/SyntacticSugar.dll | 0
WebAPI/Controllers/POStockInBillController.cs | 5
WebAPI/Controllers/仓存管理/调拨盘点/Kf_MoveStockRequestBillController.cs | 2
SyntacticSugar/obj/Debug/SyntacticSugar.pdb | 0
WebAPI/Web.config | 10 +-
WebAPI/Controllers/Sc_ProcessMangementController.cs | 17 +---
SyntacticSugar/bin/Debug/SyntacticSugar.dll | 0
13 files changed, 202 insertions(+), 28 deletions(-)
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.dll b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
index a04b391..c1cb681 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
index 508e325..d4f984c 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index b4b65b7..812ef0d 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/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
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.dll b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
index a04b391..c1cb681 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
index 508e325..d4f984c 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
index 5f07608..6914c54 100644
--- a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
+++ b/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)//涓�琛屼竴琛屽幓璇伙紝濡傛灉璇诲彇杩欎竴琛岃祴鍊糽ines,骞朵笖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;
+ // 缁熻姣忎釜瀛楃妯″潡涓� 瀛楁鐮佸嚭鐜扮殑娆℃暟 濡傛灉鍑虹幇澶氭锛屽垯鏄犲皠涓篔Array绫诲瀷
+ 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
+ );
+
+ // 鐗堟湰鍙蜂笉涓�鑷� 鍒欒鍙栨暟鎹簱涓殑瀛楁锛屽皢瀛楁鍐欏叆鍒癹son瀵硅薄涓�
+ 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());
+ }
+
+ }
+
+ // 鍏ㄩ噺鍐欏叆鍒癹son鏂囦欢涓�
+ 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
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs
index 87cdf36..80a4d21 100644
--- a/WebAPI/Controllers/POStockInBillController.cs
+++ b/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
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index bd41db0..94d6155 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/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();
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs"
index 76494a9..e19274b 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/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})");
diff --git a/WebAPI/InvokeHelper.cs b/WebAPI/InvokeHelper.cs
index e919122..1f188e6 100644
--- a/WebAPI/InvokeHelper.cs
+++ b/WebAPI/InvokeHelper.cs
@@ -247,7 +247,7 @@
}
/// <summary>
- /// 闄勪欢涓婁紶
+ /// 闄勪欢涓婁紶 閫傜敤浜� 8.0 浠ヤ笂鐗堟湰
/// </summary>
/// <param name="formId"></param>
/// <param name="content"></param>
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index cd232ba..93cf10e 100644
--- a/WebAPI/Web.config
+++ b/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>
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 62c3aec..54f52b4 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/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 />
diff --git a/WebAPI/packages.config b/WebAPI/packages.config
index 9e9c836..01b9877 100644
--- a/WebAPI/packages.config
+++ b/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" />
--
Gitblit v1.9.1