Commit c68eb166 by 泽锋 李

fix

parent 1c17c3d6
...@@ -65,10 +65,10 @@ where 1=1 "; ...@@ -65,10 +65,10 @@ where 1=1 ";
sql += " and t2.guangzhou01_transfer_stock<=0 "; sql += " and t2.guangzhou01_transfer_stock<=0 ";
}else if(search.type == 4) }else if(search.type == 4)
{ {
sql += " and t2.haiwai_uk_transfer<=0 "; sql += " and t2.haiwai_us_transfer<=0 ";
}else if(search.type == 5) }else if(search.type == 5)
{ {
sql += " and t2.haiwai_us_transfer<=0 "; sql += " and t2.haiwai_uk_transfer<=0 ";
} }
} }
return _connection.Page<dc_auto_stock_monitor_dto>(sql, search, parameters); return _connection.Page<dc_auto_stock_monitor_dto>(sql, search, parameters);
......
...@@ -244,8 +244,8 @@ namespace AutoTurnOver.Models ...@@ -244,8 +244,8 @@ namespace AutoTurnOver.Models
/// 1 = us海外仓可上-美国仓有库存 /// 1 = us海外仓可上-美国仓有库存
/// 2 = uk海外仓可上-英国国仓有库存 /// 2 = uk海外仓可上-英国国仓有库存
/// 3 = 中国未订货 /// 3 = 中国未订货
/// 4 = uk海外仓未订货 /// 4 = us海外仓未订货
/// 5 =us海外仓未订货 /// 5 = uk海外仓未订货
/// </summary> /// </summary>
public int? type { get; set; } public int? type { get; set; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment