From 3f9d7eb876f6d60d92e7f8a71240097b6ac50eb6 Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期五, 23 五月 2025 18:16:42 +0800
Subject: [PATCH] 修改测试问题
---
Wms/WMS.BLL/HttpServer.cs | 9 +-
Wms/WMS.IBLL/IHttpServer.cs | 3
Pda/View/SoSetting/ExNoticeOut.html | 54 +++++++++++++++---
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 69 ++++++++++++-----------
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 19 +----
Wms/Wms/Controllers/DownApiController.cs | 6 +-
6 files changed, 96 insertions(+), 64 deletions(-)
diff --git a/Pda/View/SoSetting/ExNoticeOut.html b/Pda/View/SoSetting/ExNoticeOut.html
index 09b6c98..0643eae 100644
--- a/Pda/View/SoSetting/ExNoticeOut.html
+++ b/Pda/View/SoSetting/ExNoticeOut.html
@@ -93,13 +93,15 @@
<img src="/assets/down_arraw.png">
</div>
</div>
- <!-- <div id="" class="layui-form-item layout-input">
- <label class="layui-form-label" lang>搴撲綅鍦板潃锛�</label>
- <div class="layui-input-block">
- <input id="LocatNo" type="text" langholder placeholder="璇锋壂鎻忓簱浣嶆潯鐮�"
- autocomplete="off" class="layui-input">
- </div>
- </div> -->
+ <div id="" class="layui-form-item layout-dropdownlist">
+ <label class="layui-form-label" lang>鎵樼洏鏉＄爜锛�</label>
+ <div class="layui-input-block" id="selectPalletNo">
+ <select id="PalletNo" lay-filter="getPalletNo" lay-search>
+ <option value=""></option>
+ </select>
+ <img src="/assets/down_arraw.png">
+ </div>
+ </div>
<div id="" class="layui-form-item layout-dropdownlist">
<label class="layui-form-label" lang>鍑哄簱鍦板潃锛�</label>
<div class="layui-input-block">
@@ -167,8 +169,7 @@
var val = input.val()
$("#bar").empty()
$("#bar").append('<option value =>' + '</option>');
- var PalletNo = $("#PalletNo").val();
-
+
var param = {
Type: "1",
};
@@ -262,12 +263,47 @@
}
+ function updatePalletNoList(callback) {
+ var input = $('select[id="PalletNo"]').next().find('.layui-select-title input')
+ var val = input.val()
+ $("#PalletNo").empty()
+ $("#PalletNo").append('<option value =>' + '</option>');
+ form.render('select');
+
+ var param = {
+ soNo:$("#bar").val()
+ };
+ sendData(IP + "/PdaCr/GetPalletNoListBySoNo", param, 'get', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#PalletNo").append('<option value =' + res.data[i] + '>' + res.data[i]+
+ '</option>');
+ }
+ form.render('select');
+
+ if (!val) {
+ $('#PalletNo').siblings("div.layui-form-select").find('dl').find('.layui-select-tips').addClass('layui-this')
+ } else {
+ var sel = 'dd[lay-value=' + val + ']';
+ $('#PalletNo').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this')
+ }
+
+ callback(res.data)
+ } else { //涓嶆垚鍔�
+ // layer.msg(res.msg, {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // }, function() {});
+ }
+ });
+ }
form.on('submit(formBind)', function (data) {
var param = {
SoNo: $("#bar").val(),
soDetailId: $("#goodSelect").val(),
+ palletNo: $("#PalletNo").val(),
outMode:$("#endSelect").val(),
}
console.log(param);
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 2027c39..ad302b4 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -5951,16 +5951,7 @@
//淇敼搴撳瓨鏄庣粏淇℃伅
Db.Updateable(item).ExecuteCommand();
}
- //鑾峰彇鎷ｈ揣淇℃伅
- var alotr = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.PalletNo == model.PalletNo && a.Status == "4");
- if (alotr != null)
- {
- alotr.Status = "5"; //5 宸插畬鎴�
- alotr.UpdateUser = model.CreateUser; //淇敼浜�
- alotr.UpdateTime = serverTime; //淇敼鏃堕棿
- //淇敼鎷ｈ揣淇℃伅
- Db.Updateable(alotr).ExecuteCommand();
- }
+
#region 浠诲姟鍙婄粍鎵樹俊鎭�
//鍒涘缓浠诲姟淇℃伅
var taskNo = new Common().GetMaxNo("TK");
@@ -6005,15 +5996,15 @@
var upShelf = new BllPalletUpShelf()
{
TaskNo = exTask.TaskNo,
- TraceNo = bindInfo.ASNNo,
- PalletNo = bindInfo.PalletNo,
+ TraceNo = bindInfo== null? "": bindInfo.ASNNo,
+ PalletNo = model.PalletNo,
SkuNo = palletupinfo.SkuNo,
SkuName = palletupinfo.SkuName,
LotNo = palletupinfo.LotNo,
Status = "2",
LocatNo = model.LocatNo,
- WareHouseNo = bindInfo.WareHouseNo,
- RoadwayNo = bindInfo.RoadwayNo,
+ WareHouseNo = storageLocat.WareHouseNo,
+ RoadwayNo = storageLocat.RoadwayNo,
AreaNo = storageLocat.AreaNo,
CreateUser = 0,
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index 01554be..ba7f4bd 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -12,6 +12,7 @@
using Newtonsoft.Json;
using SqlSugar;
using Utility;
+using Utility.Tools;
using WMS.BLL.LogServer;
using WMS.DAL;
using WMS.Entity.BllAsnEntity;
@@ -893,20 +894,22 @@
//娣诲姞鎿嶄綔鏃ュ織璁板綍
var k = new OperationCrServer().AddLogOperationCr("PDA妯″潡", "AGV杞繍", palletNo, "绉诲簱", $"PDA鍛煎彨灏忚溅瀵规墭鐩樺彿锛歿palletNo}鍙戣捣杞繍", userId);
- var outDto = new List<OutCommandDto>();
- outDto.Add(new OutCommandDto()
+ var outDto = new List<OutCommandDto>
{
- TaskNo = moveTask.TaskNo, // 浠诲姟鍙�
- TaskType = "2",// 浠诲姟绫诲瀷 0鍏� 1鍑� 2绉�
- PalletNo = moveTask.PalletNo,//鎵樼洏鍙�
+ new OutCommandDto()
+ {
+ TaskNo = moveTask.TaskNo, // 浠诲姟鍙�
+ TaskType = "2",// 浠诲姟绫诲瀷 0鍏� 1鍑� 2绉�
+ PalletNo = moveTask.PalletNo,//鎵樼洏鍙�
- StartLocate = moveTask.StartLocat, // 璧峰浣嶇疆
- EndLocate = EndLocat, // 鐩爣浣嶇疆
-
- Order = 999,
- Type = PLCTypeEnum.AGV
+ StartLocate = moveTask.StartLocat, // 璧峰浣嶇疆
+ EndLocate = EndLocat, // 鐩爣浣嶇疆
- });
+ Order = 999,
+ Type = PLCTypeEnum.AGV
+
+ }
+ };
// 姝ｅ紡杩愯绋嬪簭鏀惧紑
var list2 = outDto.Select(m => m.TaskNo).ToList();
@@ -916,21 +919,21 @@
try
{
var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
- //response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍑哄簱鍛戒护", "WCS");
+ response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍑哄簱鍛戒护", "WCS");
var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
- //////瑙ｆ瀽杩斿洖鏁版嵁
- //var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
- //if (wcsModel.StatusCode == 0)
- //{
- // //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
- new TaskServer().EditTaskIssueOk(list2, time1, time2);
- //}
- //if (wcsModel.StatusCode == -1)
- //{
- // new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.Msg);
- // throw new Exception(wcsModel.Msg);
- //}
+ //瑙ｆ瀽杩斿洖鏁版嵁
+ var wcsModel = JsonConvert.DeserializeObject<WcsModel2>(response);
+ if (wcsModel.code == 200)
+ {
+ // 鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
+ new TaskServer().EditTaskIssueOk(list2, time1, time2);
+ }
+ else
+ {
+ new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.message);
+ throw new Exception(wcsModel.message);
+ }
}
catch (Exception ex)
{
@@ -1111,16 +1114,16 @@
endLocat = locatInfo2.LocatNo;
}
- if (string.IsNullOrEmpty(endLocat))
- {
- var locatInfo3 = storageLocatList.Where(w => w.IsDel == "0" && w.Flag == "0")
- .OrderByDescending(m => m.Layer).OrderByDescending(m => m.Column).OrderByDescending(m => m.Row).First();
+ //if (string.IsNullOrEmpty(endLocat))
+ //{
+ // var locatInfo3 = storageLocatList.Where(w => w.IsDel == "0" && w.Flag == "0")
+ // .OrderByDescending(m => m.Layer).OrderByDescending(m => m.Column).OrderByDescending(m => m.Row).First();
- if (locatInfo3 != null)
- {
- endLocat = locatInfo3.LocatNo;
- }
- }
+ // if (locatInfo3 != null)
+ // {
+ // endLocat = locatInfo3.LocatNo;
+ // }
+ //}
return endLocat;
}
#endregion
diff --git a/Wms/WMS.BLL/HttpServer.cs b/Wms/WMS.BLL/HttpServer.cs
index b758081..20e977d 100644
--- a/Wms/WMS.BLL/HttpServer.cs
+++ b/Wms/WMS.BLL/HttpServer.cs
@@ -1348,12 +1348,13 @@
/// <param name="soNo"></param>
/// <param name="detailId"></param>
/// <param name="outMode"></param>
+ /// <param name="palletNo"></param>
/// <param name="userId"></param>
/// <param name="url"></param>
/// <param name="str"></param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
- public List<OutCommandDto> IssueOutHouseLk(string soNo, string detailId,string outMode, int userId, string url, out string str)
+ public List<OutCommandDto> IssueOutHouseLk(string soNo, string detailId,string outMode, string palletNo, int userId, string url, out string str)
{
try
{
@@ -1468,13 +1469,13 @@
str = "鎵樼洏涓嶅湪璐ф灦搴撲笂";
return outDto1;
}
- var locate2 = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == outModeLocate && m.IsDel == "0");//褰撳墠鍑哄簱鐨勭洰鏍囧偍浣嶄俊鎭�
- if (locate2 == null)
+ var locateEnd = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == outModeLocate && m.IsDel == "0");//褰撳墠鍑哄簱鐨勭洰鏍囧偍浣嶄俊鎭�
+ if (locateEnd == null)
{
str = "鍑哄簱鐨勬墭鐩樺偍浣嶄俊鎭敊璇�(鍦ㄥ偍浣嶈〃涓湭鏌ヨ鍒�)";
return outDto1;
}
- else if (locate2.Status != "0")
+ else if (locateEnd.Status != "0")
{
str = "鐩爣鍌ㄤ綅鐘舵�佷笉鏄┖鍌ㄤ綅";
return outDto1;
diff --git a/Wms/WMS.IBLL/IHttpServer.cs b/Wms/WMS.IBLL/IHttpServer.cs
index 8d428de..748ec82 100644
--- a/Wms/WMS.IBLL/IHttpServer.cs
+++ b/Wms/WMS.IBLL/IHttpServer.cs
@@ -75,11 +75,12 @@
/// <param name="soNo"></param>
/// <param name="detailId"></param>
/// <param name="outMode"></param>
+ /// <param name="palletNo"></param>
/// <param name="userId"></param>
/// <param name="url"></param>
/// <param name="str"></param>
/// <returns></returns>
- List<OutCommandDto> IssueOutHouseLk(string soNo, string detailId, string outMode, int userId, string url, out string str);
+ List<OutCommandDto> IssueOutHouseLk(string soNo, string detailId, string outMode, string palletNo, int userId, string url, out string str);
#endregion
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index 1e324c3..6aa7908 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -159,7 +159,7 @@
/// <param name="outMode">鍑哄簱鍦板潃锛堝钩搴撴嫞璐т綅锛�</param>
/// <returns></returns>
[HttpGet]
- public IActionResult PDAIssueOut(string soNo, string soDetailId,string outMode)
+ public IActionResult PDAIssueOut(string soNo, string soDetailId,string palletNo,string outMode)
{
try
{
@@ -188,7 +188,7 @@
}
else if (house == "W02")
{
- var list = _http.IssueOutHouseLk(soNo,soDetailId, outMode, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out string str);
+ var list = _http.IssueOutHouseLk(soNo,soDetailId, outMode,palletNo, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out string str);
return Ok(new HttpReturnModel { Success = "0", Message = str, Data = list});
}
@@ -545,7 +545,7 @@
/// <summary>
- /// 鎺ュ彈wcs杩斿洖鐨勪俊鍙� //鎸囦护鍙嶉锛堟槸鍚﹀畬鎴愶級
+ /// 鎵嬪姩瀹屾垚鐨勪俊鍙� //鎸囦护鍙嶉锛堟槸鍚﹀畬鎴愶級
/// </summary>
/// <returns></returns>
[HttpPost]
--
Gitblit v1.8.0