개정판 95e6fe93
-autoapproval 수정
Change-Id: Ic1d2983e9bfacfa5fd6bd8a284a5641978a2a098
KCOM_API_AutoStamping/AutoStamping.svc.cs | ||
---|---|---|
133 | 133 |
|
134 | 134 |
var user = GetSelectMember(cIEntity, project_no, slip_no, user_id); |
135 | 135 |
|
136 |
|
|
137 | 136 |
if (user.SLIP_COUNT == 0) |
138 | 137 |
{ |
139 | 138 |
result = "Slip No does not exist."; |
... | ... | |
194 | 193 |
|
195 | 194 |
cIEntity.MARKUP_INFO_VERSION.AddObject(mARKUPINFOVERSION); |
196 | 195 |
|
197 |
Point startPoint = new Point(15, 15);
|
|
196 |
Point startPoint = new Point(30, 30);
|
|
198 | 197 |
|
199 | 198 |
var symCtrl = GetSymNControl(Convert.ToDouble(pageInfo.PAGE_WIDTH), Convert.ToDouble(pageInfo.PAGE_HEIGHT), mARKUPINFO.USER_ID, mARKUPINFO.ID, startPoint, _stampData); |
200 | 199 |
|
201 | 200 |
var bottom = Rect.Offset(symCtrl.ItemRect, new Vector(0, symCtrl.ItemRect.Height)); |
202 | 201 |
|
203 | 202 |
var txtOriginator = GetTextControl(Convert.ToDouble(pageInfo.PAGE_WIDTH), Convert.ToDouble(pageInfo.PAGE_HEIGHT), mARKUPINFO.USER_ID, mARKUPINFO.ID |
204 |
, userName, 20, System.Windows.Media.Color.FromArgb(255, 0, 0, 255), FontWeights.Bold, TextAlignment.Center, bottom, bottom.Top + 3);
|
|
203 |
, userName, 36, System.Windows.Media.Color.FromArgb(255, 0, 0, 255), FontWeights.Bold, TextAlignment.Center, bottom, bottom.Top + 3);
|
|
205 | 204 |
|
206 | 205 |
var dtfi = new System.Globalization.DateTimeFormatInfo { DateSeparator = "-", ShortDatePattern = @"yyyy/MM/dd" }; |
207 | 206 |
|
208 | 207 |
var txtDate = GetTextControl(Convert.ToDouble(pageInfo.PAGE_WIDTH), Convert.ToDouble(pageInfo.PAGE_HEIGHT), mARKUPINFO.USER_ID, mARKUPINFO.ID |
209 |
, DateTime.Now.ToString("d", dtfi), 20, System.Windows.Media.Color.FromArgb(255, 255, 0, 0), FontWeights.Bold, TextAlignment.Center, bottom, txtOriginator.StartPoint.Y + txtOriginator.BoxHeight + 2);
|
|
208 |
, DateTime.Now.ToString("d", dtfi), 36, System.Windows.Media.Color.FromArgb(255, 255, 0, 0), FontWeights.Bold, TextAlignment.Center, bottom, txtOriginator.StartPoint.Y + txtOriginator.BoxHeight + 2);
|
|
210 | 209 |
|
211 | 210 |
var symData = symCtrl.GetMarkupData(mARKUPINFO.USER_ID, 1, mARKUPINFOVERSION.ID); |
212 | 211 |
cIEntity.MARKUP_DATA.AddObject(symData); |
... | ... | |
430 | 429 |
|
431 | 430 |
try |
432 | 431 |
{ |
433 |
double height = 80;
|
|
434 |
double itemWidth = 180;
|
|
432 |
double height = 110;
|
|
433 |
double itemWidth = 280;
|
|
435 | 434 |
|
436 | 435 |
System.Windows.Point startPoint = new System.Windows.Point(startPosition.X, startPosition.Y); |
437 | 436 |
System.Windows.Point endPoint = new System.Windows.Point(startPosition.X + itemWidth, startPosition.Y + height); |
... | ... | |
721 | 720 |
|
722 | 721 |
public class SelectMember |
723 | 722 |
{ |
723 |
public string USER_ID { get; set; } |
|
724 |
|
|
724 | 725 |
public string USER_NAME { get; set; } |
725 | 726 |
|
726 | 727 |
/// <summary> |
내보내기 Unified diff