From 41c5a191f9419bfa03e3ba0c18bb00d3172d6162 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 14 十二月 2024 14:30:15 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/BllTransServer/RcsServer.cs | 51 +++++++++++++++++++------
HTML/views/WareHouseSetting/AreaAddFrom.html | 11 +++--
HTML/views/WareHouseSetting/AreaFrom.html | 11 +++--
Wms/WMS.BLL/SysServer/StorageAreaServer.cs | 11 +++--
HTML/views/WareHouseSetting/Area.html | 8 ++--
Wms/Wms/Controllers/DownApiController.cs | 6 +-
Wms/WMS.Entity/SysEntity/SysStorageArea.cs | 2
7 files changed, 65 insertions(+), 35 deletions(-)
diff --git a/HTML/views/WareHouseSetting/Area.html b/HTML/views/WareHouseSetting/Area.html
index 77c8e60..22d0d90 100644
--- a/HTML/views/WareHouseSetting/Area.html
+++ b/HTML/views/WareHouseSetting/Area.html
@@ -43,10 +43,10 @@
<div class="layui-input-inline" >
<select name="Type" id="Type" lay-filter="Type" lay-search>
<option value=""></option>
- <option value="1">鎴愬搧鍖�</option>
- <option value="2">鍘熸枡鍖�</option>
- <option value="3">鍖呮潗鍖�</option>
- <option value="4">绌烘墭鍖�</option>
+ <option value="0">鍑�妗跺尯</option>
+ <option value="1">棰勬贩鍖�</option>
+ <option value="2">鍗婃垚鍝佸尯</option>
+ <option value="3">鑴忔《鍖�</option>
</select>
</div>
</div>
diff --git a/HTML/views/WareHouseSetting/AreaAddFrom.html b/HTML/views/WareHouseSetting/AreaAddFrom.html
index 61bb83a..f74b5fa 100644
--- a/HTML/views/WareHouseSetting/AreaAddFrom.html
+++ b/HTML/views/WareHouseSetting/AreaAddFrom.html
@@ -25,7 +25,7 @@
<div class="layui-form-item">
<label class="layui-form-label">璁惧缂栫爜</label>
<div class="layui-input-block">
- <input type="text" name="DeviceCode" lay-verify="required" placeholder="璇疯緭鍏ヨ澶囩紪鐮�" autocomplete="off" class="layui-input">
+ <input type="text" name="DeviceCode" placeholder="璇疯緭鍏ヨ澶囩紪鐮�" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
@@ -63,10 +63,11 @@
<div class="layui-input-block">
<select name="Type" id="Type" lay-verify="required" lay-search lay-filter="SelectType">
<option value=""></option>
- <option value="1">鎴愬搧鍖�</option>
- <option value="2">鍘熸枡鍖�</option>
- <option value="3">鍖呮潗鍖�</option>
- <option value="4">绌烘墭鍖�</option>
+ <option value="0">鍑�妗跺尯</option>
+ <option value="1">棰勬贩鍖�</option>
+ <option value="2">鍗婃垚鍝佸尯</option>
+ <option value="3">鑴忔《鍖�</option>
+ <option value="4">璁惧鍖�</option>
</select>
</div>
</div>
diff --git a/HTML/views/WareHouseSetting/AreaFrom.html b/HTML/views/WareHouseSetting/AreaFrom.html
index 0262677..061ce17 100644
--- a/HTML/views/WareHouseSetting/AreaFrom.html
+++ b/HTML/views/WareHouseSetting/AreaFrom.html
@@ -33,10 +33,11 @@
<div class="layui-input-block">
<select name="Type" id="Type" lay-verify="required" lay-search>
<option value=""></option>
- <option value="1">鎴愬搧鍖�</option>
- <option value="2">鍘熸枡鍖�</option>
- <option value="3">鍖呮潗鍖�</option>
- <option value="4">绌烘墭鍖�</option>
+ <option value="0">鍑�妗跺尯</option>
+ <option value="1">棰勬贩鍖�</option>
+ <option value="2">鍗婃垚鍝佸尯</option>
+ <option value="3">鑴忔《鍖�</option>
+ <option value="4">璁惧鍖�</option>
</select>
</div>
</div>
@@ -51,7 +52,7 @@
<div class="layui-form-item">
<label class="layui-form-label">璁惧缂栫爜</label>
<div class="layui-input-block">
- <input type="text" name="DeviceCode" lay-verify="required" placeholder="璇疯緭鍏ヨ澶囩紪鐮�" autocomplete="off" class="layui-input">
+ <input type="text" name="DeviceCode" placeholder="璇疯緭鍏ヨ澶囩紪鐮�" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item layui-hide">
diff --git a/Wms/WMS.BLL/BllTransServer/RcsServer.cs b/Wms/WMS.BLL/BllTransServer/RcsServer.cs
index addb71c..9c651a2 100644
--- a/Wms/WMS.BLL/BllTransServer/RcsServer.cs
+++ b/Wms/WMS.BLL/BllTransServer/RcsServer.cs
@@ -56,8 +56,11 @@
switch (model.Type)
{
case "0"://鍙噣妗�
+ //鏌ユ壘鍒拌杞﹂棿鍑�妗跺尯
+ List<string> areaNoList = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "0" && w.WareHouseNo == houseNo).Select(s=>s.AreaNo).ToList();
+ //鏌ユ壘鍑�妗�
pallet = stockDetail.Where(w => w.WareHouseNo == houseNo && w.PalletStatus == "0" && w.Status == "0"
- && (w.AreaNo.Contains("01") || w.AreaNo.Contains("11") || w.AreaNo.Contains("21") || w.AreaNo.Contains("31"))).OrderByDescending(o => o.CreateTime).First();
+ && areaNoList.Contains(w.AreaNo)).OrderByDescending(o => o.CreateTime).First();
if (pallet == null)
{
throw new Exception("鏆傛棤鍑�妗跺彲鍒嗛厤");
@@ -74,9 +77,11 @@
{
throw new Exception("鎵规鍙蜂负绌猴紒");
}
+ //鏌ユ壘鍒拌杞﹂棿棰勬贩鍖�
+ List<string> areaNoList2 = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "1" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
//鏌ユ壘搴撳瓨涓槸鍚︽湁鍙敤鐨勬鎵规鐨勬贩鏂欐《
pallet = stockDetail.Where(w => w.WareHouseNo == houseNo && w.PalletStatus == "1" && w.Status == "0" && w.LotNo == model.LotNo
- && (w.AreaNo.Contains("02") || w.AreaNo.Contains("12") || w.AreaNo.Contains("22") || w.AreaNo.Contains("32"))).OrderByDescending(o => o.CompleteTime).First();
+ && areaNoList2.Contains(w.AreaNo)).OrderByDescending(o => o.CompleteTime).First();
if (pallet == null)
{
throw new Exception("鏆傛棤娣锋枡妗跺彲鍒嗛厤");
@@ -112,9 +117,11 @@
//鏇存柊鍑哄簱鍗�
Db.Updateable(soNotice).ExecuteCommand();
+ //鏌ユ壘鍒拌杞﹂棿鍗婃垚鍝佸尯
+ List<string> areaNoList3 = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "2" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
//鏌ユ壘搴撳瓨涓槸鍚︽湁姝ゆ壒娆＄殑鍚堟牸涓嬫枡妗�
pallet = stockDetail.Where(w => w.WareHouseNo == houseNo && w.PalletStatus == "2" && w.Status == "0" && w.LotNo == model.LotNo && w.InspectStatus=="1"
- && (w.AreaNo.Contains("03") || w.AreaNo.Contains("13") || w.AreaNo.Contains("23") || w.AreaNo.Contains("33"))).OrderByDescending(o => o.CompleteTime).First();
+ && areaNoList3.Contains(w.AreaNo)).OrderByDescending(o => o.CompleteTime).First();
if (pallet == null)
{
throw new Exception("鏆傛棤涓嬫枡妗跺彲鍒嗛厤");
@@ -126,8 +133,10 @@
taskMsg = "璁惧鍙枡妗朵笅鏂欎换鍔�";
break;
case "3"://鍙剰妗�
+ //鏌ユ壘鍒拌杞﹂棿鑴忔《鍖�
+ List<string> areaNoList4 = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "3" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
List<DataStockDetail> palletList = stockDetail.Where(w => w.WareHouseNo == houseNo && w.PalletStatus == "3" && w.Status == "0"
- && (w.AreaNo.Contains("03") || w.AreaNo.Contains("13") || w.AreaNo.Contains("23") || w.AreaNo.Contains("33"))).OrderByDescending(o => o.CompleteTime).ToList();
+ && areaNoList4.Contains(w.AreaNo)).OrderByDescending(o => o.CompleteTime).ToList();
if (palletList.Count <= 0)
{
throw new Exception("鏆傛棤鑴忔《鍙垎閰�");
@@ -348,7 +357,9 @@
switch (model.Type)
{
case "3"://娓呮礂璁惧鐢宠鍌ㄤ綅锛堝噣妗剁敵璇峰偍浣嶏級
- loction = storageLocat.Where(w => w.WareHouseNo == houseNo && (w.AreaNo.Contains("01") || w.AreaNo.Contains("11") || w.AreaNo.Contains("21") || w.AreaNo.Contains("31"))).OrderByDescending(o => o.CreateTime).First();
+ //鏌ユ壘鍒拌杞﹂棿鍑�妗跺尯
+ List<string> areaNoList = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "0" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
+ loction = storageLocat.Where(w => w.WareHouseNo == houseNo && areaNoList.Contains(w.AreaNo)).OrderByDescending(o => o.CreateTime).First();
if (loction == null)
{
throw new Exception("璇ヨ溅闂村噣妗跺尯鏆傛棤绌轰綑鍌ㄤ綅");
@@ -362,7 +373,9 @@
{
throw new Exception("鎵规鍙蜂负绌猴紒");
}
- loction = storageLocat.Where(w => w.WareHouseNo == houseNo && (w.AreaNo.Contains("02") || w.AreaNo.Contains("12") || w.AreaNo.Contains("22") || w.AreaNo.Contains("32"))).OrderByDescending(o => o.CreateTime).First();
+ //鏌ユ壘鍒拌杞﹂棿棰勬贩鍖�
+ List<string> areaNoList2 = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "1" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
+ loction = storageLocat.Where(w => w.WareHouseNo == houseNo && areaNoList2.Contains(w.AreaNo)).OrderByDescending(o => o.CreateTime).First();
if (loction == null)
{
throw new Exception("璇ヨ溅闂撮娣峰尯鏆傛棤绌轰綑鍌ㄤ綅");
@@ -393,7 +406,9 @@
//鏇存柊鍏ュ簱鍗曠姸鎬�
Db.Updateable(notice).ExecuteCommand();
- loction = storageLocat.Where(w => w.WareHouseNo == houseNo && (w.AreaNo.Contains("03") || w.AreaNo.Contains("13") || w.AreaNo.Contains("23") || w.AreaNo.Contains("33"))).OrderByDescending(o => o.CreateTime).First();
+ //鏌ユ壘鍒拌杞﹂棿鍗婃垚鍝佸尯
+ List<string> areaNoList3 = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "2" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
+ loction = storageLocat.Where(w => w.WareHouseNo == houseNo && areaNoList3.Contains(w.AreaNo)).OrderByDescending(o => o.CreateTime).First();
if (loction == null)
{
throw new Exception("璇ヨ溅闂村崐鎴愬搧鍖烘殏鏃犵┖浣欏偍浣�");
@@ -402,7 +417,9 @@
taskMsg = "鎺ユ枡璁惧锛堟贩鏂欐《锛夌敵璇峰偍浣嶄换鍔�";
break;
case "2"://涓嬫枡璁惧鐢宠鍌ㄤ綅锛堣剰妗剁敵璇峰偍浣嶏級
- loction = storageLocat.Where(w => w.WareHouseNo == houseNo && (w.AreaNo.Contains("04") || w.AreaNo.Contains("14") || w.AreaNo.Contains("24") || w.AreaNo.Contains("34"))).OrderByDescending(o => o.CreateTime).First();
+ //鏌ユ壘鍒拌杞﹂棿鑴忔《鍖�
+ List<string> areaNoList4 = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "3" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
+ loction = storageLocat.Where(w => w.WareHouseNo == houseNo && areaNoList4.Contains(w.AreaNo)).OrderByDescending(o => o.CreateTime).First();
if (loction == null)
{
throw new Exception("璇ヨ溅闂磋剰妗跺尯鏆傛棤绌轰綑鍌ㄤ綅");
@@ -617,7 +634,8 @@
//涓嬭溅浠诲姟鍗�
AgvSchedulingTask agvTask = new AgvSchedulingTask();
- agvTask.reqCode = taskDetial.Taskno;//浠诲姟鍙�
+ agvTask.reqCode = taskDetial.Taskno;//璇锋眰缂栧彿
+ agvTask.taskCode= taskDetial.Taskno;//浠诲姟鍙�
agvTask.ctnrCode = taskDetial.Pallno;//妗跺彿
agvTask.ctnrTyp = "1";
agvTask.reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");//璇锋眰鏃堕棿
@@ -737,26 +755,33 @@
//淇敼鐩爣鍌ㄤ綅鐘舵��
Db.Updateable(endLocatInfo).ExecuteCommand();
+ //鐩爣鍌ㄤ綅鎵�灞炲尯鍩�
+ var endAreaInfo = Db.Queryable<SysStorageArea>().First(w => w.IsDel == "0" && w.WareHouseNo == endLocatInfo.WareHouseNo && w.AreaNo == endLocatInfo.AreaNo);
+ if (endAreaInfo == null)
+ {
+ throw new Exception($"鐩爣鍌ㄤ綅鎵�灞炲尯鍩熶俊鎭笉瀛樺湪");
+ }
+
stockDetail.WareHouseNo = endLocatInfo.WareHouseNo;//鎵�灞炰粨搴�
stockDetail.RoadwayNo = endLocatInfo.RoadwayNo;//鎵�灞炲贩閬�
stockDetail.AreaNo = endLocatInfo.AreaNo;//鎵�灞炲尯鍩�
stockDetail.LocatNo = endLocatInfo.LocatNo;//鍌ㄤ綅鍦板潃
- if (endLocatInfo.AreaNo.Contains("01") || endLocatInfo.AreaNo.Contains("11") || endLocatInfo.AreaNo.Contains("21") || endLocatInfo.AreaNo.Contains("31"))//娲佸噣鍖�
+ if (endAreaInfo.Type=="0")//娲佸噣鍖�
{
stockDetail.PalletStatus = "0";
stockDetail.Status = "0";//寰呭垎閰�
}
- else if (endLocatInfo.AreaNo.Contains("02") || endLocatInfo.AreaNo.Contains("12") || endLocatInfo.AreaNo.Contains("22") || endLocatInfo.AreaNo.Contains("32"))//棰勬贩鍖�
+ else if (endAreaInfo.Type == "1")//棰勬贩鍖�
{
stockDetail.PalletStatus = "1";
stockDetail.Status = "0";//寰呭垎閰�
}
- else if (endLocatInfo.AreaNo.Contains("03") || endLocatInfo.AreaNo.Contains("13") || endLocatInfo.AreaNo.Contains("23") || endLocatInfo.AreaNo.Contains("33"))//鍗婃垚鍝佸尯
+ else if (endAreaInfo.Type == "2")//鍗婃垚鍝佸尯
{
stockDetail.PalletStatus = "2";
stockDetail.Status = "0";//寰呭垎閰�
}
- else if (endLocatInfo.AreaNo.Contains("04") || endLocatInfo.AreaNo.Contains("14") || endLocatInfo.AreaNo.Contains("24")|| endLocatInfo.AreaNo.Contains("34"))//鑴忔《鍖�
+ else if (endAreaInfo.Type == "3")//鑴忔《鍖�
{
stockDetail.PalletStatus = "3";
stockDetail.LotNo = "";//鎵规
diff --git a/Wms/WMS.BLL/SysServer/StorageAreaServer.cs b/Wms/WMS.BLL/SysServer/StorageAreaServer.cs
index 8182074..156c344 100644
--- a/Wms/WMS.BLL/SysServer/StorageAreaServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageAreaServer.cs
@@ -310,17 +310,20 @@
var str = "";
switch (code)
{
+ case "0":
+ str = "鍑�妗跺尯";
+ break;
case "1":
- str = "鎴愬搧鍖�";
+ str = "棰勬贩鍖�";
break;
case "2":
- str = "鍘熸枡鍖�";
+ str = "鍗婃垚鍝佸尯";
break;
case "3":
- str = "鍖呮潗鍖�";
+ str = "鑴忔《鍖�";
break;
case "4":
- str = "绌烘墭鍖�";
+ str = "璁惧鍖�";
break;
default:
str = "";
diff --git a/Wms/WMS.Entity/SysEntity/SysStorageArea.cs b/Wms/WMS.Entity/SysEntity/SysStorageArea.cs
index 744454b..2ec5c05 100644
--- a/Wms/WMS.Entity/SysEntity/SysStorageArea.cs
+++ b/Wms/WMS.Entity/SysEntity/SysStorageArea.cs
@@ -48,7 +48,7 @@
/// </summary>
public int Priority { get; set; }
/// <summary>
- /// 绫诲埆 1锛氬瓨鍌ㄥ尯 2锛氬懆杞尯 3锛氭楠屽尯 4 鎷ｈ揣鍖� 绛� or 1 鍘熸枡鍖� 2 鍖呮潗鍖� 3 鎴愬搧鍖� 4锛氱┖鎵樺尯
+ /// 绫诲埆 0:鍑�妗跺尯 1:棰勬贩鍖� 2:鍗婃垚鍝佸尯 3:鑴忔《鍖�
/// Default:
/// Nullable:False
/// </summary>
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index 7b635c8..574632f 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -833,9 +833,9 @@
var jsonData = JsonConvert.SerializeObject(model);
LogFile.SaveLogToFile($"浠诲姟鎵ц閫氱煡锛�( {jsonData} ),", logStr);
- if (string.IsNullOrEmpty(model.reqCode))
+ if (string.IsNullOrEmpty(model.taskCode))
{
- return Ok(new AgvResultModel { code = "-1", message = "璇锋眰澶辫触锛宺eqCode鍙傛暟寮傚父", reqCode = model.reqCode });
+ return Ok(new AgvResultModel { code = "-1", message = "璇锋眰澶辫触锛宼askCode鍙傛暟寮傚父", reqCode = model.reqCode });
}
switch (model.method)
{
@@ -846,7 +846,7 @@
return Ok(new AgvResultModel { code = "0", message = "鎴愬姛", reqCode = model.reqCode });
case "end"://浠诲姟缁撴潫
- _rcsserver.RCSFinishTask(model.reqCode, "1");
+ _rcsserver.RCSFinishTask(model.taskCode, "1");
return Ok(new AgvResultModel { code = "0", message = "鎴愬姛", reqCode = model.reqCode });
case "cancel"://浠诲姟鍗曞彇娑�
return Ok(new AgvResultModel { code = "0", message = "鎴愬姛", reqCode = model.reqCode });
--
Gitblit v1.8.0