分支自 SuZhouGuanHong/TaiYuanTaiZhong

dengjunjie
2024-05-25 c54d869fe4c5e2a805624a9ade4f9057c916f358
添加数据库清除历史数据事务
已修改6个文件
38 ■■■■ 文件已修改
代码管理/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_detail_hty.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_head_hty.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WMS_Client/src/api/http.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_detail_hty.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_head_hty.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_detail_hty.cs
@@ -113,5 +113,13 @@
        [Column(TypeName = "nvarchar(20)")]
        [Editable(true)]
        public string Status { get; set; }
        /// <summary>
        ///鎿嶄綔鏃堕棿
        /// </summary>
        [Display(Name = "鎿嶄綔鏃堕棿")]
        [Column(TypeName = "datetime")]
        [Editable(true)]
        public DateTime? completedate { get; set; }
    }
}
代码管理/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_head_hty.cs
@@ -251,6 +251,12 @@
       [Editable(true)]
       public string compeletor { get; set; }
        /// <summary>
        ///鎿嶄綔鏃堕棿
        /// </summary>
        [Display(Name = "鎿嶄綔鏃堕棿")]
        [Column(TypeName = "datetime")]
        [Editable(true)]
        public DateTime? completedate { get; set; }
    }
}
代码管理/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs
@@ -117,9 +117,10 @@
                            jobID = mes_Detail.jobID,
                            mes_detail_id = mes_Detail.mes_detail_id,
                            mes_headID = mes_Detail.mes_headID,
                            operatetype = operatetype,
                            operatetype = string.IsNullOrEmpty(mes_Detail.Status) ? "瓒呮椂娓呯悊" : operatetype,
                            SN = mes_Detail.SN,
                            Status = mes_Detail.Status,
                            completedate = DateTime.Now,
                        };
                        mes_Details_hty.Add(mes_Detail_Hty);
                        mes_DetailRepository.Delete(mes_Detail, true);
@@ -155,6 +156,7 @@
                    reqIDLineNo = mes_Head.reqIDLineNo,
                    typeID = mes_Head.typeID,
                    workOrder = mes_Head.workOrder,
                    completedate = DateTime.Now,
                };
                mes_Head_HtyRepository.Add(mes_Head_Hty, true);
                mes_HeadRepository.Delete(mes_Head, true);
代码管理/WMS/WMS_Client/src/api/http.js
@@ -12,7 +12,7 @@
let loadingInstance;
let loadingStatus = false;
if (process.env.NODE_ENV == 'development') {
    axios.defaults.baseURL = 'http://192.168.12.101:8098/';
    axios.defaults.baseURL = 'http://192.168.12.118:8098/';
}
else if (process.env.NODE_ENV == 'debug') {
    axios.defaults.baseURL = 'http://192.168.12.101:8098/';
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_detail_hty.cs
@@ -113,5 +113,13 @@
        [Column(TypeName = "nvarchar(20)")]
        [Editable(true)]
        public string Status { get; set; }
        /// <summary>
        ///鎿嶄綔鏃堕棿
        /// </summary>
        [Display(Name = "鎿嶄綔鏃堕棿")]
        [Column(TypeName = "datetime")]
        [Editable(true)]
        public DateTime? completedate { get; set; }
    }
}
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_head_hty.cs
@@ -251,6 +251,12 @@
       [Editable(true)]
       public string compeletor { get; set; }
        /// <summary>
        ///鎿嶄綔鏃堕棿
        /// </summary>
        [Display(Name = "鎿嶄綔鏃堕棿")]
        [Column(TypeName = "datetime")]
        [Editable(true)]
        public DateTime? completedate { get; set; }
    }
}