拆匹

2025-02-20 17:32:25 +08:00 · 2025-02-20 17:32:25 +08:00 · 1d091919bd
commit 1d091919bd
parent 551a1d77a0
5 changed files with 183 additions and 1478 deletions
--- a/T02贸易汇总仓库/U_ItemizedListQtyInPut.dfm
+++ b/T02贸易汇总仓库/U_ItemizedListQtyInPut.dfm
@ -20,8 +20,6 @@ inherited frmItemizedListQtyInPut: TfrmItemizedListQtyInPut
    Align = alClient
    Caption = 'pnl1'
    TabOrder = 0
-    ExplicitWidth = 595
-    ExplicitHeight = 525
    object cxGrid1: TcxGrid
      Tag = 2
      Left = 1
@ -31,8 +29,6 @@ inherited frmItemizedListQtyInPut: TfrmItemizedListQtyInPut
      Align = alClient
      PopupMenu = PopupMenu1
      TabOrder = 0
-      ExplicitLeft = 2
-      ExplicitTop = 73
      object Tv1: TcxGridDBTableView
        Navigator.Buttons.CustomButtons = <>
        ScrollbarAnnotations.CustomAnnotations = <>
@ -199,7 +195,6 @@ inherited frmItemizedListQtyInPut: TfrmItemizedListQtyInPut
      Height = 41
      Align = alTop
      TabOrder = 2
-      ExplicitWidth = 593
      object Label9: TLabel
        Left = 33
        Top = 7
--- a/T02贸易汇总仓库/U_ItemizedListQtyInPut.pas
+++ b/T02贸易汇总仓库/U_ItemizedListQtyInPut.pas
@ -436,7 +436,7 @@ begin
            FieldByName('EditTime').Value := SGetServerDate(ADOQueryTemp);
          end;
          RTSetSaveDataCDS(ADOQueryCmd, Tv1, CDS_Sub, 'BS_Cloth_IO', 0);
-          FieldByName('STKName').Value := '˛źĆĽ˛Öżâ';
+          FieldByName('STKName').Value := 'ĂłŇ×˛źĆĽ';
          FieldByName('IOFlag').Value := 'Èë¿â';
          FieldByName('IOQtyFlag').Value := 1;
          FieldByName('Piece').Value := 1;
--- a/T03贸易布匹检验/DjdMachineInsp.dproj
+++ b/T03贸易布匹检验/DjdMachineInsp.dproj
@ -161,7 +161,7 @@
    </PropertyGroup>
    <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
-        <Debugger_HostApplication>D:\Dp10RepoV1\项目代码\D10myLvsheng\T03贸易布匹检验\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\Dp10RepoV1\项目代码\D10xhGemei\T03贸易布匹检验\testDll.exe</Debugger_HostApplication>
    </PropertyGroup>
    <ItemGroup>
        <DelphiCompile Include="$(MainSource)">
--- a/T03贸易布匹检验/U_MachRollMain.dfm
+++ b/T03贸易布匹检验/U_MachRollMain.dfm
@ -27,16 +27,8 @@ inherited frmMachRollMain: TfrmMachRollMain
    OptionsItem.SizableHorz = True
    OptionsItem.SizableVert = True
    OnDblClick = dxLayoutControl_packDblClick
-    ExplicitHeight = 791
-    object Piece: TcxTextEdit
-      Left = 239
-      Top = 154
-      Properties.ReadOnly = True
-      Style.HotTrack = False
-      Style.TransparentBorder = False
-      TabOrder = 8
-      Width = 161
-    end
+    ExplicitLeft = 5
+    ExplicitTop = -5
    object Qty: TcxTextEdit
      Left = 79
      Top = 154
@ -110,30 +102,30 @@ inherited frmMachRollMain: TfrmMachRollMain
      Properties.OnChange = InputLenPropertiesChange
      Style.HotTrack = False
      Style.TransparentBorder = False
-      TabOrder = 9
+      TabOrder = 8
      OnClick = edtScanEnter
      OnKeyPress = InputLenKeyPress
-      Height = 38
+      Height = 35
      Width = 132
    end
    object BTPrint: TButton
      Left = 259
-      Top = 256
-      Width = 140
+      Top = 253
+      Width = 120
      Height = 59
      Caption = #25552'  '#20132
-      TabOrder = 13
+      TabOrder = 11
      OnClick = BTPrintClick
    end
    object Tare: TcxTextEdit
      Tag = 999
      Left = 158
-      Top = 256
+      Top = 253
      AutoSize = False
      Properties.OnChange = InputLenPropertiesChange
      Style.HotTrack = False
      Style.TransparentBorder = False
-      TabOrder = 12
+      TabOrder = 10
      OnClick = edtScanEnter
      OnKeyPress = InputLenKeyPress
      Height = 59
@ -142,12 +134,12 @@ inherited frmMachRollMain: TfrmMachRollMain
    object Coefficient: TcxTextEdit
      Tag = 999
      Left = 79
-      Top = 324
+      Top = 321
      AutoSize = False
      Properties.ReadOnly = False
      Style.HotTrack = False
      Style.TransparentBorder = False
-      TabOrder = 14
+      TabOrder = 12
      OnClick = edtScanEnter
      OnKeyPress = InputLenKeyPress
      Height = 37
@ -156,12 +148,12 @@ inherited frmMachRollMain: TfrmMachRollMain
    object InputWeight: TcxTextEdit
      Tag = 999
      Left = 79
-      Top = 256
+      Top = 253
      AutoSize = False
      Properties.OnChange = InputLenPropertiesChange
      Style.HotTrack = False
      Style.TransparentBorder = False
-      TabOrder = 11
+      TabOrder = 9
      OnClick = edtScanEnter
      OnKeyPress = InputLenKeyPress
      Height = 59
@ -174,7 +166,7 @@ inherited frmMachRollMain: TfrmMachRollMain
      AutoSize = False
      Style.HotTrack = False
      Style.TransparentBorder = False
-      TabOrder = 18
+      TabOrder = 16
      Visible = False
      OnClick = edtScanEnter
      OnKeyPress = InputLenKeyPress
@ -183,12 +175,12 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
    object AOrdDefNote1: TcxRichEdit
      Left = 1
-      Top = 382
+      Top = 379
      Properties.ReadOnly = True
      Properties.ScrollBars = ssBoth
      Style.HotTrack = False
      Style.TransparentBorder = False
-      TabOrder = 16
+      TabOrder = 14
      Height = 206
      Width = 181
    end
@ -204,31 +196,15 @@ inherited frmMachRollMain: TfrmMachRollMain
      Properties.ShowFocusRect = False
      Style.HotTrack = False
      Style.TransparentBorder = False
-      TabOrder = 19
+      TabOrder = 17
      Visible = False
      Height = 122
      Width = 280
    end
-    object grade: TcxComboBox
-      Left = 305
-      Top = 209
-      AutoSize = False
-      Properties.DropDownListStyle = lsEditFixedList
-      Properties.Items.Strings = (
-        #27491#21697
-        #27425#21697)
-      Style.HotTrack = False
-      Style.TransparentBorder = False
-      TabOrder = 10
-      Text = #27491#21697
-      OnKeyPress = InputLenKeyPress
-      Height = 38
-      Width = 94
-    end
    object lblRuleConversion: TcxComboBox
      Tag = 2
      Left = 140
-      Top = 324
+      Top = 321
      AutoSize = False
      Properties.DropDownListStyle = lsEditFixedList
      Properties.Items.Strings = (
@ -243,7 +219,7 @@ inherited frmMachRollMain: TfrmMachRollMain
      StyleDisabled.LookAndFeel.SkinName = 'WXI'
      StyleFocused.LookAndFeel.SkinName = 'WXI'
      StyleHot.LookAndFeel.SkinName = 'WXI'
-      TabOrder = 15
+      TabOrder = 13
      Text = #26080#38656#36716#25442
      Height = 37
      Width = 102
@ -251,12 +227,12 @@ inherited frmMachRollMain: TfrmMachRollMain
    object packnote: TcxMemo
      Tag = 999
      Left = 191
-      Top = 382
+      Top = 379
      Properties.ReadOnly = True
      Properties.ScrollBars = ssVertical
      Style.HotTrack = False
      Style.TransparentBorder = False
-      TabOrder = 17
+      TabOrder = 15
      Height = 206
      Width = 199
    end
@ -287,7 +263,7 @@ inherited frmMachRollMain: TfrmMachRollMain
      Properties.ReadOnly = True
      Style.HotTrack = False
      Style.TransparentBorder = False
-      TabOrder = 23
+      TabOrder = 21
      Visible = False
      Width = 124
    end
@ -298,7 +274,7 @@ inherited frmMachRollMain: TfrmMachRollMain
      Properties.ReadOnly = True
      Style.HotTrack = False
      Style.TransparentBorder = False
-      TabOrder = 24
+      TabOrder = 22
      Text = '100'
      Visible = False
      OnClick = edtScanEnter
@ -312,7 +288,7 @@ inherited frmMachRollMain: TfrmMachRollMain
      Properties.ReadOnly = True
      Style.HotTrack = False
      Style.TransparentBorder = False
-      TabOrder = 25
+      TabOrder = 23
      Visible = False
      Width = 168
    end
@ -321,7 +297,7 @@ inherited frmMachRollMain: TfrmMachRollMain
      Top = 10000
      Style.HotTrack = False
      Style.TransparentBorder = False
-      TabOrder = 26
+      TabOrder = 24
      Visible = False
      OnClick = edtScanEnter
      Width = 121
@ -331,7 +307,7 @@ inherited frmMachRollMain: TfrmMachRollMain
      Top = 10000
      Style.HotTrack = False
      Style.TransparentBorder = False
-      TabOrder = 27
+      TabOrder = 25
      Visible = False
      OnClick = edtScanEnter
      Width = 121
@ -341,7 +317,7 @@ inherited frmMachRollMain: TfrmMachRollMain
      Top = 10000
      Style.HotTrack = False
      Style.TransparentBorder = False
-      TabOrder = 28
+      TabOrder = 26
      Visible = False
      OnClick = edtScanEnter
      Width = 121
@ -351,7 +327,7 @@ inherited frmMachRollMain: TfrmMachRollMain
      Top = 10000
      Style.HotTrack = False
      Style.TransparentBorder = False
-      TabOrder = 29
+      TabOrder = 27
      Visible = False
      OnClick = edtScanEnter
      Width = 121
@ -361,7 +337,7 @@ inherited frmMachRollMain: TfrmMachRollMain
      Top = 10000
      Style.HotTrack = False
      Style.TransparentBorder = False
-      TabOrder = 30
+      TabOrder = 28
      Visible = False
      OnClick = edtScanEnter
      Width = 121
@ -371,7 +347,7 @@ inherited frmMachRollMain: TfrmMachRollMain
      Top = 10000
      Style.HotTrack = False
      Style.TransparentBorder = False
-      TabOrder = 31
+      TabOrder = 29
      Visible = False
      OnClick = edtScanEnter
      Width = 121
@ -382,7 +358,7 @@ inherited frmMachRollMain: TfrmMachRollMain
      Width = 48
      Height = 33
      Caption = #30721#21333
-      TabOrder = 32
+      TabOrder = 30
      Visible = False
      OnClick = bt_printmdClick
    end
@ -391,7 +367,7 @@ inherited frmMachRollMain: TfrmMachRollMain
      Top = 10000
      Style.HotTrack = False
      Style.TransparentBorder = False
-      TabOrder = 33
+      TabOrder = 31
      Visible = False
      OnClick = edtScanEnter
      Width = 121
@ -401,7 +377,7 @@ inherited frmMachRollMain: TfrmMachRollMain
      Top = 10000
      Style.HotTrack = False
      Style.TransparentBorder = False
-      TabOrder = 34
+      TabOrder = 32
      Visible = False
      OnClick = edtScanEnter
      Width = 121
@ -411,7 +387,7 @@ inherited frmMachRollMain: TfrmMachRollMain
      Top = 10000
      Style.HotTrack = False
      Style.TransparentBorder = False
-      TabOrder = 35
+      TabOrder = 33
      Visible = False
      OnClick = edtScanEnter
      Width = 121
@ -571,15 +547,6 @@ inherited frmMachRollMain: TfrmMachRollMain
      ControlOptions.ShowBorder = False
      Index = 1
    end
-    object dxLayoutItem9: TdxLayoutItem
-      Parent = dxLayoutGroup_plan_2
-      CaptionOptions.Text = #21305#25968
-      Control = Piece
-      ControlOptions.OriginalHeight = 33
-      ControlOptions.OriginalWidth = 144
-      ControlOptions.ShowBorder = False
-      Index = 3
-    end
    object dxLayoutItem10: TdxLayoutItem
      Parent = dxLayoutGroup_plan_2
      CaptionOptions.Text = #21345#21495
@ -818,18 +785,6 @@ inherited frmMachRollMain: TfrmMachRollMain
      Parent = dxLayoutGroup_do2
      Index = 0
    end
-    object dxLayoutItem_grade: TdxLayoutItem
-      Parent = dxLayoutAutoCreatedGroup5
-      AlignVert = avClient
-      SizeOptions.Width = 134
-      AllowRemove = False
-      CaptionOptions.Text = '[COLOR=Red][SIZE=12]'#31561#32423'[/COLOR][/SIZE]'
-      Control = grade
-      ControlOptions.OriginalHeight = 38
-      ControlOptions.OriginalWidth = 94
-      ControlOptions.ShowBorder = False
-      Index = 2
-    end
    object dxLayoutItem14: TdxLayoutItem
      Parent = dxLayoutAutoCreatedGroup4
      AlignVert = avClient
@ -1001,16 +956,8 @@ inherited frmMachRollMain: TfrmMachRollMain
        ImageIndex = 21
        OnClick = ToolButton3Click
      end
-      object TprintPack: TToolButton
-        Left = 63
-        Top = 0
-        AutoSize = True
-        Caption = #21253#26631#31614
-        ImageIndex = 21
-        OnClick = TprintPackClick
-      end
      object Trolldel: TToolButton
-        Left = 138
+        Left = 63
        Top = 0
        AutoSize = True
        Caption = #21024#38500
@ -1018,15 +965,14 @@ inherited frmMachRollMain: TfrmMachRollMain
        OnClick = TrolldelClick
      end
      object ToolButton4: TToolButton
-        Left = 201
+        Left = 126
        Top = 0
        AutoSize = True
        Caption = #30133#28857#31649#29702
        ImageIndex = 2
-        OnClick = ToolButton4Click
      end
      object ToolButton1: TToolButton
-        Left = 288
+        Left = 213
        Top = 0
        AutoSize = True
        Caption = #25171#21367#35774#32622
@ -1034,7 +980,7 @@ inherited frmMachRollMain: TfrmMachRollMain
        OnClick = ToolButton1Click
      end
      object ToolButton7: TToolButton
-        Left = 375
+        Left = 300
        Top = 0
        AutoSize = True
        Caption = #20445#23384#26684#24335
@ -1042,15 +988,14 @@ inherited frmMachRollMain: TfrmMachRollMain
        OnClick = ToolButton7Click
      end
      object Tlog: TToolButton
-        Left = 462
+        Left = 387
        Top = 0
        AutoSize = True
        Caption = #26085#24535
        ImageIndex = 30
-        OnClick = TlogClick
      end
      object ToolButton8: TToolButton
-        Left = 525
+        Left = 450
        Top = 0
        AutoSize = True
        Caption = #20851#38381
@ -1072,7 +1017,6 @@ inherited frmMachRollMain: TfrmMachRollMain
        Navigator.Buttons.CustomButtons = <>
        ScrollbarAnnotations.CustomAnnotations = <>
        OnCustomDrawCell = Tv3CustomDrawCell
-        OnFocusedRecordChanged = Tv3FocusedRecordChanged
        DataController.DataSource = ds_3
        DataController.Filter.AutoDataSetFilter = True
        DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@ -1185,39 +1129,15 @@ inherited frmMachRollMain: TfrmMachRollMain
          Options.Editing = False
          Width = 54
        end
-        object Tv3PacketNo: TcxGridDBColumn
-          Caption = #21253#21495
-          DataBinding.FieldName = 'PacketNo'
-          DataBinding.IsNullValueType = True
-          HeaderAlignmentHorz = taCenter
-          Options.Editing = False
-          Width = 57
-        end
-        object Tv3BatchNO: TcxGridDBColumn
-          Caption = #26412#21378#32568#21495
-          DataBinding.FieldName = 'BatchNO'
-          DataBinding.IsNullValueType = True
-          HeaderAlignmentHorz = taCenter
-          Options.Editing = False
-          Width = 89
-        end
        object tv3CIID: TcxGridDBColumn
          Caption = #21367#26465#30721
-          DataBinding.FieldName = 'CIID'
+          DataBinding.FieldName = 'BCIOID'
          DataBinding.IsNullValueType = True
          HeaderAlignmentHorz = taCenter
          Options.Editing = False
          Options.Sorting = False
          Width = 112
        end
-        object Tv3FtyPCId: TcxGridDBColumn
-          Caption = #32568#21495
-          DataBinding.FieldName = 'FtyPCId'
-          DataBinding.IsNullValueType = True
-          HeaderAlignmentHorz = taCenter
-          Options.Editing = False
-          Width = 77
-        end
      end
      object cxGridLevel2: TcxGridLevel
        GridView = Tv3
@ -1225,8 +1145,8 @@ inherited frmMachRollMain: TfrmMachRollMain
    end
  end
  object cxGroupBox_keys: TcxGroupBox [2]
-    Left = 56
-    Top = 408
+    Left = 8
+    Top = 390
    Caption = #34394#25311#38190#30424
    Style.LookAndFeel.NativeStyle = False
    StyleDisabled.LookAndFeel.NativeStyle = False
@ -1253,80 +1173,35 @@ inherited frmMachRollMain: TfrmMachRollMain
        ExplicitTop = 7
        ExplicitWidth = 311
        ExplicitHeight = 206
-        inherited SpeedButton1: TSpeedButton
-          OnClick = FrameKeyBoard1SpeedButton1Click
-        end
-        inherited SpeedButton4: TSpeedButton
-          OnClick = FrameKeyBoard1SpeedButton1Click
-        end
-        inherited SpeedButton7: TSpeedButton
-          OnClick = FrameKeyBoard1SpeedButton1Click
-        end
-        inherited SpeedButton2: TSpeedButton
-          OnClick = FrameKeyBoard1SpeedButton1Click
-        end
-        inherited SpeedButton5: TSpeedButton
-          OnClick = FrameKeyBoard1SpeedButton1Click
-        end
-        inherited SpeedButton8: TSpeedButton
-          OnClick = FrameKeyBoard1SpeedButton1Click
-        end
-        inherited SpeedButton3: TSpeedButton
-          OnClick = FrameKeyBoard1SpeedButton1Click
-        end
-        inherited SpeedButton6: TSpeedButton
-          OnClick = FrameKeyBoard1SpeedButton1Click
-        end
-        inherited SpeedButton9: TSpeedButton
-          OnClick = FrameKeyBoard1SpeedButton1Click
-        end
-        inherited SpeedButton_back: TSpeedButton
-          OnClick = FrameKeyBoard1SpeedButton_backClick
-        end
-        inherited SpeedButton0: TSpeedButton
-          OnClick = FrameKeyBoard1SpeedButton1Click
-        end
-        inherited SpeedButton_dot: TSpeedButton
-          OnClick = FrameKeyBoard1SpeedButton1Click
-        end
        inherited SpeedButton_yc: TSpeedButton
          OnClick = FrameKeyBoard1SpeedButton_ycClick
        end
-        inherited SpeedButton_zdykey2: TSpeedButton
-          OnClick = FrameKeyBoard1SpeedButton1Click
-        end
-        inherited SpeedButton_zdykey1: TSpeedButton
-          OnClick = FrameKeyBoard1SpeedButton1Click
-        end
-        inherited SpeedButton10: TSpeedButton
-          OnClick = FrameKeyBoard1SpeedButton1Click
-        end
      end
    end
    object MovePanel1: TMovePanel
-      Left = 89
-      Top = -23
+      Left = 85
+      Top = -29
      Width = 237
-      Height = 42
+      Height = 45
      BevelOuter = bvNone
      DockSite = True
-      ParentColor = True
+      ParentBackground = False
      TabOrder = 1
    end
  end
  inherited loadProcess: TPanel
-    Left = 483
-    Top = 157
+    Left = 531
+    Top = 173
    Width = 177
-    ExplicitLeft = 483
-    ExplicitTop = 157
+    ExplicitLeft = 531
+    ExplicitTop = 173
    ExplicitWidth = 177
  end
  inherited cxProgressBar2: TcxProgressBar
-    Left = 483
-    Top = 121
-    ExplicitLeft = 483
-    ExplicitTop = 121
+    Left = 531
+    Top = 125
+    ExplicitLeft = 531
+    ExplicitTop = 125
    ExplicitHeight = 29
  end
  inherited ADOQueryBaseCmd: TADOQuery
--- a/T03贸易布匹检验/U_MachRollMain.pas
+++ b/T03贸易布匹检验/U_MachRollMain.pas