From f147cfa91feec613eb304c78fecafdf43286034a Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 30 三月 2024 11:12:24 +0800
Subject: [PATCH] Merge branch 'wxw'
---
Wms/Wms/Controllers/BllAsnController.cs | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/Wms/Wms/Controllers/BllAsnController.cs b/Wms/Wms/Controllers/BllAsnController.cs
index badb7b4..e31f593 100644
--- a/Wms/Wms/Controllers/BllAsnController.cs
+++ b/Wms/Wms/Controllers/BllAsnController.cs
@@ -97,6 +97,11 @@
return Ok(new { code = 1, msg = e.Message });
}
}
+ /// <summary>
+ /// 鑾峰彇娣诲姞鏄庣粏鏁版嵁婧�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
[HttpPost]
public IActionResult GetMaterialsList(GetMaterialsVm model)
{
@@ -911,7 +916,7 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- var list = _BoxInfoSvc.AddLabelBox(model.Id, model.IsReset, decimal.Parse(model.ArriveQty), model.ProductionTime, model.ExpirationTime, model.StoreTime, int.Parse(userId));
+ var list = _BoxInfoSvc.AddLabelBox(model.Id, model.IsReset, decimal.Parse(model.ArriveQty), model.ProductionTime, model.ExpirationTime, model.StoreTime, model.SupplierLot, int.Parse(userId));
return Ok(new { code = 0, msg = "鐢熸垚绠辩爜鏍囩鎴愬姛", data = list });
}
catch (Exception e)
--
Gitblit v1.8.0