From 6c3b105e0789b8bafe13b29b97e414c99f8abb62 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Fri, 8 Aug 2025 14:50:01 +0800 Subject: [PATCH] 1 --- A00通用模板/U_GetDllForm.pas | 2 +- A00通用窗体/U_ComContactSel.dfm | 6 ++---- A00通用窗体/U_ComContactSel.pas | 8 +++----- A01基础公司管理/U_GetDllForm.pas | 14 ++++++------- A02基础产品管理/U_GetDllForm.pas | 12 +++++------ A05基础资料管理/U_GetDllForm.pas | 8 ++++---- A09财务通用管理/U_GetDllForm.pas | 28 +++++++++++++------------- B01基础合同管理/U_GetDllForm.pas | 2 +- B04采购计划管理/U_GetDllForm.pas | 4 ++-- T01贸易生产计划/U_GetDllForm.pas | 16 +++++++-------- T02贸易汇总仓库/U_GetDllForm.pas | 26 ++++++++++++------------ T03贸易布匹检验/U_GetDllForm.pas | 6 +++--- T05贸易门市管理/U_GetDllForm.pas | 6 +++--- T05贸易门市管理/U_TradeMarketInPut.dfm | 3 ++- T05贸易门市管理/U_TradeMarketInPut.pas | 21 ++++++++++++------- T05贸易门市管理/U_TradeMarketList.pas | 2 ++ 16 files changed, 85 insertions(+), 79 deletions(-) diff --git a/A00通用模板/U_GetDllForm.pas b/A00通用模板/U_GetDllForm.pas index 813cb42..fd15c8b 100644 --- a/A00通用模板/U_GetDllForm.pas +++ b/A00通用模板/U_GetDllForm.pas @@ -126,7 +126,7 @@ begin 1: // begin - with TForm1.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TForm1.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; FormStyle := mstyle; diff --git a/A00通用窗体/U_ComContactSel.dfm b/A00通用窗体/U_ComContactSel.dfm index 95e4eef..27cb593 100644 --- a/A00通用窗体/U_ComContactSel.dfm +++ b/A00通用窗体/U_ComContactSel.dfm @@ -10,8 +10,8 @@ inherited frmComContactSel: TfrmComContactSel Font.Name = #24494#36719#38597#40657 Position = poMainFormCenter OnClose = FormClose - ExplicitWidth = 1030 - ExplicitHeight = 553 + ExplicitWidth = 1038 + ExplicitHeight = 561 PixelsPerInch = 96 TextHeight = 21 object ToolBar1: TToolBar [0] @@ -30,7 +30,6 @@ inherited frmComContactSel: TfrmComContactSel ParentColor = False ShowCaptions = True TabOrder = 0 - ExplicitWidth = 604 object TBRafresh: TToolButton Left = 0 Top = 0 @@ -112,7 +111,6 @@ inherited frmComContactSel: TfrmComContactSel Height = 441 Align = alClient TabOrder = 2 - ExplicitTop = 87 object TV1: TcxGridDBTableView OnDblClick = Tv1DblClick Navigator.Buttons.CustomButtons = <> diff --git a/A00通用窗体/U_ComContactSel.pas b/A00通用窗体/U_ComContactSel.pas index a494b9d..da53545 100644 --- a/A00通用窗体/U_ComContactSel.pas +++ b/A00通用窗体/U_ComContactSel.pas @@ -13,9 +13,8 @@ uses RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit, cxTextEdit, cxDBLookupComboBox, ComObj, cxLookAndFeels, cxLookAndFeelPainters, - cxNavigator, dxDateRanges, U_BaseHelp, - dxBarBuiltInMenu, System.ImageList, Vcl.ImgList, - dxScrollbarAnnotations, cxImageList, cxContainer, dxSkinsCore, + cxNavigator, dxDateRanges, U_BaseHelp, dxBarBuiltInMenu, System.ImageList, + Vcl.ImgList, dxScrollbarAnnotations, cxImageList, cxContainer, dxSkinsCore, dxSkinsDefaultPainters; type @@ -126,8 +125,7 @@ begin sql.Add('from BS_Company A '); sql.Add('left join BS_Company_contact B ON A.COID=B.COID '); - - sql.Add('where A.CoCode=' + QuotedStr(Trim(FCoCode))); + sql.Add('where A.CoCode=' + QuotedStr(Trim(FCoCode))); Open; end; diff --git a/A01基础公司管理/U_GetDllForm.pas b/A01基础公司管理/U_GetDllForm.pas index 0663a63..e03ada9 100644 --- a/A01基础公司管理/U_GetDllForm.pas +++ b/A01基础公司管理/U_GetDllForm.pas @@ -127,7 +127,7 @@ begin 100: //ʾ begin - with TfrmModulePromptList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmModulePromptList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; WindowState := mstate; @@ -137,7 +137,7 @@ begin 111: //ͻ begin - with TfrmCustomer.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmCustomer.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; WindowState := mstate; @@ -147,7 +147,7 @@ begin 121: //Ӧ̹ begin - with TfrmFactory.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmFactory.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; WindowState := mstate; @@ -157,7 +157,7 @@ begin 131: //˾ begin - with TfrmCompany.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmCompany.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; WindowState := mstate; @@ -167,7 +167,7 @@ begin 141: //˾˻ begin - with TfrmBankList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmBankList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; WindowState := mstate; @@ -177,7 +177,7 @@ begin 211: //֯ begin - with TfrmSYDept.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmSYDept.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; WindowState := mstate; @@ -187,7 +187,7 @@ begin 212: //Ա begin - with TfrmEmployeeList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmEmployeeList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; WindowState := mstate; diff --git a/A02基础产品管理/U_GetDllForm.pas b/A02基础产品管理/U_GetDllForm.pas index f45a072..c842b0b 100644 --- a/A02基础产品管理/U_GetDllForm.pas +++ b/A02基础产品管理/U_GetDllForm.pas @@ -133,7 +133,7 @@ begin 191: // begin - with TfrmClothInfoProcessList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmClothInfoProcessList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; FormStyle := mstyle; @@ -145,7 +145,7 @@ begin 192: //չ begin - with TfrmClothInfoTechnicsList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmClothInfoTechnicsList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; FormStyle := mstyle; @@ -157,7 +157,7 @@ begin 111: // Ʒ begin - with TfrmClothType.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmClothType.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; FormStyle := mstyle; @@ -169,7 +169,7 @@ begin 112: // ƷϢ begin - with TfrmClothInfo.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmClothInfo.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; WindowState := mstate; @@ -179,7 +179,7 @@ begin 122: // Ϣ begin - with TfrmTatClothInfo.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmTatClothInfo.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; FormStyle := mstyle; @@ -191,7 +191,7 @@ begin 132: // ֯ƷϢ begin - with TfrmKnitClothInfoList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmKnitClothInfoList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; FormStyle := mstyle; diff --git a/A05基础资料管理/U_GetDllForm.pas b/A05基础资料管理/U_GetDllForm.pas index 6884f8d..c5f6d5f 100644 --- a/A05基础资料管理/U_GetDllForm.pas +++ b/A05基础资料管理/U_GetDllForm.pas @@ -119,7 +119,7 @@ begin 111: //λ begin - with TfrmPositionList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do + with TfrmPositionList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do begin fFormID := FormID; FormStyle := mstyle; @@ -131,7 +131,7 @@ begin 112: // begin - with TfrmMachineManage.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do + with TfrmMachineManage.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do begin fFormID := FormID; FormStyle := mstyle; @@ -145,7 +145,7 @@ begin { 141: // begin - with TfrmWarpBeamManage.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do + with TfrmWarpBeamManage.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do begin fFormID := FormID; FormStyle := mstyle; @@ -157,7 +157,7 @@ begin 151: //̹ begin - with TfrmTrayManage.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do + with TfrmTrayManage.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do begin fFormID := FormID; FormStyle := mstyle; diff --git a/A09财务通用管理/U_GetDllForm.pas b/A09财务通用管理/U_GetDllForm.pas index 6a492e1..d6b9f91 100644 --- a/A09财务通用管理/U_GetDllForm.pas +++ b/A09财务通用管理/U_GetDllForm.pas @@ -135,7 +135,7 @@ begin 111: //ӦտǼ begin - with TfrmReceivableList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmReceivableList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; FormStyle := mstyle; @@ -147,7 +147,7 @@ begin 121: //տǼ begin - with TfrmCollectList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmCollectList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; FormStyle := mstyle; @@ -159,7 +159,7 @@ begin 130: //Ʊ begin - with TfrmInvoiceOutSQList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmInvoiceOutSQList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; FormStyle := mstyle; @@ -171,7 +171,7 @@ begin 131: //Ʊ begin - with TfrmInvoiceOutList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmInvoiceOutList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; FormStyle := mstyle; @@ -183,7 +183,7 @@ begin 141: //ͻ˵ begin - with TfrmCustStatement.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmCustStatement.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; FormStyle := mstyle; @@ -195,7 +195,7 @@ begin 142: //ͻȶ˵ begin - with TfrmCustStatementWriteOff.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmCustStatementWriteOff.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; FormStyle := mstyle; @@ -207,7 +207,7 @@ begin 211: //ӦǼ begin - with TfrmPayableList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmPayableList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; FormStyle := mstyle; @@ -219,7 +219,7 @@ begin 221: //Ǽ begin - with TfrmPayList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmPayList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; FormStyle := mstyle; @@ -231,7 +231,7 @@ begin 231: //Ʊ begin - with TfrmInvoiceInList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmInvoiceInList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; FormStyle := mstyle; @@ -243,7 +243,7 @@ begin 241: //Ӧ̶˵ begin - with TfrmFtyStatement.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmFtyStatement.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; FormStyle := mstyle; @@ -255,7 +255,7 @@ begin 311: //õǼ begin - with TfrmExpenseList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmExpenseList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; FormStyle := mstyle; @@ -267,7 +267,7 @@ begin 711: //а begin - with TfrmRankingList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmRankingList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; FormStyle := mstyle; @@ -279,7 +279,7 @@ begin 811: //˻ˮ begin - with TfrmBankFlowList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmBankFlowList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; FormStyle := mstyle; @@ -291,7 +291,7 @@ begin 821: //˻ͳ begin - with TfrmBankFlowTotalList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmBankFlowTotalList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; FormStyle := mstyle; diff --git a/B01基础合同管理/U_GetDllForm.pas b/B01基础合同管理/U_GetDllForm.pas index 34a1c42..4193679 100644 --- a/B01基础合同管理/U_GetDllForm.pas +++ b/B01基础合同管理/U_GetDllForm.pas @@ -132,7 +132,7 @@ begin 111: //ۺͬ begin - with TfrmSalesContractList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmSalesContractList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; WindowState := mstate; diff --git a/B04采购计划管理/U_GetDllForm.pas b/B04采购计划管理/U_GetDllForm.pas index bf510e9..a1f6692 100644 --- a/B04采购计划管理/U_GetDllForm.pas +++ b/B04采购计划管理/U_GetDllForm.pas @@ -127,7 +127,7 @@ begin 111: //ɴ߲ɹƻ begin - with TfrmYarnPurchasePlanList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmYarnPurchasePlanList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin FormStyle := mstyle; WindowState := mstate; @@ -137,7 +137,7 @@ begin 211: //ϲɹƻ begin - with TfrmClothPurchasePlanList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmClothPurchasePlanList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; WindowState := mstate; diff --git a/T01贸易生产计划/U_GetDllForm.pas b/T01贸易生产计划/U_GetDllForm.pas index 14b322e..44aa300 100644 --- a/T01贸易生产计划/U_GetDllForm.pas +++ b/T01贸易生产计划/U_GetDllForm.pas @@ -131,7 +131,7 @@ begin 111: //ƻ begin - with TfrmTradePlanList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmTradePlanList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; WindowState := mstate; @@ -141,7 +141,7 @@ begin 131: //ɫƻ begin - with TfrmTradePlanColorList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmTradePlanColorList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; WindowState := mstate; @@ -151,7 +151,7 @@ begin 221: //ó״ǩ begin - with TfrmTradePlanCard.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do + with TfrmTradePlanCard.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do begin fFormID := FormID; WindowState := mstate; @@ -161,7 +161,7 @@ begin 211: //ƻ begin - with TfrmTradePlanSchedule.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmTradePlanSchedule.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; WindowState := mstate; @@ -171,7 +171,7 @@ begin 311: //ѯ begin - with TfrmTradePlanProfit1.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmTradePlanProfit1.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; WindowState := mstate; @@ -181,7 +181,7 @@ begin 312: //Ȳѯ begin - with TfrmTradePlanProfit.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmTradePlanProfit.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; WindowState := mstate; @@ -190,7 +190,7 @@ begin end; // 121: //ƻӹ(ã // begin -// with TfrmTradePlanMulFtyList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // +// with TfrmTradePlanMulFtyList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // // begin // fFormID := FormID; // @@ -201,7 +201,7 @@ begin // end; // 121: // // begin -// with TfrmTradePlanProofList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // +// with TfrmTradePlanProofList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // // begin // fFormID := FormID; // diff --git a/T02贸易汇总仓库/U_GetDllForm.pas b/T02贸易汇总仓库/U_GetDllForm.pas index 8fd89f1..7e455ce 100644 --- a/T02贸易汇总仓库/U_GetDllForm.pas +++ b/T02贸易汇总仓库/U_GetDllForm.pas @@ -139,7 +139,7 @@ begin 911: //ɹز begin - with TfrmClothPurchaseEnterList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmClothPurchaseEnterList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; WindowState := mstate; @@ -149,7 +149,7 @@ begin 912: // begin - with TfrmClothScheduleList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmClothScheduleList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; WindowState := mstate; @@ -159,7 +159,7 @@ begin 920: //뵥Ǽ begin - with TfrmItemizedListList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmItemizedListList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; WindowState := mstate; @@ -169,7 +169,7 @@ begin 921: //óײƥ begin - with TfrmTradeClothTotalInList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmTradeClothTotalInList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; WindowState := mstate; @@ -179,7 +179,7 @@ begin 221: //˻ begin - with TfrmTradeRRList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmTradeRRList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; WindowState := mstate; @@ -189,7 +189,7 @@ begin 211: // begin - with TfrmTradeDeliveryRequest.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmTradeDeliveryRequest.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; WindowState := mstate; @@ -199,7 +199,7 @@ begin 922: //óײƥ begin - with TfrmTradeClothTotalOutList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmTradeClothTotalOutList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; WindowState := mstate; @@ -209,7 +209,7 @@ begin 923: //óײƥ begin - with TfrmTradeClothTotalStkList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmTradeClothTotalStkList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; WindowState := mstate; @@ -219,7 +219,7 @@ begin 924: // begin - with TfrmTradeXinYuStkList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmTradeXinYuStkList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; WindowState := mstate; @@ -229,7 +229,7 @@ begin 925: // begin - with TfrmTradeXinYuOutList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmTradeXinYuOutList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; WindowState := mstate; @@ -239,7 +239,7 @@ begin 511: // begin - with TfrmTradeSampleClothInList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmTradeSampleClothInList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin FSTKName := 'ó'; fFormID := FormID; @@ -250,7 +250,7 @@ begin 521: // begin - with TfrmTradeSampleClothOutList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmTradeSampleClothOutList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin FSTKName := 'ó'; fFormID := FormID; @@ -261,7 +261,7 @@ begin 531: // begin - with TfrmTradeSampleClothStkList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmTradeSampleClothStkList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin FSTKName := 'ó'; fFormID := FormID; diff --git a/T03贸易布匹检验/U_GetDllForm.pas b/T03贸易布匹检验/U_GetDllForm.pas index 5ab6b93..a8fab3d 100644 --- a/T03贸易布匹检验/U_GetDllForm.pas +++ b/T03贸易布匹检验/U_GetDllForm.pas @@ -133,7 +133,7 @@ begin 2: // begin - with TfrmDeviceJkTest.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmDeviceJkTest.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; FormStyle := mstyle; @@ -145,7 +145,7 @@ begin // 111: //̨ // begin -// with TfrmTradeMachInsp.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // +// with TfrmTradeMachInsp.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // // begin // fFormID := FormID; // // FormStyle := mstyle; @@ -157,7 +157,7 @@ begin 1: //̨ begin - with TfrmMachRollMain.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmMachRollMain.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; // FormStyle := mstyle; diff --git a/T05贸易门市管理/U_GetDllForm.pas b/T05贸易门市管理/U_GetDllForm.pas index 9fccac8..2fd19c8 100644 --- a/T05贸易门市管理/U_GetDllForm.pas +++ b/T05贸易门市管理/U_GetDllForm.pas @@ -129,7 +129,7 @@ begin 111: // begin - with TfrmTradeMarketList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // + with TfrmTradeMarketList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // begin fFormID := FormID; FOrdType := ''; @@ -142,7 +142,7 @@ begin // 112: // // begin -// with TfrmTradeMarketList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // +// with TfrmTradeMarketList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // // begin // fFormID := FormID; // FOrdType := ''; @@ -155,7 +155,7 @@ begin // // 121: // // begin -// with TfrmTradeDispatchedList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // +// with TfrmTradeDispatchedList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10),formId,title) do // // begin // fFormID := FormID; // FormStyle := mstyle; diff --git a/T05贸易门市管理/U_TradeMarketInPut.dfm b/T05贸易门市管理/U_TradeMarketInPut.dfm index 8d44501..6d28382 100644 --- a/T05贸易门市管理/U_TradeMarketInPut.dfm +++ b/T05贸易门市管理/U_TradeMarketInPut.dfm @@ -458,7 +458,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut OptionsView.IndicatorWidth = 33 object cxGridDBColumn8: TcxGridDBColumn Caption = #25968#37327 - DataBinding.FieldName = 'Meter' + DataBinding.FieldName = 'Qty' DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' Properties.Alignment.Horz = taCenter @@ -688,6 +688,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Properties.ImmediatePost = True Properties.ReadOnly = False Properties.OnButtonClick = StkPositionPropertiesButtonClick + Properties.OnChange = CustNamePropertiesChange TabOrder = 9 Width = 200 end diff --git a/T05贸易门市管理/U_TradeMarketInPut.pas b/T05贸易门市管理/U_TradeMarketInPut.pas index 358bb1d..47b4e63 100644 --- a/T05贸易门市管理/U_TradeMarketInPut.pas +++ b/T05贸易门市管理/U_TradeMarketInPut.pas @@ -140,6 +140,7 @@ type procedure Tv1MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); procedure FormCreate(Sender: TObject); procedure StkPositionPropertiesButtonClick(Sender: TObject); + procedure CustNamePropertiesChange(Sender: TObject); private FSCXDH: string; procedure InitData(); @@ -852,6 +853,13 @@ begin end; +procedure TfrmTradeMarketInPut.CustNamePropertiesChange(Sender: TObject); +begin + inherited; + if CDS_KH.Locate('CoAbbrName', Trim(self.CustName.Text), []) then + self.CustName.Hint := Trim(CDS_KH.fieldbyname('CoCode').AsString); +end; + procedure TfrmTradeMarketInPut.cxDBImage1DblClick(Sender: TObject); begin if TcxDBImage(Sender).Picture.Height = 0 then @@ -1062,7 +1070,7 @@ begin frmComContactSel := TfrmComContactSel.Create(Application); with frmComContactSel do begin - FCoCode := Trim(self.CustName.Properties.LookupItems.Text); + FCoCode := Trim(self.CustName.Hint); if ShowModal = 1 then begin self.ShippingAddress.Text := Trim(frmComContactSel.CDS_1.fieldbyname('mxaddress').AsString); @@ -1159,7 +1167,7 @@ begin begin Close; SQL.Clear; - sql.Add('insert into Trade_Market_Sub_Qty (TMSQID,TMSId,Meter)'); + sql.Add('insert into Trade_Market_Sub_Qty (TMSQID,TMSId,Qty)'); sql.Add('values(' + quotedstr(Trim(MaxNo))); sql.Add(',' + quotedstr(Trim(MTMSId))); sql.Add(',' + QtyMX.Text); @@ -1173,7 +1181,7 @@ begin Append; FieldByName('TMSQID').Value := MaxNo; FieldByName('TMSId').Value := MTMSId; - FieldByName('Meter').Value := QtyMX.Text; + FieldByName('Qty').Value := QtyMX.Text; post; end; except @@ -1371,8 +1379,7 @@ begin begin Close; sql.Clear; - sql.Add(' SELECT A.C_Code,B.CICUnit FROM Bs_Cloth_Info A inner join Bs_Cloth_Info_Coefficient B on A.BCIID=B.BCIID '); - sql.Add(' where A.C_Code= ' + QuotedStr(CDS_1.FieldByName('C_Code').AsString)); + sql.Add(' EXEC P_Cloth_GetCICUnit @C_Code= ' + QuotedStr(CDS_1.FieldByName('C_Code').AsString)); Open; end; end; @@ -1383,12 +1390,12 @@ begin begin Close; sql.Clear; - sql.Add(' SELECT A.C_Code,B.CICUnit FROM Bs_Cloth_Info A inner join Bs_Cloth_Info_Coefficient B on A.BCIID=B.BCIID '); - sql.Add(' where A.C_Code= ' + QuotedStr(CDS_1.FieldByName('C_Code').AsString)); + sql.Add(' EXEC P_Cloth_GetCICUnit @C_Code= ' + QuotedStr(CDS_1.FieldByName('C_Code').AsString)); Open; end; end; + // Bs_Cloth_Info_Coefficient end; diff --git a/T05贸易门市管理/U_TradeMarketList.pas b/T05贸易门市管理/U_TradeMarketList.pas index 4c9dee7..ad4c37b 100644 --- a/T05贸易门市管理/U_TradeMarketList.pas +++ b/T05贸易门市管理/U_TradeMarketList.pas @@ -606,6 +606,8 @@ begin ScrollBox1.Enabled := True; N2.Visible := False; frmTradeMarketInPut.fordtype := self.fordtype; + TvMX.OnCellDblClick := nil; + Panel5.Visible := False; if ShowModal = 1 then begin