test
昨天 dbfd38c9f09c0d057c1f762e808a741081ff7dcf
托盘明细备注
5个文件已修改
132 ■■■■■ 已修改文件
HTML/js/public.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/StatisticalReport/BoxInfor.html 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/DataServer/StockDetailServer.cs 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/Wms/Controllers/StatisticalController.cs 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/js/public.js
@@ -2,7 +2,7 @@
// var IP = "http://172.16.71.101:8082/";//接口IP
//var IP = "http://localhost:13243/api";
//var IP = "http://localhost:50515/api";  //本地
var IP="https://localhost:44363/api";
var IP="https://localhost:5001/api";
// var IP = "http://localhost:44318/api";
//var IP = "http://192.168.1.6:8017";
//var IP = "http://192.168.1.226:8086";  
HTML/views/StatisticalReport/BoxInfor.html
@@ -169,7 +169,14 @@
                            </select>
                        </div>
                    </div>
                    <!-- 维护备注弹框 -->
                    <div class="layui-inline" id="divEditDemo" style="display: none; padding-top: 10px;">
                        <label class="layui-form-label">备注</label>
                        <div class="layui-input-inline" style="width: 300px;height: 100%;">
                            <textarea placeholder="请输入内容" id="NoticeDemo" name="NoticeDemo"
                                class="layui-textarea"></textarea>
                        </div>
                    </div>
                    <div class="layui-inline sousuo">
                        <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
@@ -318,6 +325,13 @@
                            <i class="layui-icon layui-icon-edit"></i>详情
                        </button>
                    </script>
                    <!-- 添加备注按钮 -->
                    <script type="text/html" id="toolbarDemo1">
                        <a class="layui-btn layui-btn-normal layui-btn-xs editDemoClass" lay-event="editDemo">
                          <i class="layui-icon layui-icon-edit"></i>备注
                        </a>
                      </script>
            </div>
        </div>
    </div>
@@ -412,7 +426,9 @@
                { field: 'OwnerName', title: '货主名称', align: 'center', width: 100, },
                { field: 'SupplierNo', title: '供应商编码', align: 'center', width: 100, },
                { field: 'SupplierName', title: '供应商名称', align: 'center', width: 100, },
                { field: 'SupplierName', title: '供应商名称', align: 'center', width: 100, },
                { field: 'SupplierName', title: '备注', align: 'center', width: 100, },
                { field: 'caozuo', title: '操作', fixed: 'right', width: 280, align: 'center', toolbar: '#toolbarDemo1', "disabled": true }
            ]];
            var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//将表头数据进行url编码
@@ -592,7 +608,49 @@
            }
            //var url = IP + "/Statistical/GetInventoryList1";
            table.on('tool(LAY-app-content-list)', function (obj) {
                var data = obj.data;
                switch (obj.event) {
                    case "editDemo":
                        $('#NoticeDemo').val(data.Demo);
                        layer.open({
                            type: 1,
                            title: '维护备注',
                            content: $('#divEditDemo'),
                            maxmin: false,
                            area: ['420px', '260px'],
                            btn: ['确定', '取消'],
                            yes: function (index, layero) {
                                var demo = $('#NoticeDemo').val();
                                var param = {
                                    id: data.Id,
                                    demo: demo,
                                };
                                sendData(IP + "/Statistical/EditStockDetailDemo", param, 'get', function (res) {
                                    if (res.code == 0) { //成功
                                        refreshTable();
                                        layer.msg(res.msg, {
                                            icon: 1,
                                            time: 1500 //1秒关闭(如果不配置,默认是3秒)
                                        }, function () {
                                        });
                                    } else { //不成功
                                        layer.msg(res.msg, {
                                            icon: 2,
                                            time: 3000 //2秒关闭(如果不配置,默认是3秒)
                                        }, function () {
                                            refreshTable();
                                        });
                                    }
                                    layer.close(index);
                                });
                            }
                        });
                        break;
                    default: break;
                }
            });
            //接受全局变量
Wms/WMS.BLL/DataServer/StockDetailServer.cs
@@ -6,6 +6,7 @@
using SqlSugar;
using WMS.BLL.LogServer;
using WMS.DAL;
using WMS.Entity.BllAsnEntity;
using WMS.Entity.BllQualityEntity;
using WMS.Entity.Context;
using WMS.Entity.DataEntity;
@@ -200,7 +201,38 @@
            return boxInforList;
        }
        /// <summary>
        /// 托盘明细备注
        /// </summary>
        /// <param name="id"></param>
        /// <param name="demo"></param>
        /// <param name="userId"></param>
        /// <exception cref="Exception"></exception>
        public void EditStockDetailDemo(int id, string demo, int userId)
        {
            try
            {
                var detail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.Id == id);
                if (detail == null)
                {
                    throw new Exception("未查询到库存明细信息");
                }
                detail.Demo = demo + "".Trim();
                detail.UpdateUser = userId;
                detail.UpdateTime = DateTime.Now;
                int i = Db.Updateable(detail).ExecuteCommand();
                if (i > 0)
                {
                    //添加操作日志
                    new OperationASNServer().AddLogOperationAsn("库存统计", "托盘明细", detail.PalletNo, "编辑", $"编辑了托盘号为{detail.PalletNo}的备注信息", userId);
                }
            }
            catch (Exception ex)
            {
                throw new Exception(ex.Message);
            }
        }
        #endregion
Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs
@@ -27,6 +27,7 @@
            string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, 
            string inspectStatus, string ownerNo, string ownerName, string startTime, string endTIme, 
            string WareHouseNo, string AreaNo);
        void EditStockDetailDemo(int id, string demo, int userId);
        /// <summary>
        /// 导出托盘明细
Wms/Wms/Controllers/StatisticalController.cs
@@ -8,6 +8,7 @@
using System.Security.Claims;
using System.Threading.Tasks;
using Model.ModelDto.SysDto;
using WMS.BLL.LogServer;
namespace Wms.Controllers
{
@@ -122,6 +123,40 @@
            }
        }
        /// <summary>
        /// 托盘明细备注
        /// </summary>
        /// <param name="id"></param>
        /// <param name="demo"></param>
        /// <param name="userId"></param>
        /// <exception cref="Exception"></exception>
        [HttpGet]
        public IActionResult EditStockDetailDemo(int id, string demo)
        {
            try
            {
                var claimsIdentity = this.User.Identity as ClaimsIdentity;
                if (claimsIdentity == null)
                {
                    throw new Exception("未获取到用户信息");
                }
                string userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
                if (string.IsNullOrWhiteSpace(userId))
                {
                    throw new Exception("未获取到用户信息");
                }
                _stockDetail.EditStockDetailDemo(id, demo, int.Parse(userId));
                return Ok(new { code = 0, msg = "编辑备注成功" });
            }
            catch (Exception e)
            {
                return Ok(new { code = 1, msg = e.Message });
            }
        }
        /// <summary>
        /// 获取箱码明细