diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.WMS.WebAPI/Controllers/WMSBarCoreController.cs b/ICSSoft.WMS.WebAPI/ICSSoft.WMS.WebAPI/Controllers/WMSBarCoreController.cs index 95a5d8d..90307aa 100644 --- a/ICSSoft.WMS.WebAPI/ICSSoft.WMS.WebAPI/Controllers/WMSBarCoreController.cs +++ b/ICSSoft.WMS.WebAPI/ICSSoft.WMS.WebAPI/Controllers/WMSBarCoreController.cs @@ -55,7 +55,7 @@ namespace ICSSoft.WebAPI.Controllers res.Data = resultStr; } } - + } } catch (Exception ex) @@ -104,7 +104,7 @@ namespace ICSSoft.WebAPI.Controllers } } - + } } catch (Exception ex) @@ -279,21 +279,24 @@ namespace ICSSoft.WebAPI.Controllers { if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - WMSSourceDocumentModel model = new WMSSourceDocumentModel(); - model = JsonConvert.DeserializeObject(JsonData.ToString()); - var resultStr = ICSSubmitService.TransInformationGet(model); - - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") - { - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - res.Data = resultStr; - } - else + lock (key) { - res.Success = false; - res.Message = LanguageHelper.GetNameSingle("WMSAPI003");//"未查询到相关数据!"; - //res.Data = resultStr; + WMSSourceDocumentModel model = new WMSSourceDocumentModel(); + model = JsonConvert.DeserializeObject(JsonData.ToString()); + var resultStr = ICSSubmitService.TransInformationGet(model); + + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + res.Data = resultStr; + } + else + { + res.Success = false; + res.Message = LanguageHelper.GetNameSingle("WMSAPI003");//"未查询到相关数据!"; + //res.Data = resultStr; + } } } } @@ -329,21 +332,24 @@ namespace ICSSoft.WebAPI.Controllers { if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - WMSSourceDocumentModel model = new WMSSourceDocumentModel(); - model = JsonConvert.DeserializeObject(JsonData.ToString()); - var resultStr = ICSSubmitService.YLTransInformationGet(model); - - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") - { - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - res.Data = resultStr; - } - else + lock (key) { - res.Success = false; - res.Message = LanguageHelper.GetNameSingle("WMSAPI003");//"未查询到相关数据!"; - //res.Data = resultStr; + WMSSourceDocumentModel model = new WMSSourceDocumentModel(); + model = JsonConvert.DeserializeObject(JsonData.ToString()); + var resultStr = ICSSubmitService.YLTransInformationGet(model); + + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + res.Data = resultStr; + } + else + { + res.Success = false; + res.Message = LanguageHelper.GetNameSingle("WMSAPI003");//"未查询到相关数据!"; + //res.Data = resultStr; + } } } } @@ -379,21 +385,24 @@ namespace ICSSoft.WebAPI.Controllers { if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - WMSSourceDocumentModel model = new WMSSourceDocumentModel(); - model = JsonConvert.DeserializeObject(JsonData.ToString()); - var resultStr = ICSSubmitService.AMTransInformationGet(model); - - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") - { - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - res.Data = resultStr; - } - else + lock (key) { - res.Success = false; - res.Message = LanguageHelper.GetNameSingle("WMSAPI003");//"未查询到相关数据!"; - //res.Data = resultStr; + WMSSourceDocumentModel model = new WMSSourceDocumentModel(); + model = JsonConvert.DeserializeObject(JsonData.ToString()); + var resultStr = ICSSubmitService.AMTransInformationGet(model); + + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + res.Data = resultStr; + } + else + { + res.Success = false; + res.Message = LanguageHelper.GetNameSingle("WMSAPI003");//"未查询到相关数据!"; + //res.Data = resultStr; + } } } } @@ -427,21 +436,24 @@ namespace ICSSoft.WebAPI.Controllers { if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - WMSSourceDocumentModel model = new WMSSourceDocumentModel(); - model = JsonConvert.DeserializeObject(JsonData.ToString()); - var resultStr = ICSSubmitService.AMTransCodeGet(model); - - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") - { - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - res.Data = resultStr; - } - else + lock (key) { - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI003");//"未查询到相关数据!"; - res.Data = resultStr; + WMSSourceDocumentModel model = new WMSSourceDocumentModel(); + model = JsonConvert.DeserializeObject(JsonData.ToString()); + var resultStr = ICSSubmitService.AMTransCodeGet(model); + + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + res.Data = resultStr; + } + else + { + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI003");//"未查询到相关数据!"; + res.Data = resultStr; + } } } } @@ -476,21 +488,24 @@ namespace ICSSoft.WebAPI.Controllers { if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - WMSSourceDocumentModel model = new WMSSourceDocumentModel(); - model = JsonConvert.DeserializeObject(JsonData.ToString()); - var resultStr = ICSSubmitService.TransPickGet(model); - - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") - { - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - res.Data = resultStr; - } - else + lock (key) { - res.Success = false; - res.Message = LanguageHelper.GetNameSingle("WMSAPI003");//"未查询到相关数据!"; - //res.Data = resultStr; + WMSSourceDocumentModel model = new WMSSourceDocumentModel(); + model = JsonConvert.DeserializeObject(JsonData.ToString()); + var resultStr = ICSSubmitService.TransPickGet(model); + + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + res.Data = resultStr; + } + else + { + res.Success = false; + res.Message = LanguageHelper.GetNameSingle("WMSAPI003");//"未查询到相关数据!"; + //res.Data = resultStr; + } } } } @@ -524,21 +539,24 @@ namespace ICSSoft.WebAPI.Controllers { if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - WMSSourceDocumentModel model = new WMSSourceDocumentModel(); - model = JsonConvert.DeserializeObject(JsonData.ToString()); - var resultStr = ICSSubmitService.TransCodeGet(model); - - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") - { - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - res.Data = resultStr; - } - else + lock (key) { - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI003");//"未查询到相关数据!"; - res.Data = resultStr; + WMSSourceDocumentModel model = new WMSSourceDocumentModel(); + model = JsonConvert.DeserializeObject(JsonData.ToString()); + var resultStr = ICSSubmitService.TransCodeGet(model); + + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + res.Data = resultStr; + } + else + { + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI003");//"未查询到相关数据!"; + res.Data = resultStr; + } } } } @@ -573,13 +591,16 @@ namespace ICSSoft.WebAPI.Controllers { if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - BarCodeModel model = new BarCodeModel(); - model = JsonConvert.DeserializeObject(JsonData.ToString()); - //var resultStr = ICSSubmitService.BarCodeInformationGet(model); - //res.Success = true; - //res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - //res.Data = resultStr; - res = ICSSubmitService.BarCodeInformationGet(model); + lock (key) + { + BarCodeModel model = new BarCodeModel(); + model = JsonConvert.DeserializeObject(JsonData.ToString()); + //var resultStr = ICSSubmitService.BarCodeInformationGet(model); + //res.Success = true; + //res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + //res.Data = resultStr; + res = ICSSubmitService.BarCodeInformationGet(model); + } } } catch (Exception ex) @@ -613,13 +634,16 @@ namespace ICSSoft.WebAPI.Controllers { if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - BarCodeModel model = new BarCodeModel(); - model = JsonConvert.DeserializeObject(JsonData.ToString()); - //var resultStr = ICSSubmitService.BarCodeInformationGet(model); - //res.Success = true; - //res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - //res.Data = resultStr; - res = ICSSubmitService.AMBarCodeInformationGet(model); + lock (key) + { + BarCodeModel model = new BarCodeModel(); + model = JsonConvert.DeserializeObject(JsonData.ToString()); + //var resultStr = ICSSubmitService.BarCodeInformationGet(model); + //res.Success = true; + //res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + //res.Data = resultStr; + res = ICSSubmitService.AMBarCodeInformationGet(model); + } } } catch (Exception ex) @@ -702,7 +726,7 @@ namespace ICSSoft.WebAPI.Controllers res.Data = resultStr; } } - + } } catch (Exception ex) @@ -749,7 +773,7 @@ namespace ICSSoft.WebAPI.Controllers } } - + } } catch (Exception ex) @@ -977,7 +1001,7 @@ namespace ICSSoft.WebAPI.Controllers } } - + } } catch (Exception ex) @@ -1032,7 +1056,7 @@ namespace ICSSoft.WebAPI.Controllers } } - + } } catch (Exception ex) @@ -1087,7 +1111,7 @@ namespace ICSSoft.WebAPI.Controllers res.Data = resultStr; } } - + } } catch (Exception ex) @@ -1143,7 +1167,7 @@ namespace ICSSoft.WebAPI.Controllers res.Data = resultStr; } } - + } } catch (Exception ex) @@ -1198,7 +1222,7 @@ namespace ICSSoft.WebAPI.Controllers res.Data = resultStr; } } - + } } catch (Exception ex) @@ -1253,7 +1277,7 @@ namespace ICSSoft.WebAPI.Controllers res.Data = resultStr; } } - + } } catch (Exception ex) @@ -1343,7 +1367,7 @@ namespace ICSSoft.WebAPI.Controllers res.Data = resultStr; } } - + } } catch (Exception ex) @@ -1391,7 +1415,7 @@ namespace ICSSoft.WebAPI.Controllers res.Data = resultStr; } } - + } } catch (Exception ex) @@ -1439,7 +1463,7 @@ namespace ICSSoft.WebAPI.Controllers res.Data = resultStr; } } - + } } catch (Exception ex) @@ -1572,7 +1596,7 @@ namespace ICSSoft.WebAPI.Controllers res.Data = resultStr; } } - + } } catch (Exception ex) @@ -1651,7 +1675,7 @@ namespace ICSSoft.WebAPI.Controllers res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; res.Data = resultStr; } - + } } catch (Exception ex) @@ -1692,7 +1716,7 @@ namespace ICSSoft.WebAPI.Controllers res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; res.Data = resultStr; } - + } } catch (Exception ex) @@ -1732,7 +1756,7 @@ namespace ICSSoft.WebAPI.Controllers res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; res.Data = resultStr; } - + } } catch (Exception ex) @@ -1773,7 +1797,7 @@ namespace ICSSoft.WebAPI.Controllers res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; res.Data = resultStr; } - + } } catch (Exception ex) @@ -1856,15 +1880,18 @@ namespace ICSSoft.WebAPI.Controllers List model = new List(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.MOIssueDocNegativeApplyCreate(model); - var resultStr = ICSSubmitService.FinishedProductWarehouseEntryCreate(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.MOIssueDocNegativeApplyCreate(model); + var resultStr = ICSSubmitService.FinishedProductWarehouseEntryCreate(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } } @@ -1899,15 +1926,18 @@ namespace ICSSoft.WebAPI.Controllers //ICSMOApplyNeg model = new ICSMOApplyNeg(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.MOIssueDocNegativeApplyCreate(model); - var resultStr = ICSSubmitService.MOIssueDocNegativeApplyCreate(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.MOIssueDocNegativeApplyCreate(model); + var resultStr = ICSSubmitService.MOIssueDocNegativeApplyCreate(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } } @@ -1943,15 +1973,18 @@ namespace ICSSoft.WebAPI.Controllers //ICSMOApplyNeg model = new ICSMOApplyNeg(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.MOIssueDocNegativeApplyCreate(model); - var resultStr = ICSSubmitService.AMMOIssueDocNegativeApplyCreate(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.MOIssueDocNegativeApplyCreate(model); + var resultStr = ICSSubmitService.AMMOIssueDocNegativeApplyCreate(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } } @@ -1987,15 +2020,18 @@ namespace ICSSoft.WebAPI.Controllers //ICSMOApplyNeg model = new ICSMOApplyNeg(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.MOIssueDocNegativeApplyCreate(model); - var resultStr = ICSSubmitService.PurOrderCreate(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.MOIssueDocNegativeApplyCreate(model); + var resultStr = ICSSubmitService.PurOrderCreate(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } } @@ -2031,15 +2067,18 @@ namespace ICSSoft.WebAPI.Controllers //ICSMOApplyNeg model = new ICSMOApplyNeg(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.MOIssueDocNegativeApplyCreate(model); - var resultStr = ICSSubmitService.ICSPurOrderUpdate(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.MOIssueDocNegativeApplyCreate(model); + var resultStr = ICSSubmitService.ICSPurOrderUpdate(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } } @@ -2074,15 +2113,18 @@ namespace ICSSoft.WebAPI.Controllers //ICSMOApplyNeg model = new ICSMOApplyNeg(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.MOIssueDocNegativeApplyCreate(model); - var resultStr = ICSSubmitService.ICSSalesOrderCreate(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.MOIssueDocNegativeApplyCreate(model); + var resultStr = ICSSubmitService.ICSSalesOrderCreate(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } } @@ -2118,15 +2160,18 @@ namespace ICSSoft.WebAPI.Controllers //ICSMOApplyNeg model = new ICSMOApplyNeg(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.MOIssueDocNegativeApplyCreate(model); - var resultStr = ICSSubmitService.ICSSalesOrderUpdate(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.MOIssueDocNegativeApplyCreate(model); + var resultStr = ICSSubmitService.ICSSalesOrderUpdate(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } } @@ -2162,15 +2207,18 @@ namespace ICSSoft.WebAPI.Controllers //ICSMOApplyNeg model = new ICSMOApplyNeg(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.MOIssueDocNegativeApplyCreate(model); - var resultStr = ICSSubmitService.ICSMOCreate(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.MOIssueDocNegativeApplyCreate(model); + var resultStr = ICSSubmitService.ICSMOCreate(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } } @@ -2205,15 +2253,18 @@ namespace ICSSoft.WebAPI.Controllers //ICSMOApplyNeg model = new ICSMOApplyNeg(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.MOIssueDocNegativeApplyCreate(model); - var resultStr = ICSSubmitService.ICSMOUpdate(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.MOIssueDocNegativeApplyCreate(model); + var resultStr = ICSSubmitService.ICSMOUpdate(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } } @@ -2247,15 +2298,18 @@ namespace ICSSoft.WebAPI.Controllers //ICSMOApplyNeg model = new ICSMOApplyNeg(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.MOIssueDocNegativeApplyUpdate(model); - var resultStr = ICSSubmitService.MOIssueDocNegativeApplyUpdate(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.MOIssueDocNegativeApplyUpdate(model); + var resultStr = ICSSubmitService.MOIssueDocNegativeApplyUpdate(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } } @@ -2291,15 +2345,18 @@ namespace ICSSoft.WebAPI.Controllers //ICSMOApplyNeg model = new ICSMOApplyNeg(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.MOIssueDocNegativeApplyUpdate(model); - var resultStr = ICSSubmitService.AMMOIssueDocNegativeApplyUpdate(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.MOIssueDocNegativeApplyUpdate(model); + var resultStr = ICSSubmitService.AMMOIssueDocNegativeApplyUpdate(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } } @@ -2427,15 +2484,18 @@ namespace ICSSoft.WebAPI.Controllers List model = new List(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.DeliveryNoticeCreate(model, DNType); - var resultStr = ICSSubmitService.DeliveryNoticeCreate(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.DeliveryNoticeCreate(model, DNType); + var resultStr = ICSSubmitService.DeliveryNoticeCreate(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } } @@ -2472,15 +2532,18 @@ namespace ICSSoft.WebAPI.Controllers List model = new List(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.DeliveryNoticeCreate(model, DNType); - var resultStr = ICSSubmitService.PurchaseRejectDocCreate(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.DeliveryNoticeCreate(model, DNType); + var resultStr = ICSSubmitService.PurchaseRejectDocCreate(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } else @@ -2521,15 +2584,18 @@ namespace ICSSoft.WebAPI.Controllers List model = new List(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.DeliveryNoticeCreate(model, DNType); - var resultStr = ICSSubmitService.PurchaseRejectDocNoTransCreate(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.DeliveryNoticeCreate(model, DNType); + var resultStr = ICSSubmitService.PurchaseRejectDocNoTransCreate(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } else @@ -2569,15 +2635,18 @@ namespace ICSSoft.WebAPI.Controllers List model = new List(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.DeliveryNoticeODNCreate(model, DNType); - var resultStr = ICSSubmitService.OutsourcingDeliveryNoticeCreate(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.DeliveryNoticeODNCreate(model, DNType); + var resultStr = ICSSubmitService.OutsourcingDeliveryNoticeCreate(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } } @@ -2615,15 +2684,18 @@ namespace ICSSoft.WebAPI.Controllers List model = new List(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.DeliveryNoticeODNCreate(model, DNType); - var resultStr = ICSSubmitService.OutsourcingRejectDocCreate(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.DeliveryNoticeODNCreate(model, DNType); + var resultStr = ICSSubmitService.OutsourcingRejectDocCreate(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } } @@ -2658,15 +2730,18 @@ namespace ICSSoft.WebAPI.Controllers List model = new List(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.DeliveryNoticeODNCreate(model, DNType); - var resultStr = ICSSubmitService.OutsourcingRejectDocNoTransCreate(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.DeliveryNoticeODNCreate(model, DNType); + var resultStr = ICSSubmitService.OutsourcingRejectDocNoTransCreate(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } } @@ -2704,29 +2779,31 @@ namespace ICSSoft.WebAPI.Controllers ICSLocation model = new ICSLocation(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.LocationGet(model); - //if (resultStr.Count > 0) - //{ - // res.Success = true; - // res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - // res.Data = resultStr; - //} - //else - //{ - // res.Success = false; - // res.Message = "仓库没有启用,请先启用仓库!"; - - //} - var resultStr = ICSSubmitService.LocationGet(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; - } + model = JsonConvert.DeserializeObject(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.LocationGet(model); + //if (resultStr.Count > 0) + //{ + // res.Success = true; + // res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + // res.Data = resultStr; + //} + //else + //{ + // res.Success = false; + // res.Message = "仓库没有启用,请先启用仓库!"; + //} + var resultStr = ICSSubmitService.LocationGet(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } + } } } catch (Exception ex) @@ -2760,29 +2837,32 @@ namespace ICSSoft.WebAPI.Controllers ICSLocation model = new ICSLocation(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.LocationGet(model); - //if (resultStr.Count > 0) - //{ - // res.Success = true; - // res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - // res.Data = resultStr; - //} - //else - //{ - // res.Success = false; - // res.Message = "仓库没有启用,请先启用仓库!"; - - //} - var resultStr = ICSSubmitService.AMLocationGet(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + + lock (key) { - res.Data = resultStr; - } + model = JsonConvert.DeserializeObject(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.LocationGet(model); + //if (resultStr.Count > 0) + //{ + // res.Success = true; + // res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + // res.Data = resultStr; + //} + //else + //{ + // res.Success = false; + // res.Message = "仓库没有启用,请先启用仓库!"; + //} + var resultStr = ICSSubmitService.AMLocationGet(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } + } } } catch (Exception ex) @@ -2868,15 +2948,18 @@ namespace ICSSoft.WebAPI.Controllers List model = new List(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.OutsourcingIssueDoNegativeApplyCreate(model); - var resultStr = ICSSubmitService.OutsourcingIssueDoNegativeApplyCreate(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.OutsourcingIssueDoNegativeApplyCreate(model); + var resultStr = ICSSubmitService.OutsourcingIssueDoNegativeApplyCreate(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } } @@ -2911,15 +2994,18 @@ namespace ICSSoft.WebAPI.Controllers List model = new List(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.OutsourcingIssueDoNegativeApplyCreate(model); - var resultStr = ICSSubmitService.AMOutsourcingIssueDoNegativeApplyCreate(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.OutsourcingIssueDoNegativeApplyCreate(model); + var resultStr = ICSSubmitService.AMOutsourcingIssueDoNegativeApplyCreate(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } } @@ -2954,15 +3040,18 @@ namespace ICSSoft.WebAPI.Controllers List model = new List(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.OutsourcingIssueDoNegativeApplyUpdate(model); - var resultStr = ICSSubmitService.OutsourcingIssueDoNegativeApplyUpdate(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.OutsourcingIssueDoNegativeApplyUpdate(model); + var resultStr = ICSSubmitService.OutsourcingIssueDoNegativeApplyUpdate(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } } @@ -2997,15 +3086,18 @@ namespace ICSSoft.WebAPI.Controllers List model = new List(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.OutsourcingIssueDoNegativeApplyUpdate(model); - var resultStr = ICSSubmitService.AMOutsourcingIssueDoNegativeApplyUpdate(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.OutsourcingIssueDoNegativeApplyUpdate(model); + var resultStr = ICSSubmitService.AMOutsourcingIssueDoNegativeApplyUpdate(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } } @@ -3088,13 +3180,16 @@ namespace ICSSoft.WebAPI.Controllers List model = new List(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - var resultStr = ICSSubmitService.OutsourcingIssueDoNegativeApplyApprove(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + var resultStr = ICSSubmitService.OutsourcingIssueDoNegativeApplyApprove(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } } @@ -3322,15 +3417,18 @@ namespace ICSSoft.WebAPI.Controllers List model = new List(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.TransferDocupdte(model); - var resultStr = ICSSubmitService.OneStepTransferDocIn(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.TransferDocupdte(model); + var resultStr = ICSSubmitService.OneStepTransferDocIn(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } } @@ -3361,15 +3459,18 @@ namespace ICSSoft.WebAPI.Controllers List model = new List(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.TransferDocupdte(model); - var resultStr = ICSSubmitService.TransferDocCreate(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.TransferDocupdte(model); + var resultStr = ICSSubmitService.TransferDocCreate(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } } @@ -3392,7 +3493,7 @@ namespace ICSSoft.WebAPI.Controllers #region 调拨申请单 [HttpPost] - [Route("api/TransferApplication/Update")] + [Route("api/TransferApplication/Update")] public HttpResponseMessage ICSTransferApplicationupdte([FromBody] object JsonData) { log.Info("调拨单传入值" + JsonData); @@ -3401,16 +3502,19 @@ namespace ICSSoft.WebAPI.Controllers List model = new List(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.TransferDocupdte(model); - //var resultStr = ICSSubmitService.OneStepTransferDocIn(model); - var resultStr = ICSSubmitService.OneStepTransferApplicationIn(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.TransferDocupdte(model); + //var resultStr = ICSSubmitService.OneStepTransferDocIn(model); + var resultStr = ICSSubmitService.OneStepTransferApplicationIn(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } } @@ -3432,7 +3536,7 @@ namespace ICSSoft.WebAPI.Controllers #region 调拨申请单(无来源) [HttpPost] - [Route("api/TransferApplication/Create")] + [Route("api/TransferApplication/Create")] public HttpResponseMessage TransferApplicationCreate([FromBody] object JsonData) { try @@ -3440,16 +3544,19 @@ namespace ICSSoft.WebAPI.Controllers List model = new List(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.TransferDocupdte(model); - // var resultStr = ICSSubmitService.TransferDocCreate(model); - var resultStr = ICSSubmitService.TransferApplicationCreate(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.TransferDocupdte(model); + // var resultStr = ICSSubmitService.TransferDocCreate(model); + var resultStr = ICSSubmitService.TransferApplicationCreate(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } } @@ -3502,7 +3609,7 @@ namespace ICSSoft.WebAPI.Controllers res.Data = resultStr; } } - + } } catch (Exception ex) @@ -3523,7 +3630,7 @@ namespace ICSSoft.WebAPI.Controllers #region 调拨申请单 [HttpPost] - [Route("api/TransferApplicationIn/Create")] + [Route("api/TransferApplicationIn/Create")] public HttpResponseMessage TransferApplicationInCreate([FromBody] object JsonData) { try @@ -3531,16 +3638,19 @@ namespace ICSSoft.WebAPI.Controllers List model = new List(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.TransferDocupdte(model); - // var resultStr = ICSSubmitService.TransferDocInCreate(model); - var resultStr = ICSSubmitService.TransferApplicationInCreate(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.TransferDocupdte(model); + // var resultStr = ICSSubmitService.TransferDocInCreate(model); + var resultStr = ICSSubmitService.TransferApplicationInCreate(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } } @@ -3562,7 +3672,7 @@ namespace ICSSoft.WebAPI.Controllers #region 获取所有未发,未发完调拨单 [HttpPost] - [Route("api/TransferApplication/ Get")] + [Route("api/TransferApplication/ Get")] public HttpResponseMessage TransCodemationGet([FromBody] object JsonData) { try @@ -3570,19 +3680,22 @@ namespace ICSSoft.WebAPI.Controllers TransferDoc model = new TransferDoc(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.TransferDocupdte(model); - - var resultStr = ICSSubmitService.TransCodemationGet(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + model = JsonConvert.DeserializeObject(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.TransferDocupdte(model); + + var resultStr = ICSSubmitService.TransCodemationGet(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } + else + res.Data = new DataTable(); } - else - res.Data = new DataTable(); } } catch (Exception ex) @@ -3740,7 +3853,7 @@ namespace ICSSoft.WebAPI.Controllers res.Data = resultStr; } } - + } } catch (Exception ex) @@ -3783,7 +3896,7 @@ namespace ICSSoft.WebAPI.Controllers res.Data = resultStr; } } - + } } catch (Exception ex) @@ -3826,7 +3939,7 @@ namespace ICSSoft.WebAPI.Controllers res.Data = resultStr; } } - + } } catch (Exception ex) @@ -3869,7 +3982,7 @@ namespace ICSSoft.WebAPI.Controllers res.Data = resultStr; } } - + } } catch (Exception ex) @@ -3908,8 +4021,8 @@ namespace ICSSoft.WebAPI.Controllers res.Success = true; res.Message = resultStr.ToString(); } - - + + } } catch (Exception ex) @@ -3951,8 +4064,8 @@ namespace ICSSoft.WebAPI.Controllers res.Success = true; res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; } - - + + } } catch (Exception ex) @@ -3993,7 +4106,7 @@ namespace ICSSoft.WebAPI.Controllers res.Success = true; res.Message = resultStr.ToString(); } - + } } @@ -4026,13 +4139,15 @@ namespace ICSSoft.WebAPI.Controllers ICSMOReceiveUntieModel model = new ICSMOReceiveUntieModel(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject(JsonData.ToString()); - //WMSBarCoreService action = new WMSBarCoreService(); - //var resultStr = action.TransferDocupdte(model); - var resultStr = ICSSubmitService.ICSContainerConUntie(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - + lock (key) + { + model = JsonConvert.DeserializeObject(JsonData.ToString()); + //WMSBarCoreService action = new WMSBarCoreService(); + //var resultStr = action.TransferDocupdte(model); + var resultStr = ICSSubmitService.ICSContainerConUntie(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + } } } catch (Exception ex) @@ -4062,14 +4177,17 @@ namespace ICSSoft.WebAPI.Controllers { if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - BarCodeModel model = new BarCodeModel(); - model = JsonConvert.DeserializeObject(JsonData.ToString()); - var resultStr = ICSSubmitService.ICSCartBarCodeGet(model); - res.Success = true; - res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; - if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + lock (key) { - res.Data = resultStr; + BarCodeModel model = new BarCodeModel(); + model = JsonConvert.DeserializeObject(JsonData.ToString()); + var resultStr = ICSSubmitService.ICSCartBarCodeGet(model); + res.Success = true; + res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!"; + if (resultStr != null && resultStr.Rows.Count > 0 && resultStr.ToString() != "[]") + { + res.Data = resultStr; + } } } } @@ -4103,11 +4221,13 @@ namespace ICSSoft.WebAPI.Controllers List model = new List(); if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") { - model = JsonConvert.DeserializeObject>(JsonData.ToString()); - var resultStr = ICSSubmitService.ICSCartScheduleCreate(model); - res.Success = true; - res.Message = resultStr.ToString(); - + lock (key) + { + model = JsonConvert.DeserializeObject>(JsonData.ToString()); + var resultStr = ICSSubmitService.ICSCartScheduleCreate(model); + res.Success = true; + res.Message = resultStr.ToString(); + } } } catch (Exception ex) @@ -4230,6 +4350,6 @@ namespace ICSSoft.WebAPI.Controllers return result; } #endregion - + } }