개정판 30680747
Convert_Path 프로시저 추가 및 DOCUMENT_URLFilter 추가
Change-Id: Ia279d161263beddcc0d8e61404302fbee667c748
| ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/DataBaseItemsModel.cs | ||
|---|---|---|
| 414 | 414 |
} |
| 415 | 415 |
} |
| 416 | 416 |
|
| 417 |
public string _DOCUMENT_URLFilter; |
|
| 418 |
public string DOCUMENT_URLFilter |
|
| 419 |
{
|
|
| 420 |
get { return _DOCUMENT_URLFilter; }
|
|
| 421 |
set |
|
| 422 |
{
|
|
| 423 |
if (_DOCUMENT_URLFilter == "") |
|
| 424 |
{
|
|
| 425 |
_DOCUMENT_URLFilter = null; |
|
| 426 |
} |
|
| 427 |
else if (_DOCUMENT_URLFilter != value) |
|
| 428 |
{
|
|
| 429 |
_DOCUMENT_URLFilter = value; |
|
| 430 |
OnPropertyChanged(() => DOCUMENT_URLFilter); |
|
| 431 |
} |
|
| 432 |
} |
|
| 433 |
} |
|
| 434 |
|
|
| 417 | 435 |
static DateTime DefaultCreateTime = DateTime.Now; |
| 418 | 436 |
private DateTime _SelectedCreateTimeBegin = DefaultCreateTime; |
| 419 | 437 |
public DateTime SelectedCreateTimeBegin |
| ... | ... | |
| 544 | 562 |
}); |
| 545 | 563 |
} |
| 546 | 564 |
|
| 547 |
await Task.Delay(5000); |
|
| 565 |
//await Task.Delay(5000); |
|
| 566 |
await Task.Delay(10000); |
|
| 548 | 567 |
|
| 549 | 568 |
//System.Threading.Thread.Sleep(new TimeSpan(0,0,0,0,100)); |
| 550 | 569 |
|
| ... | ... | |
| 599 | 618 |
{
|
| 600 | 619 |
try |
| 601 | 620 |
{
|
| 602 |
using (markusEntities entities = new markusEntities()) |
|
| 621 |
using (markusEntities entities = new markusEntities(App.MarkusDataBaseConnecitonString))
|
|
| 603 | 622 |
{
|
| 604 | 623 |
List<ConvertItem> Listitems = new List<ConvertItem>(); |
| 605 | 624 |
|
| 606 | 625 |
foreach (var coll in collection) |
| 607 | 626 |
{
|
| 608 |
var items = entities.SELECT_CONVERT_ITEM(coll.ConvertID, coll.ProjectNumber, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null).ToList(); |
|
| 627 |
var items = entities.SELECT_CONVERT_ITEM(coll.ConvertID, coll.ProjectNumber, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null,null).ToList();
|
|
| 609 | 628 |
|
| 610 | 629 |
foreach (var x in items) |
| 611 | 630 |
{
|
| ... | ... | |
| 652 | 671 |
{
|
| 653 | 672 |
try |
| 654 | 673 |
{
|
| 655 |
using (markusEntities entities = new markusEntities()) |
|
| 674 |
using (markusEntities entities = new markusEntities(App.MarkusDataBaseConnecitonString))
|
|
| 656 | 675 |
{
|
| 657 | 676 |
|
| 658 | 677 |
int _status = 0; |
| ... | ... | |
| 662 | 681 |
} |
| 663 | 682 |
|
| 664 | 683 |
var items = entities.SELECT_CONVERT_ITEM(null, null, null, _status, SelectedCount.ValueMember, null, null, null, |
| 665 |
null, null, null, null, null, null, null, null, null).ToList(); |
|
| 684 |
null, null, null, null, null, null, null, null, null, null).ToList();
|
|
| 666 | 685 |
//var items = database.GetConvertProjects(_status, ProjectNumberFilter, UniqueKeyFilter, Document_NameFilter, Service_IDFilter, Docuemnt_NOFilter |
| 667 | 686 |
// , ReconverterFilter, RevisionFilter)//x:database객체 y:statusCodeTypeList의값 Count()안에 predicator 조건 만족하면 count개수안에 넣음 |
| 668 | 687 |
// .Take(SelectedCount.ValueMember).ToList(); |
| ... | ... | |
| 755 | 774 |
{
|
| 756 | 775 |
try |
| 757 | 776 |
{
|
| 758 |
using (markusEntities entities = new markusEntities()) |
|
| 777 |
using (markusEntities entities = new markusEntities(App.MarkusDataBaseConnecitonString))
|
|
| 759 | 778 |
{
|
| 760 | 779 |
int _status = 0; |
| 761 | 780 |
if (SelectedStatus != null) |
| ... | ... | |
| 776 | 795 |
} |
| 777 | 796 |
|
| 778 | 797 |
var items = entities.SELECT_CONVERT_ITEM(null, ProjectNumberFilter, UniqueKeyFilter, _status, SelectedCount.ValueMember, Start_CreateTime, Finish_CreateTime, null, |
| 779 |
null, null, null, GroupNOFilter, Document_NameFilter, Docuemnt_NOFilter, RevisionFilter, Service_IDFilter, ReconverterFilter).ToList(); |
|
| 798 |
null, null, null, GroupNOFilter, Document_NameFilter, Docuemnt_NOFilter, RevisionFilter, Service_IDFilter, ReconverterFilter, DOCUMENT_URLFilter).ToList();
|
|
| 780 | 799 |
|
| 781 | 800 |
List<ConvertItem> Listitems = new List<ConvertItem>(); |
| 782 | 801 |
|
| ... | ... | |
| 1159 | 1178 |
} |
| 1160 | 1179 |
System.Diagnostics.Debug.WriteLine(resultRealConvert + " " + resultFiltertConvert); |
| 1161 | 1180 |
|
| 1162 |
using (markusEntities entities = new markusEntities()) |
|
| 1181 |
using (markusEntities entities = new markusEntities(App.MarkusDataBaseConnecitonString))
|
|
| 1163 | 1182 |
{
|
| 1164 | 1183 |
|
| 1165 |
var items = entities.SELECT_CONVERT_ITEM(SelectFilterConvert.ConvertID, null, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null); //프로시저 이용 |
|
| 1184 |
var items = entities.SELECT_CONVERT_ITEM(SelectFilterConvert.ConvertID, null, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null); //프로시저 이용
|
|
| 1166 | 1185 |
|
| 1167 | 1186 |
|
| 1168 | 1187 |
foreach (var x in items) |
| ... | ... | |
| 1202 | 1221 |
|
| 1203 | 1222 |
public int SetCleanUpItem(ConvertItem _ConvertItem) |
| 1204 | 1223 |
{
|
| 1205 |
using (markusEntities entities = new markusEntities()) |
|
| 1224 |
using (markusEntities entities = new markusEntities(App.MarkusDataBaseConnecitonString))
|
|
| 1206 | 1225 |
{
|
| 1207 | 1226 |
int result = 0; |
| 1208 | 1227 |
|
| 1209 |
var items = entities.SELECT_CONVERT_ITEM(_ConvertItem.ConvertID, null, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null).ToList(); |
|
| 1228 |
var items = entities.SELECT_CONVERT_ITEM(_ConvertItem.ConvertID, null, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null).ToList();
|
|
| 1210 | 1229 |
|
| 1211 | 1230 |
if (items.Count() > 0) |
| 1212 | 1231 |
{
|
| ... | ... | |
| 1250 | 1269 |
|
| 1251 | 1270 |
private string BaseStorage(string ProjectNo) |
| 1252 | 1271 |
{
|
| 1253 |
using (markusEntities entities = new markusEntities()) |
|
| 1272 |
using (markusEntities entities = new markusEntities(App.MarkusDataBaseConnecitonString))
|
|
| 1254 | 1273 |
{
|
| 1255 | 1274 |
string result = ""; |
| 1256 | 1275 |
|
| 1257 |
var properties = entities.SELECT_CONVERT_ITEM(null, ProjectNo, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null).ToList(); |
|
| 1276 |
var properties = entities.SELECT_CONVERT_ITEM(null, ProjectNo, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null).ToList();
|
|
| 1258 | 1277 |
//var properties = entities.PROPERTIES.Where(f => f.PROPERTY == ProjectNo && f.TYPE == PROPERTIES_DEFINE.TILE_SOURCE_STORAGE);// |
| 1259 | 1278 |
|
| 1260 | 1279 |
|
| ... | ... | |
| 1380 | 1399 |
|
| 1381 | 1400 |
private void OnClosed(object sender, WindowClosedEventArgs e) |
| 1382 | 1401 |
{
|
| 1383 |
using (markusEntities entities = new markusEntities()) |
|
| 1402 |
using (markusEntities entities = new markusEntities(App.MarkusDataBaseConnecitonString))
|
|
| 1384 | 1403 |
{
|
| 1385 | 1404 |
var result = e.DialogResult; |
| 1386 | 1405 |
if (result == true) |
| ... | ... | |
| 1492 | 1511 |
ReconverterFilter = null; |
| 1493 | 1512 |
RevisionFilter = null; |
| 1494 | 1513 |
GroupNOFilter = null; |
| 1514 |
DOCUMENT_URLFilter = null; |
|
| 1495 | 1515 |
DefaultCreateTime = DateTime.Now; |
| 1496 | 1516 |
SelectedCreateTimeBegin = DefaultCreateTime; |
| 1497 | 1517 |
SelectedCreateTimeEnd = DefaultCreateTime; |
내보내기 Unified diff
