From c54d869fe4c5e2a805624a9ade4f9057c916f358 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期六, 25 五月 2024 14:13:15 +0800
Subject: [PATCH] 添加数据库清除历史数据事务
---
代码管理/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_detail_hty.cs | 8 ++++++++
代码管理/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs | 4 +++-
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_detail_hty.cs | 8 ++++++++
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_head_hty.cs | 8 +++++++-
代码管理/WMS/WMS_Client/src/api/http.js | 2 +-
代码管理/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_head_hty.cs | 8 +++++++-
6 files changed, 34 insertions(+), 4 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_detail_hty.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_detail_hty.cs"
index 73fe824..c13dd9c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_detail_hty.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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; }
}
}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_head_hty.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_head_hty.cs"
index ef459b6..e0edb36 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_head_hty.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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; }
}
}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs"
index abb82b5..73ba95a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/api/http.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/api/http.js"
index eb0a016..9b0280d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/api/http.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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/';
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_detail_hty.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_detail_hty.cs"
index 73fe824..c13dd9c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_detail_hty.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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; }
}
}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_head_hty.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_head_hty.cs"
index ef459b6..e0edb36 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_head_hty.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3