提交

username@email.com

2021-08-24 63f97a810a8dcd213f4624533aa52f7bc2647d49

提交

 zhengcaioa/DTO/AdmGoodsManageDTO.cs

@@ -22,7 +22,8 @@
        public DateTime Modifytime { get; set; }

        public decimal? GoodsCaozuo { get; set; }
        
        public string HaocaiStatus { get; set; }

    }
    public class AdmGoodsManageDTOSearch : SearchEntity
    {

 zhengcaioa/DTO/HrSalaryDTO.cs

@@ -166,6 +166,8 @@
    public partial class HrSalaryDTOSearch : SearchEntity
    {
        public string searchDate { get; set; }
        public string searchDatestart { get; set; }
        public string searchDateend { get; set; }
        public string YearMonth { get; set; }
        public string Usernumber { get; set; }
        public string DeptId { get; set; }

 zhengcaioa/Model/AdmGoodsManage.cs

@@ -19,5 +19,6 @@
        public DateTime Createtime { get; set; }
        public string Modifier { get; set; }
        public DateTime Modifytime { get; set; }
        public string HaocaiStatus { get; set; }
    }
}

 zhengcaioa/Model/zhengcaioaContext.cs

@@ -1620,6 +1620,11 @@
                    .HasDefaultValueSql("('A')")
                    .HasComment("物品状态");

                entity.Property(e => e.HaocaiStatus)
                   .HasMaxLength(1)
                   .HasColumnName("haocai_status")
                   .HasDefaultValueSql("('D')");

                entity.Property(e => e.Modifier)
                    .IsRequired()
                    .HasMaxLength(50)

 zhengcaioa/Services/AdmGoodsManageService.cs

@@ -64,7 +64,9 @@
                    }
                 
                    updateproject.GoodsStatus = entity.GoodsStatus;
                 
                    updateproject.HaocaiStatus = entity.HaocaiStatus;


                    updateproject.RecStatus = entity.RecStatus;
                    updateproject.Modifier = entity.Modifier;
                    updateproject.Modifytime = entity.Modifytime;
@@ -167,7 +169,7 @@
                             // DocContent = a.DocContent,
                             GoodsLeft = a.GoodsLeft,
                             GoodsStatus = a.GoodsStatus,

                             HaocaiStatus = a.HaocaiStatus,
                             GoodsName = a.GoodsName,



 zhengcaioa/Services/HrSalaryService.cs

@@ -791,14 +791,15 @@
            DateTime st = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date;
            DateTime et = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1); 
            int month = 0;
            if (!string.IsNullOrEmpty(searchEntity.searchDate))
            if (!string.IsNullOrEmpty(searchEntity.searchDatestart))
            {
                var times = searchEntity.searchDate.Split('|');
                if (times.Length == 2)
                {
                    st = DateTime.Parse(times[0]);
                    et= DateTime.Parse(times[1]);
                }
                st = DateTime.Parse(searchEntity.searchDatestart + "-01");
                 
            }
            if (!string.IsNullOrEmpty(searchEntity.searchDateend))
            {
                et = DateTime.Parse(searchEntity.searchDateend + "-01");

            }
            var query = (from a in _context.HrSalaries where a.Year >= st.Year && a.Month >= st.Month && a.Year <= et.Year && a.Month <= et.Month select a);


 zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs

@@ -174,7 +174,11 @@
            int y = 1;
            var columnTitles = new List<string>()
            {
                /*"建档时间",*/"客户单位","详细地址","联系电话","电子邮箱","客户微信"
                "建档时间","客户来源","行业分类","客户类型","客户名称","客户单位","联系人微信"
                ,"客户地址","网址","联系人座机","联系人手机","联系人QQ","联系人邮箱",

                "联系人2姓名","联系人2手机","联系人2QQ"

            };
            foreach(var columnTitle in columnTitles)
            {
@@ -190,17 +194,39 @@
                x++;
                y = 1;
                var cell = worksheet.Cells[x, y++];
                //cell.Value = item.CreatetimeName;
                //cell = worksheet.Cells[x, y++];
                cell.Value = item.CreatetimeName;

                cell = worksheet.Cells[x, y++];
                cell.Value = item.KhlyName;
                cell = worksheet.Cells[x, y++];
                cell.Value = item.HyflName;
                cell = worksheet.Cells[x, y++];
                cell.Value = item.KhlxName;
                cell = worksheet.Cells[x, y++];
                cell.Value = item.Name;
                cell = worksheet.Cells[x, y++];
                cell.Value = item.Name;
                cell = worksheet.Cells[x, y++];
                cell.Value = item.Weixin;
                cell = worksheet.Cells[x, y++];
                cell.Value = item.Address;
                cell = worksheet.Cells[x, y++];
                cell.Value = item.Url;
                cell = worksheet.Cells[x, y++];
                cell.Value = item.Tel;
                cell = worksheet.Cells[x, y++];
                cell.Value = item.Phone;
                cell = worksheet.Cells[x, y++];
                cell.Value = item.Qq;
                cell = worksheet.Cells[x, y++];
                cell.Value = item.Email;
                cell = worksheet.Cells[x, y++];
                cell.Value = item.Weixin;
                cell.Value = item.YwName;
                cell = worksheet.Cells[x, y++];
                cell.Value = item.YwTel;
                cell = worksheet.Cells[x, y++];
                cell.Value = item.YwQq;



            }

 zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs

@@ -292,8 +292,8 @@
            ViewData["ActionInfo"] = actionlist;

            ViewBag.dept = _hrDeptService.GetList().Select(x => new { code = x.Id, label = x.DeptName }).ToList();
            ViewBag.stime = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.ToString("yyyy-MM-dd");
            ViewBag.etime = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd"); 
            ViewBag.stime = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.ToString("yyyy-MM");
            ViewBag.etime = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM"); 

            return View();
        }
@@ -330,8 +330,8 @@
            ViewData["ActionInfo"] = actionlist;

            //ViewBag.dept = _hrDeptService.GetList().Select(x => new { code = x.Id, label = x.DeptName }).ToList();
            ViewBag.stime = new DateTime(DateTime.Now.Year,1,1).ToString("yyyy-MM-dd");
            ViewBag.etime = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd");
            ViewBag.stime =DateTime.Now.ToString("yyyy-MM");
            ViewBag.etime = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM");

            ViewBag.UserId = UserId;

@@ -349,9 +349,13 @@
            //自动确认
            //_hrSalaryService.AutoCheck();

            if (string.IsNullOrEmpty(search.searchDate))
            if (string.IsNullOrEmpty(search.searchDatestart))
            {
                search.searchDate = new DateTime(DateTime.Now.Year, 1, 1).ToString("yyyy-MM-dd") + "|" + DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd");
                search.searchDatestart = DateTime.Now.ToString("yyyy-MM");
            }
            if (string.IsNullOrEmpty(search.searchDateend))
            {
                search.searchDate = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM");
            }

            return new JsonResult(_hrSalaryService.SearchByPagingFinish(search));

 zhengcaioa/zhengcaioa/Controllers/admin/AdmGoodsManageController.cs

@@ -175,7 +175,7 @@
            ViewBag.GoodsStatus = _liaotianService.GetSYScode("adm_goods_manage", "goods_status");



            ViewBag.shifou = _liaotianService.GetSYScode("system", "shifou");




 zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs

@@ -319,8 +319,8 @@
                            Offdays += 1;
                        }
                    }

                    if(userList[a].Outdate.HasValue && dateminkaoqin >=userList[a].Outdate   )
                    //离职当天计算考勤
                    if(userList[a].Zhiwustatus == "D" && userList[a].Outdate.HasValue && dateminkaoqin >userList[a].Outdate   )
                    {
                        dateminkaoqin = dateminkaoqin.AddDays(1);
                        continue;

 zhengcaioa/zhengcaioa/Views/AdmGoodsManage/Edit.cshtml

@@ -8,6 +8,8 @@

    List<AdmGoodsClassifyDTO> ClassifyId = ViewData["ClassifyId"] as List<AdmGoodsClassifyDTO>; //物品类型

    List<SysCodeDtl> shifou = ViewData["shifou"] as List<SysCodeDtl>; //物品状态 

}
@{
    Layout = null;
@@ -150,44 +152,67 @@
                                  

                                </div>*@
                                <div class="clearfix layer-area" style="padding-bottom:15px;">
                                    @*@if (!string.IsNullOrWhiteSpace(Model.Id))
                                    {
                                        <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">剩余数量</label>
                                        <div class="col-sm-2 col-md-2" grouptype="Vdata">
                                            <input class="form-control" label="剩余数量" name="GoodsLeft" id="GoodsLeft" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="number" value="@Model.GoodsLeft" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
                            <div class="clearfix layer-area" style="padding-bottom:15px;">
                                @*@if (!string.IsNullOrWhiteSpace(Model.Id))
        {
            <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">剩余数量</label>
            <div class="col-sm-2 col-md-2" grouptype="Vdata">
                <input class="form-control" label="剩余数量" name="GoodsLeft" id="GoodsLeft" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="number" value="@Model.GoodsLeft" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">

                                        </div>
                                    }*@
            </div>
        }*@



                                    <label class="text-right col-sm-1 col-md-1 control-label">物品状态<i class="red">*</i></label>
                                    <div class="col-sm-2 col-md-2">
                                        <select id="GoodsStatus" class="form-control" name="GoodsStatus" data-placeholder="选择 åºåˆ— ...">
                                            <option value="" hassubinfo="true">请选择</option>
                                            @foreach (var item in GoodsStatus)
                                <label class="text-right col-sm-1 col-md-1 control-label">物品状态<i class="red">*</i></label>
                                <div class="col-sm-2 col-md-2">
                                    <select id="GoodsStatus" class="form-control" name="GoodsStatus" data-placeholder="选择 åºåˆ— ...">
                                        <option value="" hassubinfo="true">请选择</option>
                                        @foreach (var item in GoodsStatus)
                                        {
                                            @if (!item.CodeSn.Equals(Model.GoodsStatus))
                                            {
                                                @if (!item.CodeSn.Equals(Model.GoodsStatus))
                                                {
                                                    <option value="@item.CodeSn" hassubinfo="true">
                                                        @item.Comments
                                                    </option>
                                                }
                                                else
                                                {
                                                    <option value="@item.CodeSn" hassubinfo="true" selected="selected">
                                                        @item.Comments
                                                    </option>
                                                }

                                                <option value="@item.CodeSn" hassubinfo="true">
                                                    @item.Comments
                                                </option>
                                            }
                                            else
                                            {
                                                <option value="@item.CodeSn" hassubinfo="true" selected="selected">
                                                    @item.Comments
                                                </option>
                                            }

                                        </select>
                                    </div>
                                        }


                                    </select>
                                </div>

                                <label class="text-right col-sm-1 col-md-1 control-label">是否耗材<i class="red">*</i></label>
                                <div class="col-sm-2 col-md-2">
                                    <select id="HaocaiStatus" class="form-control" name="HaocaiStatus" data-placeholder="选择 åºåˆ— ...">
                                        <option value="" hassubinfo="true">请选择</option>
                                        @foreach (var item in shifou)
                                        {
                                            @if (!item.CodeSn.Equals(Model.HaocaiStatus))
                                            {
                                                <option value="@item.CodeSn" hassubinfo="true">
                                                    @item.Comments
                                                </option>
                                            }
                                            else
                                            {
                                                <option value="@item.CodeSn" hassubinfo="true" selected="selected">
                                                    @item.Comments
                                                </option>
                                            }

                                        }

                                    </select>
                                </div>

                            </div>
 


@@ -348,6 +373,11 @@
                return;
            }

            if ($("#HaocaiStatus").val() == '') {
                toastr.warning("是否耗材不能为空");
                return;
            }
            




 zhengcaioa/zhengcaioa/Views/SalaryCheck/Index.cshtml

@@ -74,7 +74,7 @@
        ];
        dataUrl = "/SalaryCheck/GetList";
        searchCol = [
            { label: '月份', name: 'YearMonth', labtype: 'monthdate', hidden: false },
            { label: '月份', name: 'YearMonth', labtype: 'monthdate', hidden: false, cwidth: '5%', cccwidth: '8%' },
            { label: '工作部门', name: 'DeptId', labtype: 'combox', hidden: false, data: JSON.parse(dept) },
            { label: '职工姓名', name: 'UserName', labtype: 'txt', hidden: false },
        ];

 zhengcaioa/zhengcaioa/Views/SalaryCheck/SearchIndex.cshtml

@@ -69,7 +69,8 @@
        ];
        dataUrl = "/SalaryCheck/GetSearchList";
        searchCol = [
            { label: '时间', name: 'searchDate', labtype: 'datearea', hidden: false },
            { label: '时间', name: 'searchDatestart', labtype: 'monthdate', hidden: false, cwidth: '5%', cccwidth: '8%' },
            { label: '到', name: 'searchDateend', labtype: 'monthdate', hidden: false, cwidth: '2%', cccwidth: '8%' },
            { label: '部门', name: 'DeptId', labtype: 'combox', hidden: false, data: JSON.parse(dept) },
            { label: '姓名', name: 'UserName', labtype: 'txt', hidden: false },
            { label: '工号', name: 'Usernumber', labtype: 'txt', hidden: false },

 zhengcaioa/zhengcaioa/Views/SalaryCheck/SearchIndexRenshi.cshtml

@@ -71,7 +71,8 @@
        ];
        dataUrl = "/SalaryCheck/GetSearchListRenshi?UserId=" + UserId;
        searchCol = [
            { label: '时间', name: 'searchDate', labtype: 'datearea', hidden: false },
            { label: '时间', name: 'searchDatestart', labtype: 'monthdate', hidden: false, cwidth: '5%', cccwidth: '8%' },
            { label: '到', name: 'searchDateend', labtype: 'monthdate', hidden: false, cwidth: '2%', cccwidth: '8%' },
            //{ label: '部门', name: 'DeptId', labtype: 'combox', hidden: false, data: JSON.parse(dept) },
            //{ label: '姓名', name: 'UserName', labtype: 'txt', hidden: false },
            //{ label: '工号', name: 'Usernumber', labtype: 'txt', hidden: false },

 zhengcaioa/zhengcaioa/Views/User/Edit.cshtml

@@ -946,6 +946,13 @@
                return;
            }

            if ($.trim($("#Zhiwustatus").val()) == 'D') {
                if ($.trim($("#Outdate").val()) == '') {
                    toastr.warning("在职状态为离职必须填写离职日期");
                    return;
                }
            }

            //if ($.trim($("#IpMac").val()) == '') {
            //    toastr.warning("工作电脑MAC不能为空");
            //    return;

 ±íÐÞ¸Ä.sql

@@ -1,6 +1,76 @@
USE [zhengcaioa]
GO

ALTER TABLE [dbo].[adm_goods_manage] ADD  [haocai_status] [nvarchar](1)  DEFAULT ('D')
GO


update  [adm_goods_manage] set [haocai_status]='D'
GO





























































USE [zhengcaioa]
GO

/****** Object:  Table [dbo].[ADM_Customer_withdrawal]    Script Date: 2021/8/9 13:43:29 ******/
SET ANSI_NULLS ON
GO