From a9cddcd1e3e8ae51f68a885326cfce3247fdbd66 Mon Sep 17 00:00:00 2001
From: yyk <2336760928@qq.com>
Date: 星期五, 23 八月 2024 09:20:47 +0800
Subject: [PATCH] 调整批量添加储位接口。
---
Wms/Wms/Controllers/SysController.cs | 12 +++++++++++-
Wms/WMS.BLL/SysServer/StorageLocatServer.cs | 20 +++++++++++++++++++-
HTML/views/WareHouseSetting/Locate.html | 9 +++++----
3 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/HTML/views/WareHouseSetting/Locate.html b/HTML/views/WareHouseSetting/Locate.html
index 47e5016..45973b5 100644
--- a/HTML/views/WareHouseSetting/Locate.html
+++ b/HTML/views/WareHouseSetting/Locate.html
@@ -303,7 +303,8 @@
sendData(IP + "/Sys/AddStorageLocat", param, 'post', function (res) {
console.log(res);
if (res.code == 200) { //鎴愬姛
- layer.msg(res.msg, {
+
+ layer.msg(res.ErrorMsg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}, function () {
@@ -315,13 +316,13 @@
layer.close(index1); //鍏抽棴寮瑰眰
doing = true;
});
- } else if(res.code == 1){
- layer.msg(res.msg, {
+ } else if(res.code == 400){
+ layer.msg(res.ErrorMsg, {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}, function() {doing = true;});
} else { //涓嶆垚鍔�
- layer.msg(res.statusText, {
+ layer.msg(res.ErrorMsg, {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}, function() {doing = true;});
diff --git a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
index a6ea852..43ffec1 100644
--- a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
@@ -234,12 +234,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 +269,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 d177afc..1d6ce85 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