From 35fd99d9343dbd056fa704532588fa1afb41f64e Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Thu, 28 Nov 2024 15:12:45 +0800 Subject: [PATCH] 1128 --- A09财务通用管理/Financial.identcache | Bin 2696 -> 2696 bytes A09财务通用管理/U_CompanySel.dfm | 22 ++++++++-- A09财务通用管理/U_CompanySel.pas | 2 + A09财务通用管理/U_CustStatement.dfm | 2 +- A09财务通用管理/U_GetDllForm.pas | 2 +- A09财务通用管理/U_PayInput.dfm | 21 ++++++++++ A09财务通用管理/U_PayInput.pas | 2 + A09财务通用管理/U_PayList.dfm | 7 ++++ A09财务通用管理/U_PayList.pas | 1 + A09财务通用管理/U_ReceivableInput.pas | 1 + A09财务通用管理/U_SingleCustStatement.dfm | 2 +- B01基础合同管理/U_BaoguanList.dfm | 5 ++- B01基础合同管理/U_BaoguanList.pas | 20 ++++----- B01基础合同管理/U_GetDllForm.pas | 5 ++- B01基础合同管理/U_SalesConInPut.dfm | 3 +- B01基础合同管理/U_SalesContractList.pas | 1 + T01贸易生产计划/U_TradeConSel.dfm | 26 +++++++++++- T01贸易生产计划/U_TradeConSel.pas | 8 +++- T01贸易生产计划/U_TradePlanInPut.pas | 2 +- T01贸易生产计划/U_TradePlanList.dfm | 1 - T01贸易生产计划/U_TradePlanList.pas | 2 +- T02贸易汇总仓库/U_TradeFtyClothStkList.dfm | 26 +++++++++++- T02贸易汇总仓库/U_TradeFtyClothStkList.pas | 3 +- T02贸易汇总仓库/U_TradeGreyClothStkList.dfm | 26 +++++++++++- T02贸易汇总仓库/U_TradeGreyClothStkList.pas | 3 +- T02贸易汇总仓库/U_TradeSampleClothInEdit.dfm | 3 ++ T02贸易汇总仓库/U_TradeSampleClothInEdit.pas | 38 ++++++++++++++++++ T02贸易汇总仓库/U_TradeSampleClothInList.dfm | 5 ++- T02贸易汇总仓库/U_TradeSampleClothOutEdit.dfm | 3 +- T02贸易汇总仓库/U_TradeSampleClothOutEdit.pas | 21 ++++++---- T02贸易汇总仓库/U_TradeSampleClothOutList.dfm | 11 ++++- T02贸易汇总仓库/U_TradeSampleClothStkList.dfm | 8 +++- T02贸易汇总仓库/U_TradeSampleClothStkList.pas | 4 +- T02贸易汇总仓库/U_TradeSampleClothStkSel.dfm | 2 +- T02贸易汇总仓库/U_TradeSampleClothStkSel.pas | 2 +- T04贸易明细仓库/TradeClothStk.identcache | Bin 2408 -> 2408 bytes T04贸易明细仓库/U_TradeClothStkListNew.dfm | 19 +++++++-- T04贸易明细仓库/U_TradeClothStkListNew.pas | 8 ++-- T04贸易明细仓库/testDll.identcache | Bin 172 -> 172 bytes 39 files changed, 262 insertions(+), 55 deletions(-) diff --git a/A09财务通用管理/Financial.identcache b/A09财务通用管理/Financial.identcache index dec118248ea4cd62a3bd9f3234500a6f185b6f8f..0c76d84fabcae7e8a9076f53555fe9b5e196e17e 100644 GIT binary patch delta 55 zcmV-70LcG{6^Io9B9pNNKe3nf1CzuEPqT~!xB`=B2|u%Y2T1{w<^&^?X9pCM6A4t4 N1_3{jLl~2$3F0WI6Egq+ delta 72 zcmV-O0Jr~$6^IoDA^-pYN|TWWJ(Gj1S6B@2o#gu e0VtDQ1Q4^c2N402H3UzS`v_E%JO@9MrU~LS?-&>W diff --git a/A09财务通用管理/U_CompanySel.dfm b/A09财务通用管理/U_CompanySel.dfm index 8b11dff..d9bda89 100644 --- a/A09财务通用管理/U_CompanySel.dfm +++ b/A09财务通用管理/U_CompanySel.dfm @@ -198,15 +198,22 @@ inherited frmCompanySel: TfrmCompanySel end object Label2: TLabel Left = 240 - Top = 15 + Top = 17 Width = 60 Height = 12 Caption = #20379#24212#21830#31867#22411 end + object Label3: TLabel + Left = 504 + Top = 17 + Width = 24 + Height = 12 + Caption = #31616#31216 + end object CoName: TEdit Tag = 2 Left = 54 - Top = 12 + Top = 13 Width = 169 Height = 20 TabOrder = 0 @@ -215,12 +222,21 @@ inherited frmCompanySel: TfrmCompanySel object CoBusinessType: TEdit Tag = 2 Left = 305 - Top = 11 + Top = 13 Width = 169 Height = 20 TabOrder = 1 OnChange = CoNameChange end + object CoAbbrName: TEdit + Tag = 2 + Left = 534 + Top = 13 + Width = 169 + Height = 20 + TabOrder = 2 + OnChange = CoNameChange + end end inherited ADOQueryBaseCmd: TADOQuery Connection = ADOConnection1 diff --git a/A09财务通用管理/U_CompanySel.pas b/A09财务通用管理/U_CompanySel.pas index 947dde6..b99f2c2 100644 --- a/A09财务通用管理/U_CompanySel.pas +++ b/A09财务通用管理/U_CompanySel.pas @@ -61,6 +61,8 @@ type TV1Column9: TcxGridDBColumn; TV1Column10: TcxGridDBColumn; TV1Column11: TcxGridDBColumn; + Label3: TLabel; + CoAbbrName: TEdit; procedure FormCreate(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormShow(Sender: TObject); diff --git a/A09财务通用管理/U_CustStatement.dfm b/A09财务通用管理/U_CustStatement.dfm index 476167b..4d2f594 100644 --- a/A09财务通用管理/U_CustStatement.dfm +++ b/A09财务通用管理/U_CustStatement.dfm @@ -362,7 +362,7 @@ inherited frmCustStatement: TfrmCustStatement TabOrder = 3 Properties.CustomButtons.Buttons = <> Properties.Style = 2 - Properties.TabIndex = 1 + Properties.TabIndex = 0 Properties.Tabs.Strings = ( ' USD ' ' CNY ') diff --git a/A09财务通用管理/U_GetDllForm.pas b/A09财务通用管理/U_GetDllForm.pas index bd609ba..73650e3 100644 --- a/A09财务通用管理/U_GetDllForm.pas +++ b/A09财务通用管理/U_GetDllForm.pas @@ -78,7 +78,7 @@ begin pswd := 'rightsoft@5740'; DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; - DParameters1 := ''; + DParameters1 := '¼'; end else begin diff --git a/A09财务通用管理/U_PayInput.dfm b/A09财务通用管理/U_PayInput.dfm index b75887f..881d0c5 100644 --- a/A09财务通用管理/U_PayInput.dfm +++ b/A09财务通用管理/U_PayInput.dfm @@ -87,6 +87,7 @@ object frmPayInput: TfrmPayInput ParentCtl3D = False ParentFont = False TabOrder = 1 + ExplicitTop = 44 object Label2: TLabel Left = 32 Top = 102 @@ -282,6 +283,19 @@ object frmPayInput: TfrmPayInput Font.Style = [fsBold] ParentFont = False end + object Label10: TLabel + Left = 486 + Top = 60 + Width = 63 + Height = 15 + Caption = #27719' '#29575#65306 + Font.Charset = ANSI_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = 'Times New Roman' + Font.Style = [fsBold] + ParentFont = False + end object Note: TMemo Left = 92 Top = 237 @@ -505,6 +519,13 @@ object frmPayInput: TfrmPayInput #20184#27454 #25910#27454) end + object ExchangeRate: TcxCurrencyEdit + Left = 544 + Top = 59 + Properties.AssignedValues.DisplayFormat = True + TabOrder = 16 + Width = 140 + end end object ADOQueryTemp: TADOQuery Connection = DataLink_Financial.ADOLink diff --git a/A09财务通用管理/U_PayInput.pas b/A09财务通用管理/U_PayInput.pas index fe87d7f..bbf23b9 100644 --- a/A09财务通用管理/U_PayInput.pas +++ b/A09财务通用管理/U_PayInput.pas @@ -58,6 +58,8 @@ type RegType: TComboBox; Label6: TLabel; ToolButton2: TToolButton; + Label10: TLabel; + ExchangeRate: TcxCurrencyEdit; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); diff --git a/A09财务通用管理/U_PayList.dfm b/A09财务通用管理/U_PayList.dfm index f046b35..d8c1b8b 100644 --- a/A09财务通用管理/U_PayList.dfm +++ b/A09财务通用管理/U_PayList.dfm @@ -510,6 +510,13 @@ inherited frmPayList: TfrmPayList DataBinding.IsNullValueType = True Visible = False end + object Tv1Column13: TcxGridDBColumn + Caption = #27719#29575 + DataBinding.FieldName = 'ExchangeRate' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 50 + end end object cxGridLevel1: TcxGridLevel GridView = Tv1 diff --git a/A09财务通用管理/U_PayList.pas b/A09财务通用管理/U_PayList.pas index decf6ab..c144e9f 100644 --- a/A09财务通用管理/U_PayList.pas +++ b/A09财务通用管理/U_PayList.pas @@ -99,6 +99,7 @@ type ToolButton6: TToolButton; ToolButton7: TToolButton; Tv1Column12: TcxGridDBColumn; + Tv1Column13: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); procedure btnDelClick(Sender: TObject); diff --git a/A09财务通用管理/U_ReceivableInput.pas b/A09财务通用管理/U_ReceivableInput.pas index 851d7b2..86bd677 100644 --- a/A09财务通用管理/U_ReceivableInput.pas +++ b/A09财务通用管理/U_ReceivableInput.pas @@ -386,6 +386,7 @@ begin FieldByName('OurCoNo').Value := Trim(OurCoName.TxtCode); FieldByName('OppParentCoNo').Value := Trim(OppParentCoName.TxtCode); FieldByName('FFID').Value := Trim(MaxId); + FieldByName('ReconciliationDate').Value := FFTime.DateTime; RTSetsavedata(ADOQueryCmd, 'Finance_Flow', ScrollBox1, 0); Post; end; diff --git a/A09财务通用管理/U_SingleCustStatement.dfm b/A09财务通用管理/U_SingleCustStatement.dfm index 490d0e5..c792973 100644 --- a/A09财务通用管理/U_SingleCustStatement.dfm +++ b/A09财务通用管理/U_SingleCustStatement.dfm @@ -512,7 +512,7 @@ object frmSingleCustStatement: TfrmSingleCustStatement end object V1Column26: TcxGridDBBandedColumn Caption = #22791#27880 - DataBinding.FieldName = 'YMxNote' + DataBinding.FieldName = 'Note' DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' Properties.Alignment.Horz = taCenter diff --git a/B01基础合同管理/U_BaoguanList.dfm b/B01基础合同管理/U_BaoguanList.dfm index a8e95f2..41a91c5 100644 --- a/B01基础合同管理/U_BaoguanList.dfm +++ b/B01基础合同管理/U_BaoguanList.dfm @@ -211,6 +211,7 @@ inherited frmBaoguanList: TfrmBaoguanList Align = alClient PopupMenu = pm1 TabOrder = 3 + ExplicitTop = 161 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -656,7 +657,7 @@ inherited frmBaoguanList: TfrmBaoguanList Height = 20 Date = 40675.000000000000000000 Format = 'yyyy-MM-dd' - Time = 0.464761099538009200 + Time = 0.464761099538009100 TabOrder = 1 end object PONO: TEdit @@ -769,7 +770,7 @@ inherited frmBaoguanList: TfrmBaoguanList TabOrder = 2 Properties.CustomButtons.Buttons = <> Properties.Style = 9 - Properties.TabIndex = 0 + Properties.TabIndex = 6 Properties.Tabs.Strings = ( #33609#31295#20214 #27491#24335#20214 diff --git a/B01基础合同管理/U_BaoguanList.pas b/B01基础合同管理/U_BaoguanList.pas index e3fe849..9bd3e93 100644 --- a/B01基础合同管理/U_BaoguanList.pas +++ b/B01基础合同管理/U_BaoguanList.pas @@ -649,9 +649,9 @@ begin sql.Add(',ISFY=Cast((case when ISNULL(FYFlag,'''')='''' then 0 else 1 end) AS bit)'); sql.Add(',ISDF=Cast((case when ISNULL(DFFlag,'''')='''' then 0 else 1 end) AS bit)'); sql.Add(',ISFK=Cast((case when ISNULL(FKFlag,'''')='''' then 0 else 1 end) AS bit)'); - sql.Add(',(Case A.Status when ''0'' then ''δύ'' when ''1'' then ''ύ'''); - sql.Add('when ''9'' then '''' when ''10'' then '''' '); - SQL.Add('when ''-1'' then ''ȡ'' end) AS ZT from Baoguan_Main A'); + sql.Add(',(Case A.Status when ''0'' then ''ݸ'' when ''1'' then ''ʽ'''); + sql.Add('when ''5'' then ''ȷ'' when ''9'' then ''ȷ'' when ''10'' then '''' '); + SQL.Add('when ''-1'' then '''' end) AS ZT from Baoguan_Main A'); sql.Add('where 1=1 ' + (WSql)); sql.Add(' and FPDate>=''' + Trim(FormatDateTime('yyyy-MM-dd', BegDate.Date)) + ''''); @@ -898,7 +898,7 @@ begin begin if fieldbyname('SSel').AsBoolean then begin - MBGMIDS := MBGMIDS + trim(fieldbyname('ConMID').AsString) + ','; + MBGMIDS := MBGMIDS + trim(fieldbyname('BGMID').AsString) + ','; end; next; end; @@ -959,7 +959,7 @@ begin begin if fieldbyname('SSel').AsBoolean then begin - MBGMIDS := MBGMIDS + trim(fieldbyname('ConMID').AsString) + ','; + MBGMIDS := MBGMIDS + trim(fieldbyname('BGMID').AsString) + ','; end; next; end; @@ -1025,7 +1025,7 @@ begin begin if fieldbyname('SSel').AsBoolean then begin - MBGMIDS := MBGMIDS + trim(fieldbyname('ConMID').AsString) + ','; + MBGMIDS := MBGMIDS + trim(fieldbyname('BGMID').AsString) + ','; end; next; end; @@ -1095,7 +1095,7 @@ begin begin if fieldbyname('SSel').AsBoolean then begin - MBGMIDS := MBGMIDS + trim(fieldbyname('ConMID').AsString) + ','; + MBGMIDS := MBGMIDS + trim(fieldbyname('BGMID').AsString) + ','; end; next; end; @@ -1156,7 +1156,7 @@ begin begin if fieldbyname('SSel').AsBoolean then begin - MBGMIDS := MBGMIDS + trim(fieldbyname('ConMID').AsString) + ','; + MBGMIDS := MBGMIDS + trim(fieldbyname('BGMID').AsString) + ','; end; next; end; @@ -1232,7 +1232,7 @@ begin begin if fieldbyname('SSel').AsBoolean then begin - MBGMIDS := MBGMIDS + trim(fieldbyname('ConMID').AsString) + ','; + MBGMIDS := MBGMIDS + trim(fieldbyname('BGMID').AsString) + ','; end; next; end; @@ -1293,7 +1293,7 @@ begin begin if fieldbyname('SSel').AsBoolean then begin - MBGMIDS := MBGMIDS + trim(fieldbyname('ConMID').AsString) + ','; + MBGMIDS := MBGMIDS + trim(fieldbyname('BGMID').AsString) + ','; end; next; end; diff --git a/B01基础合同管理/U_GetDllForm.pas b/B01基础合同管理/U_GetDllForm.pas index 99fe335..186fe9f 100644 --- a/B01基础合同管理/U_GetDllForm.pas +++ b/B01基础合同管理/U_GetDllForm.pas @@ -77,8 +77,9 @@ begin DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; // Parameters1 := '¼'; Parameters1 := ''; - DName :='admin'; - DCode :='006'; +// Parameters1 := ''; +// DName :='admin'; + DCode :='002'; end else begin diff --git a/B01基础合同管理/U_SalesConInPut.dfm b/B01基础合同管理/U_SalesConInPut.dfm index fd47728..29ab108 100644 --- a/B01基础合同管理/U_SalesConInPut.dfm +++ b/B01基础合同管理/U_SalesConInPut.dfm @@ -11,7 +11,6 @@ inherited frmSalesConInPut: TfrmSalesConInPut OldCreateOrder = True Position = poScreenCenter WindowState = wsMaximized - ExplicitTop = -39 ExplicitWidth = 1533 ExplicitHeight = 734 PixelsPerInch = 96 @@ -78,6 +77,8 @@ inherited frmSalesConInPut: TfrmSalesConInPut ParentCtl3D = False ParentFont = False TabOrder = 1 + ExplicitLeft = 1 + ExplicitTop = 33 object Label3: TLabel Left = 40 Top = 81 diff --git a/B01基础合同管理/U_SalesContractList.pas b/B01基础合同管理/U_SalesContractList.pas index e9cef96..b885b72 100644 --- a/B01基础合同管理/U_SalesContractList.pas +++ b/B01基础合同管理/U_SalesContractList.pas @@ -665,6 +665,7 @@ begin begin PState := '鿴'; FConMId := Trim(Self.CDS_1.fieldbyname('ConMID').AsString); + FAuthority := self.FAuthority; FGSTT := self.FGSTT; ToolBar2.Visible := False; TBSave.Visible := False; diff --git a/T01贸易生产计划/U_TradeConSel.dfm b/T01贸易生产计划/U_TradeConSel.dfm index a59337f..1b66f4e 100644 --- a/T01贸易生产计划/U_TradeConSel.dfm +++ b/T01贸易生产计划/U_TradeConSel.dfm @@ -10,7 +10,6 @@ inherited frmTradeConSel: TfrmTradeConSel Font.Name = #23435#20307 Position = poScreenCenter OnClose = FormClose - ExplicitLeft = -351 ExplicitWidth = 1556 ExplicitHeight = 597 PixelsPerInch = 96 @@ -156,9 +155,10 @@ inherited frmTradeConSel: TfrmTradeConSel BorderStyle = cxcbsNone PopupMenu = PM_1 TabOrder = 2 - ExplicitLeft = 1 + ExplicitTop = 110 object TV1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_1 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -200,6 +200,7 @@ inherited frmTradeConSel: TfrmTradeConSel object TV1Column7: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True HeaderAlignmentHorz = taCenter @@ -208,36 +209,42 @@ inherited frmTradeConSel: TfrmTradeConSel object TV1Column1: TcxGridDBColumn Caption = #21512#21516#21495 DataBinding.FieldName = 'ConNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object TV1Column6: TcxGridDBColumn Caption = #23458#25143#21333#21495 DataBinding.FieldName = 'BuyConNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 88 end object TV1Column5: TcxGridDBColumn Caption = #32463#33829#21333#20301 DataBinding.FieldName = 'SellName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object TV1Column3: TcxGridDBColumn Caption = #23458#25143 DataBinding.FieldName = 'BuyName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object TV1Column4: TcxGridDBColumn Caption = #20013#38388#21830 DataBinding.FieldName = 'MiddleName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object v1Column5: TcxGridDBColumn Caption = #35268#26684 DataBinding.FieldName = 'C_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 60 @@ -245,12 +252,14 @@ inherited frmTradeConSel: TfrmTradeConSel object TV1Column8: TcxGridDBColumn Caption = #21512#21516#26085#26399 DataBinding.FieldName = 'ConDate' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 73 end object TV1Column2: TcxGridDBColumn Caption = #20132#36135#26085#26399 DataBinding.FieldName = 'DlyDate' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 72 @@ -258,6 +267,7 @@ inherited frmTradeConSel: TfrmTradeConSel object VC_SCSCode: TcxGridDBColumn Caption = #20135#21697#32534#21495 DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -272,6 +282,7 @@ inherited frmTradeConSel: TfrmTradeConSel object cxGridDBColumn2: TcxGridDBColumn Caption = #20135#21697#21517#31216 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -279,6 +290,7 @@ inherited frmTradeConSel: TfrmTradeConSel object cxGridDBColumn3: TcxGridDBColumn Caption = #20135#21697#33521#25991#21517 DataBinding.FieldName = 'C_EName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -293,6 +305,7 @@ inherited frmTradeConSel: TfrmTradeConSel object cxGridDBColumn4: TcxGridDBColumn Caption = #25104#20998 DataBinding.FieldName = 'C_Composition' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -300,6 +313,7 @@ inherited frmTradeConSel: TfrmTradeConSel object cxGridDBColumn5: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -307,6 +321,7 @@ inherited frmTradeConSel: TfrmTradeConSel object cxGridDBColumn6: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 57 @@ -314,6 +329,7 @@ inherited frmTradeConSel: TfrmTradeConSel object cxGridDBColumn7: TcxGridDBColumn Caption = #27454#21495 DataBinding.FieldName = 'C_StyleNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 77 @@ -321,6 +337,7 @@ inherited frmTradeConSel: TfrmTradeConSel object cxGridDBColumn8: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -335,6 +352,7 @@ inherited frmTradeConSel: TfrmTradeConSel object v1Column6: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -348,6 +366,7 @@ inherited frmTradeConSel: TfrmTradeConSel object v1Column7: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -361,6 +380,7 @@ inherited frmTradeConSel: TfrmTradeConSel object v1PRTOrderQty: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'ConQty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -369,6 +389,7 @@ inherited frmTradeConSel: TfrmTradeConSel object v1OrderUnit: TcxGridDBColumn Caption = #21333#20301 DataBinding.FieldName = 'ConUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsEditFixedList Properties.Items.Strings = ( @@ -382,6 +403,7 @@ inherited frmTradeConSel: TfrmTradeConSel object v1Column2: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'ConSNote' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 diff --git a/T01贸易生产计划/U_TradeConSel.pas b/T01贸易生产计划/U_TradeConSel.pas index 7b5f0df..a87a300 100644 --- a/T01贸易生产计划/U_TradeConSel.pas +++ b/T01贸易生产计划/U_TradeConSel.pas @@ -11,7 +11,7 @@ uses cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, cxButtonEdit, - cxDropDownEdit, cxCheckBox, Vcl.Menus, cxPC; + cxDropDownEdit, cxCheckBox, Vcl.Menus, cxPC, dxSkinWXI, dxScrollbarAnnotations; type TfrmTradeConSel = class(TfrmBaseHelp) @@ -99,7 +99,7 @@ type procedure InitGrid(); { Private declarations } public - FCoType, FAuthority: string; + FCoType, FAuthority,Canshu2: string; { Public declarations } end; @@ -170,6 +170,10 @@ begin sql.Clear; sql.Add('select A.*,B.* from BS_Contract_Main A inner join BS_Contract_Sub B on A.ConMId=B.ConMId '); sql.Add(' where isnull(A.status,''0'')=''9'''); + if Canshu2='' then + begin + sql.add(' and A.Tallyer= ' + QuotedStr(Trim(DName))); + end; case cxTabControl1.TabIndex of 0: begin diff --git a/T01贸易生产计划/U_TradePlanInPut.pas b/T01贸易生产计划/U_TradePlanInPut.pas index 27e4f59..b7f76b1 100644 --- a/T01贸易生产计划/U_TradePlanInPut.pas +++ b/T01贸易生产计划/U_TradePlanInPut.pas @@ -1619,7 +1619,7 @@ begin frmTradeConSel := TfrmTradeConSel.Create(Application); with frmTradeConSel do begin - + canshu2 := self.canshu2; if ShowModal = 1 then begin while CDS_1.locate('SSel', true, []) do diff --git a/T01贸易生产计划/U_TradePlanList.dfm b/T01贸易生产计划/U_TradePlanList.dfm index 0712ee7..d418093 100644 --- a/T01贸易生产计划/U_TradePlanList.dfm +++ b/T01贸易生产计划/U_TradePlanList.dfm @@ -1445,7 +1445,6 @@ inherited frmTradePlanList: TfrmTradePlanList ParentFont = False TabOrder = 0 Zoom = 100 - ExplicitHeight = 607 end object BGComposition: TEdit Tag = 2 diff --git a/T01贸易生产计划/U_TradePlanList.pas b/T01贸易生产计划/U_TradePlanList.pas index e238d66..acbc99b 100644 --- a/T01贸易生产计划/U_TradePlanList.pas +++ b/T01贸易生产计划/U_TradePlanList.pas @@ -612,7 +612,7 @@ begin Open; end; SCSHData(ADOQueryTemp, Panel4, 2); -// BGMainID.text:=ADOQueryTemp.FieldByName('MainID').AsString; + BGName.text:=ADOQueryTemp.FieldByName('BGName').AsString; BGCM.text:=ADOQueryTemp.FieldByName('CM').AsString; BGJM.text:=ADOQueryTemp.FieldByName('JM').AsString; end; diff --git a/T02贸易汇总仓库/U_TradeFtyClothStkList.dfm b/T02贸易汇总仓库/U_TradeFtyClothStkList.dfm index c45b8f5..ccbb111 100644 --- a/T02贸易汇总仓库/U_TradeFtyClothStkList.dfm +++ b/T02贸易汇总仓库/U_TradeFtyClothStkList.dfm @@ -149,9 +149,9 @@ inherited frmTradeFtyClothStkList: TfrmTradeFtyClothStkList Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 - ExplicitTop = 75 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Summary.DefaultGroupSummaryItems = < item @@ -221,6 +221,7 @@ inherited frmTradeFtyClothStkList: TfrmTradeFtyClothStkList object v1Column6: TcxGridDBColumn Caption = #20837#24211#26102#38388 DataBinding.FieldName = 'IOTime' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 87 @@ -229,6 +230,7 @@ inherited frmTradeFtyClothStkList: TfrmTradeFtyClothStkList Tag = 2 Caption = #26469#33258#21333#20301 DataBinding.FieldName = 'FromCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Alignment.Horz = taLeftJustify Properties.Buttons = < @@ -245,6 +247,7 @@ inherited frmTradeFtyClothStkList: TfrmTradeFtyClothStkList Tag = 2 Caption = #21697#21517 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -258,6 +261,7 @@ inherited frmTradeFtyClothStkList: TfrmTradeFtyClothStkList object Tv1Column3: TcxGridDBColumn Caption = #32534#21495 DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 60 @@ -266,6 +270,7 @@ inherited frmTradeFtyClothStkList: TfrmTradeFtyClothStkList Tag = 2 Caption = #35268#26684 DataBinding.FieldName = 'C_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Options.Editing = False @@ -274,6 +279,7 @@ inherited frmTradeFtyClothStkList: TfrmTradeFtyClothStkList object v1Column4: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -281,6 +287,7 @@ inherited frmTradeFtyClothStkList: TfrmTradeFtyClothStkList object v1Column5: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -288,6 +295,7 @@ inherited frmTradeFtyClothStkList: TfrmTradeFtyClothStkList object v1Column10: TcxGridDBColumn Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 124 @@ -295,24 +303,28 @@ inherited frmTradeFtyClothStkList: TfrmTradeFtyClothStkList object v1Column11: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 68 end object v1Column7: TcxGridDBColumn Caption = #20837#24211#21305#25968 DataBinding.FieldName = 'piece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 62 end object v1Column9: TcxGridDBColumn Caption = #20837#24211#25968#37327 DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 63 end object v1Column1: TcxGridDBColumn Caption = #24211#23384#21305#25968 DataBinding.FieldName = 'stkpiece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 69 @@ -321,6 +333,7 @@ inherited frmTradeFtyClothStkList: TfrmTradeFtyClothStkList Tag = 2 Caption = #24211#23384#25968#37327 DataBinding.FieldName = 'stkqty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -330,6 +343,7 @@ inherited frmTradeFtyClothStkList: TfrmTradeFtyClothStkList Tag = 2 Caption = #21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( @@ -343,6 +357,7 @@ inherited frmTradeFtyClothStkList: TfrmTradeFtyClothStkList object Tv1Column2: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 69 @@ -350,6 +365,7 @@ inherited frmTradeFtyClothStkList: TfrmTradeFtyClothStkList object Tv1Column1: TcxGridDBColumn Caption = #33394#21035 DataBinding.FieldName = 'C_ColorDepth' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 72 @@ -357,40 +373,47 @@ inherited frmTradeFtyClothStkList: TfrmTradeFtyClothStkList object Tv1Column4: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object Tv1Column5: TcxGridDBColumn Caption = #25104#20998 DataBinding.FieldName = 'C_Composition' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object Tv1Column6: TcxGridDBColumn Caption = #27454#21495 DataBinding.FieldName = 'C_StyleNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object Tv1Column7: TcxGridDBColumn Caption = #25351#31034#21333#21495 DataBinding.FieldName = 'FromOrdNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 76 end object Tv1Column8: TcxGridDBColumn Caption = #23384#25918#21333#20301 DataBinding.FieldName = 'StkCoName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter end object Tv1Column9: TcxGridDBColumn Caption = #20837#24211#20154 DataBinding.FieldName = 'Filler' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter end object Tv1Column10: TcxGridDBColumn Caption = #20837#24211#31867#22411 DataBinding.FieldName = 'IoType' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter end end @@ -434,6 +457,7 @@ inherited frmTradeFtyClothStkList: TfrmTradeFtyClothStkList Top = 232 end object cxGridPopupMenu1: TcxGridPopupMenu + Grid = cxGrid1 PopupMenus = <> Left = 536 Top = 240 diff --git a/T02贸易汇总仓库/U_TradeFtyClothStkList.pas b/T02贸易汇总仓库/U_TradeFtyClothStkList.pas index 1ae4a4a..71d8c39 100644 --- a/T02贸易汇总仓库/U_TradeFtyClothStkList.pas +++ b/T02贸易汇总仓库/U_TradeFtyClothStkList.pas @@ -12,7 +12,8 @@ uses cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, - cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList; + cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, dxSkinWXI, + dxScrollbarAnnotations; type TfrmTradeFtyClothStkList = class(TfrmBaseList) diff --git a/T02贸易汇总仓库/U_TradeGreyClothStkList.dfm b/T02贸易汇总仓库/U_TradeGreyClothStkList.dfm index 2fa21ca..f91ca7b 100644 --- a/T02贸易汇总仓库/U_TradeGreyClothStkList.dfm +++ b/T02贸易汇总仓库/U_TradeGreyClothStkList.dfm @@ -5,7 +5,6 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList ClientHeight = 472 ClientWidth = 1400 Position = poDefault - ExplicitLeft = -149 ExplicitWidth = 1416 ExplicitHeight = 511 PixelsPerInch = 96 @@ -166,9 +165,9 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 - ExplicitTop = 75 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Summary.DefaultGroupSummaryItems = < item @@ -238,6 +237,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList object v1Column6: TcxGridDBColumn Caption = #20837#24211#26102#38388 DataBinding.FieldName = 'IOTime' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 87 @@ -246,6 +246,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList Tag = 2 Caption = #20379#24212#21830 DataBinding.FieldName = 'FromCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Alignment.Horz = taLeftJustify Properties.Buttons = < @@ -261,6 +262,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList object v1Column2: TcxGridDBColumn Caption = #23458#25143#32534#21495 DataBinding.FieldName = 'FromCoNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 92 @@ -268,6 +270,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList object Tv1Column3: TcxGridDBColumn Caption = #32534#21495 DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 86 end @@ -275,6 +278,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList Tag = 2 Caption = #21697#21517 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -289,6 +293,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList Tag = 2 Caption = #35268#26684 DataBinding.FieldName = 'C_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Options.Editing = False @@ -297,6 +302,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList object v1Column4: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -304,6 +310,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList object v1Column5: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -311,6 +318,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList object v1Column10: TcxGridDBColumn Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 124 @@ -318,30 +326,35 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList object v1Column11: TcxGridDBColumn Caption = #19994#21153#21592 DataBinding.FieldName = 'Saleser' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 68 end object v1Column12: TcxGridDBColumn Caption = #32852#31995#26041#24335 DataBinding.FieldName = 'SalesPhone' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 73 end object v1Column7: TcxGridDBColumn Caption = #20837#24211#21305#25968 DataBinding.FieldName = 'piece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 62 end object v1Column9: TcxGridDBColumn Caption = #20837#24211#25968#37327 DataBinding.FieldName = 'Qty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 63 end object v1Column1: TcxGridDBColumn Caption = #24211#23384#21305#25968 DataBinding.FieldName = 'stkpiece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 69 @@ -350,6 +363,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList Tag = 2 Caption = #24211#23384#25968#37327 DataBinding.FieldName = 'stkqty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -359,6 +373,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList Tag = 2 Caption = #21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( @@ -372,6 +387,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList object Tv1Column2: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 69 @@ -379,6 +395,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList object Tv1Column1: TcxGridDBColumn Caption = #33394#21035 DataBinding.FieldName = 'C_ColorDepth' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 72 @@ -386,24 +403,28 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList object Tv1Column4: TcxGridDBColumn Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'FromOrdNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 82 end object Tv1Column5: TcxGridDBColumn Caption = #23384#25918#21333#20301 DataBinding.FieldName = 'StkCoName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 85 end object Tv1Column6: TcxGridDBColumn Caption = #20837#24211#20154 DataBinding.FieldName = 'Filler' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 50 end object Tv1Column7: TcxGridDBColumn Caption = #20837#24211#31867#22411 DataBinding.FieldName = 'IOType' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 82 end @@ -448,6 +469,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList Top = 232 end object cxGridPopupMenu1: TcxGridPopupMenu + Grid = cxGrid1 PopupMenus = <> Left = 536 Top = 240 diff --git a/T02贸易汇总仓库/U_TradeGreyClothStkList.pas b/T02贸易汇总仓库/U_TradeGreyClothStkList.pas index b104e89..7d762b2 100644 --- a/T02贸易汇总仓库/U_TradeGreyClothStkList.pas +++ b/T02贸易汇总仓库/U_TradeGreyClothStkList.pas @@ -12,7 +12,8 @@ uses cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, - cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList; + cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, dxSkinWXI, + dxScrollbarAnnotations; type TfrmTradeGreyClothStkList = class(TfrmBaseList) diff --git a/T02贸易汇总仓库/U_TradeSampleClothInEdit.dfm b/T02贸易汇总仓库/U_TradeSampleClothInEdit.dfm index a0fd631..7f6282f 100644 --- a/T02贸易汇总仓库/U_TradeSampleClothInEdit.dfm +++ b/T02贸易汇总仓库/U_TradeSampleClothInEdit.dfm @@ -220,6 +220,7 @@ inherited frmTradeSampleClothInEdit: TfrmTradeSampleClothInEdit DataBinding.FieldName = 'Qty' DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = Tv1Column12PropertiesEditValueChanged HeaderAlignmentHorz = taCenter Width = 92 end @@ -317,6 +318,8 @@ inherited frmTradeSampleClothInEdit: TfrmTradeSampleClothInEdit Caption = #25104#26412#20215 DataBinding.FieldName = 'CBPrice' DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = Tv1Column12PropertiesEditValueChanged HeaderAlignmentHorz = taCenter Width = 55 end diff --git a/T02贸易汇总仓库/U_TradeSampleClothInEdit.pas b/T02贸易汇总仓库/U_TradeSampleClothInEdit.pas index 401d9ea..2974208 100644 --- a/T02贸易汇总仓库/U_TradeSampleClothInEdit.pas +++ b/T02贸易汇总仓库/U_TradeSampleClothInEdit.pas @@ -77,6 +77,7 @@ type procedure v1QtyUnitPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure ToolButton2Click(Sender: TObject); procedure BCIIDKeyPress(Sender: TObject; var Key: Char); + procedure Tv1Column12PropertiesEditValueChanged(Sender: TObject); private { Private declarations } function SaveCKData(): Boolean; @@ -399,6 +400,43 @@ begin end; +procedure TfrmTradeSampleClothInEdit.Tv1Column12PropertiesEditValueChanged( + Sender: TObject); +var + mvalue, FFieldName: string; + FQty, FCBPrice, FCBMoney: Double; //ۣ, Ԥɱ +begin + mvalue := TcxTextEdit(Sender).EditingText; + if Trim(mvalue) = '' then + begin + mvalue := '0'; + end; + FFieldName := Trim(Tv1.Controller.FocusedColumn.DataBinding.FilterFieldName); + + with CDS_Sub do + begin + Edit; + FieldByName(FFieldName).Value := Trim(mvalue); + Post; + FQty := Fieldbyname('Qty').AsFloat; + FCBPrice := Fieldbyname('CBPrice').AsFloat; + end; + FCBMoney := RoundFloat(FQty * FCBPrice, 2); + + with CDS_Sub do + begin + Edit; + FieldByName('Qty').Value := FQty; + FieldByName('CBPrice').Value := FCBPrice; + FieldByName('CBMoney').Value := FCBMoney; + Post; + end; + + + + tv1.Controller.EditingController.ShowEdit(); +end; + procedure TfrmTradeSampleClothInEdit.Tv1Column1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); begin try diff --git a/T02贸易汇总仓库/U_TradeSampleClothInList.dfm b/T02贸易汇总仓库/U_TradeSampleClothInList.dfm index fef6938..3cae617 100644 --- a/T02贸易汇总仓库/U_TradeSampleClothInList.dfm +++ b/T02贸易汇总仓库/U_TradeSampleClothInList.dfm @@ -4,7 +4,6 @@ inherited frmTradeSampleClothInList: TfrmTradeSampleClothInList Caption = #20837#24211#21015#34920 ClientHeight = 478 ClientWidth = 1540 - ExplicitLeft = -381 ExplicitWidth = 1556 ExplicitHeight = 517 PixelsPerInch = 96 @@ -293,6 +292,10 @@ inherited frmTradeSampleClothInList: TfrmTradeSampleClothInList end item Kind = skSum + end + item + Kind = skSum + Column = Tv1Column11 end> DataController.Summary.SummaryGroups = <> OptionsCustomize.ColumnFiltering = False diff --git a/T02贸易汇总仓库/U_TradeSampleClothOutEdit.dfm b/T02贸易汇总仓库/U_TradeSampleClothOutEdit.dfm index 089ee55..25fafb0 100644 --- a/T02贸易汇总仓库/U_TradeSampleClothOutEdit.dfm +++ b/T02贸易汇总仓库/U_TradeSampleClothOutEdit.dfm @@ -84,7 +84,6 @@ inherited frmTradeSampleClothOutEdit: TfrmTradeSampleClothOutEdit Height = 411 Align = alClient TabOrder = 1 - ExplicitTop = 44 object Tv1: TcxGridDBTableView OnMouseDown = Tv1MouseDown Navigator.Buttons.CustomButtons = <> @@ -361,6 +360,8 @@ inherited frmTradeSampleClothOutEdit: TfrmTradeSampleClothOutEdit Caption = #25104#26412#21333#20215 DataBinding.FieldName = 'CBPrice' DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxTextEditProperties' + Properties.OnEditValueChanged = v2Column6PropertiesEditValueChanged HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 diff --git a/T02贸易汇总仓库/U_TradeSampleClothOutEdit.pas b/T02贸易汇总仓库/U_TradeSampleClothOutEdit.pas index 2055eb6..88776d9 100644 --- a/T02贸易汇总仓库/U_TradeSampleClothOutEdit.pas +++ b/T02贸易汇总仓库/U_TradeSampleClothOutEdit.pas @@ -114,14 +114,14 @@ begin Append; FieldByName('IOTime').Value := Trim(FormatDateTime('yyyy-MM-dd', Now)); FieldByName('STKID').Value := frmTradeSampleClothStkSel.CDS_Main.fieldbyname('BCIOID').Value; - FieldByName('IOType').Value := ''; +// FieldByName('IOType').Value := ''; FieldByName('FromCoNo').Value := frmTradeSampleClothStkSel.CDS_Main.fieldbyname('FromCoNo').Value; FieldByName('FromCoName').Value := frmTradeSampleClothStkSel.CDS_Main.fieldbyname('FromCoName').Value; FieldByName('StkCoNo').Value := frmTradeSampleClothStkSel.CDS_Main.fieldbyname('StkCoNo').Value; FieldByName('StkCoName').Value := frmTradeSampleClothStkSel.CDS_Main.fieldbyname('StkCoName').Value; - FieldByName('ToCoNo').Value := frmTradeSampleClothStkSel.CDS_Main.fieldbyname('StkCoNo').Value; - FieldByName('ToCoName').Value := frmTradeSampleClothStkSel.CDS_Main.fieldbyname('StkCoName').Value; +// FieldByName('ToCoNo').Value := frmTradeSampleClothStkSel.CDS_Main.fieldbyname('StkCoNo').Value; +// FieldByName('ToCoName').Value := frmTradeSampleClothStkSel.CDS_Main.fieldbyname('StkCoName').Value; FieldByName('C_Pack').Value := frmTradeSampleClothStkSel.CDS_Main.fieldbyname('C_Pack').Value; FieldByName('C_Code').Value := frmTradeSampleClothStkSel.CDS_Main.fieldbyname('C_Code').Value; FieldByName('C_Name').Value := frmTradeSampleClothStkSel.CDS_Main.fieldbyname('C_Name').Value; @@ -152,7 +152,7 @@ begin FieldByName('C_Composition').Value := frmTradeSampleClothStkSel.CDS_Main.fieldbyname('C_Composition').Value; FieldByName('C_StyleNo').Value := frmTradeSampleClothStkSel.CDS_Main.fieldbyname('C_StyleNo').Value; FieldByName('CBPrice').Value := frmTradeSampleClothStkSel.CDS_Main.fieldbyname('CBPrice').Value; - FieldByName('CBMoney').Value := frmTradeSampleClothStkSel.CDS_Main.fieldbyname('CBMoney').Value; +// FieldByName('CBMoney').Value := frmTradeSampleClothStkSel.CDS_Main.fieldbyname('CBMoney').Value; end; frmTradeSampleClothStkSel.CDS_Main.Delete; end; @@ -359,6 +359,11 @@ begin Application.MessageBox('ͲΪ!', 'ʾ', 0); Exit; end; + if CDS_Sub.Locate('ToCoName', null, []) = True then + begin + Application.MessageBox('λΪ!', 'ʾ', 0); + Exit; + end; { if CDS_Sub.Locate('CRType;LCKNO', VarArrayOf(['ӹ', Null]), [loPartialKey]) then begin Application.MessageBox('ӹ̿ŲΪ!','ʾ',0); @@ -394,7 +399,7 @@ begin frmCompanySel := TfrmCompanySel.Create(Application); with frmCompanySel do begin - if (Self.CDS_sub.fieldbyname('IOType').AsString = '') or (CDS_1.fieldbyname('IOType').AsString = '۳') then + if (Self.CDS_sub.fieldbyname('IOType').AsString = '') or (Self.CDS_Sub.fieldbyname('IOType').AsString = '۳') then begin FCoType := 'ͻ'; end @@ -452,7 +457,7 @@ end; procedure TfrmTradeSampleClothOutEdit.v2Column6PropertiesEditValueChanged(Sender: TObject); var mvalue, FFieldName: string; - FQty, FPrice, FMoney: Double; //ۣ, Ԥɱ + FQty, FPrice, FCBPrice, FCBMoney, FMoney: Double; //ۣ, Ԥɱ begin mvalue := TcxTextEdit(Sender).EditingText; if Trim(mvalue) = '' then @@ -468,15 +473,17 @@ begin Post; FQty := Fieldbyname('Qty').AsFloat; FPrice := Fieldbyname('Price').AsFloat; + FCBPrice := Fieldbyname('CBPrice').AsFloat; end; FMoney := RoundFloat(FQty * FPrice, 2); - + FCBMoney := RoundFloat(FQty * FCBPrice, 2); with CDS_Sub do begin Edit; FieldByName('Qty').Value := FQty; FieldByName('Price').Value := FPrice; FieldByName('Money').Value := FMoney; + FieldByName('CBMoney').Value := FCBMoney; Post; end; diff --git a/T02贸易汇总仓库/U_TradeSampleClothOutList.dfm b/T02贸易汇总仓库/U_TradeSampleClothOutList.dfm index 9892d8c..67cd4a6 100644 --- a/T02贸易汇总仓库/U_TradeSampleClothOutList.dfm +++ b/T02贸易汇总仓库/U_TradeSampleClothOutList.dfm @@ -5,6 +5,7 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList ClientHeight = 537 ClientWidth = 1540 Position = poScreenCenter + ExplicitLeft = -381 ExplicitWidth = 1556 ExplicitHeight = 576 PixelsPerInch = 96 @@ -293,8 +294,6 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 - ExplicitLeft = 213 - ExplicitTop = 105 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -330,6 +329,14 @@ inherited frmTradeSampleClothOutList: TfrmTradeSampleClothOutList end item Kind = skSum + end + item + Kind = skSum + Column = Tv1Column14 + end + item + Kind = skSum + Column = Tv1Column12 end> DataController.Summary.SummaryGroups = <> OptionsCustomize.ColumnFiltering = False diff --git a/T02贸易汇总仓库/U_TradeSampleClothStkList.dfm b/T02贸易汇总仓库/U_TradeSampleClothStkList.dfm index 36d21ad..257bd8e 100644 --- a/T02贸易汇总仓库/U_TradeSampleClothStkList.dfm +++ b/T02贸易汇总仓库/U_TradeSampleClothStkList.dfm @@ -150,6 +150,7 @@ inherited frmTradeSampleClothStkList: TfrmTradeSampleClothStkList Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 + ExplicitTop = 71 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -204,6 +205,10 @@ inherited frmTradeSampleClothStkList: TfrmTradeSampleClothStkList item Kind = skSum Column = v1Column9 + end + item + Kind = skSum + Column = Tv1Column10 end> DataController.Summary.SummaryGroups = <> OptionsCustomize.ColumnFiltering = False @@ -440,7 +445,8 @@ inherited frmTradeSampleClothStkList: TfrmTradeSampleClothStkList Left = 656 Top = 232 end - object cxGridPopupMenu1: TcxGridPopupMenu + object GPM_1: TcxGridPopupMenu + Grid = cxGrid1 PopupMenus = <> Left = 536 Top = 240 diff --git a/T02贸易汇总仓库/U_TradeSampleClothStkList.pas b/T02贸易汇总仓库/U_TradeSampleClothStkList.pas index d6ab00f..6369ac3 100644 --- a/T02贸易汇总仓库/U_TradeSampleClothStkList.pas +++ b/T02贸易汇总仓库/U_TradeSampleClothStkList.pas @@ -26,7 +26,7 @@ type ADOQueryMain: TADOQuery; ADOQueryTemp: TADOQuery; DataSource1: TDataSource; - cxGridPopupMenu1: TcxGridPopupMenu; + GPM_1: TcxGridPopupMenu; CDS_Main: TClientDataSet; CDS_HZ: TClientDataSet; PopupMenu1: TPopupMenu; @@ -124,7 +124,7 @@ begin Filtered := False; Close; sql.Clear; - sql.Add(' select A.* '); + sql.Add(' select CBMoney=ISNULL(A.CBPrice,0)*ISNULL(A.stkqty,0),A.* '); sql.Add(' from BS_Cloth_IO A '); SQL.Add(' where A.IOFlag='''' and (isnull(StkQty,0)>0 or isnull(StkPiece,0)>0) '); sql.Add(' and isnull(stkName,'''')=''' + Trim(FstkName) + ''''); diff --git a/T02贸易汇总仓库/U_TradeSampleClothStkSel.dfm b/T02贸易汇总仓库/U_TradeSampleClothStkSel.dfm index e657790..1157f4f 100644 --- a/T02贸易汇总仓库/U_TradeSampleClothStkSel.dfm +++ b/T02贸易汇总仓库/U_TradeSampleClothStkSel.dfm @@ -178,7 +178,7 @@ inherited frmTradeSampleClothStkSel: TfrmTradeSampleClothStkSel Align = alClient PopupMenu = PopupMenu1 TabOrder = 2 - ExplicitTop = 80 + ExplicitTop = 70 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/T02贸易汇总仓库/U_TradeSampleClothStkSel.pas b/T02贸易汇总仓库/U_TradeSampleClothStkSel.pas index 9b22b84..29d1734 100644 --- a/T02贸易汇总仓库/U_TradeSampleClothStkSel.pas +++ b/T02贸易汇总仓库/U_TradeSampleClothStkSel.pas @@ -126,7 +126,7 @@ begin Filtered := False; Close; sql.Clear; - sql.Add(' select A.* '); + sql.Add(' select CBMoney=ISNULL(A.CBPrice,0)*ISNULL(A.stkqty,0),A.* '); sql.Add(' from BS_Cloth_IO A '); SQL.Add(' where A.IOFlag='''' and (isnull(STkQty,0)>0 or isnull(StkPiece,0)>0) '); sql.Add(' and isnull(stkName,'''')=''' + Trim(FstkName) + ''''); diff --git a/T04贸易明细仓库/TradeClothStk.identcache b/T04贸易明细仓库/TradeClothStk.identcache index 397b37d15a1c68e705fa50f76fcc8d971c489c24..97b16785c8154a7d817d191a8c4f3967563f827f 100644 GIT binary patch delta 65 zcmV-H0KWg|66g{E9+R*LWswA4lMMqXlRg9+vHo%bkz!f1!~=!{lRE_?lf?%VlW+r6 Xli3H_lYjvxlW+$zlOP5-lT8U5|34OA delta 77 zcmV-T0J8t+66g{I9smFUQImlMC6k{67LlSNlX(MKlNJLgvFwcklaB{flYj*{vkC-G j1CzZ7Sd&QwBa?dv6qDlz+LI>%NRdn$lP(50lT8U5&IcI3 diff --git a/T04贸易明细仓库/U_TradeClothStkListNew.dfm b/T04贸易明细仓库/U_TradeClothStkListNew.dfm index 4104a4b..4ff6880 100644 --- a/T04贸易明细仓库/U_TradeClothStkListNew.dfm +++ b/T04贸易明细仓库/U_TradeClothStkListNew.dfm @@ -146,11 +146,10 @@ Font.Style = [fsBold] ParentFont = False TabOrder = 1 - Properties.ActivePage = cxTabSheet2 + Properties.ActivePage = cxTabSheet1 Properties.CustomButtons.Buttons = <> Properties.Style = 5 OnChange = cxPageControl1Change - ExplicitTop = 44 ClientRectBottom = 554 ClientRectRight = 1540 ClientRectTop = 32 @@ -530,7 +529,7 @@ ParentFont = False PopupMenu = PM_2 TabOrder = 1 - ExplicitTop = 59 + ExplicitTop = 73 object TV2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -793,6 +792,13 @@ DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter end + object TV2Column14: TcxGridDBColumn + Caption = #33394#21495#20540 + DataBinding.FieldName = 'SHNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 58 + end object TV2Column7: TcxGridDBColumn Caption = #21512#21516#21495 DataBinding.FieldName = 'ConNo' @@ -1629,6 +1635,13 @@ Options.Editing = False Width = 66 end + object Tv1Column17: TcxGridDBColumn + Caption = #33394#21495#20540 + DataBinding.FieldName = 'SHNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 58 + end object Tv1Column1: TcxGridDBColumn Caption = #27454#21495 DataBinding.FieldName = 'C_StyleNo' diff --git a/T04贸易明细仓库/U_TradeClothStkListNew.pas b/T04贸易明细仓库/U_TradeClothStkListNew.pas index ddcfee2..1015220 100644 --- a/T04贸易明细仓库/U_TradeClothStkListNew.pas +++ b/T04贸易明细仓库/U_TradeClothStkListNew.pas @@ -185,6 +185,8 @@ type TV2Column13: TcxGridDBColumn; ToolButton9: TToolButton; StkType: TComboBox; + TV2Column14: TcxGridDBColumn; + Tv1Column17: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); @@ -368,7 +370,7 @@ begin sql.Clear; sql.Add(' select kl= DATEDIFF(dd,IOTime, GETDATE()), IOTime=CONVERT(VARCHAR(10),IOTime,120),OrderNo,C_Name,PCId,IOType'); Sql.Add(',Grade,CustName,C_Width,C_GramWeight,CIMachNo,Workshop,BatchNo,IOPosition,C_Color,C_Pattern,StkType,Price'); - sql.Add(',C_Code,Saleser,C_ColorNo,ConNo,BuyConNo,FOrdNo'); + sql.Add(',C_Code,Saleser,dbo.getNum(C_ColorNo) SHNO,C_ColorNo,ConNo,BuyConNo,FOrdNo'); sql.Add(' ,COUNT(PieceNo) SumPieceNo,sum(GrossWeight) SumGrossWeight,sum(Tare) SumTare,sum(NetWeight) SumNetWeight'); sql.Add(' ,Sum(Meter) SumMeter,Sum(Yardage) SumYardage,Sum(Amount) Amount'); sql.Add(' from V_Trade_Cloth_Stk A where 1=1 '); @@ -384,7 +386,7 @@ begin sql.Add(WSql); sql.Add(' GROUP BY DATEDIFF(dd,IOTime, GETDATE()), CONVERT(VARCHAR(10),IOTime,120),OrderNo,C_Name,PCId,IOType'); sql.Add(',Grade,CustName,C_Width,C_GramWeight,CIMachNo,Workshop,BatchNo,IOPosition,C_Color,C_Pattern,StkType,Price'); - Sql.Add(',C_Code,Saleser,C_ColorNo,ConNo,BuyConNo,FOrdNo'); + Sql.Add(',C_Code,Saleser,dbo.getNum(C_ColorNo),C_ColorNo,ConNo,BuyConNo,FOrdNo'); // showmessage(sql.text); Open; end; @@ -408,7 +410,7 @@ begin sql.Add(' select top ' + inttostr(RecordsNumber) + ' * '); sql.Add(' from '); sql.Add('(select rownumber=cast((row_number() over(order by AA.IOTime desc)) as int)'); - sql.Add(',COUNT(1) OVER() AS TotalCount'); + sql.Add(',COUNT(1) OVER() AS TotalCount,dbo.getNum(AA.C_ColorNo) SHNO'); sql.Add(', kl= DATEDIFF(dd,IOTime, GETDATE()),* from V_Trade_Cloth_Stk AA where 1=1 '); sql.Add(' and StkType=''' + trim(canshu5) + ''' '); if trim(FWorkshop) <> '' then diff --git a/T04贸易明细仓库/testDll.identcache b/T04贸易明细仓库/testDll.identcache index 9052b5493c4a9e0c935a98012f123a1afed04199..3c2d0248fa77bbbf03ebda92099232a232376e99 100644 GIT binary patch delta 12 TcmZ3(xQ3CDX<|skM3!Ix7j^@K delta 12 TcmZ3(xQ3CDX<}H|M3zth7kUGQ