|
|
@ -813,26 +813,22 @@ namespace ICSSoft.WebAPI.Controllers |
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// 使用中
|
|
|
|
/// 获取条码信息
|
|
|
|
/// 获取客供料上架条码信息
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="JsonData"></param>
|
|
|
|
/// <returns></returns>
|
|
|
|
[HttpPost] |
|
|
|
[Route("api/AMBarCodeInformation/Get")] |
|
|
|
public HttpResponseMessage AMBarCodeInformationGet([FromBody] object JsonData) |
|
|
|
[Route("api/BarCodeMsgForStockInByClient/Get")] |
|
|
|
public HttpResponseMessage BarCodeMsgForStockInByClientGet([FromBody] object JsonData) |
|
|
|
{ |
|
|
|
log.Info("获取条码信息传入值" + JsonData); |
|
|
|
log.Info("客供料上架条码信息传入值" + JsonData); |
|
|
|
try |
|
|
|
{ |
|
|
|
if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") |
|
|
|
{ |
|
|
|
BarCodeModel model = new BarCodeModel(); |
|
|
|
model = JsonConvert.DeserializeObject<BarCodeModel>(JsonData.ToString()); |
|
|
|
//var resultStr = ICSSubmitService.BarCodeInformationGet(model);
|
|
|
|
//res.Success = true;
|
|
|
|
//res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!";
|
|
|
|
//res.Data = resultStr;
|
|
|
|
res = ICSSubmitService.AMBarCodeInformationGet(model); |
|
|
|
res = ICSSubmitService.BarCodeMsgForStockInByClientGet(model); |
|
|
|
} |
|
|
|
} |
|
|
|
catch (Exception ex) |
|
|
@ -846,46 +842,10 @@ namespace ICSSoft.WebAPI.Controllers |
|
|
|
str = JsonConvert.SerializeObject(res); |
|
|
|
result.Content = new StringContent(str, Encoding.GetEncoding("UTF-8"), "application/json"); |
|
|
|
} |
|
|
|
log.Debug("获取条码信息返回值:" + str); |
|
|
|
log.Debug("客供料上架条码信息返回值:" + str); |
|
|
|
return result; |
|
|
|
} |
|
|
|
///// <summary>
|
|
|
|
///// 上架
|
|
|
|
///// </summary>
|
|
|
|
///// <param name="JsonData"></param>
|
|
|
|
///// <returns></returns>
|
|
|
|
//[HttpPost]
|
|
|
|
//[Route("api/LOTStockUp/Get")]
|
|
|
|
//public HttpResponseMessage LOTStockUpGet([FromBody] object JsonData)
|
|
|
|
//{
|
|
|
|
// log.Info("上架传入值" + JsonData);
|
|
|
|
// try
|
|
|
|
// {
|
|
|
|
// if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]")
|
|
|
|
// {
|
|
|
|
// WMSTBarCodeModel model = new WMSTBarCodeModel();
|
|
|
|
// model = JsonConvert.DeserializeObject<WMSTBarCodeModel>(JsonData.ToString());
|
|
|
|
// WMSBarCoreService action = new WMSBarCoreService();
|
|
|
|
// var resultStr = action.LOTStockUpGet(model);
|
|
|
|
// res.Success = true;
|
|
|
|
// res.Message = LanguageHelper.GetNameSingle("WMSAPI001");// "接口调用成功!";
|
|
|
|
// res.Data = resultStr;
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// catch (Exception ex)
|
|
|
|
// {
|
|
|
|
// log.Error("转换失败:" + ex.ToString());
|
|
|
|
// res.Success = false;
|
|
|
|
// res.Message = ex.Message;
|
|
|
|
// }
|
|
|
|
// finally
|
|
|
|
// {
|
|
|
|
// str = JsonConvert.SerializeObject(res);
|
|
|
|
// result.Content = new StringContent(str, Encoding.GetEncoding("UTF-8"), "application/json");
|
|
|
|
// }
|
|
|
|
// log.Debug("获取条码信息返回值:" + str);
|
|
|
|
// return result;
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// 上架添加
|
|
|
@ -3136,20 +3096,6 @@ namespace ICSSoft.WebAPI.Controllers |
|
|
|
if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]") |
|
|
|
{ |
|
|
|
model = JsonConvert.DeserializeObject<ICSLocation>(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");// "接口调用成功!";
|
|
|
|