Merge branch 'yyk'

yuyou_x

2024-03-14 54b96e7255ebcafabdbae17050fc09d19b7e0cce

Merge branch 'yyk'

 HTML/views/ASNSetting/ArrivalNotice.html

@@ -173,11 +173,13 @@
                    <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">
                                    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/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;

 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,

 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; }

 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,

 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()))

 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>

 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 });
            }