リビジョン 299
注文書:公共は0円から、それ以外は300000円以上が選択可能へ修正
branches/src/ProcessManagement/ProcessManagement/Common/CommonDefine.cs | ||
---|---|---|
747 | 747 |
/// <summary> |
748 | 748 |
/// 印刷対象金額 |
749 | 749 |
/// </summary> |
750 |
public static int s_PrintOutPricePublic = 0; |
|
750 | 751 |
public static int s_PrintOutPrice = 300000; |
751 | 752 |
#endregion |
752 | 753 |
|
branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
---|---|---|
14 | 14 |
/// <summary> |
15 | 15 |
/// 本体バージョン |
16 | 16 |
/// </summary> |
17 |
public static int s_SystemVersion = 110;
|
|
17 |
public static int s_SystemVersion = 111;
|
|
18 | 18 |
|
19 | 19 |
/// <summary> |
20 | 20 |
/// コピー・環境バージョン |
branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs | ||
---|---|---|
145 | 145 |
SuppliersDiag = 207, // 207:仕入先検索 |
146 | 146 |
SubConJobDiag = 208, // 208:協力会社職種検索画面 |
147 | 147 |
ApprovalPerson = 209, // 209:担当者承認画面 |
148 |
PeriodAvoidance = 210, // 210:期限チェック解除画面 |
|
148 | 149 |
} |
149 | 150 |
#endregion |
150 | 151 |
|
... | ... | |
253 | 254 |
{ (int)SubFormExecuteNo.SuppliersDiag, "仕入先検索-機能" }, // 207 |
254 | 255 |
{ (int)SubFormExecuteNo.SubConJobDiag, "協力会社職種検索画面-機能" }, // 208 |
255 | 256 |
{ (int)SubFormExecuteNo.ApprovalPerson, "担当者承認画面-機能" }, // 209 |
257 |
{ (int)SubFormExecuteNo.PeriodAvoidance, "期限チェック解除画面-機能" }, // 210 |
|
258 |
|
|
256 | 259 |
}; |
257 | 260 |
#endregion |
258 | 261 |
|
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs | ||
---|---|---|
730 | 730 |
|
731 | 731 |
for (int i = 0; i < s_SQLPart3.Length; i++) wrkFormat.Append(s_SQLPart3[i]); |
732 | 732 |
for (int i = 0; i < s_SQLPart3_1.Length; i++) wrkFormat.Append(s_SQLPart3_1[i]); |
733 |
|
|
733 |
wrkFormat.Append(" LEFT JOIN constructiontypemaster As ConstrType ON ConstrType.TypeCode = A.ConstructionType"); |
|
734 | 734 |
wrkFormat.Append(", PROCESSAPPROVAL App"); |
735 | 735 |
for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5[i]); |
736 | 736 |
|
... | ... | |
739 | 739 |
strSQL.Append(" AND NOT EXISTS"); |
740 | 740 |
strSQL.Append(" (SELECT * FROM PURCHASEORDER B1"); |
741 | 741 |
strSQL.Append(" WHERE B1.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)"); |
742 |
|
|
742 | 743 |
strSQL.AppendFormat(" And ((A.TYINGFLG != {0}", (int)ConstructionBaseInfo.TyingFlgDef.Tying); |
743 | 744 |
strSQL.AppendFormat(" AND ({0} <= A.ConstructionStatusFlg", ProgressStart); |
744 | 745 |
strSQL.AppendFormat(" And A.ConstructionStatusFlg <= {0}))", ProgressComplete); |
745 | 746 |
|
746 | 747 |
strSQL.AppendFormat(" OR (A.TYINGFLG = {0}", (int)ConstructionBaseInfo.TyingFlgDef.Tying); |
747 | 748 |
strSQL.AppendFormat(" AND ({0} <= A.ConstructionStatusFlg", ProgressStart); |
748 |
strSQL.AppendFormat(" And A.ConstructionStatusFlg <= {0})))", ProgressComplete2); |
|
749 |
|
|
749 |
strSQL.AppendFormat(" And A.ConstructionStatusFlg <= {0}))", ProgressComplete2); |
|
750 |
|
|
751 |
strSQL.AppendFormat(" OR (A.JOINFLG = {0}))", (int)ConstructionBaseInfo.TyingFlgDef.Parent); |
|
752 |
|
|
750 | 753 |
strSQL.Append(" AND A.ConstructionPersonCode != 0"); |
751 |
strSQL.Append(" AND ((A.ConstructionCode IN "); |
|
752 |
|
|
753 |
strSQL.Append(" (SELECT AA1.CONSTRUCTIONCODE"); |
|
754 |
strSQL.Append(" FROM CONSTRUCTIONBUDGETDETAIL AA1"); |
|
755 |
strSQL.Append(" WHERE (AA1.COMPANYCODE != 0"); |
|
756 |
strSQL.Append(" AND AA1.COMPANYCODE != -1)"); |
|
754 |
|
|
755 |
strSQL.AppendFormat(" AND (ConstrType.PublicFlg != {0}", (int)ConstructionTypeMaster.ConstructionTypeDef.Community); |
|
756 |
strSQL.Append(" And (A.ConstructionCode IN (SELECT AA1.CONSTRUCTIONCODE FROM CONSTRUCTIONBUDGETDETAIL AA1"); |
|
757 |
strSQL.Append(" WHERE AA1.COMPANYCODE != 0 AND AA1.COMPANYCODE != -1"); |
|
757 | 758 |
strSQL.Append(" GROUP BY AA1.CONSTRUCTIONCODE, AA1.COMPANYCODE"); |
758 |
|
|
759 | 759 |
strSQL.AppendFormat(" HAVING SUM(AA1.EXECUTIONAMOUNT) >= {0}))", CommonDefine.s_PrintOutPrice); |
760 | 760 |
|
761 |
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(" WHERE AA1.COMPANYCODE != 0 AND AA1.COMPANYCODE != -1"); |
|
764 |
strSQL.Append(" GROUP BY AA1.CONSTRUCTIONCODE, AA1.COMPANYCODE"); |
|
765 |
strSQL.AppendFormat(" HAVING SUM(AA1.EXECUTIONAMOUNT) >= {0})))", CommonDefine.s_PrintOutPricePublic); |
|
766 |
|
|
761 | 767 |
// Left Join??????????????? |
762 | 768 |
strSQL.Append(" And ("); |
763 | 769 |
strSQL.Append(s_SQLPart3_2[1]); |
... | ... | |
766 | 772 |
strSQL.Append(s_SQLPart3_2[4]); |
767 | 773 |
strSQL.AppendFormat(" And App.ApprovalStatus = {0}", (int)CommonDefine.ApprovalStatus.Approval); |
768 | 774 |
strSQL.Append(") "); |
769 |
|
|
770 |
strSQL.Append(" OR A.JOINFLG = 1)"); |
|
771 | 775 |
|
772 | 776 |
// ???????I??????????? |
773 | 777 |
strSQL.Append(GetDepartmentString()); |
... | ... | |
1054 | 1058 |
strSQL.AppendFormat(" AND A1.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts); |
1055 | 1059 |
strSQL.Append(" AND A1.COMPANYCODE > 0"); |
1056 | 1060 |
strSQL.AppendFormat(" And A1.PurchaseOrderFlg <> {0}",(int)ConstructionLedgerDetail.PurOrderFlgDef.NotMakingData); |
1057 |
|
|
1058 |
strSQL.AppendFormat(" And A1.EXECUTIONAMOUNT >= {0}", CommonDefine.s_PrintOutPrice); |
|
1059 | 1061 |
|
1062 |
strSQL.AppendFormat(" And ((ConstrType.PublicFlg != {0}", (int)ConstructionTypeMaster.ConstructionTypeDef.Community); |
|
1063 |
strSQL.AppendFormat(" And A1.EXECUTIONAMOUNT >= {0})", CommonDefine.s_PrintOutPrice); |
|
1064 |
strSQL.AppendFormat(" OR (ConstrType.PublicFlg = {0}", (int)ConstructionTypeMaster.ConstructionTypeDef.Community); |
|
1065 |
strSQL.AppendFormat(" And A1.EXECUTIONAMOUNT >= {0}))", CommonDefine.s_PrintOutPricePublic); |
|
1066 |
|
|
1060 | 1067 |
strSQL.Append(" Order By"); |
1061 | 1068 |
strSQL.Append(" A1.PURCHASEORDERFLG"); |
1062 | 1069 |
|
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryListAuxiliary.cs | ||
---|---|---|
166 | 166 |
LedgerLine, |
167 | 167 |
OrderNo, |
168 | 168 |
PrintoutDate, |
169 |
PublicFlg, |
|
169 | 170 |
} |
170 | 171 |
#endregion |
171 | 172 |
|
... | ... | |
193 | 194 |
strSQL.Append(", A.LINECOUNT AS LINECOUNT"); |
194 | 195 |
strSQL.Append(", 0 AS ORDERNO"); |
195 | 196 |
strSQL.AppendFormat(", DATE ('{0}') AS PRINTOUTDATE", DateTime.MinValue.ToShortDateString()); |
197 |
strSQL.Append(", ConstrType.PublicFlg"); |
|
196 | 198 |
strSQL.Append(" FROM CONSTRUCTIONLEDGERDETAIL A"); |
197 | 199 |
|
198 | 200 |
strSQL.Append(" LEFT JOIN CONSTRUCTIONBASEINFODETAIL B ON B.CONSTRUCTIONCODE = A.SOURCECODE"); |
199 | 201 |
strSQL.AppendFormat(" AND B.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName); |
202 |
strSQL.Append(" Inner Join constructionbaseinfo AS Base On Base.ConstructionCode = A.ConstructionCode"); |
|
203 |
strSQL.Append(" Inner Join constructiontypemaster As ConstrType On ConstrType.TypeCode = Base.ConstructionType"); |
|
200 | 204 |
|
201 | 205 |
strSQL.AppendFormat(" WHERE A.CONSTRUCTIONCODE = {0}", ParentCode); |
202 | 206 |
strSQL.AppendFormat(" AND A.SOURCECODE = {0}", SearchCode); |
203 | 207 |
strSQL.AppendFormat(" AND A.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts); |
204 | 208 |
strSQL.Append(" AND A.COMPANYCODE > 0"); |
205 | 209 |
strSQL.AppendFormat(" AND A.COMPANYTYPE <> {0}", (int)CommonDefine.CodeDataType.Person); |
206 |
|
|
207 |
strSQL.Append(" AND ((A.SOURCECODE, A.COMPANYCODE) IN ("); |
|
208 |
strSQL.Append(" SELECT SUMTBL.SOURCECODE, SUMTBL.COMPANYCODE FROM CONSTRUCTIONLEDGERDETAIL SUMTBL"); |
|
209 |
strSQL.AppendFormat(" WHERE SUMTBL.CONSTRUCTIONCODE = {0}", ParentCode); |
|
210 |
strSQL.AppendFormat(" AND SUMTBL.SOURCECODE = {0}", SearchCode); |
|
211 |
strSQL.AppendFormat(" AND SUMTBL.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts); |
|
212 |
strSQL.Append(" AND SUMTBL.COMPANYCODE > 0"); |
|
213 |
strSQL.Append(" GROUP BY SUMTBL.SOURCECODE, SUMTBL.COMPANYCODE, SUMTBL.PURCHASEORDERFLG"); |
|
214 |
strSQL.AppendFormat(" HAVING SUM(SUMTBL.EXECUTIONAMOUNT) >= {0}))", CommonDefine.s_PrintOutPrice); |
|
215 | 210 |
|
211 |
strSQL.AppendFormat(" AND ((ConstrType.PublicFlg != {0}", (int)ConstructionTypeMaster.ConstructionTypeDef.Community); |
|
212 |
strSQL.Append(" AND (A.SOURCECODE, A.COMPANYCODE) IN (SELECT SUMTBL.SOURCECODE, SUMTBL.COMPANYCODE"); |
|
213 |
strSQL.Append(" FROM CONSTRUCTIONLEDGERDETAIL SUMTBL"); |
|
214 |
strSQL.AppendFormat(" WHERE SUMTBL.CONSTRUCTIONCODE = {0}", ParentCode); |
|
215 |
strSQL.AppendFormat(" AND SUMTBL.SOURCECODE = {0}", SearchCode); |
|
216 |
strSQL.AppendFormat(" AND SUMTBL.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts); |
|
217 |
strSQL.Append(" AND SUMTBL.COMPANYCODE > 0"); |
|
218 |
strSQL.Append(" GROUP BY SUMTBL.SOURCECODE, SUMTBL.COMPANYCODE, SUMTBL.PURCHASEORDERFLG"); |
|
219 |
strSQL.AppendFormat(" HAVING SUM(SUMTBL.EXECUTIONAMOUNT) >= {0}))", CommonDefine.s_PrintOutPrice); |
|
220 |
|
|
221 |
strSQL.AppendFormat(" OR (ConstrType.PublicFlg = {0}", (int)ConstructionTypeMaster.ConstructionTypeDef.Community); |
|
222 |
strSQL.Append(" AND (A.SOURCECODE, A.COMPANYCODE) IN (SELECT SUMTBL.SOURCECODE, SUMTBL.COMPANYCODE"); |
|
223 |
strSQL.Append(" FROM CONSTRUCTIONLEDGERDETAIL SUMTBL"); |
|
224 |
strSQL.AppendFormat(" WHERE SUMTBL.CONSTRUCTIONCODE = {0}", ParentCode); |
|
225 |
strSQL.AppendFormat(" AND SUMTBL.SOURCECODE = {0}", SearchCode); |
|
226 |
strSQL.AppendFormat(" AND SUMTBL.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts); |
|
227 |
strSQL.Append(" AND SUMTBL.COMPANYCODE > 0"); |
|
228 |
strSQL.Append(" GROUP BY SUMTBL.SOURCECODE, SUMTBL.COMPANYCODE, SUMTBL.PURCHASEORDERFLG"); |
|
229 |
strSQL.AppendFormat(" HAVING SUM(SUMTBL.EXECUTIONAMOUNT) >= {0})))", CommonDefine.s_PrintOutPricePublic); |
|
230 |
|
|
216 | 231 |
strSQL.Append(" AND NOT EXISTS (SELECT * FROM purchaseorderdetail AS C, purchaseorder AS D"); |
217 | 232 |
strSQL.Append(" WHERE C.ConstructionCode = A.SourceCode"); |
218 | 233 |
strSQL.Append(" AND D.ConstructionCode = C.ConstructionCode"); |
... | ... | |
228 | 243 |
strSQL.Append(", A.COMPANYCODE AS COMPANYCODE"); |
229 | 244 |
strSQL.Append(", A.COMPANYNAME"); |
230 | 245 |
|
231 |
//strSQL.Append(", A.EXECUTIONAMOUNT"); |
|
232 |
|
|
233 | 246 |
strSQL.Append(", Case ifnull(F.OrderPrice, 0)"); |
234 | 247 |
strSQL.Append(" When 0 Then A.EXECUTIONAMOUNT"); |
235 | 248 |
strSQL.Append(" Else F.OrderPrice"); |
... | ... | |
243 | 256 |
strSQL.Append(", A.LINECOUNT AS LINECOUNT"); |
244 | 257 |
strSQL.Append(", IFNULL(C.ORDERNO, 0) AS ORDERNO"); |
245 | 258 |
strSQL.Append(", DATE_FORMAT(F.PRINTOUTDATE, '%Y/%m/%d') AS PRINTOUTDATE"); |
259 |
strSQL.Append(", ConstrType.PublicFlg"); |
|
260 |
|
|
246 | 261 |
strSQL.Append(" FROM CONSTRUCTIONLEDGERDETAIL A"); |
247 | 262 |
|
263 |
strSQL.Append(" Inner Join CONSTRUCTIONBASEINFO As Base ON Base.CONSTRUCTIONCODE = A.SOURCECODE"); |
|
264 |
strSQL.Append(" Inner Join constructiontypemaster As ConstrType On ConstrType.TypeCode = Base.ConstructionType"); |
|
265 |
|
|
248 | 266 |
strSQL.Append(" LEFT JOIN CONSTRUCTIONBASEINFODETAIL B ON B.CONSTRUCTIONCODE = A.SOURCECODE"); |
249 | 267 |
strSQL.AppendFormat(" AND B.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName); |
250 | 268 |
|
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs | ||
---|---|---|
503 | 503 |
// デフォルトページを削除する |
504 | 504 |
this.TabCollections.TabPages.RemoveAt(0); |
505 | 505 |
|
506 |
// 工事種別を取得する |
|
507 |
object[] wrkRec = (object[])m_DetailList[0]; |
|
508 |
int nPublicFlg = CommonMotions.cnvInt(wrkRec[(int)FrmOrderEntryList.ReadDBColumn.PublicFlg]); |
|
509 |
// 対象金額のセット |
|
510 |
long nPrintOutVal = CommonDefine.s_PrintOutPricePublic; |
|
511 |
// 公共工事以外は協力業者発注合計が30万以上に注文書を発行する |
|
512 |
if (nPublicFlg != (int)ConstructionTypeMaster.ConstructionTypeDef.Community) |
|
513 |
nPrintOutVal = CommonDefine.s_PrintOutPrice; |
|
514 |
|
|
506 | 515 |
int icnt = OrderDB.SelectMaxSeqNoCount(OrderDB.CreatePrimarykeyString(m_ConstructionCode)); |
507 | 516 |
int PageSeqNo = icnt; |
508 | 517 |
bool binit = true; |
... | ... | |
523 | 532 |
// 会社コードが変わればデータセットへ行く |
524 | 533 |
if (Break_CompanyCode != DetailRec.CompanyCode) |
525 | 534 |
{ |
526 |
// 協力業者発注合計が30万以上に注文書を発行する
|
|
527 |
if (Break_Total >= CommonDefine.s_PrintOutPrice)
|
|
535 |
// 対象金額以上に注文書を発行する
|
|
536 |
if (Break_Total >= nPrintOutVal)
|
|
528 | 537 |
{ |
529 | 538 |
// ページ追加 |
530 | 539 |
PurchaseOrderInputPage inputpage = new PurchaseOrderInputPage(); |
... | ... | |
553 | 562 |
Break_Total += DetailRec.ExecutionAmount; |
554 | 563 |
} |
555 | 564 |
|
556 |
// 協力業者発注合計が30万以上に注文書を発行する
|
|
557 |
if (Break_Total >= CommonDefine.s_PrintOutPrice)
|
|
565 |
// 対象金額以上に注文書を発行する
|
|
566 |
if (Break_Total >= nPrintOutVal)
|
|
558 | 567 |
{ |
559 | 568 |
// ページ追加 |
560 | 569 |
PurchaseOrderInputPage inputpage = new PurchaseOrderInputPage(); |
branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmTyingConstrDiag.cs | ||
---|---|---|
137 | 137 |
this.Text = string.Format("【{0}】 工事案件選択", |
138 | 138 |
ClsExcute.ProcessExecuteName[m_OperationProcess].Replace("-", "")); |
139 | 139 |
} |
140 |
|
|
140 |
|
|
141 | 141 |
// 初期表示 |
142 | 142 |
InitDataLoad(); |
143 | 143 |
} |
... | ... | |
237 | 237 |
ClsProcessExist.GetTargetList(BaseDB, ref CodeList, m_ParentAdd); |
238 | 238 |
int ParentCode = ClsProcessExist.GetParentConstrCode(m_ConstructionCode); |
239 | 239 |
|
240 |
int iCode = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("非 受 注")).Key; |
|
241 | 240 |
|
242 |
string strSQL = "SELECT A.CONSTRUCTIONCODE, B.DETAILSTRING FROM CONSTRUCTIONBASEINFO A, CONSTRUCTIONBASEINFODETAIL B"; |
|
241 |
StringBuilder strSQL = new StringBuilder(); |
|
242 |
strSQL.Append("SELECT"); |
|
243 |
strSQL.Append(" A.CONSTRUCTIONCODE"); |
|
244 |
strSQL.Append(", B.DETAILSTRING"); |
|
245 |
strSQL.Append(" FROM CONSTRUCTIONBASEINFO A"); |
|
246 |
strSQL.Append(", CONSTRUCTIONBASEINFODETAIL B"); |
|
243 | 247 |
|
244 | 248 |
string strInWher = " ("; |
245 | 249 |
bool binit = true; |
... | ... | |
251 | 255 |
} |
252 | 256 |
strInWher += ")"; |
253 | 257 |
|
254 |
strSQL += " WHERE A.CONSTRUCTIONCODE in ";
|
|
255 |
strSQL += strInWher;
|
|
258 |
strSQL.Append(" WHERE A.CONSTRUCTIONCODE in ");
|
|
259 |
strSQL.Append(strInWher);
|
|
256 | 260 |
|
257 |
strSQL += string.Format(" AND A.CONSTRUCTIONSTATUSFLG != {0}", iCode); |
|
258 |
strSQL += string.Format(" AND (B.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE AND B.DETAILNO = {0})", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName); |
|
261 |
int iCode = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("非 受 注")).Key; |
|
262 |
strSQL.AppendFormat(" AND A.CONSTRUCTIONSTATUSFLG != {0}", iCode); |
|
263 |
strSQL.Append(" AND (B.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE"); |
|
264 |
strSQL.AppendFormat(" AND B.DETAILNO = {0})", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName); |
|
259 | 265 |
|
260 | 266 |
switch (m_OperationProcess) |
261 | 267 |
{ |
262 | 268 |
case (int)ClsExcute.ProcessExecuteNo.EstimateInput: |
263 | 269 |
case (int)ClsExcute.ProcessExecuteNo.EstimateBudget: |
264 |
strSQL += " AND (EXISTS (SELECT * FROM ESTIMATEDATA EXDB WHERE EXDB.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)";
|
|
265 |
strSQL += string.Format(" OR (A.CONSTRUCTIONSTATUSFLG < {0}))",
|
|
266 |
CommonDefine.ProjectsStatus.First(x => x.Value.Equals("見積提出")).Key);
|
|
270 |
int nCode1 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("見積提出")).Key;
|
|
271 |
strSQL.Append(" AND (EXISTS (SELECT * FROM ESTIMATEDATA EXDB WHERE EXDB.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)");
|
|
272 |
strSQL.AppendFormat(" OR (A.CONSTRUCTIONSTATUSFLG < {0}))", nCode1);
|
|
267 | 273 |
break; |
268 | 274 |
case (int)ClsExcute.ProcessExecuteNo.ConstructionBudget: |
269 |
strSQL += " AND (EXISTS (SELECT * FROM CONSTRUCTIONBUDGET EXDB WHERE EXDB.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)";
|
|
275 |
strSQL.Append(" AND (EXISTS (SELECT * FROM CONSTRUCTIONBUDGET EXDB WHERE EXDB.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)");
|
|
270 | 276 |
|
271 |
strSQL += string.Format(" OR ((A.TYINGFLG != {0}", (int)ConstructionBaseInfo.TyingFlgDef.Tying); |
|
272 |
strSQL += string.Format(" AND {0} <= A.CONSTRUCTIONSTATUSFLG", CommonDefine.ProjectsStatus.First(x => x.Value.Equals("仮 受 注")).Key); |
|
273 |
strSQL += string.Format(" AND A.CONSTRUCTIONSTATUSFLG < {0})", CommonDefine.ProjectsStatus.First(x => x.Value.Equals("施工開始")).Key); |
|
277 |
strSQL.AppendFormat(" OR ((A.TYINGFLG != {0}", (int)ConstructionBaseInfo.TyingFlgDef.Tying); |
|
278 |
|
|
279 |
int nCode2 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("仮 受 注")).Key; |
|
280 |
int nCode3 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("施工開始")).Key; |
|
281 |
int nCode4 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("請求準備")).Key; |
|
274 | 282 |
|
275 |
strSQL += string.Format(" OR (A.TYINGFLG = {0}", (int)ConstructionBaseInfo.TyingFlgDef.Tying); |
|
276 |
strSQL += string.Format(" AND A.CONSTRUCTIONSTATUSFLG < {0})))", CommonDefine.ProjectsStatus.First(x => x.Value.Equals("請求準備")).Key); |
|
283 |
strSQL.AppendFormat(" AND {0} <= A.CONSTRUCTIONSTATUSFLG", nCode2); |
|
284 |
strSQL.AppendFormat(" AND A.CONSTRUCTIONSTATUSFLG < {0})", nCode3); |
|
285 |
|
|
286 |
strSQL.AppendFormat(" OR (A.TYINGFLG = {0}", (int)ConstructionBaseInfo.TyingFlgDef.Tying); |
|
287 |
strSQL.AppendFormat(" AND A.CONSTRUCTIONSTATUSFLG < {0})))", nCode4); |
|
277 | 288 |
break; |
278 | 289 |
case (int)ClsExcute.ProcessExecuteNo.ConstructionCopyList: |
279 |
//strSQL += " AND EXISTS (SELECT * FROM ESTIMATEDATA EXDB WHERE EXDB.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)";
|
|
290 |
//strSQL.Append(" AND EXISTS (SELECT * FROM ESTIMATEDATA EXDB WHERE EXDB.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)");
|
|
280 | 291 |
break; |
281 | 292 |
case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderEntry: |
282 |
strSQL += " AND EXISTS (SELECT * FROM CONSTRUCTIONLEDGERDETAIL EXDB"; |
|
283 |
strSQL += " WHERE EXDB.CONSTRUCTIONCODE in " + strInWher; |
|
284 |
strSQL += " AND EXDB.SOURCECODE = A.CONSTRUCTIONCODE"; |
|
285 |
strSQL += string.Format(" AND EXDB.EXECUTIONAMOUNT >= {0})", CommonDefine.s_PrintOutPrice); |
|
293 |
strSQL.Append(" AND EXISTS (SELECT * FROM CONSTRUCTIONLEDGERDETAIL EXDB"); |
|
294 |
strSQL.Append(" Inner Join CONSTRUCTIONBASEINFO AS Base ON Base.ConstructionCode = EXDB.ConstructionCode"); |
|
295 |
strSQL.Append(" Inner Join constructiontypemaster AS ConstrType On ConstrType.TypeCode = Base.ConstructionType"); |
|
296 |
strSQL.AppendFormat(" WHERE EXDB.CONSTRUCTIONCODE in {0}", strInWher); |
|
297 |
strSQL.Append(" AND EXDB.SOURCECODE = A.CONSTRUCTIONCODE"); |
|
298 |
strSQL.AppendFormat(" AND ((ConstrType.PublicFlg != {0}", (int)ConstructionTypeMaster.ConstructionTypeDef.Community); |
|
299 |
strSQL.AppendFormat(" AND EXDB.EXECUTIONAMOUNT >= {0})", CommonDefine.s_PrintOutPrice); |
|
300 |
strSQL.AppendFormat(" Or (ConstrType.PublicFlg = {0}", (int)ConstructionTypeMaster.ConstructionTypeDef.Community); |
|
301 |
strSQL.AppendFormat(" And EXDB.EXECUTIONAMOUNT >= {0})))", CommonDefine.s_PrintOutPricePublic); |
|
302 |
|
|
286 | 303 |
break; |
287 | 304 |
case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint: |
288 |
strSQL += " AND EXISTS (SELECT * FROM PURCHASEORDER EXDB WHERE EXDB.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)";
|
|
305 |
strSQL.Append(" AND EXISTS (SELECT * FROM PURCHASEORDER EXDB WHERE EXDB.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE)");
|
|
289 | 306 |
break; |
290 | 307 |
default: |
291 | 308 |
break; |
292 | 309 |
} |
293 | 310 |
|
294 |
strSQL += " ORDER BY A.CONSTRUCTIONCODE";
|
|
311 |
strSQL.Append(" ORDER BY A.CONSTRUCTIONCODE");
|
|
295 | 312 |
|
296 | 313 |
ArrayList BaseList = new ArrayList(); |
297 |
if (!BaseDB.ExecuteReader(strSQL, ref BaseList)) return; |
|
298 |
if (BaseList.Count == 0) return; |
|
314 |
if (!BaseDB.ExecuteReader(strSQL.ToString(), ref BaseList)) return; |
|
315 |
if (BaseList.Count == 0) |
|
316 |
{ |
|
317 |
MessageBox.Show("対象データがありません。", "選択データ無", MessageBoxButtons.OK, MessageBoxIcon.Stop); |
|
318 |
m_EndButton = DialogResult.No; |
|
319 |
this.Close(); |
|
320 |
return; |
|
321 |
} |
|
299 | 322 |
|
300 | 323 |
// 要素表示 |
301 | 324 |
int i = 0; |
branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
---|---|---|
32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
33 | 33 |
// 既定値にすることができます: |
34 | 34 |
// [assembly: AssemblyVersion("1.0.*")] |
35 |
[assembly: AssemblyVersion("1.0.1.10")]
|
|
36 |
[assembly: AssemblyFileVersion("1.0.1.10")]
|
|
35 |
[assembly: AssemblyVersion("1.0.1.11")]
|
|
36 |
[assembly: AssemblyFileVersion("1.0.1.11")]
|
|
37 | 37 |
// Log4netを使用する |
38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff