Commit d988f932 by 泽锋 李

库容 fix

parent bb813fa9
...@@ -149,6 +149,10 @@ left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code where ...@@ -149,6 +149,10 @@ left join dc_base_warehouse as t2 on t1.warehouse_code = t2.warehouse_code where
throw new Exception("创建人必填"); throw new Exception("创建人必填");
} }
var type_enum = (dc_base_storage_capacity_log_enum)data.type; var type_enum = (dc_base_storage_capacity_log_enum)data.type;
if(type_enum.ToString()== data.type.ToString())
{
throw new Exception("无法识别的流水类型");
}
data.bailun_sku_warehouse_code = $"{data.bailun_sku}{data.warehouse_code}"; data.bailun_sku_warehouse_code = $"{data.bailun_sku}{data.warehouse_code}";
var conn = MyMySqlConnection._connection; var conn = MyMySqlConnection._connection;
conn.Open(); conn.Open();
......
...@@ -94,13 +94,13 @@ namespace AutoTurnOver.Controllers ...@@ -94,13 +94,13 @@ namespace AutoTurnOver.Controllers
} }
[NoLogin] [NoLogin]
public JsonResult ProfitAnalysisSumFooter([FromQuery]Condition_AutoTurnOver m) public JsonResult ProfitAnalysisSumFooter([FromQuery]Condition_AutoTurnOver m, [FromQuery] int offset, [FromQuery] int limit, [FromQuery] string order, [FromQuery] string sort)
{ {
var services = new SkuAutoTurnServices(); var services = new SkuAutoTurnServices();
var total = 0; var total = 0;
m.isSum = true; m.isSum = true;
var list = services.ProfitAnalysis(m, 0, 1, ref total, "", ""); var list = services.ProfitAnalysis(m, offset, limit, ref total, order, sort);
return new JsonResult(list == null || list.Count <= 0 ? new dc_report_profit_analysis_dto() : list[0]); return new JsonResult(list == null || list.Count <= 0 ? new dc_report_profit_analysis_dto() : list[0]);
} }
......
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