From 7bb0a817a938d4f44569cc14d6ea34dbb7b1105f Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 01 二月 2024 08:45:14 +0800
Subject: [PATCH] 入库单增加复核时间和复核人
---
HTML/views/ASNSetting/ArrivalNoticeDetail.html | 11 ++-
HTML/views/ASNSetting/SelMaterials.html | 39 +++++++-----
Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs | 10 +++
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 35 ++++++++++-
Wms/WMS.Entity/BllCheckEntity/BllStockCheck.cs | 10 +++
HTML/views/ASNSetting/ArrivalNotice.html | 34 ++++++++++-
Wms/Model/ModelDto/BllAsnDto/ArrivalNoticeDto.cs | 4 +
Wms/WMS.Entity/BllAsnEntity/BllArrivalNotice.cs | 9 +++
8 files changed, 125 insertions(+), 27 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 1629f2e..e69f57a 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -181,7 +181,7 @@
<a class="layui-btn layui-btn-danger layui-btn-xs cheXiaoClass" lay-event="chexiao"> <i class="layui-icon layui-icon-delete"></i>鎾ら攢</a>`;
break;
case "3" :
- html += `<a class="layui-btn layui-btn-normal layui-btn-xs clossClass" lay-event="check"> <i class="layui-icon layui-icon-ok"></i>澶嶆牳</a>`;
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs checkClass" lay-event="check"> <i class="layui-icon layui-icon-ok"></i>澶嶆牳</a>`;
break;
default :
break;
@@ -221,10 +221,20 @@
{{# function GetBtn4(d){
var html = ``;
if(d.Type=='0'){
- html = `鏍囧噯浜у搧鍏ュ簱`;
+ html = `鎴愬搧鍏ュ簱`;
} else if(d.Type=='1') {
- html = `闈炴爣浜у搧鍏ュ簱`;
- } else {
+ html = `閲囪喘鍏ュ簱`;
+ } else if(d.Type=='2') {
+ html = `涓棿鍝佸叆搴揱;
+ }else if(d.Type=='3') {
+ html = `閫�璐у叆搴揱;
+ }else if(d.Type=='4') {
+ html = `杞﹂棿浣欐枡閫�鍥炲叆搴揱;
+ }else if(d.Type=='5') {
+ html = `鍏跺畠鍏ュ簱`;
+ }else if(d.Type=='6') {
+ html = `浠ｅ偍鍏ュ簱`;
+ }else {
}
return html;
@@ -255,6 +265,14 @@
}
}}
{{ GetBtn7(d) }}
+ </script>
+
+ <script type="text/html" id="templetCheckTime">
+ {{# function GetBtn11(d){
+ return formatDate(d.CheckTime);
+ }
+ }}
+ {{ GetBtn11(d) }}
</script>
<!-- #endregion -->
</div>
@@ -386,6 +404,8 @@
{field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center',templet: '#templetCreateTime'},
{field: 'UpdateUserName',title: '淇敼浜�',align: 'center',width: 110},
{field: 'UpdateTime',title: '淇敼鏃堕棿',align: 'center',templet: '#templetUpdateTime'},
+ {field: 'CheckUserName',title: '澶嶆牳浜�',align: 'center',width: 110},
+ {field: 'CheckTime',title: '澶嶆牳鏃堕棿',align: 'center',templet: '#templetCheckTime'},
{field: 'caozuo',title: '鎿嶄綔',fixed: 'right',width: 280,align: 'center',toolbar: '#toolbarDemo1', "disabled": true}
]];
var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
@@ -856,6 +876,7 @@
$(".cheXiaoClass").hide();
$(".clossClass").hide();
$(".editDemoClass").hide();//澶囨敞
+ $(".checkClass").hide(); //澶嶆牳
});
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
if (res.code == 0) { //鎴愬姛
@@ -890,6 +911,11 @@
$(".editDemoClass").show();
});
}
+ if (res.data[k].MenuName == "澶嶆牳鍏ュ簱鍗�") {
+ $(function() {
+ $(".checkClass").show();
+ });
+ }
}
} else { //涓嶆垚鍔�
layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
diff --git a/HTML/views/ASNSetting/ArrivalNoticeDetail.html b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
index dd6fb15..11938fc 100644
--- a/HTML/views/ASNSetting/ArrivalNoticeDetail.html
+++ b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
@@ -47,9 +47,14 @@
<div class="layui-input-inline">
<select name="Type" id="Type" lay-filter="Type" lay-search>
<!-- <option value=""></option> -->
- <!-- JC09 -->
- <option value="0" selected>鏍囧噯浜у搧鍏ュ簱</option>
- <option value="1">闈炴爣浜у搧鍏ュ簱</option>
+ <!-- JC24 -->
+ <option value="0" selected>鎴愬搧鍏ュ簱</option>
+ <option value="1">閲囪喘鍏ュ簱</option>
+ <option value="2">涓棿鍝佸叆搴�</option>
+ <option value="3">閫�璐у叆搴�</option>
+ <option value="4">杞﹂棿浣欐枡閫�鍥炲叆搴�</option>
+ <option value="5">鍏跺畠鍏ュ簱</option>
+ <option value="6">浠ｅ偍鍏ュ簱</option>
<!-- JC08 -->
<!-- <option value="0">鎴愬搧鍏ュ簱</option>
<option value="1">鍘熸枡鍏ュ簱</option>
diff --git a/HTML/views/ASNSetting/SelMaterials.html b/HTML/views/ASNSetting/SelMaterials.html
index 1bc6dbe..54ae688 100644
--- a/HTML/views/ASNSetting/SelMaterials.html
+++ b/HTML/views/ASNSetting/SelMaterials.html
@@ -21,12 +21,17 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡绫诲瀷</label>
+ <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
<div class="layui-input-inline">
- <select name="IsControlled" id="IsControlled" lay-filter="IsControlled" disabled="disabled"
+ <select name="Type" id="Type" lay-filter="Type" disabled="disabled"
lay-search>
- <option value="0">鏍囧噯鐗╂枡</option>
- <option value="1">闈炴爣鐗╂枡</option>
+ <option value="0">鎴愬搧鍏ュ簱</option>
+ <option value="1">閲囪喘鍏ュ簱</option>
+ <option value="2">涓棿鍝佸叆搴�</option>
+ <option value="3">閫�璐у叆搴�</option>
+ <option value="4">杞﹂棿浣欐枡閫�鍥炲叆搴�</option>
+ <option value="5">鍏跺畠鍏ュ簱</option>
+ <option value="6">浠ｅ偍鍏ュ簱</option>
</select>
</div>
</div>
@@ -72,18 +77,20 @@
if (r != null)
{
- $("#IsControlled").empty();
- if (unescape(r[2]) == 0)
- {
- $("#IsControlled").append('<option value ="0" Selected >鏍囧噯鐗╂枡</option>');
- $("#IsControlled").append('<option value ="1">闈炴爣鐗╂枡</option>');
- }
- if (unescape(r[2]) == 1)
- {
- $("#IsControlled").append('<option value ="0">鏍囧噯鐗╂枡</option>');
- $("#IsControlled").append('<option value ="1" Selected >闈炴爣鐗╂枡</option>');
- }
+ // $("#Type").empty();
+ // if (unescape(r[2]) == 0)
+ // {
+ // $("#Type").append('<option value ="0" Selected >鏍囧噯鐗╂枡</option>');
+ // $("#Type").append('<option value ="1">闈炴爣鐗╂枡</option>');
+ // }
+ // if (unescape(r[2]) == 1)
+ // {
+ // $("#Type").append('<option value ="0">鏍囧噯鐗╂枡</option>');
+ // $("#Type").append('<option value ="1" Selected >闈炴爣鐗╂枡</option>');
+ // }
+
+ $("#Type").val(unescape(r[2])); // "optionValue"涓洪渶瑕佽閫変腑鐨勯�夐」鐨剉alue灞炴�у��
form.render('select');
}
@@ -117,7 +124,7 @@
function refreshTable() {
var param = {
SkuNo: $("#Msg").val(),
- IsControlled: $("#IsControlled").val()
+ Type: $("#Type").val()
};
sendData(IP + "/BllAsn/GetMaterialsList", param, 'post', function(res) {
diff --git a/Wms/Model/ModelDto/BllAsnDto/ArrivalNoticeDto.cs b/Wms/Model/ModelDto/BllAsnDto/ArrivalNoticeDto.cs
index 8590faa..7c7e39a 100644
--- a/Wms/Model/ModelDto/BllAsnDto/ArrivalNoticeDto.cs
+++ b/Wms/Model/ModelDto/BllAsnDto/ArrivalNoticeDto.cs
@@ -89,5 +89,9 @@
public string UpdateTime { get; set; }
public string UpdateUserName { get; set; }
+
+ public string CheckTime { get; set; }
+
+ public string CheckUserName { get; set; }
}
}
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index 5609bc5..bf8b36e 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -39,10 +39,11 @@
try
{
sqlCount += "SELECT DISTINCT COUNT(tb1.ID) FROM BllArrivalNotice AS tb1 ";
- sqlString += "SELECT DISTINCT tb1.*,tb3.RealName as CreateUserName,tb4.RealName as UpdateUserName FROM BllArrivalNotice AS tb1 ";
+ sqlString += "SELECT DISTINCT tb1.*,tb3.RealName as CreateUserName,tb4.RealName as UpdateUserName,tb5.RealName as CheckUserName FROM BllArrivalNotice AS tb1 ";
sqlPub += "LEFT JOIN BllArrivalNoticeDetail AS tb2 ON tb1.ASNNo = tb2.ASNNo ";
sqlPub += "LEFT JOIN SysUserInfor AS tb3 ON tb1.CreateUser = tb3.Id ";
sqlPub += "LEFT JOIN SysUserInfor AS tb4 ON tb1.UpdateUser = tb4.Id ";
+ sqlPub += "LEFT JOIN SysUserInfor AS tb5 ON tb1.CheckUser = tb5.Id ";
sqlPub += $"WHERE tb1.ASNNo LIKE '%{model.ASNNo}%' AND tb2.LotNo LIKE '%{model.LotNo}%' ";
sqlPub += $"AND tb2.SkuNo LIKE '%{model.SkuNo}%' AND tb2.SkuName LIKE '%{model.SkuName}%' ";
sqlPub += $"AND tb1.CustomerName LIKE '%{model.CustomerName}%' ";
@@ -128,8 +129,34 @@
{
try
{
+ string skuType = string.Empty;
+ switch(model.Type)//0锛氬師鏂� 1锛氬寘鏉� 2锛氭垚鍝� 3锛氳�楁潗 4锛氬崐鎴愬搧
+ {
+ case "0"://鎴愬搧鍏ュ簱
+ skuType = "(2)";
+ break;
+ case "1"://閲囪喘鍏ュ簱
+ skuType = "(0,1,3)";
+ break;
+ case "2"://涓棿鍝佸叆搴�
+ skuType = "(4)";
+ break;
+ case "3"://閫�璐у叆搴�
+ skuType = "(2)";
+ break;
+ case "4"://杞﹂棿浣欐枡閫�鍥炲叆搴�
+ skuType = "(0,1,3)";
+ break;
+ case "5"://鍏跺畠鍏ュ簱
+ skuType = "(2)";
+ break;
+ case "6"://浠ｅ偍鍏ュ簱
+ skuType = "(2)";
+ break;
+ }
+
Expression<Func<SysMaterials, bool>> item = Expressionable.Create<SysMaterials>()
- .AndIF(!string.IsNullOrWhiteSpace(model.IsControlled), it => it.IsControlled == model.IsControlled)
+ .AndIF(true, it => skuType.Contains(it.Type))
.AndIF(true, it => it.IsDel == "0")
.And(it => it.SkuNo != "100099")
.AndIF(!string.IsNullOrWhiteSpace(model.SkuNo),
@@ -884,8 +911,8 @@
#endregion
notice.Status = "4";
- notice.UpdateTime = DateTime.Now;
- notice.UpdateUser = userId;
+ notice.CheckTime = DateTime.Now;
+ notice.CheckUser = userId;
Db.Updateable(notice).ExecuteCommand();
new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鍗曟嵁", notice.ASNNo, "澶嶆牳", $"澶嶆牳浜嗗崟鎹彿涓簕notice.ASNNo}鐨勫崟鎹俊鎭�", userId);
diff --git a/Wms/WMS.Entity/BllAsnEntity/BllArrivalNotice.cs b/Wms/WMS.Entity/BllAsnEntity/BllArrivalNotice.cs
index 578b06b..6085886 100644
--- a/Wms/WMS.Entity/BllAsnEntity/BllArrivalNotice.cs
+++ b/Wms/WMS.Entity/BllAsnEntity/BllArrivalNotice.cs
@@ -91,5 +91,14 @@
/// </summary>
public string OrderCode { get; set; }
+ /// <summary>
+ /// 澶嶆牳浜�
+ /// </summary>
+ public int CheckUser { get; set; }
+
+ /// <summary>
+ /// 澶嶆牳鏃堕棿
+ /// </summary>
+ public DateTime? CheckTime { get; set; }
}
}
diff --git a/Wms/WMS.Entity/BllCheckEntity/BllStockCheck.cs b/Wms/WMS.Entity/BllCheckEntity/BllStockCheck.cs
index b16d2dc..dc3b4a1 100644
--- a/Wms/WMS.Entity/BllCheckEntity/BllStockCheck.cs
+++ b/Wms/WMS.Entity/BllCheckEntity/BllStockCheck.cs
@@ -80,5 +80,15 @@
/// Nullable:True
/// </summary>
public string Demo { get; set; }
+
+ /// <summary>
+ /// 澶嶆牳浜�
+ /// </summary>
+ public int CheckUser { get; set; }
+
+ /// <summary>
+ /// 澶嶆牳鏃堕棿
+ /// </summary>
+ public DateTime? CheckTime { get; set; }
}
}
diff --git a/Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs b/Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs
index 2e8db41..039d0ab 100644
--- a/Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs
+++ b/Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs
@@ -153,6 +153,16 @@
/// </summary>
public string OutMode { get; set; }
+ /// <summary>
+ /// 澶嶆牳浜�
+ /// </summary>
+ public int CheckUser { get; set; }
+
+ /// <summary>
+ /// 澶嶆牳鏃堕棿
+ /// </summary>
+ public DateTime? CheckTime { get; set; }
+
[Navigate(NavigateType.OneToOne, nameof(LogisticsId))]
public SysLogisticsInfo LogisticsInfoInfo { get; set; }
--
Gitblit v1.8.0