diff --git a/D01针织生产计划/U_KnitPlanInPut.dfm b/D01针织生产计划/U_KnitPlanInPut.dfm index d238b02..a5739b4 100644 --- a/D01针织生产计划/U_KnitPlanInPut.dfm +++ b/D01针织生产计划/U_KnitPlanInPut.dfm @@ -638,6 +638,19 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut Font.Style = [fsBold] ParentFont = False end + object lbl12: TLabel + Left = 893 + Top = 331 + Width = 154 + Height = 21 + Caption = #26159#21542#38656#35201#39318#20214#65306 + Font.Charset = GB2312_CHARSET + Font.Color = clBlack + Font.Height = -21 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end object OrdDate: TDateTimePicker Left = 669 Top = 4 @@ -742,7 +755,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut Tag = 2 Left = 669 Top = 123 - Width = 200 + Width = 116 Height = 27 Font.Charset = GB2312_CHARSET Font.Color = clBlack @@ -1370,6 +1383,41 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut TabOrder = 41 OnKeyPress = ConNoKeyPress end + object C_WidthUnit: TComboBox + Tag = 2 + Left = 791 + Top = 121 + Width = 78 + Height = 29 + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -21 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + TabOrder = 42 + Items.Strings = ( + #26377#25928 + #24102#36793) + end + object ISShouJian: TComboBox + Left = 1045 + Top = 328 + Width = 127 + Height = 26 + Style = csOwnerDrawFixed + Font.Charset = GB2312_CHARSET + Font.Color = clBlack + Font.Height = -21 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ItemHeight = 20 + ParentFont = False + TabOrder = 43 + Items.Strings = ( + #26159 + #21542) + end end object Panel2: TPanel [2] Left = 0 diff --git a/D01针织生产计划/U_KnitPlanInPut.pas b/D01针织生产计划/U_KnitPlanInPut.pas index e422888..d5c4fd7 100644 --- a/D01针织生产计划/U_KnitPlanInPut.pas +++ b/D01针织生产计划/U_KnitPlanInPut.pas @@ -401,6 +401,9 @@ type C_MainYarn: TComboBox; lbl11: TLabel; LineNumber: TEdit; + C_WidthUnit: TComboBox; + lbl12: TLabel; + ISShouJian: TComboBox; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); @@ -514,7 +517,7 @@ begin end; SCSHData(ADOQuery1, ScrollBox1, 0); CustName.TxtCode := ADOQuery1.FieldByName('CustNo').AsString; - ISChongDa.Text:= ADOQuery1.fieldbyname('ISChongDa').AsString; + ISChongDa.Text := ADOQuery1.fieldbyname('ISChongDa').AsString; with ADOQuery1 do begin @@ -524,8 +527,8 @@ begin Open; end; SCSHData(ADOQuery1, ScrollBox1, 2); - C_Deal.Text:= ADOQuery1.fieldbyname('C_Deal').AsString; - C_ZhuJi.Text:= ADOQuery1.fieldbyname('C_ZhuJi').AsString; + C_Deal.Text := ADOQuery1.fieldbyname('C_Deal').AsString; + C_ZhuJi.Text := ADOQuery1.fieldbyname('C_ZhuJi').AsString; FConMId := ADOQuery1.fieldbyname('ConMID').AsString; FConSId := ADOQuery1.fieldbyname('ConSId').AsString; @@ -1037,6 +1040,14 @@ begin Application.MessageBox('ƻͲΪ!', 'ʾ', 0); Exit; end; + if OrdType.Text = '' then + begin + if Trim(ISShouJian.Text) = '' then + begin + Application.MessageBox('Ƿ׼Ϊ!', 'ʾ', 0); + Exit; + end; + end; if Trim(CustName.Text) = '' then begin @@ -1058,6 +1069,11 @@ begin Application.MessageBox('ŷΪ!', 'ʾ', 0); Exit; end; + if Trim(C_WidthUnit.Text) = '' then + begin + Application.MessageBox('ŷѡЧ!', 'ʾ', 0); + Exit; + end; if Trim(C_GramWeight.Text) = '' then begin Application.MessageBox('زΪ!', 'ʾ', 0); diff --git a/D01针织生产计划/U_KnitPlanList.dfm b/D01针织生产计划/U_KnitPlanList.dfm index 57cf332..c80f436 100644 --- a/D01针织生产计划/U_KnitPlanList.dfm +++ b/D01针织生产计划/U_KnitPlanList.dfm @@ -113,24 +113,24 @@ inherited frmKnitPlanList: TfrmKnitPlanList ImageIndex = 4 OnClick = TBViewClick end - object TBDel: TToolButton - Left = 824 - Top = 0 - AutoSize = True - Caption = #21024#38500 - ImageIndex = 5 - OnClick = TBDelClick - end object TBSCAP: TToolButton - Left = 895 + Left = 824 Top = 0 AutoSize = True Caption = #29983#20135#23433#25490 ImageIndex = 23 OnClick = TBSCAPClick end + object SCPrint: TToolButton + Left = 919 + Top = 0 + AutoSize = True + Caption = #25171#21360#29983#20135#21333 + ImageIndex = 21 + OnClick = SCPrintClick + end object ToolButton2: TToolButton - Left = 990 + Left = 1026 Top = 0 AutoSize = True Caption = #25171#21367#35774#32622 @@ -138,7 +138,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList OnClick = ToolButton2Click end object btn1: TToolButton - Left = 1085 + Left = 1121 Top = 0 AutoSize = True Caption = #25171#21360#27969#31243#21345 @@ -152,6 +152,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList AutoSize = True Caption = ' '#26032#22686#27969#31243#21345 ImageIndex = 2 + Visible = False OnClick = ToolButton5Click end object ToolButton9: TToolButton @@ -160,6 +161,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList AutoSize = True Caption = #26032#22686#25286#20998#21345 ImageIndex = 2 + Visible = False OnClick = ToolButton9Click end object ToolButton10: TToolButton @@ -218,16 +220,24 @@ inherited frmKnitPlanList: TfrmKnitPlanList ImageIndex = 11 OnClick = ToolButton4Click end - object TBExport: TToolButton + object TBDel: TToolButton Left = 873 Top = 38 AutoSize = True + Caption = #21024#38500 + ImageIndex = 5 + OnClick = TBDelClick + end + object TBExport: TToolButton + Left = 944 + Top = 38 + AutoSize = True Caption = #23548#20986 ImageIndex = 20 OnClick = TBExportClick end object ToolButton1: TToolButton - Left = 944 + Left = 1015 Top = 38 AutoSize = True Caption = #20445#23384#26684#24335 @@ -235,7 +245,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList OnClick = ToolButton1Click end object TBClose: TToolButton - Left = 1039 + Left = 1110 Top = 38 AutoSize = True Caption = #20851#38381 @@ -902,6 +912,14 @@ inherited frmKnitPlanList: TfrmKnitPlanList Options.Editing = False Width = 70 end + object cxgrdbclmnTv1Column23: TcxGridDBColumn + Caption = #26159#21542#38656#35201#39318#20214 + DataBinding.FieldName = 'ISShouJian' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 90 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/D01针织生产计划/U_KnitPlanList.pas b/D01针织生产计划/U_KnitPlanList.pas index 05e830a..e1a4848 100644 --- a/D01针织生产计划/U_KnitPlanList.pas +++ b/D01针织生产计划/U_KnitPlanList.pas @@ -166,6 +166,8 @@ type lbl2: TLabel; LineNumber: TEdit; cxgrdbclmnTv1Column22: TcxGridDBColumn; + cxgrdbclmnTv1Column23: TcxGridDBColumn; + SCPrint: TToolButton; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); procedure TBFindClick(Sender: TObject); @@ -211,6 +213,7 @@ type procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); procedure DYPrintClick(Sender: TObject); procedure ToolButton11Click(Sender: TObject); + procedure SCPrintClick(Sender: TObject); private FInt, PFInt: Integer; procedure InitGrid(); @@ -1274,6 +1277,24 @@ begin TBRafresh.Click; end; +procedure TfrmKnitPlanList.SCPrintClick(Sender: TObject); +begin + try + frmLabelPrint := TfrmLabelPrint.Create(Application); + with frmLabelPrint do + begin + FLMType := 'ZZSCD'; + FFiltration1 := CDS_1.FieldByName('MAINID').AsString; + if ShowModal = 1 then + begin + + end; + end; + finally + frmLabelPrint.Free; + end; +end; + procedure TfrmKnitPlanList.C_CodeKeyPress(Sender: TObject; var Key: Char); begin if Key = #13 then diff --git a/D02针织坯布检验/KnitInsp.identcache b/D02针织坯布检验/KnitInsp.identcache index cd4d22c..733a8f0 100644 Binary files a/D02针织坯布检验/KnitInsp.identcache and b/D02针织坯布检验/KnitInsp.identcache differ diff --git a/F04染色刷卡/DyeProcess.identcache b/F04染色刷卡/DyeProcess.identcache index c552fad..664b631 100644 Binary files a/F04染色刷卡/DyeProcess.identcache and b/F04染色刷卡/DyeProcess.identcache differ diff --git a/F04染色刷卡/U_DyeOutput.dfm b/F04染色刷卡/U_DyeOutput.dfm index 88d90a9..fe4f3f9 100644 --- a/F04染色刷卡/U_DyeOutput.dfm +++ b/F04染色刷卡/U_DyeOutput.dfm @@ -841,8 +841,8 @@ inherited frmDyeOutput: TfrmDyeOutput end end object MovePanel1: TMovePanel [3] - Left = 318 - Top = 461 + Left = 227 + Top = 299 Width = 713 Height = 251 TabOrder = 3 diff --git a/F04染色刷卡/U_DyeOutput.pas b/F04染色刷卡/U_DyeOutput.pas index 18878bd..df95702 100644 --- a/F04染色刷卡/U_DyeOutput.pas +++ b/F04染色刷卡/U_DyeOutput.pas @@ -397,6 +397,7 @@ procedure TfrmDyeOutput.Button1Click(Sender: TObject); begin inherited; MovePanel1.Visible := false; + Scan.SetFocus; end; procedure TfrmDyeOutput.cxButton3Click(Sender: TObject); diff --git a/T03贸易布匹检验/TradeInspFile.INI b/T03贸易布匹检验/TradeInspFile.INI index a8aa515..58706a2 100644 --- a/T03贸易布匹检验/TradeInspFile.INI +++ b/T03贸易布匹检验/TradeInspFile.INI @@ -13,6 +13,6 @@ =1 =100 Сλ=1 -Сλ=2 -Сλ=2 +Сλ=1 +Сλ=1 Ա=Select UserID= 'CS' diff --git a/T03贸易布匹检验/U_DataLink.dfm b/T03贸易布匹检验/U_DataLink.dfm index 0a891d4..0ed2609 100644 --- a/T03贸易布匹检验/U_DataLink.dfm +++ b/T03贸易布匹检验/U_DataLink.dfm @@ -10567,6 +10567,14 @@ inherited DataLink_TradeInsp: TDataLink_TradeInsp Font.Name = #23435#20307 Font.Style = [fsBold] end + object cxstyl1: TcxStyle + AssignedValues = [svFont] + Font.Charset = ANSI_CHARSET + Font.Color = clWindowText + Font.Height = -21 + Font.Name = #23435#20307 + Font.Style = [fsBold] + end end object Timer_link: TTimer Interval = 15000 diff --git a/T03贸易布匹检验/U_DataLink.pas b/T03贸易布匹检验/U_DataLink.pas index 6c0a605..26a6b89 100644 --- a/T03贸易布匹检验/U_DataLink.pas +++ b/T03贸易布匹检验/U_DataLink.pas @@ -77,6 +77,7 @@ type Timer_link: TTimer; ImageList_new32: TImageList; cxStyle1: TcxStyle; + cxstyl1: TcxStyle; procedure DataModuleDestroy(Sender: TObject); procedure Timer_linkTimer(Sender: TObject); procedure DataModuleCreate(Sender: TObject); diff --git a/T03贸易布匹检验/U_TradeClothInspList.dfm b/T03贸易布匹检验/U_TradeClothInspList.dfm index 148bf19..e4c6d4b 100644 --- a/T03贸易布匹检验/U_TradeClothInspList.dfm +++ b/T03贸易布匹检验/U_TradeClothInspList.dfm @@ -283,17 +283,26 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList Caption = #22383#24067#20811#37325 DataBinding.FieldName = 'C_KnitGramWeight' DataBinding.IsNullValueType = True + Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 80 + Width = 93 end object v1Column5: TcxGridDBColumn - Caption = #25104#21697#20811#37325 + Caption = #35746#21333#20811#37325 DataBinding.FieldName = 'C_GramWeight' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False - Width = 66 + Width = 98 + end + object cxgrdbclmnTv1Column15: TcxGridDBColumn + Caption = #25104#21697#20811#37325 + DataBinding.FieldName = 'C_TradeGramWeight' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 end object Tv1Column2: TcxGridDBColumn Caption = #39068#33394 @@ -495,6 +504,14 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList Options.Editing = False Width = 66 end + object cxgrdbclmnTv1Column16: TcxGridDBColumn + Caption = #23458#25143#35746#21333#21495 + DataBinding.FieldName = 'khconno' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 100 + end object v1Column46: TcxGridDBColumn Caption = #26816#39564#26426#21488 DataBinding.FieldName = 'CIMachNo' @@ -650,10 +667,10 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList object TLabel Left = 526 Top = 10 - Width = 36 + Width = 60 Height = 12 Hint = '0' - Caption = #21512#21516#21495 + Caption = #23458#25143#35746#21333#21495 end object Label7: TLabel Left = 722 @@ -749,7 +766,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList TabOrder = 1 OnKeyPress = OrderNoKeyPress end - object conNO: TEdit + object khconno: TEdit Tag = 2 Left = 592 Top = 6 diff --git a/T03贸易布匹检验/U_TradeClothInspList.pas b/T03贸易布匹检验/U_TradeClothInspList.pas index 9c3a93a..b2c38f3 100644 --- a/T03贸易布匹检验/U_TradeClothInspList.pas +++ b/T03贸易布匹检验/U_TradeClothInspList.pas @@ -33,7 +33,7 @@ type OrderNo: TEdit; TBExport: TToolButton; Order_Main: TClientDataSet; - conNO: TEdit; + khconno: TEdit; Label7: TLabel; Label8: TLabel; Label10: TLabel; @@ -118,6 +118,8 @@ type edt1: TEdit; cxgrdbclmnTv1Column13: TcxGridDBColumn; cxgrdbclmnTv1Column14: TcxGridDBColumn; + cxgrdbclmnTv1Column15: TcxGridDBColumn; + cxgrdbclmnTv1Column16: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBCloseClick(Sender: TObject); diff --git a/T03贸易布匹检验/U_TradeMachInsp.dfm b/T03贸易布匹检验/U_TradeMachInsp.dfm index f526186..fa0a2dc 100644 --- a/T03贸易布匹检验/U_TradeMachInsp.dfm +++ b/T03贸易布匹检验/U_TradeMachInsp.dfm @@ -7,8 +7,6 @@ FormStyle = fsMDIChild Position = poScreenCenter Visible = True - ExplicitLeft = -63 - ExplicitTop = -140 ExplicitWidth = 1556 ExplicitHeight = 810 PixelsPerInch = 96 @@ -238,6 +236,20 @@ Font.Style = [fsBold] ParentFont = False end + object lbl7: TLabel + Left = 90 + Top = 287 + Width = 124 + Height = 34 + Caption = #24320#21098#20010#25968 + Font.Charset = ANSI_CHARSET + Font.Color = clBlue + Font.Height = -29 + Font.Name = 'Arial' + Font.Style = [fsBold] + ParentFont = False + Visible = False + end object InputLen: TEdit Left = 80 Top = 88 @@ -285,8 +297,8 @@ OnClick = Button6Click end object Button8: TButton - Left = 303 - Top = 137 + Left = 305 + Top = 148 Width = 80 Height = 45 Caption = #35814#24773 @@ -452,6 +464,7 @@ Font.Style = [fsBold] ParentFont = False TabOrder = 13 + OnChange = DelQtyChange OnClick = CIFBegClick OnKeyPress = MJstr3KeyPress end @@ -817,7 +830,7 @@ ReadOnly = True TabOrder = 9 end - object Edit7: TEdit + object C_TradeGramWeight: TEdit Left = 248 Top = 144 Width = 144 @@ -2196,7 +2209,7 @@ Left = 1 Top = 77 Width = 293 - Height = 500 + Height = 462 Align = alClient TabOrder = 0 object Tv3: TcxGridDBTableView @@ -2339,23 +2352,23 @@ end object cxPageControl1: TcxPageControl Left = 1 - Top = 577 + Top = 539 Width = 293 - Height = 193 + Height = 231 Align = alBottom Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -12 + Font.Height = -25 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False TabOrder = 1 - Properties.ActivePage = cxTabSheet1 + Properties.ActivePage = 查看 Properties.CustomButtons.Buttons = <> - ClientRectBottom = 191 + ClientRectBottom = 229 ClientRectLeft = 2 ClientRectRight = 291 - ClientRectTop = 22 + ClientRectTop = 34 object cxTabSheet1: TcxTabSheet Caption = #24405#20837 ImageIndex = 0 @@ -2363,11 +2376,11 @@ Left = 0 Top = 0 Width = 289 - Height = 169 + Height = 195 Align = alClient Font.Charset = GB2312_CHARSET Font.Color = clWindowText - Font.Height = -25 + Font.Height = -12 Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False @@ -2376,6 +2389,7 @@ Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> OnCellDblClick = Tv2CellDblClick + OnCustomDrawCell = Tv2CustomDrawCell DataController.DataSource = DS_2 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -2396,10 +2410,9 @@ DataController.Summary.SummaryGroups = <> OptionsCustomize.ColumnFiltering = False OptionsSelection.CellSelect = False + OptionsView.DataRowHeight = 26 OptionsView.Footer = True OptionsView.GroupByBox = False - Styles.Header = DataLink_TradeInsp.Default - Styles.Selection = DataLink_TradeInsp.cxStyle1 object tv2CDType: TcxGridDBColumn Caption = #30133#28857#21517#31216 DataBinding.FieldName = 'CIFName' @@ -2490,12 +2503,19 @@ Left = 0 Top = 0 Width = 289 - Height = 169 + Height = 195 Align = alClient + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False TabOrder = 0 object TV1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> + OnCustomDrawCell = TV1CustomDrawCell DataController.DataSource = DS_1 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -2647,6 +2667,7 @@ Caption = #21024#38500 ImageIndex = 5 Wrap = True + Visible = False OnClick = ToolButton5Click end object ToolButton4: TToolButton @@ -3600,7 +3621,7 @@ Top = 183 end object Timer1: TTimer - Left = 393 - Top = 277 + Left = 433 + Top = 305 end end diff --git a/T03贸易布匹检验/U_TradeMachInsp.pas b/T03贸易布匹检验/U_TradeMachInsp.pas index b7569de..02865a4 100644 --- a/T03贸易布匹检验/U_TradeMachInsp.pas +++ b/T03贸易布匹检验/U_TradeMachInsp.pas @@ -308,10 +308,11 @@ type edtKJ: TEdit; btn1: TButton; lbl5: TLabel; - Edit7: TEdit; + C_TradeGramWeight: TEdit; lbl6: TLabel; Edit8: TEdit; cxgrdbclmnTv3Column6: TcxGridDBColumn; + lbl7: TLabel; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormShow(Sender: TObject); @@ -364,6 +365,9 @@ type procedure Edit1Click(Sender: TObject); procedure SpeedButton87Click(Sender: TObject); procedure btn1Click(Sender: TObject); + procedure Tv2CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); + procedure TV1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); + procedure DelQtyChange(Sender: TObject); private { Private declarations } FCIID, FOperationStatus, FCIFName, FWorkshop: string; @@ -450,6 +454,18 @@ begin until ((GetTickCount - FirstTickCount) >= Longint(msecs)); end; +procedure TfrmTradeMachInsp.DelQtyChange(Sender: TObject); +begin + if (StrToFloatdef(inputWeight.Text, 0) > 0) and (StrToFloatdef(MaxQty.Caption, 0) > 0) and (Width.text <> '') and (GramWeight.Text <> '') then + begin + C_TradeGramWeight.Text := FormatFloat('0.0', (((StrToFloatdef(inputWeight.Text, 0) - StrToFloatdef(FRuleBeforeTare, 0)) * 1000) / (((StrToFloatdef(copy(Width.Text, 1, 3), 0) / 100) + 0.03) * (StrToFloatdef(MaxQty.Caption, 0) - StrToFloatDef(DelQty.Text, 0))))); + end + else + begin + C_TradeGramWeight.Text := ''; + end; +end; + procedure TfrmTradeMachInsp.PrtMD(MInNo: string); var fPrintFile, FLBName: string; @@ -594,11 +610,11 @@ begin if (StrToFloatdef(inputWeight.Text, 0) > 0) and (StrToFloatdef(MaxQty.Caption, 0) > 0) and (Width.text <> '') and (GramWeight.Text <> '') then begin - Edit7.Text := FormatFloat('0.0', (((StrToFloatdef(inputWeight.Text, 0) - StrToFloatdef(FRuleBeforeTare, 0)) * 1000) / ((StrToFloatdef(copy(Width.Text, 1, 3), 0) / 100) * (StrToFloatdef(MaxQty.Caption, 0) - StrToFloatDef(DelQty.Text, 0))))); + C_TradeGramWeight.Text := FormatFloat('0.0', (((StrToFloatdef(inputWeight.Text, 0) - StrToFloatdef(FRuleBeforeTare, 0)) * 1000) / (((StrToFloatdef(copy(Width.Text, 1, 3), 0) / 100) + 0.03) * (StrToFloatdef(MaxQty.Caption, 0) - StrToFloatDef(DelQty.Text, 0))))); end else begin - Edit7.Text := ''; + C_TradeGramWeight.Text := ''; end; end; @@ -630,7 +646,21 @@ begin // exit; // end; // end; - + if (StrToFloatDef(C_TradeGramWeight.Text, 0) <= 0) or (StrToFloatDef(GramWeight.Text, 0) <= 0) then + begin + raise Exception.Create('⣬!'); + end + else + begin + if abs(strtofloatdef(C_TradeGramWeight.Text, 0) - strtofloatdef(GramWeight.Text, 0)) >= 10 then + begin + if Application.MessageBox('ƥطȡ10Ƿύ', 'ʾ', 32 + 4) <> IDYES then + begin + Result := false; + exit; + end; + end; + end; if (StrToIntDef(PieceNo.Text, 0) = 0) and (ComboBox2.Text = 'ֶ') then raise Exception.Create('ŲΪ!'); @@ -1227,7 +1257,7 @@ begin if (trim(edtMaBiao.Text) = '') then begin - if (i1 = 0) and (strToFloatdef(InputLen.Text, 0) > 10) then + if (i1 = 0) and (strToFloatdef(InputLen.Text, 0) > 20) then begin edit2.Text := InputLen.Text; @@ -1331,20 +1361,20 @@ var I: INTEGER; begin inherited; - ReadCxGrid(trim(Self.Caption) + 'Tv1', Tv1, 'ó׼'); - ReadCxGrid(trim(Self.Caption) + 'Tv2', Tv2, 'ó׼'); - ReadCxGrid(trim(Self.Caption) + 'Tv3', Tv3, 'ó׼'); + ReadCxGrid(trim(Self.Caption) + 'Tv11', Tv1, 'ó׼'); + ReadCxGrid(trim(Self.Caption) + 'Tv22', Tv2, 'ó׼'); + ReadCxGrid(trim(Self.Caption) + 'Tv33', Tv3, 'ó׼'); // Ĭ -// cxGrid1.Font.Size := 19; -// cxGrid2.Font.Size := 19; -// cxGrid3.Font.Size := 19; + cxGrid1.Font.Size := 19; + cxGrid2.Font.Size := 19; + cxGrid3.Font.Size := 19; // 2. ǿм̳ȫʽжã - for I := 0 to TV2.ColumnCount - 1 do - begin - TV2.Columns[I].Styles.Content := DataLink_TradeInsp.cxStyle1; - TV2.Columns[I].Styles.Header := DataLink_TradeInsp.cxStyle1; - end; - TV2.Styles.selection := DataLink_TradeInsp.cxStyle1; +// for I := 0 to TV2.ColumnCount - 1 do +// begin +// TV2.Columns[I].Styles.Content := DataLink_TradeInsp.cxStyle1; +// TV2.Columns[I].Styles.Header := DataLink_TradeInsp.cxStyle1; +// end; +// TV2.Styles.selection := DataLink_TradeInsp.cxStyle1; // for i := 0 to TV2.ColumnCount - 1 do // begin // // @@ -1460,10 +1490,16 @@ begin end; end; +procedure TfrmTradeMachInsp.Tv2CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); +begin + ACanvas.font.size := 19; +end; + procedure TfrmTradeMachInsp.Tv3CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); begin if AViewInfo.GridRecord.Values[TcxGridDBTableView(Sender).GetColumnByFieldName('Grade').Index] = 'Ʒ' then ACanvas.Brush.Color := clRed; + ACanvas.font.size := 19; end; procedure TfrmTradeMachInsp.Tv3MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); @@ -1613,6 +1649,7 @@ begin //FieldByName('Loom').value := FLoom; FieldByName('C_Width').value := FC_Width; FieldByName('C_KnitGramWeight').value := FC_KnitGramWeight; + FieldByName('C_TradeGramWeight').value := C_TradeGramWeight.Text; FieldByName('C_Figure').value := FC_Figure; FieldByName('C_Yarn').value := FC_Yarn; FieldByName('C_GramWeight').value := FC_GramWeight; @@ -2588,9 +2625,9 @@ end; procedure TfrmTradeMachInsp.ToolButton7Click(Sender: TObject); begin - WriteCxGrid(trim(Self.Caption) + 'Tv1', Tv1, 'ó׼'); - WriteCxGrid(trim(Self.Caption) + 'Tv2', Tv2, 'ó׼'); - WriteCxGrid(trim(Self.Caption) + 'Tv3', Tv3, 'ó׼'); + WriteCxGrid(trim(Self.Caption) + 'Tv11', Tv1, 'ó׼'); + WriteCxGrid(trim(Self.Caption) + 'Tv22', Tv2, 'ó׼'); + WriteCxGrid(trim(Self.Caption) + 'Tv33', Tv3, 'ó׼'); end; @@ -2599,6 +2636,11 @@ begin Close; end; +procedure TfrmTradeMachInsp.TV1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); +begin + ACanvas.font.size := 19; +end; + procedure TfrmTradeMachInsp.edt1Click(Sender: TObject); begin if Trim(edt1.Text) = '' then diff --git a/T03贸易布匹检验/U_TradePACKETPrint.dfm b/T03贸易布匹检验/U_TradePACKETPrint.dfm index 8cbf031..11ddcd2 100644 --- a/T03贸易布匹检验/U_TradePACKETPrint.dfm +++ b/T03贸易布匹检验/U_TradePACKETPrint.dfm @@ -113,11 +113,20 @@ inherited frmTradePACKETPrint: TfrmTradePACKETPrint OptionsSelection.MultiSelect = True OptionsSelection.CheckBoxVisibility = [cbvDataRow, cbvColumnHeader] OptionsView.GroupByBox = False + object cxgrdbclmnTv1Column8: TcxGridDBColumn + Caption = #35745#21010#21333#21495 + DataBinding.FieldName = 'MainId' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end object v2Column2: TcxGridDBColumn Caption = #20135#21697#32534#21495 DataBinding.FieldName = 'C_Code' DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' + Visible = False HeaderAlignmentHorz = taCenter Styles.Content = cxStyle1 Styles.Footer = cxStyle1 @@ -374,11 +383,20 @@ inherited frmTradePACKETPrint: TfrmTradePACKETPrint OptionsSelection.MultiSelect = True OptionsSelection.CheckBoxVisibility = [cbvDataRow, cbvColumnHeader] OptionsView.GroupByBox = False + object cxgrdbclmnTv2Column3: TcxGridDBColumn + Caption = #35745#21010#21333#21495 + DataBinding.FieldName = 'MainId' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end object cxgrdbclmn1: TcxGridDBColumn Caption = #20135#21697#32534#21495 DataBinding.FieldName = 'C_Code' DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' + Visible = False HeaderAlignmentHorz = taCenter Styles.Content = cxStyle1 Styles.Footer = cxStyle1 diff --git a/T03贸易布匹检验/U_TradePACKETPrint.pas b/T03贸易布匹检验/U_TradePACKETPrint.pas index 752692a..df4d048 100644 --- a/T03贸易布匹检验/U_TradePACKETPrint.pas +++ b/T03贸易布匹检验/U_TradePACKETPrint.pas @@ -70,6 +70,8 @@ type Tv1Column7: TcxGridDBColumn; Tv2Column1: TcxGridDBColumn; Tv2Column2: TcxGridDBColumn; + cxgrdbclmnTv1Column8: TcxGridDBColumn; + cxgrdbclmnTv2Column3: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); diff --git a/T04贸易明细仓库/U_TradeClothDROutEdit.pas b/T04贸易明细仓库/U_TradeClothDROutEdit.pas index 01311f8..46323ba 100644 --- a/T04贸易明细仓库/U_TradeClothDROutEdit.pas +++ b/T04贸易明细仓库/U_TradeClothDROutEdit.pas @@ -236,7 +236,6 @@ begin sql.Add(' select * from Trade_Cloth_DR_Sub A INNER JOIN Trade_Cloth_Stock B on A.C_Code = B.C_Code and isnull(A.C_Color,'''')=isnull(B.C_Color,'''') and isnull(A.C_ColorNo,'''') = isnull(B.C_ColorNo,'''') '); sql.Add(' where B.StkExists=1 and B.CIID=''' + Trim(MStkIds) + ''''); sql.Add(' and A.DRMID=''' + Trim(OutNo.Text) + ''''); - //showmessage(sql.Text); Open; end; diff --git a/T04贸易明细仓库/U_TradeClothStkList_Sel.dfm b/T04贸易明细仓库/U_TradeClothStkList_Sel.dfm index 36d3cd6..1cd4e1a 100644 --- a/T04贸易明细仓库/U_TradeClothStkList_Sel.dfm +++ b/T04贸易明细仓库/U_TradeClothStkList_Sel.dfm @@ -110,10 +110,10 @@ inherited frmTradeClothStkList_Sel: TfrmTradeClothStkList_Sel object TLabel Left = 536 Top = 10 - Width = 36 + Width = 60 Height = 13 Hint = '0' - Caption = #21512#21516#21495 + Caption = #23458#25143#35746#21333#21495 end object Label10: TLabel Left = 747 @@ -232,7 +232,7 @@ inherited frmTradeClothStkList_Sel: TfrmTradeClothStkList_Sel TabOrder = 5 OnKeyPress = orderNoKeyPress end - object conNO: TEdit + object khconno: TEdit Tag = 2 Left = 605 Top = 6 @@ -292,7 +292,6 @@ inherited frmTradeClothStkList_Sel: TfrmTradeClothStkList_Sel AutoSize = True BorderStyle = bsSingle TabOrder = 2 - ExplicitTop = 126 DesignSize = ( 1536 23) @@ -401,8 +400,6 @@ inherited frmTradeClothStkList_Sel: TfrmTradeClothStkList_Sel ParentFont = False PopupMenu = PM_1 TabOrder = 3 - ExplicitTop = 153 - ExplicitHeight = 447 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -667,6 +664,14 @@ inherited frmTradeClothStkList_Sel: TfrmTradeClothStkList_Sel Options.Editing = False Width = 66 end + object cxgrdbclmnTv1Column3: TcxGridDBColumn + Caption = #23458#25143#35746#21333#21495 + DataBinding.FieldName = 'khconno' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 100 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/T04贸易明细仓库/U_TradeClothStkList_Sel.pas b/T04贸易明细仓库/U_TradeClothStkList_Sel.pas index 31f4533..d7feed5 100644 --- a/T04贸易明细仓库/U_TradeClothStkList_Sel.pas +++ b/T04贸易明细仓库/U_TradeClothStkList_Sel.pas @@ -88,7 +88,7 @@ type lbl1: TLabel; Label23: TLabel; OrderNo: TEdit; - conNO: TEdit; + khconno: TEdit; STKID: TEdit; C_Name: TEdit; PCId: TEdit; @@ -103,6 +103,7 @@ type ToolButton1: TToolButton; lbl2: TLabel; lbl3: TLabel; + cxgrdbclmnTv1Column3: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject);