リビジョン 304
注文書一覧表示バグ修正
注文書作成一覧業者毎金額バグ修正
注文書EXCEL2016での位置ずれ修正
請求まとめ修正中
| branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
|---|---|---|
| 14 | 14 |
/// <summary> |
| 15 | 15 |
/// 本体バージョン |
| 16 | 16 |
/// </summary> |
| 17 |
public static int s_SystemVersion = 118;
|
|
| 17 |
public static int s_SystemVersion = 119;
|
|
| 18 | 18 |
|
| 19 | 19 |
/// <summary> |
| 20 | 20 |
/// コピー・環境バージョン |
| branches/src/ProcessManagement/ProcessManagement/Common/Office/UsedExcel.cs | ||
|---|---|---|
| 1265 | 1265 |
, null |
| 1266 | 1266 |
, PageSetup |
| 1267 | 1267 |
, new object[1] { PageWide });
|
| 1268 |
|
|
| 1269 |
PageSetup.GetType().InvokeMember("CenterHorizontally"
|
|
| 1270 |
, BindingFlags.SetProperty |
|
| 1271 |
, null |
|
| 1272 |
, PageSetup |
|
| 1273 |
, new object[1] { true });
|
|
| 1274 |
|
|
| 1275 |
PageSetup.GetType().InvokeMember("CenterVertically"
|
|
| 1276 |
, BindingFlags.SetProperty |
|
| 1277 |
, null |
|
| 1278 |
, PageSetup |
|
| 1279 |
, new object[1] { true });
|
|
| 1268 | 1280 |
} |
| 1269 | 1281 |
catch (Exception ex) |
| 1270 | 1282 |
{
|
| ... | ... | |
| 1277 | 1289 |
} |
| 1278 | 1290 |
#endregion |
| 1279 | 1291 |
|
| 1292 |
#region マージン位置定義 |
|
| 1293 |
/// <summary> |
|
| 1294 |
/// マージン位置定義 |
|
| 1295 |
/// </summary> |
|
| 1296 |
public enum MarginPos |
|
| 1297 |
{
|
|
| 1298 |
/// <summary> |
|
| 1299 |
/// ヘッダーマージン |
|
| 1300 |
/// </summary> |
|
| 1301 |
HeaderSize = 0, |
|
| 1302 |
/// <summary> |
|
| 1303 |
/// フッダーマージン |
|
| 1304 |
/// </summary> |
|
| 1305 |
FooterSize, |
|
| 1306 |
/// <summary> |
|
| 1307 |
/// 上部マージン |
|
| 1308 |
/// </summary> |
|
| 1309 |
TopSize, |
|
| 1310 |
/// <summary> |
|
| 1311 |
/// 底部マージン |
|
| 1312 |
/// </summary> |
|
| 1313 |
BottomSize, |
|
| 1314 |
/// <summary> |
|
| 1315 |
/// 左マージン |
|
| 1316 |
/// </summary> |
|
| 1317 |
LeftSize, |
|
| 1318 |
/// <summary> |
|
| 1319 |
/// 右マージン |
|
| 1320 |
/// </summary> |
|
| 1321 |
RightSize, |
|
| 1322 |
} |
|
| 1323 |
#endregion |
|
| 1324 |
|
|
| 1325 |
#region シートへの印刷余白セット |
|
| 1326 |
/// <summary> |
|
| 1327 |
/// シートへの印刷余白セット |
|
| 1328 |
/// </summary> |
|
| 1329 |
/// <param name="SetMargin"></param> |
|
| 1330 |
public void ExcelMarginSet(double [] SetMargin) |
|
| 1331 |
{
|
|
| 1332 |
object PageSetup = null; |
|
| 1333 |
try |
|
| 1334 |
{
|
|
| 1335 |
// 印刷頁セッティング取得 |
|
| 1336 |
PageSetup = xlsWorkSheet.GetType().InvokeMember("PageSetup"
|
|
| 1337 |
, BindingFlags.GetProperty |
|
| 1338 |
, null |
|
| 1339 |
, xlsWorkSheet |
|
| 1340 |
, null); |
|
| 1341 |
|
|
| 1342 |
// ----- 余白を取得する |
|
| 1343 |
object[] ss = new object[Enum.GetNames(typeof(MarginPos)).Length]; |
|
| 1344 |
ss[(int)MarginPos.HeaderSize] = PageSetup.GetType().InvokeMember("HeaderMargin"
|
|
| 1345 |
, BindingFlags.GetProperty |
|
| 1346 |
, null |
|
| 1347 |
, PageSetup |
|
| 1348 |
, null); |
|
| 1349 |
|
|
| 1350 |
ss[(int)MarginPos.FooterSize] = PageSetup.GetType().InvokeMember("FooterMargin"
|
|
| 1351 |
, BindingFlags.GetProperty |
|
| 1352 |
, null |
|
| 1353 |
, PageSetup |
|
| 1354 |
, null); |
|
| 1355 |
|
|
| 1356 |
ss[(int)MarginPos.TopSize] = PageSetup.GetType().InvokeMember("TopMargin"
|
|
| 1357 |
, BindingFlags.GetProperty |
|
| 1358 |
, null |
|
| 1359 |
, PageSetup |
|
| 1360 |
, null); |
|
| 1361 |
|
|
| 1362 |
ss[(int)MarginPos.BottomSize] = PageSetup.GetType().InvokeMember("BottomMargin"
|
|
| 1363 |
, BindingFlags.GetProperty |
|
| 1364 |
, null |
|
| 1365 |
, PageSetup |
|
| 1366 |
, null); |
|
| 1367 |
|
|
| 1368 |
ss[(int)MarginPos.LeftSize] = PageSetup.GetType().InvokeMember("LeftMargin"
|
|
| 1369 |
, BindingFlags.GetProperty |
|
| 1370 |
, null |
|
| 1371 |
, PageSetup |
|
| 1372 |
, null); |
|
| 1373 |
|
|
| 1374 |
ss[(int)MarginPos.RightSize] = PageSetup.GetType().InvokeMember("RightMargin"
|
|
| 1375 |
, BindingFlags.GetProperty |
|
| 1376 |
, null |
|
| 1377 |
, PageSetup |
|
| 1378 |
, null); |
|
| 1379 |
|
|
| 1380 |
|
|
| 1381 |
if (CommonMotions.cnvDouble(ss[(int)MarginPos.HeaderSize]) < SetMargin[(int)MarginPos.HeaderSize]) |
|
| 1382 |
PageSetup.GetType().InvokeMember("HeaderMargin"
|
|
| 1383 |
, BindingFlags.SetProperty |
|
| 1384 |
, null |
|
| 1385 |
, PageSetup |
|
| 1386 |
, new object[1] { SetMargin[(int)MarginPos.HeaderSize] });
|
|
| 1387 |
|
|
| 1388 |
if (CommonMotions.cnvDouble(ss[(int)MarginPos.FooterSize]) < SetMargin[(int)MarginPos.FooterSize]) |
|
| 1389 |
PageSetup.GetType().InvokeMember("FooterMargin"
|
|
| 1390 |
, BindingFlags.SetProperty |
|
| 1391 |
, null |
|
| 1392 |
, PageSetup |
|
| 1393 |
, new object[1] { SetMargin[(int)MarginPos.FooterSize] });
|
|
| 1394 |
|
|
| 1395 |
if (CommonMotions.cnvDouble(ss[(int)MarginPos.TopSize]) < SetMargin[(int)MarginPos.TopSize]) |
|
| 1396 |
PageSetup.GetType().InvokeMember("TopMargin"
|
|
| 1397 |
, BindingFlags.SetProperty |
|
| 1398 |
, null |
|
| 1399 |
, PageSetup |
|
| 1400 |
, new object[1] { SetMargin[(int)MarginPos.TopSize] });
|
|
| 1401 |
|
|
| 1402 |
if (CommonMotions.cnvDouble(ss[(int)MarginPos.BottomSize]) < SetMargin[(int)MarginPos.BottomSize]) |
|
| 1403 |
PageSetup.GetType().InvokeMember("BottomMargin"
|
|
| 1404 |
, BindingFlags.SetProperty |
|
| 1405 |
, null |
|
| 1406 |
, PageSetup |
|
| 1407 |
, new object[1] { SetMargin[(int)MarginPos.BottomSize] });
|
|
| 1408 |
|
|
| 1409 |
if (CommonMotions.cnvDouble(ss[(int)MarginPos.LeftSize]) < SetMargin[(int)MarginPos.LeftSize]) |
|
| 1410 |
PageSetup.GetType().InvokeMember("LeftMargin"
|
|
| 1411 |
, BindingFlags.SetProperty |
|
| 1412 |
, null |
|
| 1413 |
, PageSetup |
|
| 1414 |
, new object[1] { SetMargin[(int)MarginPos.LeftSize] });
|
|
| 1415 |
|
|
| 1416 |
if (CommonMotions.cnvDouble(ss[(int)MarginPos.RightSize]) < SetMargin[(int)MarginPos.RightSize]) |
|
| 1417 |
PageSetup.GetType().InvokeMember("RightMargin"
|
|
| 1418 |
, BindingFlags.SetProperty |
|
| 1419 |
, null |
|
| 1420 |
, PageSetup |
|
| 1421 |
, new object[1] { SetMargin[(int)MarginPos.RightSize] });
|
|
| 1422 |
} |
|
| 1423 |
catch (Exception ex) |
|
| 1424 |
{
|
|
| 1425 |
logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
|
|
| 1426 |
} |
|
| 1427 |
finally |
|
| 1428 |
{
|
|
| 1429 |
CommonMotions.ReleaseCom(ref PageSetup); |
|
| 1430 |
} |
|
| 1431 |
} |
|
| 1432 |
#endregion |
|
| 1280 | 1433 |
} |
| 1281 | 1434 |
} |
| branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeLedgerData.cs | ||
|---|---|---|
| 1042 | 1042 |
|
| 1043 | 1043 |
ExecList.Clear(); |
| 1044 | 1044 |
if (!ExecDB.ExecuteReader(strSQL.ToString(), ref ExecList, false)) continue; |
| 1045 |
if (ExcuteRec.ConstructionCode == 2017028801) { Debug.WriteLine(""); }
|
|
| 1045 |
|
|
| 1046 | 1046 |
bExists = false; |
| 1047 | 1047 |
object[] objRec = (object[])ExecList[0]; |
| 1048 | 1048 |
// 明細データが存在する場合 |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPersonAuxiliary.cs | ||
|---|---|---|
| 869 | 869 |
int NowPoint = ClsExcute.NextProcess(iNextProcessNo); |
| 870 | 870 |
|
| 871 | 871 |
// 手間・業者支払いは区分が一番最初 |
| 872 |
ClsExcute.ProcControlPara[NowPoint].ArrayParameter.Clear(); |
|
| 873 | 872 |
switch (m_ApprovalCode) |
| 874 | 873 |
{
|
| 875 | 874 |
case (int)ClsExcute.ApprovalListNo.FeePayment: // 11:手間支払 |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs | ||
|---|---|---|
| 117 | 117 |
/// <summary> |
| 118 | 118 |
/// ?????? |
| 119 | 119 |
/// </summary> |
| 120 |
EstimateType = 0,
|
|
| 120 |
EstimateType = GetData.TYINGFLG + 1,
|
|
| 121 | 121 |
/// <summary> |
| 122 | 122 |
/// ?????? |
| 123 | 123 |
/// </summary> |
| ... | ... | |
| 128 | 128 |
EstimatesSubmittedDate, |
| 129 | 129 |
} |
| 130 | 130 |
#endregion |
| 131 |
|
|
| 131 | 132 |
#endregion |
| 132 | 133 |
|
| 133 | 134 |
#region ??? |
| ... | ... | |
| 752 | 753 |
|
| 753 | 754 |
strSQL.Append(" AND A.ConstructionPersonCode != 0");
|
| 754 | 755 |
|
| 755 |
strSQL.AppendFormat(" AND (ConstrType.PublicFlg != {0}", (int)ConstructionTypeMaster.ConstructionTypeDef.Community);
|
|
| 756 |
strSQL.AppendFormat(" AND ((ConstrType.PublicFlg != {0}", (int)ConstructionTypeMaster.ConstructionTypeDef.Community);
|
|
| 756 | 757 |
strSQL.Append(" And (A.ConstructionCode IN (SELECT AA1.CONSTRUCTIONCODE FROM CONSTRUCTIONBUDGETDETAIL AA1");
|
| 757 | 758 |
strSQL.Append(" WHERE AA1.COMPANYCODE != 0 AND AA1.COMPANYCODE != -1");
|
| 758 | 759 |
strSQL.Append(" GROUP BY AA1.CONSTRUCTIONCODE, AA1.COMPANYCODE");
|
| 759 |
strSQL.AppendFormat(" HAVING SUM(AA1.EXECUTIONAMOUNT) >= {0}))", CommonDefine.s_PrintOutPrice);
|
|
| 760 |
strSQL.AppendFormat(" HAVING SUM(AA1.EXECUTIONAMOUNT) >= {0})))", CommonDefine.s_PrintOutPrice);
|
|
| 760 | 761 |
|
| 761 | 762 |
strSQL.AppendFormat(" OR (ConstrType.PublicFlg = {0}", (int)ConstructionTypeMaster.ConstructionTypeDef.Community);
|
| 762 |
strSQL.Append(" And A.ConstructionCode IN (SELECT AA1.CONSTRUCTIONCODE FROM CONSTRUCTIONBUDGETDETAIL AA1");
|
|
| 763 |
strSQL.Append(" And (A.ConstructionCode IN (SELECT AA1.CONSTRUCTIONCODE FROM CONSTRUCTIONBUDGETDETAIL AA1");
|
|
| 763 | 764 |
strSQL.Append(" WHERE AA1.COMPANYCODE != 0 AND AA1.COMPANYCODE != -1");
|
| 764 | 765 |
strSQL.Append(" GROUP BY AA1.CONSTRUCTIONCODE, AA1.COMPANYCODE");
|
| 765 |
strSQL.AppendFormat(" HAVING SUM(AA1.EXECUTIONAMOUNT) >= {0})))", CommonDefine.s_PrintOutPricePublic);
|
|
| 766 |
strSQL.AppendFormat(" HAVING SUM(AA1.EXECUTIONAMOUNT) >= {0}))))", CommonDefine.s_PrintOutPricePublic);
|
|
| 766 | 767 |
|
| 767 | 768 |
// Left Join??????????????? |
| 768 | 769 |
strSQL.Append(" And (");
|
| ... | ... | |
| 770 | 771 |
strSQL.AppendFormat(s_SQLPart3_2[2], (int)ClsExcute.ApprovalListNo.ConstructionBudgetApproval); |
| 771 | 772 |
strSQL.AppendFormat(s_SQLPart3_2[3], CommonDefine.s_Default_OrderNo); |
| 772 | 773 |
strSQL.Append(s_SQLPart3_2[4]); |
| 773 |
strSQL.AppendFormat(" And App.ApprovalStatus = {0}", (int)CommonDefine.ApprovalStatus.Approval);
|
|
| 774 |
strSQL.Append(") ");
|
|
| 774 |
strSQL.AppendFormat(" And App.ApprovalStatus = {0})", (int)CommonDefine.ApprovalStatus.Approval);
|
|
| 775 | 775 |
|
| 776 | 776 |
// ???????I??????????? |
| 777 | 777 |
strSQL.Append(GetDepartmentString()); |
| ... | ... | |
| 852 | 852 |
StringBuilder wrkFormat = new StringBuilder(); |
| 853 | 853 |
for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]); |
| 854 | 854 |
wrkFormat.Append(s_SQLPart1_2[0]); |
| 855 |
wrkFormat.Append(", DATE_FORMAT(A2.PRINTOUTDATE, '%Y/%m/%d')"); // ???t?B?[???h???????????
|
|
| 855 |
|
|
| 856 | 856 |
for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]); |
| 857 | 857 |
|
| 858 | 858 |
for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]); |
| 859 | 859 |
for (int i = 0; i < s_SQLPart3_1.Length; i++) wrkFormat.Append(s_SQLPart3_1[i]); |
| 860 |
wrkFormat.Append(", PROCESSAPPROVAL App, PURCHASEORDER A2");
|
|
| 860 |
wrkFormat.Append(", PROCESSAPPROVAL App");
|
|
| 861 |
wrkFormat.Append(", (Select CONSTRUCTIONCODE From PURCHASEORDER Group by CONSTRUCTIONCODE) As A2");
|
|
| 861 | 862 |
for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5[i]); |
| 862 | 863 |
|
| 863 | 864 |
strSQL.AppendFormat(wrkFormat.ToString(), numUDConstPro.Value); |
| ... | ... | |
| 867 | 868 |
strSQL.Append(" And (");
|
| 868 | 869 |
strSQL.Append(s_SQLPart3_2[1]); |
| 869 | 870 |
strSQL.AppendFormat(s_SQLPart3_2[2], (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval); |
| 870 |
//strSQL.AppendFormat(s_SQLPart3_2[3], CommonDefine.s_Default_OrderNo); |
|
| 871 | 871 |
strSQL.Append(s_SQLPart3_2[4]); |
| 872 | 872 |
strSQL.AppendFormat(" And App.ApprovalStatus = {0}", (int)CommonDefine.ApprovalStatus.Approval);
|
| 873 | 873 |
strSQL.Append(") ");
|
| 874 | 874 |
|
| 875 |
strSQL.Append(" AND (A.CONSTRUCTIONCODE = A2.CONSTRUCTIONCODE AND A2.SEQNO = 1)");
|
|
| 875 |
strSQL.Append(" AND (A.CONSTRUCTIONCODE = A2.CONSTRUCTIONCODE)");
|
|
| 876 | 876 |
|
| 877 | 877 |
// ???????I??????????? |
| 878 | 878 |
strSQL.Append(GetDepartmentString()); |
| ... | ... | |
| 1108 | 1108 |
/// </summary> |
| 1109 | 1109 |
/// <param name="AllCount"></param> |
| 1110 | 1110 |
/// <param name="PrintCount"></param> |
| 1111 |
private bool GetPrintCount(IOPurchaseOrder OrderDB, int ParentCode, int SourceCode) |
|
| 1111 |
private bool GetPrintCount(IOPurchaseOrder OrderDB, int ParentCode, int SourceCode, int OrderNo)
|
|
| 1112 | 1112 |
{
|
| 1113 | 1113 |
try |
| 1114 | 1114 |
{
|
| ... | ... | |
| 1116 | 1116 |
|
| 1117 | 1117 |
|
| 1118 | 1118 |
strSQL.Append("SELECT");
|
| 1119 |
strSQL.Append(" CompanyCode");
|
|
| 1120 |
strSQL.Append(", CreateDate");
|
|
| 1121 |
strSQL.Append(", PrintoutDate");
|
|
| 1122 |
strSQL.Append(" From purchaseorder");
|
|
| 1119 |
strSQL.Append(" A.CompanyCode");
|
|
| 1120 |
strSQL.Append(", A.CreateDate");
|
|
| 1121 |
strSQL.Append(", A.PrintoutDate");
|
|
| 1122 |
strSQL.Append(" From purchaseorder As A");
|
|
| 1123 |
strSQL.Append(" Left Join processapprovaldetail As B");
|
|
| 1124 |
strSQL.Append(" On B.ConstructionCode = A.ConstructionCode");
|
|
| 1125 |
strSQL.AppendFormat(" And B.ApprovalCode = {0}", (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval);
|
|
| 1126 |
strSQL.Append(" And B.LinkCode = A.SeqNo");
|
|
| 1123 | 1127 |
strSQL.Append(" Where");
|
| 1124 |
strSQL.AppendFormat(" ConstructionCode = {0}", SourceCode);
|
|
| 1128 |
strSQL.AppendFormat(" A.ConstructionCode = {0}", SourceCode);
|
|
| 1129 |
strSQL.AppendFormat(" And B.OrderNo = {0}", OrderNo);
|
|
| 1125 | 1130 |
|
| 1126 | 1131 |
ArrayList arList = new ArrayList(); |
| 1127 | 1132 |
if (!OrderDB.ExecuteReader(strSQL.ToString(), ref arList)) return false; |
| ... | ... | |
| 1273 | 1278 |
int nCode1 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("??????")).Key;
|
| 1274 | 1279 |
int nCode2 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("?????o")).Key;
|
| 1275 | 1280 |
|
| 1276 |
// ?f?[?^???x?[?X?J?E???g |
|
| 1277 |
int AddGetDataCnt = Enum.GetNames(typeof(GetData)).Length; |
|
| 1278 | 1281 |
// ?????? |
| 1279 |
int EstimanteType = EstimanteType = CommonMotions.cnvInt(objCurRec[AddGetDataCnt + (int)GetDataAddSQL01.EstimateType]);
|
|
| 1282 |
int EstimanteType = EstimanteType = CommonMotions.cnvInt(objCurRec[(int)GetDataAddSQL01.EstimateType]); |
|
| 1280 | 1283 |
|
| 1281 | 1284 |
DateTime TargetDate = DateTime.Now; |
| 1282 | 1285 |
Color clrBackColor = Color.White; |
| ... | ... | |
| 1284 | 1287 |
if (Status == nCode1) |
| 1285 | 1288 |
{
|
| 1286 | 1289 |
// ----- ?????? |
| 1287 |
TargetDate = CommonMotions.cnvDate(objCurRec[AddGetDataCnt + (int)GetDataAddSQL01.RequestedDate]);
|
|
| 1290 |
TargetDate = CommonMotions.cnvDate(objCurRec[(int)GetDataAddSQL01.RequestedDate]); |
|
| 1288 | 1291 |
} |
| 1289 | 1292 |
else if (Status == nCode2) |
| 1290 | 1293 |
{
|
| 1291 | 1294 |
// ----- ?????o |
| 1292 |
TargetDate = CommonMotions.cnvDate(objCurRec[AddGetDataCnt + (int)GetDataAddSQL01.EstimatesSubmittedDate]);
|
|
| 1295 |
TargetDate = CommonMotions.cnvDate(objCurRec[(int)GetDataAddSQL01.EstimatesSubmittedDate]); |
|
| 1293 | 1296 |
} |
| 1294 | 1297 |
else |
| 1295 | 1298 |
{
|
| ... | ... | |
| 1374 | 1377 |
} |
| 1375 | 1378 |
break; |
| 1376 | 1379 |
case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint: // ????????? |
| 1377 |
if (GetPrintCount(OrderDB, ParentCode, nConstrCode)) |
|
| 1380 |
if (GetPrintCount(OrderDB, ParentCode, nConstrCode, nOrderNo))
|
|
| 1378 | 1381 |
{
|
| 1379 | 1382 |
FlgString = "?????"; |
| 1380 | 1383 |
} |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs | ||
|---|---|---|
| 1986 | 1986 |
ArrayList ArList = new ArrayList(); |
| 1987 | 1987 |
if (!BaseDB.ExecuteReader(strSQL, ref ArList)) return; |
| 1988 | 1988 |
|
| 1989 |
dgv.Columns[1].HeaderCell.Style.Font = new Font("?l?r ????", 9.75F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(128)));
|
|
| 1989 | 1990 |
string strDate = string.Empty; |
| 1990 | 1991 |
foreach (object[] OneRec in ArList) |
| 1991 | 1992 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryListAuxiliary.cs | ||
|---|---|---|
| 185 | 185 |
strSQL.Append(" , A.SECONDSTRING");
|
| 186 | 186 |
strSQL.Append(" , A.COMPANYCODE AS COMPANYCODE");
|
| 187 | 187 |
strSQL.Append(" , A.COMPANYNAME");
|
| 188 |
strSQL.Append(" , A.EXECUTIONAMOUNT");
|
|
| 188 |
strSQL.Append(" , SUM(A.EXECUTIONAMOUNT)");
|
|
| 189 | 189 |
strSQL.Append(" , A.SOURCECODE");
|
| 190 | 190 |
strSQL.Append(" , A.PURCHASEORDERFLG");
|
| 191 | 191 |
strSQL.Append(" , B.DETAILSTRING");
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/PrintCommon.cs | ||
|---|---|---|
| 61 | 61 |
}; |
| 62 | 62 |
#endregion |
| 63 | 63 |
|
| 64 |
#region シート名称 |
|
| 64 |
#region シート名称カウント
|
|
| 65 | 65 |
/// <summary> |
| 66 | 66 |
/// シート名称カウント |
| 67 | 67 |
/// </summary> |
| 68 |
enum enumSheetName |
|
| 68 |
private enum enumSheetName
|
|
| 69 | 69 |
{
|
| 70 | 70 |
/// <summary> |
| 71 | 71 |
/// 簡易版注文書・請書 |
| ... | ... | |
| 96 | 96 |
private string s_WordDocumentName = "正規版：注文書"; |
| 97 | 97 |
#endregion |
| 98 | 98 |
|
| 99 |
#region 図形置き場シート |
|
| 99 | 100 |
/// <summary> |
| 100 | 101 |
/// 図形置き場シート |
| 101 | 102 |
/// </summary> |
| 102 | 103 |
private const string s_shapeSheetName = "図形シート"; |
| 104 |
#endregion |
|
| 105 |
|
|
| 106 |
#region 図形名称 |
|
| 103 | 107 |
/// <summary> |
| 104 | 108 |
/// 図形名称 |
| 105 | 109 |
/// </summary> |
| 106 | 110 |
private const string s_shapeName = "SealStamp1"; // 判子オブジェクト名 |
| 111 |
#endregion |
|
| 112 |
|
|
| 113 |
#region 図形サイズ【縦・横】（図形名称順） |
|
| 107 | 114 |
/// <summary> |
| 108 | 115 |
/// 図形サイズ【縦・横】（図形名称順） |
| 109 | 116 |
/// </summary> |
| 110 | 117 |
private static float[,] s_ShapeSize = new float[1, 2] { { 32.00f, 32.00f } }; // 判子サイズ
|
| 118 |
#endregion |
|
| 119 |
|
|
| 120 |
#region 判子フォントサイズ |
|
| 111 | 121 |
/// <summary> |
| 112 | 122 |
/// 判子フォントサイズ |
| 113 | 123 |
/// </summary> |
| 114 | 124 |
private static float[] s_EstimateSeal1FontSize = { 16f, 10f, 10f, 8f, 6f };
|
| 125 |
#endregion |
|
| 126 |
|
|
| 127 |
#region 判子位置(Key:X Value:Y)左から |
|
| 115 | 128 |
/// <summary> |
| 116 | 129 |
/// 判子位置(Key:X Value:Y)左から |
| 117 | 130 |
/// </summary> |
| ... | ... | |
| 120 | 133 |
{490.50f, 202.75f}, // 承認者3
|
| 121 | 134 |
{560.50f, 202.75f} }; // 承認者4
|
| 122 | 135 |
#endregion |
| 136 |
#endregion |
|
| 123 | 137 |
|
| 124 | 138 |
#region 変数 |
| 125 | 139 |
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/PrintFormat1.cs | ||
|---|---|---|
| 267 | 267 |
|
| 268 | 268 |
// 注文書データ取得 |
| 269 | 269 |
strSQL.Clear(); |
| 270 |
strSQL.AppendFormat("{0} ORDER BY SEQNO", OrderDB.CreatePrimarykeyString(m_ConstructionCode));
|
|
| 270 |
strSQL.AppendFormat(" {0} ORDER BY SEQNO", OrderDB.CreatePrimarykeyString(m_ConstructionCode));
|
|
| 271 | 271 |
List<PurchaseOrder> OrderList = new List<PurchaseOrder>(); |
| 272 | 272 |
if (!OrderDB.SelectAction(strSQL.ToString(), ref OrderList)) return CommonDefine.RetunAnswer.Answer3; |
| 273 | 273 |
if (OrderList.Count == 0) return CommonDefine.RetunAnswer.Answer3; |
| ... | ... | |
| 286 | 286 |
|
| 287 | 287 |
// 注文書シートの取得 |
| 288 | 288 |
m_UsedExcel.ExcelSheetGet(SheetName[(int)enumSheetName.OrderSheet], true, ContractorRec.CompanyName); |
| 289 |
// 約款ページ縦・横セット |
|
| 290 |
m_UsedExcel.ExcelFitCountSet(4, 1); |
|
| 291 |
// 余白セット |
|
| 292 |
double[] setMargin = new double[Enum.GetNames(typeof(UsedExcel.MarginPos)).Length]; |
|
| 293 |
setMargin[(int)UsedExcel.MarginPos.HeaderSize] = 0.0; |
|
| 294 |
setMargin[(int)UsedExcel.MarginPos.FooterSize] = 0.0; |
|
| 295 |
setMargin[(int)UsedExcel.MarginPos.TopSize] = 28.0; |
|
| 296 |
setMargin[(int)UsedExcel.MarginPos.BottomSize] = 28.0; |
|
| 297 |
setMargin[(int)UsedExcel.MarginPos.LeftSize] = 17.0; |
|
| 298 |
setMargin[(int)UsedExcel.MarginPos.HeaderSize] = 17.0; |
|
| 289 | 299 |
|
| 300 |
m_UsedExcel.ExcelMarginSet(setMargin); |
|
| 301 |
|
|
| 290 | 302 |
// ----- ページ編集 |
| 291 | 303 |
// ブロック１編集 |
| 292 | 304 |
CommonDefine.RetunAnswer RARet = SetBlock1Data(OrderRec); |
| ... | ... | |
| 349 | 361 |
} |
| 350 | 362 |
|
| 351 | 363 |
// ブロック２編集 |
| 352 |
RARet = SetBlock2Data(OrderRec, workRec.DetailString, 153);
|
|
| 364 |
RARet = SetBlock2Data(OrderRec, workRec.DetailString, 159);
|
|
| 353 | 365 |
if (RARet != CommonDefine.RetunAnswer.Answer0) return RARet; |
| 354 | 366 |
|
| 355 | 367 |
// 中断処理 |
| ... | ... | |
| 361 | 373 |
} |
| 362 | 374 |
|
| 363 | 375 |
// ブロック３編集 |
| 364 |
RARet = SetBlock3Data(OrderRec, 153);
|
|
| 376 |
RARet = SetBlock3Data(OrderRec, 159);
|
|
| 365 | 377 |
if (RARet != CommonDefine.RetunAnswer.Answer0) return RARet; |
| 366 | 378 |
|
| 367 | 379 |
// 中断処理 |
| ... | ... | |
| 373 | 385 |
} |
| 374 | 386 |
|
| 375 | 387 |
// ブロック４編集 |
| 376 |
RARet = SetBlock4Data(OrderRec, 153);
|
|
| 388 |
RARet = SetBlock4Data(OrderRec, 159);
|
|
| 377 | 389 |
if (RARet != CommonDefine.RetunAnswer.Answer0) return RARet; |
| 378 | 390 |
|
| 379 | 391 |
// 中断処理 |
| ... | ... | |
| 679 | 691 |
IOMSubContractor ContractorDB = new IOMSubContractor(); |
| 680 | 692 |
try |
| 681 | 693 |
{
|
| 682 |
m_UsedExcel.ExcelCellSet("B164", "〒" + CommonMotions.SystemMasterData.ZipCode); // 自社 郵便番号
|
|
| 683 |
m_UsedExcel.ExcelCellSet("B165", CommonMotions.SystemMasterData.Address1 +
|
|
| 694 |
m_UsedExcel.ExcelCellSet("B166", "〒" + CommonMotions.SystemMasterData.ZipCode); // 自社 郵便番号
|
|
| 695 |
m_UsedExcel.ExcelCellSet("B167", CommonMotions.SystemMasterData.Address1 +
|
|
| 684 | 696 |
CommonMotions.SystemMasterData.Address2 + |
| 685 | 697 |
CommonMotions.SystemMasterData.Address3); // 自社 住所 |
| 686 |
m_UsedExcel.ExcelCellSet("C168", CommonMotions.SystemMasterData.CompanyName1 +
|
|
| 698 |
m_UsedExcel.ExcelCellSet("C170", CommonMotions.SystemMasterData.CompanyName1 +
|
|
| 687 | 699 |
CommonMotions.SystemMasterData.CompanyName2); // 自社 会社名 |
| 688 | 700 |
|
| 689 | 701 |
// 協力会社名取得 |
| ... | ... | |
| 714 | 726 |
break; |
| 715 | 727 |
} |
| 716 | 728 |
|
| 717 |
m_UsedExcel.ExcelCellSet("M166", "〒" + ContractorRec.ZipCode); // 発注先 郵便番号
|
|
| 729 |
m_UsedExcel.ExcelCellSet("L166", "〒" + ContractorRec.ZipCode); // 発注先 郵便番号
|
|
| 718 | 730 |
m_UsedExcel.ExcelCellSet("M167", strA2); // 発注先 住所1
|
| 719 |
m_UsedExcel.ExcelCellSet("M168", strA3); // 発注先 住所2
|
|
| 720 |
m_UsedExcel.ExcelCellSet("M169", strA4); // 発注先 会社
|
|
| 731 |
m_UsedExcel.ExcelCellSet("L168", strA3); // 発注先 住所2
|
|
| 732 |
m_UsedExcel.ExcelCellSet("M170", strA4); // 発注先 会社
|
|
| 721 | 733 |
|
| 722 | 734 |
return CommonDefine.RetunAnswer.Answer0; |
| 723 | 735 |
} |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs | ||
|---|---|---|
| 4344 | 4344 |
|
| 4345 | 4345 |
sql.Append(" Select ");
|
| 4346 | 4346 |
sql.Append(" ifnull(Bd.SeqNo, 1) as SeqNo ");
|
| 4347 |
sql.Append(" , ifnull(Bdd.LineCount, 0) as LineCount ");
|
|
| 4347 |
sql.Append(" , ifnull(Bdd.CONSTRUCTIONROWCNT, 0) as LineCount ");
|
|
| 4348 | 4348 |
sql.Append(" , ifnull(Bdd.CompanyCode, 0) as CompanyCode ");
|
| 4349 | 4349 |
sql.Append(" , ifnull(Scm.CompanyName, \'\') as CompanyName ");
|
| 4350 | 4350 |
sql.Append(" , ifnull(Scm.DisplayOrder, 99999999) as DisplayOrder ");
|
| ... | ... | |
| 4464 | 4464 |
sql.Append(" Left join constructionledgerDetail as Cld");
|
| 4465 | 4465 |
sql.Append(" ON Cld.ConstructionCode = Bdd.CONSTRUCTIONCODE");
|
| 4466 | 4466 |
sql.AppendFormat(" And Cld.GroupCount = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
|
| 4467 |
sql.Append(" And Cld.LineCount = Bdd.CONSTRUCTIONROWCNT");
|
|
| 4467 |
sql.Append(" And Cld.DetailCount = Bdd.CONSTRUCTIONROWCNT");
|
|
| 4468 | 4468 |
|
| 4469 | 4469 |
sql.Append(" left join approvalmaster As AppM ");
|
| 4470 | 4470 |
sql.AppendFormat(" on AppM.ApprovalCode = {0} ", Appcode);
|
| ... | ... | |
| 5356 | 5356 |
return false; |
| 5357 | 5357 |
} |
| 5358 | 5358 |
|
| 5359 |
IoBd.commit(); |
|
| 5360 |
IoBdD.commit(); |
|
| 5361 |
IoPdD.commit(); |
|
| 5362 |
IoPaI.commit(); |
|
| 5363 |
IoBps.commit(); |
|
| 5364 |
IoDetail.commit(); |
|
| 5365 |
IoExec.commit(); |
|
| 5366 |
|
|
| 5367 | 5359 |
m_bChengeAns = false; |
| 5368 | 5360 |
|
| 5369 | 5361 |
return true; |
| ... | ... | |
| 5376 | 5368 |
} |
| 5377 | 5369 |
finally |
| 5378 | 5370 |
{
|
| 5371 |
IoBd.commit(); |
|
| 5372 |
IoBdD.commit(); |
|
| 5373 |
IoPdD.commit(); |
|
| 5374 |
IoPaI.commit(); |
|
| 5375 |
IoBps.commit(); |
|
| 5376 |
IoDetail.commit(); |
|
| 5377 |
IoExec.commit(); |
|
| 5378 |
|
|
| 5379 | 5379 |
IoBd.close(); IoBd = null; |
| 5380 | 5380 |
IoBdD.close(); IoBdD = null; |
| 5381 | 5381 |
IoPdD.close(); IoPdD = null; |
| branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
|---|---|---|
| 32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
| 33 | 33 |
// 既定値にすることができます: |
| 34 | 34 |
// [assembly: AssemblyVersion("1.0.*")]
|
| 35 |
[assembly: AssemblyVersion("1.0.1.18")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.1.18")]
|
|
| 35 |
[assembly: AssemblyVersion("1.0.1.19")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.1.19")]
|
|
| 37 | 37 |
// Log4netを使用する |
| 38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff