diff --git a/检验管理英文版/U_JYOrderCDOne.dfm b/检验管理英文版/U_JYOrderCDOne.dfm index eb1a42b..66a5290 100644 --- a/检验管理英文版/U_JYOrderCDOne.dfm +++ b/检验管理英文版/U_JYOrderCDOne.dfm @@ -22,7 +22,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Left = 0 Top = 0 Width = 1465 - Height = 62 + Height = 92 AutoSize = True ButtonHeight = 30 ButtonWidth = 173 @@ -102,27 +102,28 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne AutoSize = True Caption = 'Modify lot NO' ImageIndex = 54 + Wrap = True OnClick = ToolButton11Click end object TBDW: TToolButton - Left = 714 - Top = 0 + Left = 0 + Top = 30 AutoSize = True Caption = 'Modify unit' ImageIndex = 54 OnClick = TBDWClick end object ToolButton4: TToolButton - Left = 819 - Top = 0 + Left = 105 + Top = 30 AutoSize = True Caption = 'Modify length' ImageIndex = 54 OnClick = ToolButton4Click end object ToolButton13: TToolButton - Left = 936 - Top = 0 + Left = 222 + Top = 30 AutoSize = True Caption = #25209#37327#20928#37325#36716#38271#24230 ImageIndex = 54 @@ -130,24 +131,23 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = ToolButton13Click end object ToolButton8: TToolButton - Left = 1059 - Top = 0 + Left = 345 + Top = 30 AutoSize = True Caption = 'Modify tare' ImageIndex = 54 OnClick = ToolButton8Click end object ToolButton1: TToolButton - Left = 1164 - Top = 0 + Left = 450 + Top = 30 AutoSize = True Caption = 'Print label' ImageIndex = 96 - Wrap = True OnClick = ToolButton1Click end object TCPDB: TToolButton - Left = 0 + Left = 555 Top = 30 AutoSize = True Caption = 'Fabric packing' @@ -156,7 +156,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = TCPDBClick end object ToolButton3: TToolButton - Left = 123 + Left = 678 Top = 30 AutoSize = True Caption = 'Print package label' @@ -165,24 +165,25 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = ToolButton3Click end object ToolButton2: TToolButton - Left = 276 + Left = 831 Top = 30 AutoSize = True Caption = 'Print inspection report' ImageIndex = 12 + Wrap = True OnClick = ToolButton2Click end object ToolButton5: TToolButton - Left = 453 - Top = 30 + Left = 0 + Top = 60 AutoSize = True Caption = 'Print' ImageIndex = 12 OnClick = ToolButton5Click end object Edit3: TEdit - Left = 522 - Top = 30 + Left = 69 + Top = 60 Width = 68 Height = 30 Font.Charset = GB2312_CHARSET @@ -196,8 +197,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnKeyPress = Edit3KeyPress end object ComboBox1: TComboBox - Left = 590 - Top = 33 + Left = 137 + Top = 63 Width = 315 Height = 24 Style = csDropDownList @@ -221,8 +222,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne #26816#39564#30721#21333) end object Edit4: TEdit - Left = 905 - Top = 30 + Left = 452 + Top = 60 Width = 121 Height = 30 Font.Charset = GB2312_CHARSET @@ -235,8 +236,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Visible = False end object ToolButton12: TToolButton - Left = 1026 - Top = 30 + Left = 573 + Top = 60 AutoSize = True Caption = #20462#25913#30721#21333 ImageIndex = 54 @@ -244,24 +245,24 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = ToolButton12Click end object ToolButton9: TToolButton - Left = 1113 - Top = 30 + Left = 660 + Top = 60 AutoSize = True Caption = 'Abnormal data' ImageIndex = 2 OnClick = ToolButton9Click end object TBExport: TToolButton - Left = 1230 - Top = 30 + Left = 777 + Top = 60 AutoSize = True Caption = 'Export' ImageIndex = 75 OnClick = TBExportClick end object TBClose: TToolButton - Left = 1305 - Top = 30 + Left = 852 + Top = 60 AutoSize = True Caption = 'Close' ImageIndex = 55 @@ -270,7 +271,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object Panel1: TPanel Left = 0 - Top = 62 + Top = 92 Width = 1465 Height = 88 Align = alTop @@ -785,9 +786,9 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object cxGrid1: TcxGrid Left = 0 - Top = 150 + Top = 180 Width = 1465 - Height = 496 + Height = 466 Align = alClient PopupMenu = PopupMenu1 TabOrder = 3 diff --git a/检验管理英文版/U_JYOrderCDOne.pas b/检验管理英文版/U_JYOrderCDOne.pas index 55bc281..76d629a 100644 --- a/检验管理英文版/U_JYOrderCDOne.pas +++ b/检验管理英文版/U_JYOrderCDOne.pas @@ -378,7 +378,7 @@ procedure TfrmJYOrderCDOne.InitGrid(); var i: integer; j: Integer; -begin +begin try ADOQueryMain.DisableControls; with ADOQueryMain do @@ -386,7 +386,7 @@ begin Close; Filtered := False; sql.Clear; - sql.Add('select A.*,'); + sql.Add('select A.dingdanhao as orderno,A.*,'); SQL.Add('cast(A.MJSTR4 as varchar(20)) as gangno,'); sql.Add('C.OrderNo,C.MPRTCodeName,C.MPRTMF,C.MPRTKZ,B.*,'); sql.Add('KouFenQty=(select Sum(X.KouFenQty) from WFB_MJJY_CD X where X.MJID=A.MJID),'); diff --git a/检验管理英文版/U_MJManageNewFDNew.dfm b/检验管理英文版/U_MJManageNewFDNew.dfm index 829116e..be466d7 100644 --- a/检验管理英文版/U_MJManageNewFDNew.dfm +++ b/检验管理英文版/U_MJManageNewFDNew.dfm @@ -1070,7 +1070,6 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Font.Name = #23435#20307 Font.Style = [fsBold] ParentFont = False - Visible = False end object Label10: TLabel Left = 16 @@ -1519,7 +1518,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 57 Top = 243 Width = 91 - Height = 34 + Height = 36 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -28 diff --git a/检验管理英文版/U_MJManageNewFDNew.pas b/检验管理英文版/U_MJManageNewFDNew.pas index 491f196..e8eb86c 100644 --- a/检验管理英文版/U_MJManageNewFDNew.pas +++ b/检验管理英文版/U_MJManageNewFDNew.pas @@ -1065,7 +1065,9 @@ begin // FieldByName('BaoNO').Value := Trim(BaoNO.Text); FieldByName('MJTypeOther').Value := Trim(Label9.Caption); FieldByName('MJStr1').Value := Trim(Label13.Caption); - + FieldByName('dingdanhao').Value := Trim(dingdanhao.Text); + FieldByName('shift').Value := Trim(shift.Text); + FieldByName('Loom').Value := Trim(Loom.Text); FieldByName('PM').Value := Trim(PM.Text); FieldByName('KH').Value := Trim(KH.Text); FieldByName('YS').Value := Trim(YS.Text); @@ -1098,7 +1100,7 @@ begin begin FieldByName('MJFK').Value := MJFK.Text; end; - if Trim(MJMaoZ.Text) <> '' then + if Trim(MJMaoZ.Text) <> '' then begin FieldByName('MJMaoZ').Value := StrToFloat(MJMaoZ.Text) + fjz; end;