From 98553b87fae16011c82a6f1cdbd03846f20e95c6 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 04 三月 2024 16:02:42 +0800
Subject: [PATCH] BllExportAllot (出库分配表)增加UnstackingMode拆垛模式和LoadingAddre装车口字段
---
HTML/views/SOSetting/ExportNoticeAddFrom.html | 2 ++
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 2 +-
Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs | 14 ++++++++++++++
Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs | 2 +-
HTML/views/SOSetting/ExportNotice.html | 9 ++++++++-
Wms/Wms/Controllers/DownApiController.cs | 10 ++++++----
6 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index 8299035..5706555 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -66,6 +66,7 @@
<option value="5">涓棿鍝佸嚭搴�</option>
<option value="6">浠ｅ偍鍑哄簱</option>
<option value="7">鍏朵粬鍑哄簱</option>
+ <option value="8">瀵勫瓨鍑哄簱</option>
<!-- 09 -->
<!-- <option value="0">鏍囧噯閿�鍞嚭搴�</option>
<option value="1">闈炴爣閿�鍞嚭搴�</option>
@@ -142,7 +143,7 @@
<div class="layui-input-inline" style="width: 220px;">
<select name="UnstackWay" id="UnstackWay" lay-filter="UnstackWay" lay-search>
<option value="0" selected>鏈哄櫒浜烘媶鍨�</option>
- <option value="1">浜哄伐鎷嗗灈</option>
+ <option value="1">PDA鎷嗗灈</option>
</select>
</div>
</div>
@@ -212,6 +213,8 @@
return "浠ｅ偍鍑哄簱";
case "7":
return "鍏朵粬鍑哄簱";
+ case "8":
+ return "瀵勫瓨鍑哄簱";
default:
return "";
}
@@ -1223,6 +1226,8 @@
});
}else if(obj.event === 'outKu'){
$("#UnstackWay option[value='0']").attr("selected","selected");
+ $("#LoadingArea option[value='']").attr("selected","selected");
+ $("#PickingArea option[value='']").attr("selected","selected");
form.render('select');
var param = {
soNo: SoNo
@@ -1269,7 +1274,9 @@
}
var param = {
soNo: data.SONo,
+ unstackingMode:$('#UnstackWay').val(),
outMode: pa,
+ loadingAddre:$('#LoadingArea').val()
};
console.log(param);
sendData(IP + "/DownApi/IssueOutHouse", param, 'get', function(res) {
diff --git a/HTML/views/SOSetting/ExportNoticeAddFrom.html b/HTML/views/SOSetting/ExportNoticeAddFrom.html
index 7955b10..62b4982 100644
--- a/HTML/views/SOSetting/ExportNoticeAddFrom.html
+++ b/HTML/views/SOSetting/ExportNoticeAddFrom.html
@@ -42,6 +42,7 @@
<option value="5">涓棿鍝佸嚭搴�</option>
<option value="6">浠ｅ偍鍑哄簱</option>
<option value="7">鍏朵粬鍑哄簱</option>
+ <option value="8">瀵勫瓨鍑哄簱</option>
<!-- 09 -->
<!-- <option value="0">鏍囧噯閿�鍞嚭搴�</option>
<option value="1">闈炴爣閿�鍞嚭搴�</option>
@@ -496,6 +497,7 @@
case "5": //涓棿鍝佸嚭搴�
case "6": //浠ｅ偍鍑哄簱
case "7": //鍏朵粬鍑哄簱
+ case "8": //瀵勫瓨鍑哄簱
TypeNum = 2;
console.log(TypeNum)
break;
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 81e5525..20f3e34 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -1376,7 +1376,7 @@
#region 涓嬪彂鍑哄簱銆佸嚭搴撳畬鎴愩�侀噸鏂颁笅鍙戜换鍔°�佸彇娑堜换鍔°�佸紓甯稿鐞�
// 涓嬪彂鍑哄簱锛堣皟鐢╟s鎺ュ彛缁欎粬搴撲綅鍦板潃锛�
- public List<OutCommandDto> IssueOutHouse(string soNo, string outMode, int userId, string url, out string str)
+ public List<OutCommandDto> IssueOutHouse(string soNo, string unstackingMode, string outMode, string loadingAddre, int userId, string url, out string str)
{
try
{
diff --git a/Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs b/Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs
index 848b4da..2e7369d 100644
--- a/Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs
+++ b/Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs
@@ -153,6 +153,20 @@
/// </summary>
public string OutMode { get; set; }
+ /// <summary>
+ /// Desc:瑁呰溅鍙�
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string LoadingAddre { get; set; }
+
+ /// <summary>
+ /// Desc:鎷嗗灈妯″紡
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string UnstackingMode { get; set; }
+
[Navigate(NavigateType.OneToOne, nameof(LogisticsId))]
public SysLogisticsInfo LogisticsInfoInfo { get; set; }
diff --git a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
index d72b933..df0233b 100644
--- a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
+++ b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
@@ -126,7 +126,7 @@
/// <param name="url">涓嬪彂鍑哄簱璺緞</param>
/// <param name="str">鎻愮ず淇℃伅</param>
/// <returns>涓嬪彂鐨勬寚浠ら泦鍚�</returns>
- List<OutCommandDto> IssueOutHouse(string soNo, string outMode, int userId,string url,out string str);
+ List<OutCommandDto> IssueOutHouse(string soNo, string unstackingMode, string outMode, string loadingAddre, int userId,string url,out string str);
/// <summary>
/// wcs杩斿洖鐨勬垚鍔熶俊鍙锋垨鎵嬪姩瀹屾垚锛堝嚭搴撴垚鍔燂級
/// </summary>
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index 2be6a9d..e1773a3 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -42,12 +42,14 @@
/// <summary>
/// 鎸囦护涓嬪彂锛堝嚭搴擄級
/// </summary>
- /// <param name="soNo"></param>
- /// <param name="outMode"></param>
+ /// <param name="unstackingMode">鎷嗗灈鏂瑰紡</param>
+ /// <param name="soNo">鍑哄簱鍗曞彿</param>
+ /// <param name="outMode">鍑哄簱鍙�</param>
+ /// <param name="loadingAddre">瑁呰溅鍙�</param>
/// <returns></returns>
[Authorize]
[HttpGet]
- public IActionResult IssueOutHouse(string soNo,string outMode)
+ public IActionResult IssueOutHouse(string soNo,string unstackingMode, string outMode,string loadingAddre)
{
try
{
@@ -68,7 +70,7 @@
// return Ok(new { code = 1, msg = "璇烽�夋嫨鍑哄簱鍙�" });
//}
- var list = _exNoticeSvc.IssueOutHouse(soNo, outMode,int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl,out string str);
+ var list = _exNoticeSvc.IssueOutHouse(soNo,unstackingMode, outMode,loadingAddre, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl,out string str);
return Ok(new { code = 0, msg = str , data = list });
--
Gitblit v1.8.0