diff --git a/T01贸易生产计划/U_PlanProfit.dfm b/T01贸易生产计划/U_PlanProfit.dfm index 7c73e1a..d364b7b 100644 --- a/T01贸易生产计划/U_PlanProfit.dfm +++ b/T01贸易生产计划/U_PlanProfit.dfm @@ -353,7 +353,8 @@ inherited frmPlanProfit: TfrmPlanProfit Text = #21046#21333#26085#26399 OnChange = ComboBox1Change Items.Strings = ( - #21046#21333#26085#26399) + #21046#21333#26085#26399 + #23436#25104#26085#26399) end object CustName: TEdit Tag = 2 @@ -573,6 +574,14 @@ inherited frmPlanProfit: TfrmPlanProfit Options.Editing = False Width = 89 end + object Tv1Comptime: TcxGridDBColumn + Caption = #23436#25104#26085#26399 + DataBinding.FieldName = 'Comptime' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end object v1OrdDate: TcxGridDBColumn Caption = #21046#21333#26085#26399 DataBinding.FieldName = 'OrdDate' diff --git a/T01贸易生产计划/U_PlanProfit.pas b/T01贸易生产计划/U_PlanProfit.pas index 21b7c45..34dee16 100644 --- a/T01贸易生产计划/U_PlanProfit.pas +++ b/T01贸易生产计划/U_PlanProfit.pas @@ -123,6 +123,7 @@ type Tv1Column30: TcxGridDBColumn; Tv1CPMC: TcxGridDBColumn; Tv1ConPrice: TcxGridDBColumn; + Tv1Comptime: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -300,8 +301,6 @@ begin end; procedure TfrmPlanProfit.InitGrid(); -//var -// MCG, MDH, MTP, MFH, MLen, MWeight: Double; begin application.ProcessMessages; @@ -343,6 +342,10 @@ begin end; end; + if ComboBox1.Text = 'Íê³ÉÈÕÆÚ' then + sql.Add(' ,@DateType=''Comptime''') + else + sql.Add(' ,@DateType=''OrdDate'''); Open; end; SCreateCDS(ADOQueryMain, Order_Main); diff --git a/T01贸易生产计划/U_TradePlanList.dfm b/T01贸易生产计划/U_TradePlanList.dfm index f61dfe7..ef83e4c 100644 --- a/T01贸易生产计划/U_TradePlanList.dfm +++ b/T01贸易生产计划/U_TradePlanList.dfm @@ -440,6 +440,7 @@ inherited frmTradePlanList: TfrmTradePlanList Align = alClient PopupMenu = PM_1 TabOrder = 3 + ExplicitTop = 173 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -705,6 +706,13 @@ inherited frmTradePlanList: TfrmTradePlanList HeaderAlignmentHorz = taCenter Width = 56 end + object Tv1Comptime: TcxGridDBColumn + Caption = #23436#25104#26102#38388 + DataBinding.FieldName = 'Comptime' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 80 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 @@ -727,7 +735,7 @@ inherited frmTradePlanList: TfrmTradePlanList TabOrder = 2 Properties.CustomButtons.Buttons = <> Properties.Style = 9 - Properties.TabIndex = 0 + Properties.TabIndex = 5 Properties.Tabs.Strings = ( ' '#24453#25552#20132' ' ' '#24453#23457#26680' ' diff --git a/T01贸易生产计划/U_TradePlanList.pas b/T01贸易生产计划/U_TradePlanList.pas index dfecccd..7ebd3ad 100644 --- a/T01贸易生产计划/U_TradePlanList.pas +++ b/T01贸易生产计划/U_TradePlanList.pas @@ -228,6 +228,7 @@ type ToolButton11: TToolButton; Label27: TLabel; BGPLACE: TBtnEditC; + Tv1Comptime: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -1802,6 +1803,9 @@ begin close; sql.Clear; sql.Add('update Trade_Plan_Main SET status=''10'' '); + sql.Add(',CompId=' + QuotedStr(Trim(DCode))); + sql.Add(',Comper=' + QuotedStr(Trim(DName))); + sql.Add(',Comptime=getdate() '); sql.Add('where mainID=' + quotedstr(trim(Order_Main.fieldbyname('mainID').AsString))); // sql.Add('exec P_Ord_Up_SuoLv @DataID=' + quotedstr(trim(Order_Main.fieldbyname('mainID').AsString))); @@ -1846,6 +1850,7 @@ begin close; sql.Clear; sql.Add('update Trade_Plan_Main SET status=''11'' '); + sql.Add(',CompId=null, Comper=null, Comptime=null '); sql.Add('where mainID=' + quotedstr(trim(Order_Main.fieldbyname('mainID').AsString))); sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( '); sql.Add(' ' + quotedstr(trim(DName))); diff --git a/T01贸易生产计划/U_TradePlanMulFtyList.dfm b/T01贸易生产计划/U_TradePlanMulFtyList.dfm index 2f35433..4e758c0 100644 --- a/T01贸易生产计划/U_TradePlanMulFtyList.dfm +++ b/T01贸易生产计划/U_TradePlanMulFtyList.dfm @@ -343,6 +343,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList TabOrder = 3 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> OnCellDblClick = Tv1CellDblClick OnFocusedRecordChanged = Tv1FocusedRecordChanged DataController.DataSource = DataSource1 @@ -372,6 +373,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object v1Column16: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True HeaderAlignmentHorz = taCenter @@ -380,6 +382,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object v1OrdDate: TcxGridDBColumn Caption = #21046#21333#26085#26399 DataBinding.FieldName = 'OrdDate' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' Properties.ShowTime = False HeaderAlignmentHorz = taCenter @@ -390,6 +393,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object Tv1Column2: TcxGridDBColumn Caption = #32463#33829#21333#20301 DataBinding.FieldName = 'OurCoName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Styles.Header = DataLink_TradePlan.FontBlue @@ -398,6 +402,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object Tv1Column4: TcxGridDBColumn Caption = #23458#25143 DataBinding.FieldName = 'CustName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Styles.Header = DataLink_TradePlan.FoneClMaroon @@ -406,6 +411,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object v1OrderNo: TcxGridDBColumn Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'OrderNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Styles.Header = DataLink_TradePlan.Default @@ -414,6 +420,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object v1DeliveryDate: TcxGridDBColumn Caption = #20132#36135#26085#26399 DataBinding.FieldName = 'DlyDate' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' Properties.ShowTime = False OnCustomDrawCell = v1DeliveryDateCustomDrawCell @@ -425,12 +432,14 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object Tv1Column3: TcxGridDBColumn Caption = #32534#21495 DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object Tv1Column22: TcxGridDBColumn Caption = #21697#21517 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 89 @@ -438,6 +447,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object Tv1Column12: TcxGridDBColumn Caption = #21512#21516#21495 DataBinding.FieldName = 'ConNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 72 @@ -445,6 +455,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object Tv1Column13: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 68 @@ -452,12 +463,14 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object Tv1Column14: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object Tv1Column15: TcxGridDBColumn Caption = #35268#26684 DataBinding.FieldName = 'C_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 72 @@ -465,12 +478,14 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object Tv1Column16: TcxGridDBColumn Caption = #25104#20998 DataBinding.FieldName = 'C_Composition' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object Tv1Column11: TcxGridDBColumn Caption = #21305#25968 DataBinding.FieldName = 'HZPiQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 54 @@ -478,6 +493,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object Tv1Column10: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'OrdQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Options.Editing = False @@ -486,6 +502,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object v1Column11: TcxGridDBColumn Caption = #21333#20301 DataBinding.FieldName = 'OrdUnit' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Options.Editing = False @@ -494,6 +511,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object Tv1Column6: TcxGridDBColumn Caption = #21046#21333#20154 DataBinding.FieldName = 'FILLER' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 72 @@ -501,6 +519,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object Tv1Column1: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 99 @@ -563,6 +582,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList TabOrder = 0 object TV2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource2 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -612,6 +632,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList Tag = 99 Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True Properties.NullStyle = nssUnchecked @@ -624,6 +645,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object v1PRTColor: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -639,6 +661,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object cxGridDBColumn4: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -646,6 +669,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object v1Column5: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -659,6 +683,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object VC_PRTPs: TcxGridDBColumn Caption = #21305#25968 DataBinding.FieldName = 'OrdPiece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -666,6 +691,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object v1PRTOrderQty: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'OrdQty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -675,6 +701,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object v1OrderUnit: TcxGridDBColumn Caption = #21333#20301 DataBinding.FieldName = 'OrdUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.Items.Strings = ( 'M' @@ -688,6 +715,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object cxGridDBColumn7: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'OrdSNote' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -695,6 +723,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object TV2Column1: TcxGridDBColumn Caption = #27454#21495 DataBinding.FieldName = 'C_StyleNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end @@ -713,6 +742,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList TabOrder = 6 object TV3: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_3 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -744,12 +774,14 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object V2Column2: TcxGridDBColumn Caption = #24207#21495 DataBinding.FieldName = 'SerialNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object cxGridDBColumn2: TcxGridDBColumn Caption = #24037#33402 DataBinding.FieldName = 'Technics' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -762,6 +794,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object V2Column3: TcxGridDBColumn Caption = #32534#21495 DataBinding.FieldName = 'FtyNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 82 @@ -769,6 +802,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object V2Column1: TcxGridDBColumn Caption = #21152#24037#21378 DataBinding.FieldName = 'FtyName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -781,6 +815,7 @@ inherited frmTradePlanMulFtyList: TfrmTradePlanMulFtyList object TV2Column5: TcxGridDBColumn Caption = #36319#21333#21592 DataBinding.FieldName = 'FollowMan' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item diff --git a/T01贸易生产计划/U_TradePlanMulFtyList.pas b/T01贸易生产计划/U_TradePlanMulFtyList.pas index ca39d28..9476e9a 100644 --- a/T01贸易生产计划/U_TradePlanMulFtyList.pas +++ b/T01贸易生产计划/U_TradePlanMulFtyList.pas @@ -15,7 +15,8 @@ uses IdFTP, ShellAPI, cxDropDownEdit, cxCheckBox, RM_e_Graphic, RM_e_Jpeg, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, Math, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, - IdExplicitTLSClientServerBase, U_BaseList, Vcl.Clipbrd; + IdExplicitTLSClientServerBase, U_BaseList, Vcl.Clipbrd, dxSkinWXI, + dxScrollbarAnnotations; type TfrmTradePlanMulFtyList = class(TfrmBaseList)