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.BLL/SysServer/StorageLocatServer.cs | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
index a6ea852..5082e8a 100644
--- a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
@@ -119,12 +119,25 @@
}
}
+ public List<SysStorageLocat> GetStorageLocat()
+ {
+ try
+ {
+ var data = LocatRst.GetAll().ToList();
+ return data;
+ }
+ catch (Exception e)
+ {
+ Console.WriteLine(e);
+ throw;
+ }
+ }
public bool EditStorageLocat(EditLocateVm model, string url, int userId)
{
try
{
- var bl = LocatRst.EditStorageLocat(model.Id, model.Status, model.Flag, model.Temperature, url, userId);
+ var bl = LocatRst.EditStorageLocat(model.Id,model.AreaNo, model.Status, model.Flag, model.Temperature, url, userId);
return bl;
}
@@ -234,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()
{
// 鍖哄煙+鎺�+鍒�+灞�
@@ -251,7 +282,7 @@
AisleOne = "1",
AisleTwo = "",
Flag = "0",
- Depth = z.ToString(),
+ Depth = depthString,
Row = i,
Column = z,
Layer = 1,
@@ -272,7 +303,7 @@
{
try
{
- var bl = LocatRst.EditStorageLocatList(model.Id, model.Status, model.Flag, model.Temperature, url, userId);
+ var bl = LocatRst.EditStorageLocatList(model.Id, model.AreaNo, model.Status, model.Flag, model.Temperature, url, userId);
return bl;
}
--
Gitblit v1.8.0