From 62b3bf8205277b9bdceaa83f0d7e5d73312e1780 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期五, 23 八月 2024 14:48:02 +0800
Subject: [PATCH] 解决冲突
---
Wms/Wms/Controllers/SysController.cs | 12 +++++++++++-
Wms/WMS.BLL/SysServer/StorageLocatServer.cs | 20 +++++++++++++++++++-
Wms/WMS.BLL/SysServer/MaterialsServer.cs | 10 ++++++++++
3 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/MaterialsServer.cs b/Wms/WMS.BLL/SysServer/MaterialsServer.cs
index 38e3477..7321b66 100644
--- a/Wms/WMS.BLL/SysServer/MaterialsServer.cs
+++ b/Wms/WMS.BLL/SysServer/MaterialsServer.cs
@@ -92,6 +92,16 @@
return await Db.Queryable<SysMaterials>().CountAsync(s => s.SkuNo == SkuNo && s.IsDel == "0");
}
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鏌ヨ鐗╂枡淇℃伅
+ /// </summary>
+ /// <param name="PackagNo">鍖呰缂栧彿</param>
+ /// <returns></returns>
+ public async Task<int> GetMateByPa(string PackagNo)
+ {
+ return await Db.Queryable<SysMaterials>().CountAsync(s => s.PackagNo == PackagNo && s.IsDel == "0");
+ }
/// <summary>
/// 鏂板鐗╂枡淇℃伅
/// </summary>
diff --git a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
index d886a35..5082e8a 100644
--- a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
@@ -247,12 +247,30 @@
try
{
var q = 0;
+ var depth = 0;
+ var depthString = "";
// 鎺�(缁�)寰幆
for (int i = 1; i <= model.Row; i++)
{
// 鍒楀惊鐜�
for (int z = 1; z <= model.Col; z++)
{
+ if (z == 1)
+ {
+ depth += 1;
+ if (depth >= 10)
+ {
+ depthString = depth.ToString();
+ }
+ else if (depth < 10)
+ {
+ depthString = "0" + depth.ToString();
+ }
+ else {
+ //鍏朵綑鏉′欢
+ }
+ }
+
q += await LocatRst.AddAsync(new SysStorageLocat()
{
// 鍖哄煙+鎺�+鍒�+灞�
@@ -264,7 +282,7 @@
AisleOne = "1",
AisleTwo = "",
Flag = "0",
- Depth = z.ToString(),
+ Depth = depthString,
Row = i,
Column = z,
Layer = 1,
diff --git a/Wms/Wms/Controllers/SysController.cs b/Wms/Wms/Controllers/SysController.cs
index 1a53042..6136e07 100644
--- a/Wms/Wms/Controllers/SysController.cs
+++ b/Wms/Wms/Controllers/SysController.cs
@@ -1091,7 +1091,17 @@
//{
// return Ok(new { code = 400, ErrorMsg = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
//}
- var bolls = await _locatSvc.AddStorageLocat(model.Index, model.HouseNo, model.RoadwayNo, model.AreaNo, model.Row, model.Col, model.Layer, model.Depth, 1);
+ var bolls = 0;
+ if (model.HouseNo == "W01")
+ {
+ bolls = await _locatSvc.AddStorageLocat(model.Index, model.HouseNo, model.RoadwayNo, model.AreaNo, model.Row, model.Col, model.Layer, model.Depth, 1);
+ }
+ else
+ {
+ bolls = await _locatSvc.AddPkStorageLocat(model, 1);
+ }
+
+
if (bolls > 0)
{
await _operation.InsertOperation("浠撳簱璁剧疆", "鍌ㄤ綅绠＄悊", model.RoadwayNo, "娣诲姞", "娣诲姞鍌ㄤ綅淇℃伅 鍌ㄤ綅鍙凤細" + model.RoadwayNo, 1);
--
Gitblit v1.8.0