入库单增加复核时间和复核人

Administrator

2024-02-01 7bb0a817a938d4f44569cc14d6ea34dbb7b1105f

入库单增加复核时间和复核人

 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)))//将表头数据进行url编码
@@ -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('获取权限信息失败', {

 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>

 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"为需要被选中的选项的value属性值
                        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) {

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

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

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

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

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