From 25abd822fc249e574ba3e90d34f7446b33cd9258 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期六, 17 八月 2024 08:59:11 +0800
Subject: [PATCH] 问题修改
---
HTML/views/ASNSetting/PalletUpShelf.html | 50 ++++++++--------
Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs | 64 ++++++++++----------
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 9 +-
3 files changed, 62 insertions(+), 61 deletions(-)
diff --git a/HTML/views/ASNSetting/PalletUpShelf.html b/HTML/views/ASNSetting/PalletUpShelf.html
index 66a957c..517a855 100644
--- a/HTML/views/ASNSetting/PalletUpShelf.html
+++ b/HTML/views/ASNSetting/PalletUpShelf.html
@@ -67,12 +67,12 @@
class="layui-input">
</div>
</div>
- <div class="layui-inline" style="margin-right: 0;">
+ <div class="layui-inline" style="margin-right: 0;">
<label class="layui-form-label" style="width: 60px;">鎵樼洏鍙�</label>
<div class="layui-input-inline" style="margin-right: 0;">
<div class="layui-input-inline" style="margin-right: 0;">
- <input type="text" id="PalletNo" name="PalletNo" placeholder="鎵樼洏鍙�"
- autocomplete="off" class="layui-input">
+ <input type="text" id="PalletNo" name="PalletNo" placeholder="鎵樼洏鍙�" autocomplete="off"
+ class="layui-input">
</div>
</div>
</div>
@@ -83,7 +83,7 @@
class="layui-input">
</div>
</div>
- <div class="layui-inline" style="margin-right: 0;">
+ <div class="layui-inline" style="margin-right: 0;">
<label class="layui-form-label" style="width: 60px;">鐗╁搧鍚嶇О</label>
<div class="layui-input-inline" style="margin-right: 0;">
<input type="text" id="SkuName" name="SkuName" placeholder="鐗╂枡鍚嶇О" autocomplete="off"
@@ -99,7 +99,7 @@
</div>
</div>
</div>
-
+
<div class="layui-inline" style="margin-right: 0;">
<label class="layui-form-label">鐘舵��</label>
@@ -122,12 +122,12 @@
lay-filter="LAY-app-contlist-search">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
</button>
-
+
</div>
-
+
</div>
</div>
- <div class="layui-card-body">
+ <div class="layui-card-body">
<div class="position-relative">
<table id="Box-list" lay-filter="Box-list"></table>
@@ -137,7 +137,7 @@
</button>
</div>
-
+
<script type="text/html" id="templetStatus">
{{# function GetBtn1(d){
@@ -152,7 +152,7 @@
}}
{{ GetBtn1(d) }}
</script>
-
+
<script type="text/html" id="templetCreateTime">
{{# function GetBtn2(d){
return formatDate(d.CreateTime);
@@ -160,7 +160,7 @@
}}
{{ GetBtn2(d) }}
</script>
- <script type="text/html" id="templetUpdateTime">
+ <script type="text/html" id="templetUpdateTime">
{{# function GetBtn3(d){
return formatDate(d.UpdateTime);
}
@@ -194,7 +194,7 @@
<script src="../../js/jquery-3.5.1.min.js"></script>
<script src="../../js/jquery.cookie.js"></script>
<script>
-
+
layui.config({
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -204,7 +204,7 @@
table = layui.table,
layer = layui.layer,
laydate = layui.laydate;
-
+
// 鎼滅储鏂规硶
form.on('submit(LAY-app-contlist-search)', function (data) {
bindTable();
@@ -217,21 +217,21 @@
//鑷畾涔夎〃澶�
var TotalColsArr = [[
- { field: 'TraceNo', title: '杩芥函鍙�', align: 'center',fixed: 'left', width: 180, "disabled": true },
+ { field: 'TraceNo', title: '杩芥函鍙�', align: 'center', fixed: 'left', width: 180, "disabled": true },
{ field: 'TaskNo', title: '浠诲姟鍙�', align: 'center', fixed: 'left', width: 220, "disabled": true },
- { field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', fixed: 'left', width: 220, "disabled": true },
+ { field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', fixed: 'left', width: 220, "disabled": true },
{ field: 'Status', title: '鐘舵��', align: 'center', templet: '#templetStatus', width: 90 },
- { field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width: 140},
- { field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center'},
- { field: 'LotNo', title: '鎵规鍙�', align: 'center', width: 155},
+ { field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width: 140 },
+ { field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center' },
+ { field: 'LotNo', title: '鎵规鍙�', align: 'center', width: 155 },
- { field: 'LocatName', title: '鍌ㄤ綅鍦板潃', align: 'center', width: 90 },
+ { field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center', width: 90 },
{ field: 'RoadwayName', title: '鎵�灞炲贩閬�', align: 'center', width: 90 },
{ field: 'WareHouseName', title: '鎵�灞炰粨搴�', align: 'center', width: 90 },
{ field: 'CreateUserName', title: '鍒涘缓浜�', align: 'center', width: 100 },
{ field: 'CreateTime', title: '鍒涘缓鏃堕棿', align: 'center', width: 160, templet: '#templetCreateTime' },
-
+
{ field: 'UpdateUserName', title: '鏇存柊浜�', align: 'center', width: 100 },
{ field: 'UpdateTime', title: '鏇存柊鏃堕棿', align: 'center', width: 160, templet: '#templetUpdateTime' },
//{ field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 100, align: 'center', toolbar: '#toolbarDemoList', "disabled": true }
@@ -256,12 +256,12 @@
colsJson = TotalColsArr
}
var param = {
- TraceNo:$("#ASNNo").val(),
+ TraceNo: $("#ASNNo").val(),
TaskNo: $("#BoxNo").val(),
- PalletNo: $("#PalletNo").val(),
+ PalletNo: $("#PalletNo").val(),
SkuNo: $("#SkuNo").val(),
SkuName: $("#SkuName").val(),
- LotNo: $("#LotNo").val(),
+ LotNo: $("#LotNo").val(),
Status: $("#Status").val(),
};
table.render({
@@ -271,7 +271,7 @@
height: 'full-96',
id: 'Box-list',
where: param,
- contentType: 'application/json',
+ contentType: 'application/json',
headers: { ToKen: $.cookie('token') },
page: true,
even: true,
@@ -279,7 +279,7 @@
limits: pageLimits,
cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
done: function (res) {
-
+
//鑷畾涔夊垪瀹�
SetTableColW('Box-list', 'BllAsn/GetPalletUpShelfList', TotalColsSysArr);
},
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index 898544e..4c0e2f0 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -399,10 +399,11 @@
}
else if (model.Type == "0")//鐗╂枡鎵�
{
- if (model.Detail.Count(m => m.OrderCode != detail.OrderDetailCode) > 0)
- {
- throw new Exception($"鎵樼洏缁戝畾鏄庣粏涓紝鍚湁绠辩爜鐢熶骇宸ュ崟涓嶄竴鑷�");
- }
+ // 浣跨敤鍦烘櫙涓嶆槑纭�
+ //if (model.Detail.Count(m => m.OrderCode != detail.OrderDetailCode) > 0)
+ //{
+ // throw new Exception($"鎵樼洏缁戝畾鏄庣粏涓紝鍚湁绠辩爜鐢熶骇宸ュ崟涓嶄竴鑷�");
+ //}
if (model.Detail.Count(m => m.SkuNo != model.SkuNo || m.LotNo != model.LotNo) > 0)
{
throw new Exception($"鎵樼洏缁戝畾鏄庣粏涓紝鍚湁绠辩爜鐗╂枡鎴栨壒娆′笉涓�鑷�");
diff --git a/Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs b/Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs
index 54503c3..92fb59a 100644
--- a/Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs
+++ b/Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs
@@ -93,23 +93,23 @@
outDtoList.Add(locatEntry2);
// 姝ｅ紡杩愯绋嬪簭鏀惧紑
- var jsonData = JsonConvert.SerializeObject(outDtoList);
- string response = "";
+ //var jsonData = JsonConvert.SerializeObject(outDtoList);
+ //string response = "";
- try
- {
- response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍚屾鍌ㄤ綅淇℃伅", "WCS");
- //瑙ｆ瀽杩斿洖鏁版嵁
- var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
- if (wcsModel.StatusCode == -1)
- {
- throw new Exception(wcsModel.Msg);
- }
- }
- catch (Exception ex)
- {
- throw new Exception(ex.Message);
- }
+ //try
+ //{
+ // response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍚屾鍌ㄤ綅淇℃伅", "WCS");
+ // //瑙ｆ瀽杩斿洖鏁版嵁
+ // var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
+ // if (wcsModel.StatusCode == -1)
+ // {
+ // throw new Exception(wcsModel.Msg);
+ // }
+ //}
+ //catch (Exception ex)
+ //{
+ // throw new Exception(ex.Message);
+ //}
}
Db.CommitTran();
@@ -195,23 +195,23 @@
if (i > 0)
{
// 姝ｅ紡杩愯绋嬪簭鏀惧紑
- var jsonData = JsonConvert.SerializeObject(outDtoList);
- string response = "";
+ //var jsonData = JsonConvert.SerializeObject(outDtoList);
+ //string response = "";
- try
- {
- response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍑哄簱鍛戒护", "WCS");
- //瑙ｆ瀽杩斿洖鏁版嵁
- var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
- if (wcsModel.StatusCode == -1)
- {
- throw new Exception(wcsModel.Msg);
- }
- }
- catch (Exception ex)
- {
- throw new Exception(ex.Message);
- }
+ //try
+ //{
+ // response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍑哄簱鍛戒护", "WCS");
+ // //瑙ｆ瀽杩斿洖鏁版嵁
+ // var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
+ // if (wcsModel.StatusCode == -1)
+ // {
+ // throw new Exception(wcsModel.Msg);
+ // }
+ //}
+ //catch (Exception ex)
+ //{
+ // throw new Exception(ex.Message);
+ //}
}
Db.CommitTran();
return i > 0;
--
Gitblit v1.8.0