1

public10/ThreeFun/Form/U_ZDYHelp.dfm

@@ -96,8 +96,11 @@ inherited frmZDYHelp: TfrmZDYHelp
         Caption = #22791#27880'1'
         DataBinding.FieldName = 'note1'
         DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxTextEditProperties'
+        PropertiesClassName = 'TcxComboBoxProperties'
-        Properties.OnEditValueChanged = V1Column1PropertiesEditValueChanged
+        Properties.Items.Strings = (
+          #22383#24067#30133#28857
+          #26579#33394#30133#28857)
+        Properties.OnEditValueChanged = V1note1PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
         MinWidth = 100
         Width = 100
@@ -241,7 +244,7 @@ inherited frmZDYHelp: TfrmZDYHelp
     LockType = ltReadOnly
     Parameters = <>
     Left = 32
-    Top = 176
+    Top = 177
   end
   object ADOQueryTemp: TADOQuery [7]
     Connection = ADOConnection1

public10/ThreeFun/Form/U_ZDYHelp.pas

@@ -11,7 +11,8 @@ uses
   cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
    cxNavigator,
   dxDateRanges, dxBarBuiltInMenu, System.ImageList,
-  dxScrollbarAnnotations, cxContainer, cxImageList, cxLookAndFeelPainters;
+  dxScrollbarAnnotations, cxContainer, cxImageList, cxLookAndFeelPainters,
+  cxDropDownEdit;
 
 type
   TfrmZDYHelp = class(TfrmBaseInput)
@@ -62,6 +63,7 @@ type
     procedure V1Column1PropertiesEditValueChanged(Sender: TObject);
     procedure V1HelpTypePropertiesEditValueChanged(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
+    procedure V1note1PropertiesEditValueChanged(Sender: TObject);
   private
     procedure InitGrid();
     { Private declarations }
@@ -341,7 +343,7 @@ begin
   V1Note.Visible := fnote;
   V1ZdyFlag.Visible := fZdyFlag;
   V1OrderNo.Visible := forderno;
-  v1note1.Visible := fnote1;
+//  V1note1.Visible := fnote1;
   V1HelpType.Visible := fhelpType;
   if ViewFlag = True then
   begin
@@ -537,6 +539,37 @@ begin
   end;
 end;
 
+procedure TfrmZDYHelp.V1note1PropertiesEditValueChanged(Sender: TObject);
+var
+  mvalue: string;
+begin
+  inherited;
+  if Trim(ClientDataSet1.fieldbyname('ZdyName').AsString) = '' then
+  begin
+    Application.MessageBox('Ãû³Æ²»ÄÜΪ¿Õ!', 'Ìáʾ', 0);
+    Exit;
+  end;
+  mvalue := TcxTextEdit(Sender).EditingText;
+  if Trim(mvalue) = '' then
+  begin
+    mvalue := '';
+  end;
+  with ClientDataSet1 do
+  begin
+    Edit;
+    FieldByName('Note1').Value := mvalue;
+    Post;
+  end;
+  with ADOQueryCmd do
+  begin
+    Close;
+    SQL.Clear;
+    sql.Add('Update KH_Zdy Set Note1=''' + Trim(mvalue) + '''');
+    sql.Add(' where ZdyNo=''' + Trim(ClientDataSet1.fieldbyname('ZdyNo').AsString) + '''');
+    ExecSQL;
+  end;
+end;
+
 procedure TfrmZDYHelp.V1OrderNoPropertiesEditValueChanged(Sender: TObject);
 var
   mvalue: string;

public10/ThreeFun/Form/U_ZDYHelp.vlb

@@ -1,96 +0,0 @@
-[TBDel]
-Coordinates=374,214,50,36
-
-[Label2]
-Coordinates=298,146,53,58
-
-[ToolButton1]
-Coordinates=280,214,84,36
-
-[cxGrid1Level1]
-Coordinates=361,155,97,36
-
-[V1HelpType]
-Coordinates=361,210,85,36
-
-[TBEdit]
-Coordinates=217,214,53,36
-
-[V1Note]
-Coordinates=342,251,57,36
-
-[ADOQueryCmd]
-Coordinates=121,146,104,58
-
-[TBAdd]
-Coordinates=153,214,54,36
-
-[V1OrderNo]
-Coordinates=194,251,79,36
-
-[V1note1]
-Coordinates=125,251,62,36
-
-[TV1]
-Coordinates=76,251,40,36
-
-[TBClose]
-Coordinates=79,214,64,36
-
-[Panel1]
-Coordinates=333,78,55,58
-
-[cxGrid1]
-Coordinates=10,214,59,36
-
-[V1Name]
-Coordinates=504,133,64,36
-
-[ADOQueryTemp]
-Coordinates=233,10,109,58
-
-[cxGridPopupMenu1]
-Coordinates=504,188,128,36
-
-[ADOConnection1]
-Coordinates=504,243,114,36
-
-[ThreeImgList]
-Coordinates=504,298,90,36
-
-[V1Code]
-Coordinates=435,325,61,36
-
-[ClientDataSet1]
-Coordinates=10,146,101,58
-
-[V1ZdyFlag]
-Coordinates=356,325,77,36
-
-[DataSource1]
-Coordinates=219,78,89,36
-
-[Label1]
-Coordinates=235,146,53,58
-
-[TBSave]
-Coordinates=438,146,60,36
-
-[ADOQueryMain]
-Coordinates=398,78,105,58
-
-[DataLink_TradeManage.AdoDataLink]
-Coordinates=10,78,229,58
-
-[ToolBar1]
-Coordinates=361,146,67,36
-
-[frmBaseInput.ADOQueryBaseTemp]
-Coordinates=352,10,219,58
-
-[frmBaseInput.ADOQueryBaseCmd]
-Coordinates=10,10,213,58
-
-[]
-Coordinates=249,78,74,58
-

项目代码/DJ/G01贸易生产计划/ProjectGroup1.groupproj.local

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Default.Personality>
-		<Projects ActiveProject="D:\Dp10RepoV1\项目代码\MoBan\项目代码\DJ\G01贸易生产计划\djdPackPlan.dproj"/>
+		<Projects ActiveProject="D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G01贸易生产计划\djdPackPlan.dproj"/>
 	</Default.Personality>
 </BorlandProject>

项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.dfm

@@ -8,6 +8,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
   Position = poScreenCenter
   WindowState = wsMaximized
   OnClose = FormClose
+  ExplicitTop = -63
   ExplicitWidth = 1093
   ExplicitHeight = 689
   PixelsPerInch = 96
@@ -234,7 +235,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
       object DLYDate: TcxDateEdit
         Tag = 2
         Left = 67
-        Top = 44
+        Top = 49
         Properties.SaveTime = False
         Properties.ShowTime = False
         Style.HotTrack = False
@@ -245,7 +246,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
       object saleser: TcxButtonEdit
         Tag = 2
         Left = 247
-        Top = 44
+        Top = 49
         Hint = 'saleser/'#19994#21153#21592
         Properties.Buttons = <
           item
@@ -262,7 +263,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
       object factoryName: TcxButtonEdit
         Tag = 2
         Left = 446
-        Top = 44
+        Top = 49
         Hint = 'FtyName/'#21152#24037#21378
         Properties.Buttons = <
           item
@@ -279,7 +280,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
       object Gilding: TcxButtonEdit
         Tag = 2
         Left = 67
-        Top = 74
+        Top = 85
         Hint = 'Gilding/'#28907#37329
         Properties.Buttons = <
           item
@@ -296,7 +297,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
       object PackSeal: TcxButtonEdit
         Tag = 2
         Left = 657
-        Top = 74
+        Top = 85
         Hint = 'PackSeal/'#23553#26465
         Properties.Buttons = <
           item
@@ -317,7 +318,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
       object ShippingSample: TcxButtonEdit
         Tag = 2
         Left = 247
-        Top = 74
+        Top = 85
         Hint = 'ShippingSample/'#33337#26679
         AutoSize = False
         Properties.Buttons = <
@@ -330,13 +331,13 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         Style.HotTrack = False
         Style.TransparentBorder = False
         TabOrder = 8
-        Height = 25
+        Height = 29
         Width = 150
       end
       object SizeNote: TcxButtonEdit
         Tag = 2
         Left = 446
-        Top = 74
+        Top = 85
         Hint = 'SizeNote/'#24320#21098
         Properties.Buttons = <
           item
@@ -353,7 +354,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
       object OrdNote: TcxMemo
         Tag = 2
         Left = 67
-        Top = 220
+        Top = 241
         Properties.ScrollBars = ssVertical
         Style.HotTrack = False
         Style.TransparentBorder = False
@@ -364,7 +365,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
       object PackNote: TcxMemo
         Tag = 2
         Left = 67
-        Top = 136
+        Top = 157
         Properties.ScrollBars = ssVertical
         Style.HotTrack = False
         Style.TransparentBorder = False
@@ -466,7 +467,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
       end
       object LabVolume: TcxButtonEdit
         Left = 67
-        Top = 106
+        Top = 121
         Properties.Buttons = <
           item
             Default = True
@@ -482,7 +483,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
       end
       object LabPackage: TcxButtonEdit
         Left = 299
-        Top = 106
+        Top = 121
         Properties.Buttons = <
           item
             Default = True
@@ -594,7 +595,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         AllowRemove = False
         CaptionOptions.Text = '[COLOR=#FF0000]*[/COLOR]'#35746#21333#21495
         Control = OrderNo
-        ControlOptions.OriginalHeight = 23
+        ControlOptions.OriginalHeight = 29
         ControlOptions.OriginalWidth = 131
         ControlOptions.ShowBorder = False
         Index = 0
@@ -606,7 +607,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         AllowRemove = False
         CaptionOptions.Text = #23458'  '#25143
         Control = CustName
-        ControlOptions.OriginalHeight = 23
+        ControlOptions.OriginalHeight = 29
         ControlOptions.OriginalWidth = 150
         ControlOptions.ShowBorder = False
         Index = 1
@@ -617,7 +618,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         SizeOptions.SizableHorz = True
         CaptionOptions.Text = #21512#21516#21495
         Control = ConNo
-        ControlOptions.OriginalHeight = 23
+        ControlOptions.OriginalHeight = 29
         ControlOptions.OriginalWidth = 150
         ControlOptions.ShowBorder = False
         Index = 2
@@ -629,7 +630,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         AllowRemove = False
         CaptionOptions.Text = #25490#21333#26085#26399
         Control = OrdDate
-        ControlOptions.OriginalHeight = 23
+        ControlOptions.OriginalHeight = 29
         ControlOptions.OriginalWidth = 131
         ControlOptions.ShowBorder = False
         Index = 3
@@ -648,7 +649,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         SizeOptions.SizableHorz = True
         CaptionOptions.Text = #21152#24037#21378
         Control = factoryName
-        ControlOptions.OriginalHeight = 23
+        ControlOptions.OriginalHeight = 29
         ControlOptions.OriginalWidth = 150
         ControlOptions.ShowBorder = False
         Index = 2
@@ -660,7 +661,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         AllowRemove = False
         CaptionOptions.Text = #20132#36135#26085#26399
         Control = DLYDate
-        ControlOptions.OriginalHeight = 23
+        ControlOptions.OriginalHeight = 29
         ControlOptions.OriginalWidth = 131
         ControlOptions.ShowBorder = False
         Index = 0
@@ -672,7 +673,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         AllowRemove = False
         CaptionOptions.Text = #19994#21153#21592
         Control = saleser
-        ControlOptions.OriginalHeight = 23
+        ControlOptions.OriginalHeight = 29
         ControlOptions.OriginalWidth = 150
         ControlOptions.ShowBorder = False
         Index = 1
@@ -705,7 +706,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         SizeOptions.SizableHorz = True
         CaptionOptions.Text = #28907'  '#37329
         Control = Gilding
-        ControlOptions.OriginalHeight = 23
+        ControlOptions.OriginalHeight = 29
         ControlOptions.OriginalWidth = 131
         ControlOptions.ShowBorder = False
         Index = 0
@@ -716,7 +717,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         SizeOptions.SizableHorz = True
         CaptionOptions.Text = #24320'  '#21098
         Control = SizeNote
-        ControlOptions.OriginalHeight = 23
+        ControlOptions.OriginalHeight = 29
         ControlOptions.OriginalWidth = 150
         ControlOptions.ShowBorder = False
         Index = 2
@@ -727,7 +728,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         SizeOptions.SizableHorz = True
         CaptionOptions.Text = #23553'  '#26465
         Control = PackSeal
-        ControlOptions.OriginalHeight = 23
+        ControlOptions.OriginalHeight = 29
         ControlOptions.OriginalWidth = 131
         ControlOptions.ShowBorder = False
         Index = 3
@@ -770,7 +771,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         SizeOptions.SizableVert = False
         CaptionOptions.Text = #33136#23553#22791#27880
         Control = PackSealNote
-        ControlOptions.OriginalHeight = 19
+        ControlOptions.OriginalHeight = 25
         ControlOptions.OriginalWidth = 131
         ControlOptions.ShowBorder = False
         Index = -1
@@ -781,7 +782,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         SizeOptions.SizableVert = False
         CaptionOptions.Text = #21253#35013#26041#24335
         Control = PackType
-        ControlOptions.OriginalHeight = 19
+        ControlOptions.OriginalHeight = 25
         ControlOptions.OriginalWidth = 131
         ControlOptions.ShowBorder = False
         Index = -1
@@ -792,7 +793,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         SizeOptions.SizableVert = False
         CaptionOptions.Text = #25968#37327#35201#27714#65292#28322#30701#35013
         Control = QtyNote
-        ControlOptions.OriginalHeight = 19
+        ControlOptions.OriginalHeight = 25
         ControlOptions.OriginalWidth = 131
         ControlOptions.ShowBorder = False
         Index = -1
@@ -803,7 +804,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         SizeOptions.SizableVert = False
         CaptionOptions.Text = #20854#20182#35201#27714
         Control = OtherProcess1
-        ControlOptions.OriginalHeight = 19
+        ControlOptions.OriginalHeight = 25
         ControlOptions.OriginalWidth = 131
         ControlOptions.ShowBorder = False
         Index = -1
@@ -824,7 +825,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         SizeOptions.Width = 237
         CaptionOptions.Text = #21367#26631#31614
         Control = LabVolume
-        ControlOptions.OriginalHeight = 23
+        ControlOptions.OriginalHeight = 29
         ControlOptions.OriginalWidth = 183
         ControlOptions.ShowBorder = False
         Index = 0
@@ -836,7 +837,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         SizeOptions.Width = 204
         CaptionOptions.Text = #21253#26631#31614
         Control = LabPackage
-        ControlOptions.OriginalHeight = 23
+        ControlOptions.OriginalHeight = 29
         ControlOptions.OriginalWidth = 162
         ControlOptions.ShowBorder = False
         Index = 1
@@ -847,7 +848,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         SizeOptions.SizableVert = True
         CaptionOptions.Text = #20027#34920#23383#31526#33258#23450#20041#23383#27573'1'
         Control = CustDefStr1
-        ControlOptions.OriginalHeight = 23
+        ControlOptions.OriginalHeight = 29
         ControlOptions.OriginalWidth = 150
         ControlOptions.ShowBorder = False
         Index = -1
@@ -858,7 +859,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         SizeOptions.SizableVert = True
         CaptionOptions.Text = #20027#34920#23383#31526#33258#23450#20041#23383#27573'2'
         Control = CustDefStr2
-        ControlOptions.OriginalHeight = 23
+        ControlOptions.OriginalHeight = 29
         ControlOptions.OriginalWidth = 150
         ControlOptions.ShowBorder = False
         Index = -1
@@ -869,7 +870,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         SizeOptions.SizableVert = True
         CaptionOptions.Text = #20027#34920#23383#31526#33258#23450#20041#23383#27573'3'
         Control = CustDefStr3
-        ControlOptions.OriginalHeight = 23
+        ControlOptions.OriginalHeight = 29
         ControlOptions.OriginalWidth = 150
         ControlOptions.ShowBorder = False
         Index = -1
@@ -880,7 +881,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         SizeOptions.SizableVert = True
         CaptionOptions.Text = #20027#34920#25968#23383#33258#23450#20041#23383#27573'1'
         Control = CustDefFloat1
-        ControlOptions.OriginalHeight = 23
+        ControlOptions.OriginalHeight = 29
         ControlOptions.OriginalWidth = 94
         ControlOptions.ShowBorder = False
         Index = -1
@@ -891,7 +892,7 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         SizeOptions.SizableVert = True
         CaptionOptions.Text = #20027#34920#25968#23383#33258#23450#20041#23383#27573'2'
         Control = CustDefFloat2
-        ControlOptions.OriginalHeight = 23
+        ControlOptions.OriginalHeight = 29
         ControlOptions.OriginalWidth = 82
         ControlOptions.ShowBorder = False
         Index = -1
@@ -987,17 +988,18 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
       TabOrder = 1
       Properties.ActivePage = cxTabSheet1
       Properties.CustomButtons.Buttons = <>
-      ClientRectBottom = 337
+      ClientRectBottom = 335
-      ClientRectRight = 200
+      ClientRectLeft = 2
-      ClientRectTop = 28
+      ClientRectRight = 198
+      ClientRectTop = 32
       object cxTabSheet1: TcxTabSheet
         Caption = #21367#26631#31614
         ImageIndex = 0
         object RMPreview1: TRMPreview
           Left = 0
           Top = 0
-          Width = 200
+          Width = 196
-          Height = 309
+          Height = 303
           Align = alClient
           BevelOuter = bvNone
           Caption = 'Insert After'
@@ -1020,11 +1022,15 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
       object cxTabSheet2: TcxTabSheet
         Caption = #21253#26631#31614
         ImageIndex = 1
+        ExplicitLeft = 0
+        ExplicitTop = 28
+        ExplicitWidth = 200
+        ExplicitHeight = 309
         object RMPreview2: TRMPreview
           Left = 0
           Top = 0
-          Width = 200
+          Width = 196
-          Height = 309
+          Height = 303
           Align = alClient
           BevelOuter = bvNone
           Caption = #26631#31614#39044#35272
@@ -1036,6 +1042,8 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
           Options.DrawBorder = False
           Options.BorderPen.Color = clGray
           Options.BorderPen.Style = psDash
+          ExplicitWidth = 200
+          ExplicitHeight = 309
         end
       end
     end
@@ -1047,6 +1055,8 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
     Height = 250
     Align = alBottom
     TabOrder = 3
+    ExplicitLeft = 1
+    ExplicitTop = 399
     object Tv1: TcxGridDBTableView
       PopupMenu = PM_1
       Navigator.Buttons.CustomButtons = <>
@@ -1180,6 +1190,34 @@ inherited frmTradePlanInPut: TfrmTradePlanInPut
         HeaderAlignmentHorz = taCenter
         Width = 115
       end
+      object Tv1JWQL: TcxGridDBColumn
+        Caption = #32463#32428#24378#21147
+        DataBinding.FieldName = 'JWQL'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 66
+      end
+      object Tv1PB_Spec: TcxGridDBColumn
+        Caption = ' '#22383#24067#35268#26684
+        DataBinding.FieldName = 'PB_Spec'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 66
+      end
+      object Tv1PB_Code: TcxGridDBColumn
+        Caption = #22383#24067#32534#21495
+        DataBinding.FieldName = 'PB_Code'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 66
+      end
+      object Tv1DSLight: TcxGridDBColumn
+        Caption = #23545#33394#20809#28304
+        DataBinding.FieldName = 'DSLight'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 66
+      end
       object v1C_Pattern: TcxGridDBColumn
         Caption = #33457#22411
         DataBinding.FieldName = 'C_Pattern'

项目代码/DJ/G01贸易生产计划/U_TradePlanInPut.pas

@@ -155,6 +155,10 @@ type
     ToolButton7: TToolButton;
     ToolButton8: TToolButton;
     Tv1Column1: TcxGridDBColumn;
+    Tv1JWQL: TcxGridDBColumn;
+    Tv1PB_Spec: TcxGridDBColumn;
+    Tv1PB_Code: TcxGridDBColumn;
+    Tv1DSLight: TcxGridDBColumn;
     procedure TBCloseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure TBSaveClick(Sender: TObject);

项目代码/DJ/G01贸易生产计划/U_TradePlanMgeList.dfm

@@ -187,7 +187,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
     object custName: TcxTextEdit
       Tag = 2
       Left = 629
-      Top = 7
+      Top = 11
       Properties.OnChange = TfilterClick
       Style.HotTrack = False
       Style.TransparentBorder = False
@@ -197,7 +197,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
     object ConNo: TcxTextEdit
       Tag = 2
       Left = 803
-      Top = 7
+      Top = 11
       Properties.OnChange = TfilterClick
       Style.HotTrack = False
       Style.TransparentBorder = False
@@ -221,7 +221,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
     object OrderNo: TcxTextEdit
       Tag = 2
       Left = 439
-      Top = 7
+      Top = 11
       Properties.OnChange = OrderNoPropertiesChange
       Style.HotTrack = False
       Style.TransparentBorder = False
@@ -258,7 +258,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
     end
     object endDate: TcxDateEdit
       Left = 242
-      Top = 7
+      Top = 11
       Properties.ImmediatePost = True
       Style.HotTrack = False
       Style.TransparentBorder = False
@@ -267,7 +267,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
     end
     object begdate: TcxDateEdit
       Left = 88
-      Top = 7
+      Top = 11
       Properties.ImmediatePost = True
       Style.HotTrack = False
       Style.TransparentBorder = False
@@ -277,7 +277,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
     object batchNo: TcxTextEdit
       Tag = 2
       Left = 989
-      Top = 7
+      Top = 11
       Properties.OnChange = TfilterClick
       Style.HotTrack = False
       Style.TransparentBorder = False
@@ -315,7 +315,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
       AllowRemove = False
       CaptionOptions.Text = #35746#21333#21495
       Control = OrderNo
-      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalHeight = 33
       ControlOptions.OriginalWidth = 109
       ControlOptions.ShowBorder = False
       Index = 2
@@ -325,7 +325,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
       AllowRemove = False
       CaptionOptions.Text = #23458#25143#21517#31216
       Control = custName
-      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalHeight = 33
       ControlOptions.OriginalWidth = 109
       ControlOptions.ShowBorder = False
       Index = 3
@@ -334,7 +334,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
       Tag = 99
       CaptionOptions.Text = #19994#21153#21592
       Control = ywy
-      ControlOptions.OriginalHeight = 21
+      ControlOptions.OriginalHeight = 25
       ControlOptions.OriginalWidth = 121
       ControlOptions.ShowBorder = False
       Index = -1
@@ -344,7 +344,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
       Visible = False
       CaptionOptions.Text = #20135#21697#21517#31216
       Control = C_Name
-      ControlOptions.OriginalHeight = 21
+      ControlOptions.OriginalHeight = 25
       ControlOptions.OriginalWidth = 121
       ControlOptions.ShowBorder = False
       Index = -1
@@ -354,7 +354,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
       SizeOptions.Width = 195
       CaptionOptions.Text = #21046#21333#26085#26399
       Control = begdate
-      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalHeight = 33
       ControlOptions.OriginalWidth = 123
       ControlOptions.ShowBorder = False
       Index = 0
@@ -364,7 +364,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
       SizeOptions.Width = 154
       CaptionOptions.Text = '--'
       Control = endDate
-      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalHeight = 33
       ControlOptions.OriginalWidth = 132
       ControlOptions.ShowBorder = False
       Index = 1
@@ -373,7 +373,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
       Parent = dxLayoutControl_queryGroup_Root
       CaptionOptions.Text = #21512#21516#21495
       Control = ConNo
-      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalHeight = 33
       ControlOptions.OriginalWidth = 105
       ControlOptions.ShowBorder = False
       Index = 4
@@ -383,7 +383,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
       Visible = False
       CaptionOptions.Text = #23458#25143#21333#21495
       Control = BuyConNo
-      ControlOptions.OriginalHeight = 21
+      ControlOptions.OriginalHeight = 25
       ControlOptions.OriginalWidth = 121
       ControlOptions.ShowBorder = False
       Index = -1
@@ -392,7 +392,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
       Parent = dxLayoutControl_queryGroup_Root
       CaptionOptions.Text = #26412#21378#32568#21495
       Control = batchNo
-      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalHeight = 33
       ControlOptions.OriginalWidth = 105
       ControlOptions.ShowBorder = False
       Index = 5
@@ -400,7 +400,7 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
     object dxLayoutItem_FtyPCId: TdxLayoutItem
       CaptionOptions.Text = #26579#21378#32568#21495
       Control = FtyPCId
-      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalHeight = 33
       ControlOptions.OriginalWidth = 105
       ControlOptions.ShowBorder = False
       Index = -1
@@ -416,9 +416,10 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
     Properties.CustomButtons.Buttons = <>
     Properties.TabPosition = tpBottom
     OnClick = cxPageControl1Click
-    ClientRectBottom = 433
+    ClientRectBottom = 429
-    ClientRectRight = 1113
+    ClientRectLeft = 2
-    ClientRectTop = 0
+    ClientRectRight = 1111
+    ClientRectTop = 2
     object cxTabSheet1: TcxTabSheet
       Caption = #27719#24635#35270#22270
       ImageIndex = 0
@@ -806,13 +807,12 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
       end
       object cxGrid2: TcxGrid
         Left = 0
-        Top = 278
+        Top = 272
-        Width = 1113
+        Width = 1109
         Height = 155
         Align = alBottom
         TabOrder = 1
         LookAndFeel.ScrollbarMode = sbmDefault
-        ExplicitTop = 284
         object TV2: TcxGridDBTableView
           Navigator.Buttons.CustomButtons = <>
           ScrollbarAnnotations.CustomAnnotations = <>
@@ -1303,18 +1303,21 @@ inherited frmTradePlanMgeList: TfrmTradePlanMgeList
       end
       object cxSplitter1: TcxSplitter
         Left = 0
-        Top = 270
+        Top = 264
-        Width = 1113
+        Width = 1109
         Height = 8
         HotZoneClassName = 'TcxMediaPlayer9Style'
         AlignSplitter = salBottom
         Control = cxGrid2
-        ExplicitTop = 264
       end
     end
     object cxTabSheet2: TcxTabSheet
       Caption = #26126#32454#35270#22270
       ImageIndex = 1
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       object cxGrid3: TcxGrid
         Left = -549
         Top = 46

项目代码/DJ/G01贸易生产计划/djdPackPlan.dproj.local

@@ -1,34 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<ProjectSortOrder AutoSort="0" SortType="0">
-    <File Path="android-support-v4.dex.jar"/>
-    <File Path="cloud-messaging.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-ads-base.17.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-ads.17.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-analytics.16.0.8.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-base.16.0.1.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-basement.16.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-gass.17.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-identity.16.0.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-maps.16.1.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-stats.16.0.1.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-tasks.16.0.1.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-wallet.16.0.1.dex.jar"/>
-    <File Path="com-google-firebase.firebase-analytics.16.4.0.dex.jar"/>
-    <File Path="com-google-firebase.firebase-common.16.1.0.dex.jar"/>
-    <File Path="com-google-firebase.firebase-iid-interop.16.0.1.dex.jar"/>
-    <File Path="com-google-firebase.firebase-iid.17.1.1.dex.jar"/>
-    <File Path="com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar"/>
-    <File Path="com-google-firebase.firebase-messaging.17.5.0.dex.jar"/>
-    <File Path="fmx.dex.jar"/>
-    <File Path="google-play-billing.dex.jar"/>
-    <File Path="google-play-licensing.dex.jar"/>
     <File Path="..\..\DJ"/>
     <File Path="..\A00通用窗体"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.pas"/>
@@ -53,7 +25,7 @@
     <File Path="..\G00贸易通用窗体"/>
     <File Path="..\G00贸易通用窗体\U_TradeSalesContractSel.pas"/>
     <File Path="..\G00贸易通用窗体\U_TradeSalesContractSel.dfm"/>
-    <File Path="..\..\..\..\MoBan"/>
+    <File Path="..\..\..\..\D10DJjinglei"/>
     <File Path="..\..\..\public10"/>
     <File Path="..\..\..\public10\design"/>
     <File Path="..\..\..\public10\design\U_BaseDataLink.pas"/>
@@ -99,10 +71,10 @@
 	<Transactions>
     <Transaction>1899-12-30 00:00:00.000.939,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_SysLogOrderzsd.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.dfm=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.578,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_MJSJFX.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.368,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_OrderInPut.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.296,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_TradePlanList.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.054,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_ProductOrderNewList.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.368,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_OrderInPut.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.578,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_MJSJFX.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.296,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_TradePlanList.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.245,D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\U_UptPlanDataToRoll.pas=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.651,=D:\Dp10RepoV1\项目代码\djdPack\G01贸易生产计划\Unit2.pas</Transaction>
   </Transactions>

项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.dpr

@@ -18,7 +18,7 @@ uses
   U_WindowFormdesign in '..\..\..\public10\design\U_WindowFormdesign.pas',
   U_CompressionFun in '..\..\..\public10\ThreeFun\Fun\U_CompressionFun.pas',
   U_RTFun in '..\..\..\public10\ThreeFun\Fun\U_RTFun.pas',
-  U_ZDYHelp in '..\..\..\public10\ThreeFun\Form\U_ZDYHelp.pas' {frmZDYHelp},
+  U_CDList in 'U_CDList.pas' {frmCDList},
   U_AttachmentUpload in '..\A00通用窗体\U_AttachmentUpload.pas' {frmFjList_RZ},
   U_ClothInfoSel in '..\A00通用窗体\U_ClothInfoSel.pas' {frmClothInfoSel},
   U_CompanySel in '..\A00通用窗体\U_CompanySel.pas' {frmCompanySel},
@@ -50,7 +50,8 @@ uses
   U_FormInitThread in '..\..\..\public10\design\U_FormInitThread.pas',
   Unit2 in 'Unit2.pas' {Form2},
   U_ControlData in '..\..\..\public10\ThreeFun\Fun\U_ControlData.pas',
-  uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas';
+  uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas',
+  U_ZDYHelp in '..\..\..\public10\ThreeFun\Form\U_ZDYHelp.pas' {frmZDYHelp};
 
 {$R *.res}
 

项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.dproj

@@ -4,7 +4,7 @@
         <MainSource>DjdMachineInsp.dpr</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <TargetedPlatforms>38017</TargetedPlatforms>
+        <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Library</AppType>
         <FrameworkType>VCL</FrameworkType>
         <ProjectVersion>19.2</ProjectVersion>
@@ -13,16 +13,6 @@
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
     </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Base)'=='true') or '$(Base_Android64)'!=''">
-        <Base_Android64>true</Base_Android64>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''">
-        <Base_iOSDevice64>true</Base_iOSDevice64>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
         <Base_Win32>true</Base_Win32>
         <CfgParent>Base</CfgParent>
@@ -38,24 +28,6 @@
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Android64)'!=''">
-        <Cfg_1_Android64>true</Cfg_1_Android64>
-        <CfgParent>Cfg_1</CfgParent>
-        <Cfg_1>true</Cfg_1>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_1)'=='true') or '$(Cfg_1_iOSDevice64)'!=''">
-        <Cfg_1_iOSDevice64>true</Cfg_1_iOSDevice64>
-        <CfgParent>Cfg_1</CfgParent>
-        <Cfg_1>true</Cfg_1>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='OSX64' and '$(Cfg_1)'=='true') or '$(Cfg_1_OSX64)'!=''">
-        <Cfg_1_OSX64>true</Cfg_1_OSX64>
-        <CfgParent>Cfg_1</CfgParent>
-        <Cfg_1>true</Cfg_1>
-        <Base>true</Base>
-    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
         <Cfg_1_Win32>true</Cfg_1_Win32>
         <CfgParent>Cfg_1</CfgParent>
@@ -67,24 +39,6 @@
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Android64)'!=''">
-        <Cfg_2_Android64>true</Cfg_2_Android64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''">
-        <Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='OSX64' and '$(Cfg_2)'=='true') or '$(Cfg_2_OSX64)'!=''">
-        <Cfg_2_OSX64>true</Cfg_2_OSX64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
         <Cfg_2_Win32>true</Cfg_2_Win32>
         <CfgParent>Cfg_2</CfgParent>
@@ -108,13 +62,6 @@
         <VerInfo_Locale>2052</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_Android64)'!=''">
-        <Android_LauncherIcon192>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png</Android_LauncherIcon192>
-        <EnabledSysJars>android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar</EnabledSysJars>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''">
-        <iOS_AppStore1024>$(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_1024x1024.png</iOS_AppStore1024>
-    </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <DCC_Namespace>System.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
@@ -132,15 +79,6 @@
         <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
         <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_1_Android64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_1_iOSDevice64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_1_OSX64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_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\项目代码\djdPack\G03贸易布匹检验\testDll.exe</Debugger_HostApplication>
@@ -150,18 +88,9 @@
         <DCC_Optimize>false</DCC_Optimize>
         <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_Android64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_OSX64)'!=''">
-        <BT_BuildType>Debug</BT_BuildType>
-    </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\项目代码\MoBan\项目代码\DJ\G03贸易布匹检验\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G03贸易布匹检验\testDll.exe</Debugger_HostApplication>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -190,8 +119,8 @@
         <DCCReference Include="..\..\..\public10\design\U_WindowFormdesign.pas"/>
         <DCCReference Include="..\..\..\public10\ThreeFun\Fun\U_CompressionFun.pas"/>
         <DCCReference Include="..\..\..\public10\ThreeFun\Fun\U_RTFun.pas"/>
-        <DCCReference Include="..\..\..\public10\ThreeFun\Form\U_ZDYHelp.pas">
+        <DCCReference Include="U_CDList.pas">
-            <Form>frmZDYHelp</Form>
+            <Form>frmCDList</Form>
             <FormType>dfm</FormType>
         </DCCReference>
         <DCCReference Include="..\A00通用窗体\U_AttachmentUpload.pas">
@@ -306,6 +235,10 @@
         </DCCReference>
         <DCCReference Include="..\..\..\public10\ThreeFun\Fun\U_ControlData.pas"/>
         <DCCReference Include="..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas"/>
+        <DCCReference Include="..\..\..\public10\ThreeFun\Form\U_ZDYHelp.pas">
+            <Form>frmZDYHelp</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
@@ -328,10 +261,6 @@
                 </Source>
             </Delphi.Personality>
             <Platforms>
-                <Platform value="Android64">True</Platform>
-                <Platform value="iOSDevice64">True</Platform>
-                <Platform value="Linux64">True</Platform>
-                <Platform value="OSX64">True</Platform>
                 <Platform value="Win32">True</Platform>
                 <Platform value="Win64">False</Platform>
             </Platforms>

项目代码/DJ/G03贸易布匹检验/DjdMachineInsp.dproj.local

@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
+    <Transaction>1899-12-30 00:00:00.000.322,=D:\Dp10RepoV1\public10\design\U_FormInitThread.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.417,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.157,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradePack.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.322,=D:\Dp10RepoV1\public10\design\U_FormInitThread.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.339,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.dfm=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.582,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.417,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.870,=D:\rtgit\git_clone\D10DJjinglei\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.178,D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G03贸易布匹检验\U_CDList.pas=D:\rtgit\git_clone\D10DJjinglei\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.769,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj</Transaction>
     <Transaction>1899-12-30 00:00:00.000.382,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeInsp.dproj=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeMachineInsp.dproj</Transaction>
     <Transaction>1899-12-30 00:00:00.000.792,=D:\rtgit\D10djdPack\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.540,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.339,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.888,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_TradeMachInsp.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.532,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeMachInsp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.540,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\Unit1.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.612,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.567,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameBads.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.514,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_KeyBoard.pas</Transaction>
@@ -36,99 +36,74 @@
     <Transaction>1899-12-30 00:00:00.000.822,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameParam.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.193,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas=D:\Dp10RepoV1\public10\ThreeFun\Fun\U_AdoFunc.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.996,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\Unit1.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.996,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.817,D:\Dp10RepoV1\项目代码\djdPack\G00贸易通用窗体\U_TradePlanSel.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.051,=D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_BillPrintList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.581,D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\TradeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\DyeInsp.dproj</Transaction>
     <Transaction>1899-12-30 00:00:00.000.018,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradeClothWaitPack.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.507,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.114,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkTest.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.581,D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\TradeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\DyeInsp.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.995,D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.dfm=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_MdPrint.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.822,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameParam.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.975,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkDll.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.608,D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\U_TradeClothInspList.dfm=D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\U_TradeClothInspList_Auto.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.679,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.717,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.991,=D:\Dp10RepoV1\项目代码\djdPack\A00通用组件\FrameDateSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.995,D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.dfm=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_MdPrint.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.706,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.717,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.233,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.990,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.739,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.975,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DeviceJkDll.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.514,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_KeyBoard.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.567,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_frameBads.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.201,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelMapSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.582,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\TradeMachineInsp.dproj=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\DjdMachineInsp.dproj</Transaction>
     <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.661,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.448,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.608,D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\U_TradeClothInspList.dfm=D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\U_TradeClothInspList_Auto.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.608,D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\U_TradeClothInspList.pas=D:\Dp10RepoV1\项目代码\D10djdPack\项目代码\djdPack\G03贸易布匹检验\U_TradeClothInspList_Auto.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.995,D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_MdPrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.448,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.661,=D:\Dp10RepoV1\项目代码\TradePack\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.706,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.322,=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\U_TradeMachInsp.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductListHelp.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.313,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_BatchMdyData.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_SysLogList.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.673,D:\Dp10RepoV1\public10\ThreeFun\Fun\U_ControlData.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.686,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_MachRollMain.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.322,=D:\Dp10Repo\项目代码\RTBasics\G03贸易布匹检验\U_TradeMachInsp.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.313,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_BatchMdyData.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.421,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ParamSet.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.178,D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G03贸易布匹检验\U_CDList.dfm=D:\rtgit\git_clone\D10DJjinglei\public10\ThreeFun\Form\U_ZDYHelp.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.634,D:\Dp10RepoV1\项目代码\djdPack\G03贸易布匹检验\U_baseList1.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.673,D:\Dp10RepoV1\public10\ThreeFun\Fun\U_ControlData.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.313,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_BatchMdyData.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.701,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.053,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.950,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.233,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.990,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.679,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.739,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.pas=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.747,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradeClothInspList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.964,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_DjdDjClList.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.757,D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\Unit2.dfm=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_ProductJYHZList.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.054,=D:\Dp10RepoV1\项目代码\TradePack\G00贸易通用窗体\U_TradePlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.747,=D:\Dp10RepoV1\项目代码\TradePack\G03贸易布匹检验\U_TradeClothInspList.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
-    <File Path="android-support-v4.dex.jar"/>
-    <File Path="cloud-messaging.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-ads-base.17.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-ads.17.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-analytics.16.0.8.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-base.16.0.1.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-basement.16.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-gass.17.2.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-identity.16.0.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-maps.16.1.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-stats.16.0.1.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-tasks.16.0.1.dex.jar"/>
-    <File Path="com-google-android-gms.play-services-wallet.16.0.1.dex.jar"/>
-    <File Path="com-google-firebase.firebase-analytics.16.4.0.dex.jar"/>
-    <File Path="com-google-firebase.firebase-common.16.1.0.dex.jar"/>
-    <File Path="com-google-firebase.firebase-iid-interop.16.0.1.dex.jar"/>
-    <File Path="com-google-firebase.firebase-iid.17.1.1.dex.jar"/>
-    <File Path="com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar"/>
-    <File Path="com-google-firebase.firebase-messaging.17.5.0.dex.jar"/>
-    <File Path="fmx.dex.jar"/>
-    <File Path="google-play-billing.dex.jar"/>
-    <File Path="google-play-licensing.dex.jar"/>
     <File Path="..\..\DJ"/>
     <File Path="..\A00通用窗体"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.pas"/>
@@ -148,7 +123,7 @@
     <File Path="..\A00通用组件"/>
     <File Path="..\A00通用组件\FrameDateSel.pas"/>
     <File Path="..\A00通用组件\FrameDateSel.dfm"/>
-    <File Path="..\..\..\..\MoBan"/>
+    <File Path="..\..\..\..\D10DJjinglei"/>
     <File Path="..\..\..\public10"/>
     <File Path="..\..\..\public10\design"/>
     <File Path="..\..\..\public10\design\U_BaseDataLink.pas"/>
@@ -212,5 +187,7 @@
     <File Path="U_TradePack.dfm"/>
     <File Path="U_TradeClothInspList_Auto.pas"/>
     <File Path="U_TradeClothInspList_Auto.dfm"/>
+    <File Path="U_CDList.pas"/>
+    <File Path="U_CDList.dfm"/>
   </ProjectSortOrder>
 </BorlandProject>

项目代码/DJ/G03贸易布匹检验/ProjectGroup1.groupproj.local

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Default.Personality>
-		<Projects ActiveProject="D:\Dp10RepoV1\项目代码\MoBan\项目代码\DJ\G03贸易布匹检验\DjdMachineInsp.dproj"/>
+		<Projects ActiveProject="D:\rtgit\git_clone\D10DJjinglei\项目代码\DJ\G03贸易布匹检验\DjdMachineInsp.dproj"/>
 	</Default.Personality>
 </BorlandProject>

项目代码/DJ/G03贸易布匹检验/U_GetDllForm.pas

@@ -74,8 +74,8 @@ begin
   if trim(DataBaseStr) = '' then
   begin
     server := '101.132.143.144,7781';
-   // dtbase := 'jingpinjydata';
+    dtbase := 'jingleijydata';
-    dtbase := 'rtbasicsdata';
+//    dtbase := 'rtbasicsdata';
     user := 'rtsa';
     pswd := 'rightsoft@5740';
     DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;

项目代码/DJ/G03贸易布匹检验/U_MachRollMain.pas

@@ -18,7 +18,7 @@ uses
   cxGeometry, dxFramedControl, dxPanel, U_KeyBoard, cxGroupBox,
   cxGridCustomPopupMenu, cxGridPopupMenu, MovePanel, RM_RichEdit, cxProgressBar,
   cxCurrencyEdit, Xml.XMLDoc, Xml.xmldom, Xml.XMLIntf, cxDateUtils,
-  System.DateUtils;
+  System.DateUtils, cxLabel;
 
 type
   TfrmMachRollMain = class(TfrmBaseList)
@@ -262,6 +262,43 @@ type
     Tv3Column2: TcxGridDBColumn;
     cds_paramsaixunpage: TStringField;
     Tv3Column3: TcxGridDBColumn;
+    C_GramWeight1: TcxTextEdit;
+    dxLayoutItem_C_GramWeight1: TdxLayoutItem;
+    InputMeter: TcxTextEdit;
+    dxLayoutItem_InputMeter: TdxLayoutItem;
+    dxLayoutAutoCreatedGroup6: TdxLayoutAutoCreatedGroup;
+    C_GramWeight2: TcxTextEdit;
+    dxLayoutItem_C_GramWeight2: TdxLayoutItem;
+    C_GramWeight3: TcxTextEdit;
+    dxLayoutItem_C_GramWeight3: TdxLayoutItem;
+    ValidC_Width: TcxTextEdit;
+    BDBC_Width: TcxTextEdit;
+    JingMi: TcxTextEdit;
+    WeiMi: TcxTextEdit;
+    color_diff: TcxButtonEdit;
+    TW_diff: TcxButtonEdit;
+    LMR_diff: TcxButtonEdit;
+    hand_feel: TcxButtonEdit;
+    color_light: TcxButtonEdit;
+    dxLayoutItem_ValidC_Width: TdxLayoutItem;
+    dxLayoutItem_BDBC_Width: TdxLayoutItem;
+    dxLayoutItem_hand_feel: TdxLayoutItem;
+    dxLayoutItem_color_diff: TdxLayoutItem;
+    dxLayoutItem_TW_diff: TdxLayoutItem;
+    dxLayoutAutoCreatedGroup8: TdxLayoutAutoCreatedGroup;
+    dxLayoutItem_LMR_diff: TdxLayoutItem;
+    dxLayoutItem_color_light: TdxLayoutItem;
+    dxLayoutItem_JingMi: TdxLayoutItem;
+    dxLayoutItem_WeiMi: TdxLayoutItem;
+    dxLayoutAutoCreatedGroup10: TdxLayoutAutoCreatedGroup;
+    dxLayoutAutoCreatedGroup9: TdxLayoutAutoCreatedGroup;
+    dxLayoutAutoCreatedGroup11: TdxLayoutAutoCreatedGroup;
+    dxLayoutAutoCreatedGroup7: TdxLayoutAutoCreatedGroup;
+    CIFPoints: TcxTextEdit;
+    cxLabel1: TcxLabel;
+    cxLabel2: TcxLabel;
+    CIFnote: TcxTextEdit;
+    Tv2CIFType: TcxGridDBColumn;
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure Button_badClick(Sender: TObject);
@@ -309,6 +346,7 @@ type
     procedure customStrField5DblClick(Sender: TObject);
     procedure customStrField5PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure ToolButton1Click(Sender: TObject);
+    procedure hand_feelPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
   private
     FCIID, FOperationStatus, FCIFName, FWorkshop: string;
     FBCIOID, FOrderNo, FMainId, FSubId, FPCId, FConNo, FConMId, fBuyConNo, FConSId: string;
@@ -368,6 +406,7 @@ type
     function getCurMaxPieceNo(): integer;
     type
 
+
   public
     fmanage, canshu1: string;
     fFlileFlag: string;
@@ -383,7 +422,7 @@ implementation
 uses
   U_DataLink, U_ControlData, U_ParamSet, U_RTFun, U_globalVar,
   U_FormLayOutDesign, U_ZDYHelp, U_iniParam, U_ProductListHelp, U_SysLogList,
-  U_MdPrint;
+  U_MdPrint, U_CDList;
 {$R *.dfm}
   /// ///////////////////////////////
 
@@ -1632,6 +1671,8 @@ begin
       flagname := '´Ãµã';
       fnote := true;
       V1Note.Caption := 'Ó¢ÎÄÃû³Æ';
+      V1note1.Caption := '疵点类型';
+
       if ShowModal = 1 then
       begin
         Self.frameBads1.InitBadPanel();
@@ -2297,6 +2338,8 @@ begin
 end;
 
 procedure TfrmMachRollMain.cxButton2Click(Sender: TObject);
+var
+  CIFType : string;
 begin
   inherited;
   if FCIFName = '' then
@@ -2305,33 +2348,44 @@ begin
     exit;
   end;
 
+  with ADOQueryBaseTemp do
+  begin
+    Close;
+    SQL.Clear;
+    sql.Add('select A.*,ZJM=dbo.getPinYin(A.ZdyName) from KH_ZDY A where A.Type=''WFBCD'' and ZDYName='+QuotedStr(trim(FCIFName)));
+//        ShowMessage(sql.Text);
+    Open;
+  end;
+  CIFType := ADOQueryBaseTemp.FieldByName('note1').AsString;
   with CDS_2 do
   begin
     Append;
-    if frameBads1.RadioGroup1.ItemIndex = 5 then
+//    if frameBads1.RadioGroup1.ItemIndex = 5 then
-      FieldByName('CIFName').Value := 'Á¬ÐøÐÔ' + Trim(FCIFName)
+//      FieldByName('CIFName').Value := '连续性' + Trim(FCIFName)
-    else if frameBads1.RadioGroup1.ItemIndex = 4 then
+//    else if frameBads1.RadioGroup1.ItemIndex = 4 then
-      FieldByName('CIFName').Value := 'ÕûÆ¥' + Trim(FCIFName)
+//      FieldByName('CIFName').Value := '整匹' + Trim(FCIFName)
-    else
+//    else
     fieldbyName('CIFName').value := trim(FCIFName);
 
     fieldbyName('CIFbeg').value := trim(frameBads1.CIFBeg.Text);
     fieldbyName('CIFEnd').value := trim(frameBads1.CIFEnd.Text);
     fieldbyName('CIFNumber').value := strtointdef(trim(frameBads1.CIFNumber.Text), 0);
 
-    fieldbyName('CIFPoints').value := 0;
+    fieldbyName('CIFPoints').value := StrToFloatDef(trim(CIFPoints.Text), 0);
+    fieldbyName('CIFnote').value := trim(CIFnote.Text);
+    fieldbyName('CIFType').value := trim(CIFType);
+//    if frameBads1.RadioGroup1.ItemIndex > -1 then
+//    begin
+//      if frameBads1.RadioGroup1.ItemIndex < 3 then
+//      begin
+//        fieldbyName('CIFPoints').value := frameBads1.RadioGroup1.ItemIndex + 1;
+//      end
+//      else
+//      begin
+//        fieldbyName('CIFPoints').value := 4;
+//      end;
+//    end;
 
-    if frameBads1.RadioGroup1.ItemIndex > -1 then
-    begin
-      if frameBads1.RadioGroup1.ItemIndex < 3 then
-      begin
-        fieldbyName('CIFPoints').value := frameBads1.RadioGroup1.ItemIndex + 1;
-      end
-      else
-      begin
-        fieldbyName('CIFPoints').value := 4;
-      end;
-    end;
     fieldbyName('CIFQty').value := strtofloatdef(trim(frameBads1.CIFQty.Text), 0);
     fieldbyName('SubtractQty').value := strtofloatdef(trim(frameBads1.SubtractQty.Text), 0);
     fieldbyName('IsSubtract').value := frameBads1.IsSubtract.Checked;
@@ -2341,6 +2395,8 @@ begin
   frameBads1.CIFBeg.Text := '';
   frameBads1.CIFEnd.Text := '';
   frameBads1.CIFQty.Text := '';
+  CIFPoints.Text := '';
+  CIFnote.Text := '';
   frameBads1.dxPanel1.Visible := false;
   cxPageControl1.ActivePageIndex := 0;
 end;
@@ -2713,6 +2769,21 @@ begin
       fieldbyName('customStrField7').value := trim(customStrField7.Text);
       fieldbyName('customStrField8').value := trim(customStrField8.Text);
 
+      /// 新加的一堆 ///
+      fieldbyName('InputMeter').value := trim(InputMeter.Text);
+      fieldbyName('C_GramWeight1').value := trim(C_GramWeight1.Text);
+      fieldbyName('C_GramWeight2').value := trim(C_GramWeight2.Text);
+      fieldbyName('C_GramWeight3').value := trim(C_GramWeight3.Text);
+      fieldbyName('ValidC_Width').value := trim(ValidC_Width.Text);
+      fieldbyName('BDBC_Width').value := trim(BDBC_Width.Text);
+      fieldbyName('hand_feel').value := trim(hand_feel.Text);
+      fieldbyName('color_diff').value := trim(color_diff.Text);
+      fieldbyName('TW_diff').value := trim(TW_diff.Text);
+      fieldbyName('LMR_diff').value := trim(LMR_diff.Text);
+      fieldbyName('color_light').value := trim(color_light.Text);
+      fieldbyName('JingMi').value := trim(JingMi.Text);
+      fieldbyName('WeiMi').value := trim(WeiMi.Text);
+      /// 新加的一堆 ///
 
       //Æ´Æ¥
 
@@ -3323,6 +3394,32 @@ begin
   end;
 end;
 
+procedure TfrmMachRollMain.hand_feelPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+var
+  fsj: string;
+  FWZ: Integer;
+begin
+  inherited;
+  fsj := Trim(TcxButtonEdit(Sender).Hint);
+  FWZ := Pos('/', fsj);
+  try
+    frmZDYHelp := TfrmZDYHelp.Create(Application);
+    with frmZDYHelp do
+    begin
+      MainType := 'ClothInfo';
+      flag := Copy(fsj, 1, FWZ - 1);
+      flagname := Copy(fsj, FWZ + 1, Length(fsj) - FWZ);
+      if ShowModal = 1 then
+      begin
+        TcxButtonEdit(Sender).Text := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString);
+      end;
+    end;
+  finally
+    frmZDYHelp.Free;
+  end;
+end;
+
+
 /////////////////////////////////////
 function TfrmMachRollMain.deletePack(packId: string): boolean;
 var

项目代码/DJ/G03贸易布匹检验/U_TradeClothInspList.dfm

@@ -7,7 +7,8 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
   Color = clBtnFace
   Font.Height = -16
   Position = poDefault
-  ExplicitLeft = -211
+  ExplicitLeft = -154
+  ExplicitTop = -30
   ExplicitWidth = 1312
   ExplicitHeight = 648
   PixelsPerInch = 96
@@ -16,27 +17,28 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     Left = 0
     Top = 146
     Width = 1296
-    Height = 40
+    Height = 44
     Align = alTop
     AutoSize = True
     BevelInner = bvLowered
     TabOrder = 3
     DesignSize = (
       1296
-      40)
+      44)
     object Label31: TLabel
       Left = 14
-      Top = 10
+      Top = 12
       Width = 96
       Height = 21
       Alignment = taCenter
       Anchors = [akLeft]
       Caption = #27599#39029#35760#24405#26465#25968
       Layout = tlCenter
+      ExplicitTop = 10
     end
     object LBCPAP: TLabel
       Left = 409
-      Top = 12
+      Top = 14
       Width = 100
       Height = 20
       Alignment = taCenter
@@ -44,26 +46,29 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       AutoSize = False
       Caption = #24403#21069#39029'/'#24635#39029#25968
       Layout = tlCenter
+      ExplicitTop = 12
     end
     object BTLP: TButton
       Left = 325
-      Top = 10
+      Top = 12
       Width = 78
       Height = 27
       Anchors = [akLeft]
       Caption = #19978#19968#39029
       TabOrder = 0
       OnClick = BTLPClick
+      ExplicitTop = 10
     end
     object BTNP: TButton
       Left = 525
-      Top = 10
+      Top = 12
       Width = 78
       Height = 28
       Anchors = [akLeft]
       Caption = #19979#19968#39029
       TabOrder = 1
       OnClick = BTNPClick
+      ExplicitTop = 10
     end
     object TCBNOR: TcxComboBox
       Tag = 2
@@ -99,8 +104,8 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     end
   end
   object cxGrid1: TcxGrid [1]
-    Left = -40
+    Left = -38
-    Top = 192
+    Top = 193
     Width = 1296
     Height = 390
     BorderStyle = cxcbsNone
@@ -562,6 +567,110 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
         HeaderAlignmentHorz = taCenter
         Width = 60
       end
+      object Tv1InputMeter: TcxGridDBColumn
+        Caption = #21407#31859#25968
+        DataBinding.FieldName = 'InputMeter'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 60
+      end
+      object Tv1C_GramWeight1: TcxGridDBColumn
+        Caption = #20811#37325'1'
+        DataBinding.FieldName = 'C_GramWeight1'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 60
+      end
+      object Tv1C_GramWeight2: TcxGridDBColumn
+        Caption = #20811#37325'2'
+        DataBinding.FieldName = 'C_GramWeight2'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 60
+      end
+      object Tv1C_GramWeight3: TcxGridDBColumn
+        Caption = #20811#37325'3'
+        DataBinding.FieldName = 'C_GramWeight3'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 60
+      end
+      object Tv1ValidC_Width: TcxGridDBColumn
+        Caption = #26377#25928#24133#23485
+        DataBinding.FieldName = 'ValidC_Width'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 60
+      end
+      object Tv1BDBC_Width: TcxGridDBColumn
+        Caption = #36793#21040#36793#38376#24133
+        DataBinding.FieldName = 'BDBC_Width'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 60
+      end
+      object Tv1hand_feel: TcxGridDBColumn
+        Caption = #25163#24863
+        DataBinding.FieldName = 'hand_feel'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 60
+      end
+      object Tv1color_diff: TcxGridDBColumn
+        Caption = #39068#33394#24046#24322
+        DataBinding.FieldName = 'color_diff'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 60
+      end
+      object Tv1TW_diff: TcxGridDBColumn
+        Caption = #22836#23614#24046#24322
+        DataBinding.FieldName = 'TW_diff'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 60
+      end
+      object Tv1LMR_diff: TcxGridDBColumn
+        Caption = #24038#20013#21491#24046#24322
+        DataBinding.FieldName = 'LMR_diff'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 60
+      end
+      object Tv1color_light: TcxGridDBColumn
+        Caption = #33394#24425#20142#24230
+        DataBinding.FieldName = 'color_light'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 60
+      end
+      object Tv1JingMi: TcxGridDBColumn
+        Caption = #32463#23494
+        DataBinding.FieldName = 'JingMi'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 60
+      end
+      object Tv1WeiMi: TcxGridDBColumn
+        Caption = #32428#23494
+        DataBinding.FieldName = 'WeiMi'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 60
+      end
     end
     object cxGrid1Level1: TcxGridLevel
       GridView = Tv1
@@ -742,7 +851,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     object OrderNo: TcxTextEdit
       Tag = 2
       Left = 296
-      Top = 0
+      Top = 6
       Hint = '0'
       Style.HotTrack = False
       Style.TransparentBorder = False
@@ -753,7 +862,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     object conNO: TcxTextEdit
       Tag = 2
       Left = 464
-      Top = 0
+      Top = 6
       Hint = '0'
       Style.HotTrack = False
       Style.TransparentBorder = False
@@ -764,7 +873,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     object CIID: TcxTextEdit
       Tag = 2
       Left = 731
-      Top = 30
+      Top = 39
       Hint = '1'
       Style.HotTrack = False
       Style.TransparentBorder = False
@@ -775,7 +884,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     object C_Name: TcxTextEdit
       Tag = 2
       Left = 478
-      Top = 30
+      Top = 39
       Hint = '0'
       Style.HotTrack = False
       Style.TransparentBorder = False
@@ -786,7 +895,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     object C_Color: TcxTextEdit
       Tag = 2
       Left = 613
-      Top = 0
+      Top = 6
       Hint = '0'
       Style.HotTrack = False
       Style.TransparentBorder = False
@@ -797,7 +906,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     object BCIOID: TcxTextEdit
       Tag = 2
       Left = 880
-      Top = 0
+      Top = 6
       Hint = '0'
       Style.HotTrack = False
       Style.TransparentBorder = False
@@ -808,7 +917,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     object CIMachNo: TcxTextEdit
       Tag = 1
       Left = 892
-      Top = 30
+      Top = 39
       Hint = '1'
       Style.HotTrack = False
       Style.TransparentBorder = False
@@ -819,7 +928,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     object C_Pattern: TcxTextEdit
       Tag = 2
       Left = 609
-      Top = 30
+      Top = 39
       Hint = '0'
       Style.HotTrack = False
       Style.TransparentBorder = False
@@ -830,7 +939,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     object C_Code: TcxTextEdit
       Tag = 2
       Left = 307
-      Top = 30
+      Top = 39
       Hint = '0'
       Style.HotTrack = False
       Style.TransparentBorder = False
@@ -841,7 +950,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     object C_EColor: TcxTextEdit
       Tag = 2
       Left = 750
-      Top = 0
+      Top = 6
       Hint = '0'
       Style.HotTrack = False
       Style.TransparentBorder = False
@@ -852,7 +961,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     object BatchNO: TcxTextEdit
       Tag = 2
       Left = 1008
-      Top = 0
+      Top = 6
       Hint = '0'
       Style.HotTrack = False
       Style.TransparentBorder = False
@@ -863,7 +972,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     object grade: TcxComboBox
       Tag = 1
       Left = 1002
-      Top = 30
+      Top = 39
       Properties.DropDownListStyle = lsEditFixedList
       Properties.Items.Strings = (
         #27491#21697
@@ -888,14 +997,14 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       Properties.OnChange = CIIOFlagPropertiesChange
       Style.HotTrack = False
       Style.TransparentBorder = False
-      TabOrder = 20
+      TabOrder = 17
       Visible = False
       Height = 30
       Width = 78
     end
     object BegDate: TcxDateEdit
       Left = 124
-      Top = 0
+      Top = 6
       Properties.ImmediatePost = True
       Properties.SaveTime = False
       Properties.ShowTime = False
@@ -906,7 +1015,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     end
     object EndDate: TcxDateEdit
       Left = 111
-      Top = 30
+      Top = 39
       Properties.ImmediatePost = True
       Style.HotTrack = False
       Style.TransparentBorder = False
@@ -915,7 +1024,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     end
     object IsJYTime: TcxCheckBox
       Left = 16
-      Top = 0
+      Top = 6
       ParentFont = False
       Properties.ImmediatePost = True
       State = cbsChecked
@@ -927,25 +1036,25 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
     object custName: TcxTextEdit
       Tag = 2
       Left = 1131
-      Top = 30
+      Top = 39
       Hint = '0'
       AutoSize = False
       Style.HotTrack = False
       Style.TransparentBorder = False
       TabOrder = 16
       OnKeyPress = KHConNOKeyPress
-      Height = 29
+      Height = 33
       Width = 88
     end
     object C_StyleNo: TcxTextEdit
       Tag = 2
       Left = 1145
-      Top = 0
+      Top = 6
       AutoSize = False
       Style.HotTrack = False
       Style.TransparentBorder = False
       TabOrder = 8
-      Height = 30
+      Height = 33
       Width = 74
     end
     object dxLayoutControl_queryGroup_Root: TdxLayoutGroup
@@ -989,7 +1098,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       AllowRemove = False
       CaptionOptions.Text = #26816#39564#26085#26399
       Control = BegDate
-      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalHeight = 33
       ControlOptions.OriginalWidth = 107
       ControlOptions.ShowBorder = False
       Index = 1
@@ -1002,7 +1111,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       SizeOptions.Width = 159
       CaptionOptions.Text = #35746#21333#21495
       Control = OrderNo
-      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalHeight = 33
       ControlOptions.OriginalWidth = 103
       ControlOptions.ShowBorder = False
       Index = 2
@@ -1016,7 +1125,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       AllowRemove = False
       CaptionOptions.Text = #33267
       Control = EndDate
-      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalHeight = 33
       ControlOptions.OriginalWidth = 115
       ControlOptions.ShowBorder = False
       Index = 1
@@ -1029,7 +1138,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       SizeOptions.Width = 162
       CaptionOptions.Text = #20135#21697#32534#21495
       Control = C_Code
-      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalHeight = 33
       ControlOptions.OriginalWidth = 90
       ControlOptions.ShowBorder = False
       Index = 2
@@ -1042,7 +1151,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       SizeOptions.Width = 154
       CaptionOptions.Text = #21697#21517#20013#25991
       Control = C_Name
-      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalHeight = 33
       ControlOptions.OriginalWidth = 82
       ControlOptions.ShowBorder = False
       Index = 3
@@ -1054,7 +1163,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       SizeOptions.SizableVert = True
       CaptionOptions.Text = #21512#21516#21495
       Control = conNO
-      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalHeight = 33
       ControlOptions.OriginalWidth = 100
       ControlOptions.ShowBorder = False
       Index = 3
@@ -1067,7 +1176,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       SizeOptions.Width = 96
       CaptionOptions.Text = #39068#33394
       Control = C_Color
-      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalHeight = 33
       ControlOptions.OriginalWidth = 56
       ControlOptions.ShowBorder = False
       Index = 4
@@ -1080,7 +1189,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       SizeOptions.Width = 97
       CaptionOptions.Text = #33457#22411
       Control = C_Pattern
-      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalHeight = 33
       ControlOptions.OriginalWidth = 57
       ControlOptions.ShowBorder = False
       Index = 4
@@ -1094,7 +1203,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       SizeOptions.Width = 135
       CaptionOptions.Text = #32568#26465#30721
       Control = BCIOID
-      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalHeight = 33
       ControlOptions.OriginalWidth = 79
       ControlOptions.ShowBorder = False
       Index = 6
@@ -1108,7 +1217,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       SizeOptions.Width = 136
       CaptionOptions.Text = #21367#26465#30721
       Control = CIID
-      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalHeight = 33
       ControlOptions.OriginalWidth = 80
       ControlOptions.ShowBorder = False
       Index = 5
@@ -1121,7 +1230,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       SizeOptions.Width = 137
       CaptionOptions.Text = #39068#33394#33521#25991
       Control = C_EColor
-      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalHeight = 33
       ControlOptions.OriginalWidth = 65
       ControlOptions.ShowBorder = False
       Index = 5
@@ -1135,7 +1244,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       SizeOptions.Width = 133
       CaptionOptions.Text = #26816#39564#26426#21488
       Control = CIMachNo
-      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalHeight = 33
       ControlOptions.OriginalWidth = 61
       ControlOptions.ShowBorder = False
       Index = 6
@@ -1162,7 +1271,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       SizeOptions.Width = 120
       CaptionOptions.Text = #31561#32423
       Control = grade
-      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalHeight = 33
       ControlOptions.OriginalWidth = 80
       ControlOptions.ShowBorder = False
       Index = 7
@@ -1175,7 +1284,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       SizeOptions.SizableVert = True
       CaptionOptions.Text = #32568#21495
       Control = BatchNO
-      ControlOptions.OriginalHeight = 27
+      ControlOptions.OriginalHeight = 33
       ControlOptions.OriginalWidth = 88
       ControlOptions.ShowBorder = False
       Index = 7
@@ -1192,7 +1301,7 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
       CaptionOptions.Visible = False
       Control = IsJYTime
       ControlOptions.OriginalHeight = 30
-      ControlOptions.OriginalWidth = 13
+      ControlOptions.OriginalWidth = 18
       ControlOptions.ShowBorder = False
       Index = 0
     end

项目代码/DJ/G03贸易布匹检验/U_TradeClothInspList.pas

@@ -172,6 +172,19 @@ type
     dxLayoutItem18: TdxLayoutItem;
     C_StyleNo: TcxTextEdit;
     dxLayoutItem19: TdxLayoutItem;
+    Tv1InputMeter: TcxGridDBColumn;
+    Tv1C_GramWeight1: TcxGridDBColumn;
+    Tv1C_GramWeight2: TcxGridDBColumn;
+    Tv1C_GramWeight3: TcxGridDBColumn;
+    Tv1ValidC_Width: TcxGridDBColumn;
+    Tv1BDBC_Width: TcxGridDBColumn;
+    Tv1hand_feel: TcxGridDBColumn;
+    Tv1color_diff: TcxGridDBColumn;
+    Tv1TW_diff: TcxGridDBColumn;
+    Tv1LMR_diff: TcxGridDBColumn;
+    Tv1color_light: TcxGridDBColumn;
+    Tv1JingMi: TcxGridDBColumn;
+    Tv1WeiMi: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);