feat: 新增库存批次和Lot查询功能,优化入库界面和报表处理
refactor: 重构SimpleReceiptIn界面,增加历史记录和自动完成功能 fix: 修复报表参数处理和SQL解码问题 perf: 优化WCS接口调用和库存计算逻辑 style: 清理无用代码和调整格式 chore: 更新数据库连接配置和调试模式设置
This commit is contained in:
1 parent
5a04ca9d59
commit
48c63bb15d
13 files changed
+361
-199
No files matched your search
@@ -1,6 +1,7 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using HHWMS.Web;
|
||||
using HHWMS.Web.Models;
|
||||
using Newtonsoft.Json.Linq;
|
||||
@@ -52,6 +53,7 @@ namespace HHWMS.Web
|
||||
// 组装查询条件
|
||||
if (!string.IsNullOrEmpty(sFilter))
|
||||
{
|
||||
sFilter = HttpUtility.HtmlDecode(sFilter);
|
||||
if (string.IsNullOrEmpty(filter))
|
||||
{
|
||||
return ResponseResult<dynamic>.Error("请填写查询条件!");
|
||||
@@ -66,7 +68,7 @@ namespace HHWMS.Web
|
||||
return ResponseResult<dynamic>.Error("查询条件不正确!");
|
||||
}
|
||||
}
|
||||
|
||||
sql = HttpUtility.HtmlDecode(sql.Replace("\\t","" ).Replace("\\n",""));
|
||||
foreach (var item in json)
|
||||
{
|
||||
sql = sql.Replace(item.Key, item.Value.ToString());
|
||||
@@ -84,7 +86,8 @@ namespace HHWMS.Web
|
||||
}
|
||||
result.Add(colList);
|
||||
// 添加列表
|
||||
result.Add(data.Rows[0].Table);
|
||||
if(data.Rows.Count > 0)
|
||||
result.Add(data.Rows[0].Table);
|
||||
|
||||
return ResponseResult<dynamic>.Success(result);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user