From 54b96e7255ebcafabdbae17050fc09d19b7e0cce Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期四, 14 三月 2024 10:29:11 +0800
Subject: [PATCH] Merge branch 'yyk'
---
HTML/views/ASNSetting/PalletBindFrom.html | 54 ++++++++++++++-------------
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 2
Wms/WMS.BLL/SysServer/CustomerServer.cs | 3 +
Wms/WMS.IBLL/ISysServer/ICustomerServer.cs | 3 +
HTML/views/BaseSetting/Customer.html | 10 +++++
Wms/Model/ModelVm/SysVm/CustomerVm.cs | 4 ++
HTML/views/ASNSetting/ArrivalNotice.html | 20 +++++----
Wms/Wms/Controllers/BasisController.cs | 2
8 files changed, 59 insertions(+), 39 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index dd840b9..918055e 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -173,23 +173,25 @@
<script type="text/html" id="toolbarDemo1">
{{# function GetBtn1(d){
var html = '';
+ if (d.Status == '0' && d.Origin == '褰曞叆') {
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs editClass" lay-event="edit">
+ <i class="layui-icon layui-icon-edit"></i>缂栬緫</a>`;
+ }
switch (d.Status) {
case "0" :
- html += `<a class="layui-btn layui-btn-normal layui-btn-xs editClass" lay-event="edit">
- <i class="layui-icon layui-icon-edit"></i>缂栬緫</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="del">
- <i class="layui-icon layui-icon-delete"></i>鍒犻櫎</a>`;
+ html += `<a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="del">
+ <i class="layui-icon layui-icon-delete"></i>鍒犻櫎</a>`;
break;
case "1" :
- html += `<a class="layui-btn layui-btn-normal layui-btn-xs clossClass" lay-event="closs"> <i class="layui-icon layui-icon-ok"></i>璁㈠崟鍏抽棴</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs cheXiaoClass" lay-event="chexiao"> <i class="layui-icon layui-icon-delete"></i>鎾ら攢</a>`;
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs clossClass" lay-event="closs"> <i class="layui-icon layui-icon-ok"></i>璁㈠崟鍏抽棴</a>
+ <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 "2" :
- html += `<a class="layui-btn layui-btn-normal layui-btn-xs clossClass" lay-event="closs"> <i class="layui-icon layui-icon-ok"></i>璁㈠崟鍏抽棴</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs cheXiaoClass" lay-event="chexiao"> <i class="layui-icon layui-icon-delete"></i>鎾ら攢</a>`;
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs clossClass" lay-event="closs"> <i class="layui-icon layui-icon-ok"></i>璁㈠崟鍏抽棴</a>
+ <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 checkClass" 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;
diff --git a/HTML/views/ASNSetting/PalletBindFrom.html b/HTML/views/ASNSetting/PalletBindFrom.html
index b3d50ff..b3650a0 100644
--- a/HTML/views/ASNSetting/PalletBindFrom.html
+++ b/HTML/views/ASNSetting/PalletBindFrom.html
@@ -306,33 +306,35 @@
Origin:"WMS"
}
- if (doing) {
- doing = false;
- //缁勭洏
- sendData(IP + "/PdaAsn/BindPallet", param, 'post', function (res) {
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- renderTable(null);
- $("#boxNo").val("");
- $("#boxNo2").val("");
- var index = parent.layer.getFrameIndex(window.name)
- parent.layer.close(index); //鍏抽棴寮瑰眰
- parent.layui.table.reload('PalletBind');
- parent.layui.table.reload('BoxInfo');
- doing = true;
- });
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { doing = true;});
- }
- });
+ console.i
- }
+ // if (doing) {
+ // doing = false;
+ // //缁勭洏
+ // sendData(IP + "/PdaAsn/BindPallet", param, 'post', function (res) {
+ // if (res.code == 0) { //鎴愬姛
+ // layer.msg(res.msg, {
+ // icon: 1,
+ // time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // }, function () {
+ // renderTable(null);
+ // $("#boxNo").val("");
+ // $("#boxNo2").val("");
+ // var index = parent.layer.getFrameIndex(window.name)
+ // parent.layer.close(index); //鍏抽棴寮瑰眰
+ // parent.layui.table.reload('PalletBind');
+ // parent.layui.table.reload('BoxInfo');
+ // doing = true;
+ // });
+ // } else { //涓嶆垚鍔�
+ // layer.msg(res.msg, {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // }, function () { doing = true;});
+ // }
+ // });
+
+ // }
}
return false;
diff --git a/HTML/views/BaseSetting/Customer.html b/HTML/views/BaseSetting/Customer.html
index b6ec76e..d8898f6 100644
--- a/HTML/views/BaseSetting/Customer.html
+++ b/HTML/views/BaseSetting/Customer.html
@@ -26,6 +26,14 @@
<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label" style="width: 56px;">瀹㈡埛缂栫爜</label>
+ <div class="layui-input-inline">
+ <input type="text" id="CustomerNo" name="CustomerNo" placeholder="瀹㈡埛缂栫爜"
+ autocomplete="off" class="layui-input"
+ onkeyup="this.value=this.value.replace(/[, ]/g,'')">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 56px;">瀹㈡埛鍚嶇О</label>
<div class="layui-input-inline">
<input type="text" id="CustomerName" name="CustomerName" placeholder="瀹㈡埛鍚嶇О"
@@ -105,12 +113,14 @@
function refreshTable() {
+ var no = $("#CustomerNo").val();
var name = $("#CustomerName").val();
var type = parseInt($("#CustomerType").val());
var linkman = $("#Linkman").val();
var phone = $("#Phone").val();
var param = {
+ CustomerNo: no,
CustomerName: name,
LinkMan: linkman,
Phone: phone,
diff --git a/Wms/Model/ModelVm/SysVm/CustomerVm.cs b/Wms/Model/ModelVm/SysVm/CustomerVm.cs
index 37e01b3..249eb1e 100644
--- a/Wms/Model/ModelVm/SysVm/CustomerVm.cs
+++ b/Wms/Model/ModelVm/SysVm/CustomerVm.cs
@@ -109,6 +109,10 @@
public class GetCustomerVm:IndexPage
{
/// <summary>
+ /// 瀹㈡埛缂栫爜
+ /// </summary>
+ public string CustomerNo { get; set; }
+ /// <summary>
/// 瀹㈡埛鍚嶇О
/// </summary>
public string CustomerName { get; set; }
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index cc445d9..c8a1d77 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -888,7 +888,7 @@
{
ASNNo = asnNo,
Type = model.AsnType,
- Origin = model.Origin,
+ Origin = string.IsNullOrEmpty(model.Origin) ? "ERP" : model.Origin,
CustomerNo = model.Customer,
CustomerName = CustomerModel.CustomerName,
OrderCode = model.OrderCode,
diff --git a/Wms/WMS.BLL/SysServer/CustomerServer.cs b/Wms/WMS.BLL/SysServer/CustomerServer.cs
index c6895ce..0af5d65 100644
--- a/Wms/WMS.BLL/SysServer/CustomerServer.cs
+++ b/Wms/WMS.BLL/SysServer/CustomerServer.cs
@@ -25,11 +25,12 @@
}
- public List<CustomerDto> GetCustomerList(string name, int? type, string linkMan, string phone, int page, int limit, out int count)
+ public List<CustomerDto> GetCustomerList(string no,string name, int? type, string linkMan, string phone, int page, int limit, out int count)
{
try
{
Expression<Func<SysCustomer, bool>> item = Expressionable.Create<SysCustomer>()
+ .AndIF(!string.IsNullOrWhiteSpace(no), it => it.CustomerNo.Contains(no.Trim()))
.AndIF(!string.IsNullOrWhiteSpace(name), it => it.CustomerName.Contains(name.Trim()))
.AndIF(type >= 0, it => it.Type == type)
.AndIF(!string.IsNullOrWhiteSpace(linkMan), it => it.LinkMan.Contains(linkMan.Trim()))
diff --git a/Wms/WMS.IBLL/ISysServer/ICustomerServer.cs b/Wms/WMS.IBLL/ISysServer/ICustomerServer.cs
index 09a3f4c..43feedd 100644
--- a/Wms/WMS.IBLL/ISysServer/ICustomerServer.cs
+++ b/Wms/WMS.IBLL/ISysServer/ICustomerServer.cs
@@ -12,6 +12,7 @@
/// <summary>
/// 鏌ヨ瀹㈡埛淇℃伅
/// </summary>
+ /// <param name="no">缂栫爜</param>
/// <param name="name">鍚嶇О</param>
/// <param name="type">绫诲瀷</param>
/// <param name="linkMan">鑱旂郴浜�</param>
@@ -20,7 +21,7 @@
/// <param name="limit"></param>
/// <param name="count"></param>
/// <returns></returns>
- List<CustomerDto> GetCustomerList(string name,int? type,string linkMan,string phone ,int page,int limit,out int count);
+ List<CustomerDto> GetCustomerList(string no, string name,int? type,string linkMan,string phone ,int page,int limit,out int count);
/// <summary>
/// 鏌ヨ鍗曟潯瀹㈡埛淇℃伅
/// </summary>
diff --git a/Wms/Wms/Controllers/BasisController.cs b/Wms/Wms/Controllers/BasisController.cs
index a737dda..1d03f17 100644
--- a/Wms/Wms/Controllers/BasisController.cs
+++ b/Wms/Wms/Controllers/BasisController.cs
@@ -1612,7 +1612,7 @@
{
try
{
- var bolls = _customerSvc.GetCustomerList(model.CustomerName, model.Type, model.LinkMan, model.Phone, model.Page, model.Limit, out int count);
+ var bolls = _customerSvc.GetCustomerList(model.CustomerNo,model.CustomerName, model.Type, model.LinkMan, model.Phone, model.Page, model.Limit, out int count);
return Ok(new { code = 0, count, msg = "瀹㈡埛淇℃伅", data = bolls });
}
--
Gitblit v1.8.0