リビジョン 223
工事台帳まとめ・部署別台帳まとめバグ修正
| branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
|---|---|---|
| 14 | 14 |
/// <summary> |
| 15 | 15 |
/// 本体バージョン |
| 16 | 16 |
/// </summary> |
| 17 |
public static int s_SystemVersion = 48;
|
|
| 17 |
public static int s_SystemVersion = 49;
|
|
| 18 | 18 |
|
| 19 | 19 |
/// <summary> |
| 20 | 20 |
/// コピー・環境バージョン |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs | ||
|---|---|---|
| 900 | 900 |
strSQL.AppendFormat(" AND (DATE(P.STARTDATE) <= STR_TO_DATE('{0}','%Y/%m/%d')", dtDefaultEnd.ToShortDateString());
|
| 901 | 901 |
strSQL.AppendFormat(" AND (STR_TO_DATE('{0}','%Y/%m/%d') <= DATE(P.ENDDATE)", dtDefaultStart.ToShortDateString());
|
| 902 | 902 |
strSQL.AppendFormat(" OR STR_TO_DATE('{0}','%Y/%m/%d') = DATE(P.ENDDATE)))", DateTime.MinValue.ToShortDateString());
|
| 903 |
if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode) |
|
| 904 |
{
|
|
| 905 |
strSQL.Append(" AND P.DEPARTMENTCODE IN (select PDep.DepartmentCode from PersonDepartmentMaster AS PDep");
|
|
| 906 |
strSQL.AppendFormat(" WHERE PDep.PersonCode = {0})", CommonMotions.LoginUserData.PersonCode);
|
|
| 907 |
} |
|
| 903 | 908 |
|
| 904 | 909 |
// ?H?????f?[?^?????????????? |
| 905 | 910 |
if (DepartmentCode == 0) |
| ... | ... | |
| 1059 | 1064 |
|
| 1060 | 1065 |
strSQL.Append(" AND P.COMPANYCODE IN (SELECT A1.PERSONCODE FROM PERSONINCHARGEMASTER A1 WHERE A1.DELETEFLG = 0");
|
| 1061 | 1066 |
|
| 1067 |
if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode) |
|
| 1068 |
{
|
|
| 1069 |
strSQL.Append(" AND A1.DEPARTMENTCODE IN (select PDep.DepartmentCode from PersonDepartmentMaster AS PDep");
|
|
| 1070 |
strSQL.AppendFormat(" WHERE PDep.PersonCode = {0})", CommonMotions.LoginUserData.PersonCode);
|
|
| 1071 |
} |
|
| 1072 |
|
|
| 1062 | 1073 |
if (DepartmentCode != 0) strSQL.AppendFormat(" AND A1.DEPARTMENTCODE = {0}", DepartmentCode);
|
| 1063 | 1074 |
if (PersonCode != 0) strSQL.AppendFormat(" AND A1.PERSONCODE = {0}", PersonCode);
|
| 1064 | 1075 |
|
| ... | ... | |
| 1077 | 1088 |
|
| 1078 | 1089 |
strSQL.Append(" AND P.COMPANYCODE IN (SELECT A1.PERSONCODE FROM PERSONINCHARGEMASTER A1 WHERE A1.DELETEFLG = 0");
|
| 1079 | 1090 |
|
| 1091 |
if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode) |
|
| 1092 |
{
|
|
| 1093 |
strSQL.Append(" AND A1.DEPARTMENTCODE IN (select PDep.DepartmentCode from PersonDepartmentMaster AS PDep");
|
|
| 1094 |
strSQL.AppendFormat(" WHERE PDep.PersonCode = {0})", CommonMotions.LoginUserData.PersonCode);
|
|
| 1095 |
} |
|
| 1096 |
|
|
| 1080 | 1097 |
if (DepartmentCode != 0) strSQL.AppendFormat(" AND A1.DEPARTMENTCODE = {0}", DepartmentCode);
|
| 1081 | 1098 |
if (PersonCode != 0) strSQL.AppendFormat(" AND A1.PERSONCODE = {0}", PersonCode);
|
| 1082 | 1099 |
|
| ... | ... | |
| 1146 | 1163 |
strSQL.Append(" AND C.CONSTRUCTIONCODE = P.CONSTRUCTIONCODE");
|
| 1147 | 1164 |
strSQL.AppendFormat(" AND C.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.Payroll);
|
| 1148 | 1165 |
strSQL.Append(" AND D.PERSONCODE = B.CONSTRUCTIONPERSONCODE");
|
| 1166 |
|
|
| 1167 |
if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode) |
|
| 1168 |
{
|
|
| 1169 |
strSQL.Append(" AND D.DEPARTMENTCODE IN (select PDep.DepartmentCode from PersonDepartmentMaster AS PDep");
|
|
| 1170 |
strSQL.AppendFormat(" WHERE PDep.PersonCode = {0})", CommonMotions.LoginUserData.PersonCode);
|
|
| 1171 |
} |
|
| 1172 |
|
|
| 1149 | 1173 |
if (DepartmentCode != 0) strSQL.AppendFormat(" AND D.DEPARTMENTCODE = {0}", DepartmentCode);
|
| 1150 | 1174 |
if (PersonCode != 0) strSQL.AppendFormat(" AND D.PERSONCODE = {0}", PersonCode);
|
| 1151 | 1175 |
|
| ... | ... | |
| 1155 | 1179 |
OnSalary = CommonMotions.cnvInt(objSalary[0]); |
| 1156 | 1180 |
|
| 1157 | 1181 |
// ?U???????????v?? |
| 1158 |
strSQL = new StringBuilder();
|
|
| 1182 |
strSQL.Clear();
|
|
| 1159 | 1183 |
strSQL.Append("SELECT SUM(P.NETPROFIT) FROM CONSTRUCTIONLEDGER P, CONSTRUCTIONBASEINFO B, PERSONINCHARGEMASTER D");
|
| 1160 | 1184 |
// ?U???????????v |
| 1161 | 1185 |
strSQL.Append(" WHERE P.CONSTRUCTIONCODE IN (SELECT A.CONSTRUCTIONCODE FROM CONSTRUCTIONLEDGERDETAIL A");
|
| ... | ... | |
| 1168 | 1192 |
strSQL.AppendFormat(" AND B.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
|
| 1169 | 1193 |
strSQL.AppendFormat(" AND B.CONSTRUCTIONSTATUSFLG != {0}", NotOrder);
|
| 1170 | 1194 |
strSQL.Append(" AND D.PERSONCODE = B.CONSTRUCTIONPERSONCODE");
|
| 1195 |
|
|
| 1196 |
if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode) |
|
| 1197 |
{
|
|
| 1198 |
strSQL.Append(" AND D.DEPARTMENTCODE IN (select PDep.DepartmentCode from PersonDepartmentMaster AS PDep");
|
|
| 1199 |
strSQL.AppendFormat(" WHERE PDep.PersonCode = {0})", CommonMotions.LoginUserData.PersonCode);
|
|
| 1200 |
} |
|
| 1201 |
|
|
| 1171 | 1202 |
if (DepartmentCode != 0) strSQL.AppendFormat(" AND D.DEPARTMENTCODE = {0}", DepartmentCode);
|
| 1172 | 1203 |
if (PersonCode != 0) strSQL.AppendFormat(" AND D.PERSONCODE = {0}", PersonCode);
|
| 1173 | 1204 |
|
| ... | ... | |
| 1177 | 1208 |
NetIncome = CommonMotions.cnvInt(objNetIncome[0]); |
| 1178 | 1209 |
|
| 1179 | 1210 |
// ?U?????????????v?? |
| 1180 |
strSQL = new StringBuilder();
|
|
| 1211 |
strSQL.Clear();
|
|
| 1181 | 1212 |
strSQL.Append("SELECT SUM(P.NETPROFIT) FROM CONSTRUCTIONLEDGER P, CONSTRUCTIONBASEINFO B, PERSONINCHARGEMASTER D");
|
| 1182 | 1213 |
// ?U???????????v |
| 1183 | 1214 |
strSQL.Append(" WHERE P.CONSTRUCTIONCODE NOT IN (SELECT A.CONSTRUCTIONCODE FROM CONSTRUCTIONLEDGERDETAIL A");
|
| ... | ... | |
| 1190 | 1221 |
strSQL.AppendFormat(" AND B.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
|
| 1191 | 1222 |
strSQL.AppendFormat(" AND B.CONSTRUCTIONSTATUSFLG != {0}", NotOrder);
|
| 1192 | 1223 |
strSQL.Append(" AND D.PERSONCODE = B.CONSTRUCTIONPERSONCODE");
|
| 1224 |
|
|
| 1225 |
if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode) |
|
| 1226 |
{
|
|
| 1227 |
strSQL.Append(" AND D.DEPARTMENTCODE IN (select PDep.DepartmentCode from PersonDepartmentMaster AS PDep");
|
|
| 1228 |
strSQL.AppendFormat(" WHERE PDep.PersonCode = {0})", CommonMotions.LoginUserData.PersonCode);
|
|
| 1229 |
} |
|
| 1230 |
|
|
| 1193 | 1231 |
if (DepartmentCode != 0) strSQL.AppendFormat(" AND D.DEPARTMENTCODE = {0}", DepartmentCode);
|
| 1194 | 1232 |
if (PersonCode != 0) strSQL.AppendFormat(" AND D.PERSONCODE = {0}", PersonCode);
|
| 1195 | 1233 |
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs | ||
|---|---|---|
| 947 | 947 |
strSQL.AppendFormat(" AND (STR_TO_DATE('{0}','%Y/%m/%d') <= DATE(P.ENDDATE)", dtDefaultStart.ToShortDateString());
|
| 948 | 948 |
strSQL.AppendFormat(" OR STR_TO_DATE('{0}','%Y/%m/%d') = DATE(P.ENDDATE)))", DateTime.MinValue.ToShortDateString());
|
| 949 | 949 |
|
| 950 |
if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode) |
|
| 951 |
{
|
|
| 952 |
strSQL.Append(" AND P.DEPARTMENTCODE IN (select PDep.DepartmentCode from PersonDepartmentMaster AS PDep");
|
|
| 953 |
strSQL.AppendFormat(" WHERE PDep.PersonCode = {0})", CommonMotions.LoginUserData.PersonCode);
|
|
| 954 |
} |
|
| 955 |
|
|
| 950 | 956 |
// ?H?????f?[?^?????????????? |
| 951 | 957 |
if (DepartmentCode == 0) |
| 952 | 958 |
{
|
| ... | ... | |
| 1104 | 1110 |
strSQL.AppendFormat(" WHERE P.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.Instructor);
|
| 1105 | 1111 |
|
| 1106 | 1112 |
strSQL.Append(" AND P.COMPANYCODE IN (SELECT P1.PERSONCODE FROM PERSONINCHARGEMASTER P1 WHERE P1.DELETEFLG = 0");
|
| 1113 |
|
|
| 1114 |
if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode) |
|
| 1115 |
{
|
|
| 1116 |
strSQL.Append(" AND P1.DEPARTMENTCODE IN (select PDep.DepartmentCode from PersonDepartmentMaster AS PDep");
|
|
| 1117 |
strSQL.AppendFormat(" WHERE PDep.PersonCode = {0})", CommonMotions.LoginUserData.PersonCode);
|
|
| 1118 |
} |
|
| 1119 |
|
|
| 1107 | 1120 |
if (DepartmentCode != 0) strSQL.AppendFormat(" AND P1.DEPARTMENTCODE = {0}", DepartmentCode);
|
| 1108 | 1121 |
if (PersonCode != 0) strSQL.AppendFormat(" AND P1.PERSONCODE = {0}", PersonCode);
|
| 1109 | 1122 |
|
| ... | ... | |
| 1122 | 1135 |
strSQL.AppendFormat(" WHERE P.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.Assistant);
|
| 1123 | 1136 |
|
| 1124 | 1137 |
strSQL.Append(" AND P.COMPANYCODE IN (SELECT P1.PERSONCODE FROM PERSONINCHARGEMASTER P1 WHERE P1.DELETEFLG = 0");
|
| 1138 |
|
|
| 1139 |
if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode) |
|
| 1140 |
{
|
|
| 1141 |
strSQL.Append(" AND P1.DEPARTMENTCODE IN (select PDep.DepartmentCode from PersonDepartmentMaster AS PDep");
|
|
| 1142 |
strSQL.AppendFormat(" WHERE PDep.PersonCode = {0})", CommonMotions.LoginUserData.PersonCode);
|
|
| 1143 |
} |
|
| 1144 |
|
|
| 1125 | 1145 |
if (DepartmentCode != 0) strSQL.AppendFormat(" AND P1.DEPARTMENTCODE = {0}", DepartmentCode);
|
| 1126 | 1146 |
if (PersonCode != 0) strSQL.AppendFormat(" AND P1.PERSONCODE = {0}", PersonCode);
|
| 1127 | 1147 |
|
| ... | ... | |
| 1189 | 1209 |
strSQL.Append(" AND C.CONSTRUCTIONCODE = P.CONSTRUCTIONCODE");
|
| 1190 | 1210 |
strSQL.AppendFormat(" AND C.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.Payroll);
|
| 1191 | 1211 |
strSQL.Append(" AND D.PERSONCODE = B.CONSTRUCTIONPERSONCODE");
|
| 1212 |
|
|
| 1213 |
if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode) |
|
| 1214 |
{
|
|
| 1215 |
strSQL.Append(" AND D.DEPARTMENTCODE IN (select PDep.DepartmentCode from PersonDepartmentMaster AS PDep");
|
|
| 1216 |
strSQL.AppendFormat(" WHERE PDep.PersonCode = {0})", CommonMotions.LoginUserData.PersonCode);
|
|
| 1217 |
} |
|
| 1218 |
|
|
| 1192 | 1219 |
if (DepartmentCode != 0) strSQL.AppendFormat(" AND D.DEPARTMENTCODE = {0}", DepartmentCode);
|
| 1193 |
if (PersonCode != 0) strSQL.AppendFormat(" AND D.PERSONCODE = {0}", PersonCode);
|
|
| 1220 |
//if (PersonCode != 0) strSQL.AppendFormat(" AND D.PERSONCODE = {0}", PersonCode);
|
|
| 1194 | 1221 |
|
| 1195 | 1222 |
ArrayList arList = new ArrayList(); |
| 1196 | 1223 |
if (!LedgerlDB.ExecuteReader(strSQL.ToString(), ref arList)) return; |
| ... | ... | |
| 1198 | 1225 |
OnSalary = CommonMotions.cnvInt(objSalary[0]); |
| 1199 | 1226 |
|
| 1200 | 1227 |
// ?U???????????v?? |
| 1201 |
strSQL = new StringBuilder();
|
|
| 1228 |
strSQL.Clear();
|
|
| 1202 | 1229 |
strSQL.Append("SELECT SUM(P.NETPROFIT) FROM CONSTRUCTIONLEDGER P, CONSTRUCTIONBASEINFO B, PERSONINCHARGEMASTER D");
|
| 1203 | 1230 |
// ?U???????????v |
| 1204 | 1231 |
strSQL.Append(" WHERE P.CONSTRUCTIONCODE IN (SELECT A.CONSTRUCTIONCODE FROM CONSTRUCTIONLEDGERDETAIL A");
|
| ... | ... | |
| 1211 | 1238 |
strSQL.AppendFormat(" AND B.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
|
| 1212 | 1239 |
strSQL.AppendFormat(" AND B.CONSTRUCTIONSTATUSFLG != {0}", NotOrder);
|
| 1213 | 1240 |
strSQL.Append(" AND D.PERSONCODE = B.CONSTRUCTIONPERSONCODE");
|
| 1241 |
|
|
| 1242 |
if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode) |
|
| 1243 |
{
|
|
| 1244 |
strSQL.Append(" AND D.DEPARTMENTCODE IN (select PDep.DepartmentCode from PersonDepartmentMaster AS PDep");
|
|
| 1245 |
strSQL.AppendFormat(" WHERE PDep.PersonCode = {0})", CommonMotions.LoginUserData.PersonCode);
|
|
| 1246 |
} |
|
| 1247 |
|
|
| 1214 | 1248 |
if (DepartmentCode != 0) strSQL.AppendFormat(" AND D.DEPARTMENTCODE = {0}", DepartmentCode);
|
| 1215 | 1249 |
|
| 1216 | 1250 |
ArrayList arList2 = new ArrayList(); |
| ... | ... | |
| 1219 | 1253 |
NetIncome = CommonMotions.cnvInt(objNetIncome[0]); |
| 1220 | 1254 |
|
| 1221 | 1255 |
// ?U?????????????v?? |
| 1222 |
strSQL = new StringBuilder();
|
|
| 1256 |
strSQL.Clear();
|
|
| 1223 | 1257 |
strSQL.Append("SELECT SUM(P.NETPROFIT) FROM CONSTRUCTIONLEDGER P, CONSTRUCTIONBASEINFO B, PERSONINCHARGEMASTER D");
|
| 1224 | 1258 |
// ?U???????????v |
| 1225 | 1259 |
strSQL.Append(" WHERE P.CONSTRUCTIONCODE NOT IN (SELECT A.CONSTRUCTIONCODE FROM CONSTRUCTIONLEDGERDETAIL A");
|
| ... | ... | |
| 1232 | 1266 |
strSQL.AppendFormat(" AND B.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
|
| 1233 | 1267 |
strSQL.AppendFormat(" AND B.CONSTRUCTIONSTATUSFLG != {0}", NotOrder);
|
| 1234 | 1268 |
strSQL.Append(" AND D.PERSONCODE = B.CONSTRUCTIONPERSONCODE");
|
| 1269 |
|
|
| 1270 |
if (CommonMotions.LoginUserData.PersonCode != CommonDefine.AdminCode) |
|
| 1271 |
{
|
|
| 1272 |
strSQL.Append(" AND D.DEPARTMENTCODE IN (select PDep.DepartmentCode from PersonDepartmentMaster AS PDep");
|
|
| 1273 |
strSQL.AppendFormat(" WHERE PDep.PersonCode = {0})", CommonMotions.LoginUserData.PersonCode);
|
|
| 1274 |
} |
|
| 1275 |
|
|
| 1235 | 1276 |
if (DepartmentCode != 0) strSQL.AppendFormat(" AND D.DEPARTMENTCODE = {0}", DepartmentCode);
|
| 1236 | 1277 |
|
| 1237 | 1278 |
ArrayList arList3 = new ArrayList(); |
| branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
|---|---|---|
| 32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
| 33 | 33 |
// 既定値にすることができます: |
| 34 | 34 |
// [assembly: AssemblyVersion("1.0.*")]
|
| 35 |
[assembly: AssemblyVersion("1.0.0.48")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.0.48")]
|
|
| 35 |
[assembly: AssemblyVersion("1.0.0.49")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.0.49")]
|
|
| 37 | 37 |
// Log4netを使用する |
| 38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff