111

A00通用窗体/U_AttachmentUpload.pas

@@ -9,24 +9,8 @@ uses
   IdTCPClient, IdFTP, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData,
   cxDataStorage, cxEdit, cxDBData, cxGridCustomTableView, cxGridTableView,
   cxGridDBTableView, cxGridLevel, cxClasses, cxControls, cxGridCustomView,
-  cxGrid, cxLookAndFeels,   cxNavigator,
+  cxGrid, cxLookAndFeels, cxNavigator, dxDateRanges,
-  dxDateRanges, IdExplicitTLSClientServerBase, System.ImageList, U_BaseHelp,
+  IdExplicitTLSClientServerBase, System.ImageList, U_BaseHelp, Vcl.ToolWin,
-  Vcl.ToolWin,    
-     
-    
-     
-     
-    
-    
-    
-    
-    
-    
-     
-      
-     
-   
-     
   dxScrollbarAnnotations, cxImageList, dxSkinsCore, dxSkinsDefaultPainters;
 
 type

A00通用窗体/U_CJDJ.dfm

@@ -0,0 +1,66 @@
+object frmCJDJ: TfrmCJDJ
+  Left = 682
+  Top = 315
+  Caption = #25277#26816#30331#35760
+  ClientHeight = 100
+  ClientWidth = 362
+  Color = clWhite
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'MS Sans Serif'
+  Font.Style = []
+  OldCreateOrder = False
+  Position = poMainFormCenter
+  PixelsPerInch = 96
+  TextHeight = 13
+  object Panel1: TPanel
+    Left = 0
+    Top = 0
+    Width = 362
+    Height = 100
+    Align = alClient
+    TabOrder = 0
+    object Label1: TLabel
+      Left = 31
+      Top = 37
+      Width = 66
+      Height = 21
+      Caption = #25968#23383#65306
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -21
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Button1: TButton
+      Left = 217
+      Top = 33
+      Width = 83
+      Height = 29
+      Caption = #30830#35748
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -21
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 0
+      OnClick = Button1Click
+    end
+    object Price: TEdit
+      Left = 90
+      Top = 33
+      Width = 121
+      Height = 29
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -21
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 1
+    end
+  end
+end

A00通用窗体/U_CJDJ.pas

@@ -0,0 +1,39 @@
+unit U_CJDJ;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, StdCtrls, ExtCtrls, DB, ADODB;
+
+type
+  TfrmCJDJ = class(TForm)
+    Panel1: TPanel;
+    Button1: TButton;
+    Label1: TLabel;
+    Price: TEdit;
+    procedure Button1Click(Sender: TObject);
+  private
+    { Private declarations }
+  public
+    FFFIDS: string;
+    { Public declarations }
+  end;
+
+var
+  frmCJDJ: TfrmCJDJ;
+
+implementation
+
+{$R *.dfm}
+
+procedure TfrmCJDJ.Button1Click(Sender: TObject);
+begin
+  if StrToFloatDef(Price.Text, 0) = 0 then
+    Price.Text := '0';
+
+  ModalResult := 1;
+end;
+
+end.
+

A02基础产品管理/U_TatClothInfo.dfm

@@ -359,6 +359,8 @@ inherited frmTatClothInfo: TfrmTatClothInfo
       Align = alClient
       PopupMenu = PM_1
       TabOrder = 0
+      ExplicitLeft = 6
+      ExplicitTop = 39
       object Tv1: TcxGridDBTableView
         OnDblClick = Tv1DblClick
         Navigator.Buttons.CustomButtons = <>
@@ -418,6 +420,14 @@ inherited frmTatClothInfo: TfrmTatClothInfo
           Options.Editing = False
           Width = 99
         end
+        object Tv1Column3: TcxGridDBColumn
+          Caption = #32463#23494
+          DataBinding.FieldName = 'C_FinishLongitudeDensity'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 100
+        end
         object Tv1Column1: TcxGridDBColumn
           Caption = #32428#23494
           DataBinding.FieldName = 'C_FinishLatitudeDensity'
@@ -555,6 +565,22 @@ inherited frmTatClothInfo: TfrmTatClothInfo
           Options.Editing = False
           Width = 99
         end
+        object Tv1Column4: TcxGridDBColumn
+          Caption = #32463#32433
+          DataBinding.FieldName = 'JinSha'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 100
+        end
+        object Tv1Column10: TcxGridDBColumn
+          Caption = #32428#32433
+          DataBinding.FieldName = 'WeiSha'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 100
+        end
       end
       object cxGrid1Level1: TcxGridLevel
         GridView = Tv1
@@ -897,9 +923,6 @@ inherited frmTatClothInfo: TfrmTatClothInfo
       object cxTabSheet2: TcxTabSheet
         Caption = #32428#19997#32452#21512
         ImageIndex = 1
-        ExplicitTop = 0
-        ExplicitWidth = 0
-        ExplicitHeight = 0
         object cxGrid4: TcxGrid
           Left = 0
           Top = 0
@@ -1080,9 +1103,6 @@ inherited frmTatClothInfo: TfrmTatClothInfo
       object cxTabSheet3: TcxTabSheet
         Caption = #26679#21697#22270#29255
         ImageIndex = 2
-        ExplicitTop = 0
-        ExplicitWidth = 0
-        ExplicitHeight = 0
         object GroupBox1: TGroupBox
           Left = 0
           Top = 0
@@ -1106,9 +1126,6 @@ inherited frmTatClothInfo: TfrmTatClothInfo
       object cxTabSheet4: TcxTabSheet
         Caption = #36215#32508#27861
         ImageIndex = 3
-        ExplicitTop = 0
-        ExplicitWidth = 0
-        ExplicitHeight = 0
         object QZF: TMemo
           Tag = 2
           Left = 0
@@ -1130,9 +1147,6 @@ inherited frmTatClothInfo: TfrmTatClothInfo
       object cxTabSheet5: TcxTabSheet
         Caption = #31359#32508#27861
         ImageIndex = 3
-        ExplicitTop = 0
-        ExplicitWidth = 0
-        ExplicitHeight = 0
         object CZF: TMemo
           Tag = 2
           Left = 0
@@ -1154,9 +1168,6 @@ inherited frmTatClothInfo: TfrmTatClothInfo
       object cxTabSheet6: TcxTabSheet
         Caption = #31359#31576#27861
         ImageIndex = 3
-        ExplicitTop = 0
-        ExplicitWidth = 0
-        ExplicitHeight = 0
         object CKF: TMemo
           Tag = 2
           Left = 0

A02基础产品管理/U_TatClothInfo.pas

@@ -208,6 +208,9 @@ type
     DBRichEdit1: TDBRichEdit;
     ADOQueryFJ: TADOQuery;
     Tv1Column21: TcxGridDBColumn;
+    Tv1Column3: TcxGridDBColumn;
+    Tv1Column4: TcxGridDBColumn;
+    Tv1Column10: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
     procedure TBDelClick(Sender: TObject);

A02基础产品管理/U_TatClothInfoInput.dfm

@@ -4,19 +4,19 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
   Anchors = []
   Caption = #26797#32455#20135#21697#20449#24687#24405#20837
   ClientHeight = 737
-  ClientWidth = 1404
+  ClientWidth = 1540
   Color = clWhite
   Font.Height = -16
   OldCreateOrder = True
   Position = poScreenCenter
-  ExplicitWidth = 1420
+  ExplicitWidth = 1556
   ExplicitHeight = 776
   PixelsPerInch = 96
   TextHeight = 21
   object ToolBar1: TToolBar [0]
     Left = 0
     Top = 0
-    Width = 1404
+    Width = 1540
     Height = 30
     AutoSize = True
     ButtonHeight = 30
@@ -28,6 +28,7 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
     ParentColor = False
     ShowCaptions = True
     TabOrder = 0
+    ExplicitWidth = 1404
     object ToolButton1: TToolButton
       Tag = 1
       Left = 0
@@ -66,7 +67,7 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
   object ScrollBox1: TScrollBox [1]
     Left = 0
     Top = 30
-    Width = 1404
+    Width = 1540
     Height = 245
     Align = alTop
     BevelInner = bvNone
@@ -76,6 +77,7 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
     ParentColor = False
     ParentCtl3D = False
     TabOrder = 1
+    ExplicitTop = 36
     object Label1: TLabel
       Left = 38
       Top = 26
@@ -136,7 +138,7 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
     end
     object Label6: TLabel
       Left = 1114
-      Top = 26
+      Top = 63
       Width = 32
       Height = 21
       Caption = #32428#23494
@@ -209,22 +211,22 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
       Caption = #33457#22411
     end
     object Label14: TLabel
-      Left = 1114
+      Left = 757
-      Top = 98
+      Top = 63
       Width = 32
       Height = 21
       Caption = #27454#21495
     end
     object Label15: TLabel
       Left = 757
-      Top = 62
+      Top = 136
       Width = 32
       Height = 21
       Caption = #35268#26684
     end
     object Label17: TLabel
       Left = 1114
-      Top = 62
+      Top = 99
       Width = 32
       Height = 21
       Caption = #25104#20998
@@ -243,6 +245,27 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
       Height = 21
       Caption = #32455#32553
     end
+    object Label20: TLabel
+      Left = 1114
+      Top = 28
+      Width = 32
+      Height = 21
+      Caption = #32463#23494
+    end
+    object Label21: TLabel
+      Left = 757
+      Top = 172
+      Width = 32
+      Height = 21
+      Caption = #32463#32433
+    end
+    object Label22: TLabel
+      Left = 757
+      Top = 206
+      Width = 32
+      Height = 21
+      Caption = #32428#32433
+    end
     object BCIID: TEdit
       Left = 107
       Top = 353
@@ -352,7 +375,7 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
     object C_FinishLatitudeDensity: TcxTextEdit
       Tag = 2
       Left = 1217
-      Top = 22
+      Top = 60
       ParentColor = True
       Properties.OnEditValueChanged = C_ReedWidthPropertiesEditValueChanged
       TabOrder = 11
@@ -411,8 +434,8 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
     end
     object C_StyleNo: TcxTextEdit
       Tag = 2
-      Left = 1217
+      Left = 870
-      Top = 94
+      Top = 59
       ParentColor = True
       TabOrder = 17
       Width = 220
@@ -420,16 +443,17 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
     object C_Spec: TcxTextEdit
       Tag = 2
       Left = 870
-      Top = 58
+      Top = 132
       ParentColor = True
       TabOrder = 18
-      Width = 220
+      Width = 567
     end
     object C_Composition: TcxTextEdit
       Tag = 2
       Left = 1217
-      Top = 58
+      Top = 95
       ParentColor = True
+      Properties.OnEditValueChanged = C_CompositionPropertiesEditValueChanged
       TabOrder = 19
       Width = 220
     end
@@ -449,36 +473,65 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
       TabOrder = 21
       Width = 220
     end
-    object cxComboBox1: TcxComboBox
+    object MFDW: TcxComboBox
+      Tag = 2
       Left = 1031
       Top = 24
       Properties.Items.Strings = (
-        'CM'
+        #8220
-        'INCH')
+        'CM')
+      Properties.OnEditValueChanged = MFDWPropertiesEditValueChanged
       TabOrder = 22
       Width = 63
     end
+    object C_FinishLongitudeDensity: TcxTextEdit
+      Tag = 2
+      Left = 1217
+      Top = 24
+      ParentColor = True
+      Properties.OnEditValueChanged = C_FinishLongitudeDensityPropertiesEditValueChanged
+      TabOrder = 23
+      Width = 220
+    end
+    object JinSha: TcxTextEdit
+      Tag = 2
+      Left = 870
+      Top = 168
+      ParentColor = True
+      TabOrder = 24
+      Width = 567
+    end
+    object WeiSha: TcxTextEdit
+      Tag = 2
+      Left = 870
+      Top = 202
+      ParentColor = True
+      TabOrder = 25
+      Width = 567
+    end
   end
   object cxPageControl3: TcxPageControl [2]
     Left = 0
     Top = 275
-    Width = 1404
+    Width = 1540
     Height = 462
     Align = alClient
     TabOrder = 2
     Properties.ActivePage = cxTabSheet1
     Properties.CustomButtons.Buttons = <>
     Properties.Style = 9
+    ExplicitWidth = 1404
     ClientRectBottom = 462
-    ClientRectRight = 1404
+    ClientRectRight = 1540
     ClientRectTop = 28
     object cxTabSheet1: TcxTabSheet
       Caption = #32463#19997#32452#21512
       ImageIndex = 0
+      ExplicitWidth = 1404
       object GroupBox1: TGroupBox
         Left = 931
         Top = 0
-        Width = 473
+        Width = 609
         Height = 434
         Align = alClient
         Caption = #32463#25490#21015
@@ -489,14 +542,16 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
         Font.Style = [fsBold]
         ParentFont = False
         TabOrder = 0
+        ExplicitWidth = 473
         object Y_Note_PLJ: TMemo
           Tag = 2
           Left = 2
           Top = 31
-          Width = 469
+          Width = 605
           Height = 401
           Align = alClient
           TabOrder = 0
+          ExplicitWidth = 469
         end
       end
       object Panel1: TPanel
@@ -707,13 +762,11 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
     object cxTabSheet2: TcxTabSheet
       Caption = #32428#19997#32452#21512
       ImageIndex = 1
-      ExplicitTop = 0
+      ExplicitWidth = 1404
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object GroupBox2: TGroupBox
         Left = 961
         Top = 0
-        Width = 443
+        Width = 579
         Height = 434
         Align = alClient
         Caption = #32428#25490#21015
@@ -724,14 +777,16 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
         Font.Style = [fsBold]
         ParentFont = False
         TabOrder = 0
+        ExplicitWidth = 443
         object Y_Note_PLW: TMemo
           Tag = 2
           Left = 2
           Top = 31
-          Width = 439
+          Width = 575
           Height = 401
           Align = alClient
           TabOrder = 0
+          ExplicitWidth = 439
         end
       end
       object Panel2: TPanel
@@ -942,17 +997,16 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
     object cxTabSheet3: TcxTabSheet
       Caption = #36215#32508#27861
       ImageIndex = 3
-      ExplicitTop = 0
+      ExplicitWidth = 1404
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object Panel8: TPanel
         Left = 0
         Top = 0
-        Width = 1404
+        Width = 1540
         Height = 32
         Align = alTop
         TabOrder = 0
         Visible = False
+        ExplicitWidth = 1404
         object ToolBar4: TToolBar
           Tag = 1
           Left = 555
@@ -1018,45 +1072,44 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
         Tag = 2
         Left = 0
         Top = 32
-        Width = 1404
+        Width = 1540
         Height = 402
         Align = alClient
         ImeName = #20013#25991'('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
         TabOrder = 1
+        ExplicitWidth = 1404
       end
     end
     object cxTabSheet4: TcxTabSheet
       Caption = #31359#32508#27861
       ImageIndex = 3
-      ExplicitTop = 0
+      ExplicitWidth = 1404
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object CZF: TMemo
         Tag = 2
         Left = 0
         Top = 0
-        Width = 1404
+        Width = 1540
         Height = 434
         Align = alClient
         ImeName = #20013#25991'('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
         TabOrder = 0
+        ExplicitWidth = 1404
       end
     end
     object cxTabSheet5: TcxTabSheet
       Caption = #31359#31576#27861
       ImageIndex = 3
-      ExplicitTop = 0
+      ExplicitWidth = 1404
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object CKF: TMemo
         Tag = 2
         Left = 0
         Top = 0
-        Width = 1404
+        Width = 1540
         Height = 434
         Align = alClient
         ImeName = #20013#25991'('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
         TabOrder = 0
+        ExplicitWidth = 1404
       end
     end
   end

A02基础产品管理/U_TatClothInfoInput.pas

@@ -172,7 +172,13 @@ type
     PM_2: TPopupMenu;
     MenuItem1: TMenuItem;
     QZF: TMemo;
-    cxComboBox1: TcxComboBox;
+    MFDW: TcxComboBox;
+    Label20: TLabel;
+    C_FinishLongitudeDensity: TcxTextEdit;
+    Label21: TLabel;
+    JinSha: TcxTextEdit;
+    Label22: TLabel;
+    WeiSha: TcxTextEdit;
     procedure FormShow(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);
     procedure ToolButton1Click(Sender: TObject);
@@ -199,6 +205,9 @@ type
     procedure C_YarnQtyPropertiesEditValueChanged(Sender: TObject);
     procedure N1Click(Sender: TObject);
     procedure MenuItem1Click(Sender: TObject);
+    procedure MFDWPropertiesEditValueChanged(Sender: TObject);
+    procedure C_FinishLongitudeDensityPropertiesEditValueChanged(Sender: TObject);
+    procedure C_CompositionPropertiesEditValueChanged(Sender: TObject);
   private
     canshu1: string;
     Fint: Integer;
@@ -566,6 +575,11 @@ begin
   end;
 end;
 
+procedure TfrmTatClothInfoInput.MFDWPropertiesEditValueChanged(Sender: TObject);
+begin
+  JSKZ();
+end;
+
 procedure TfrmTatClothInfoInput.N1Click(Sender: TObject);
 begin
   with CDS_1 do
@@ -594,6 +608,7 @@ end;
 procedure TfrmTatClothInfoInput.JSKZ();
 var
   SumJS, SumWS: double;
+  FJinSha, FWeiSha: string;
 begin
 //  C_GramWeight.SetFocus;
 //
@@ -617,9 +632,11 @@ begin
 //
 //  C_GramWeight.text := floattostr(roundfloat((SumJS + SumWS) / 3, 2));
   /////////////Éú³É¹æ¸ñ /////////////
+  JinSha.text := JSGG;
+  WeiSha.text := WSGG;
 
   FC_Spec := '';
-  FC_Spec := '(' + JSGG + ')*(' + WSGG + ')';
+  FC_Spec := C_Composition.text + ' (' + JSGG + ')*(' + WSGG + ') ' + C_FinishLongitudeDensity.text + '*' + C_FinishLatitudeDensity.text + ' ' + C_ReedWidth.text + MFDW.text;
 
   C_Spec.text := trim(FC_Spec);
 
@@ -1046,6 +1063,13 @@ begin
     Exit;
   end;
 
+  if MFDW.Text = '' then
+  begin
+    Application.MessageBox('门幅单位不能为空！', '提示', 0);
+    Exit;
+  end;
+
+
 //  CDS_1.First;
 //  if Trim(CDS_1.fieldbyname('Y_Code').AsString) = '' then
 //  begin
@@ -1168,6 +1192,16 @@ begin
   end;
 end;
 
+procedure TfrmTatClothInfoInput.C_CompositionPropertiesEditValueChanged(Sender: TObject);
+begin
+  JSKZ();
+end;
+
+procedure TfrmTatClothInfoInput.C_FinishLongitudeDensityPropertiesEditValueChanged(Sender: TObject);
+begin
+  JSKZ();
+end;
+
 procedure TfrmTatClothInfoInput.C_ReedWidthPropertiesEditValueChanged(Sender: TObject);
 begin
   JSJS();

B01基础合同管理/U_SalesContractList.dfm

@@ -7,7 +7,6 @@ inherited frmSalesContractList: TfrmSalesContractList
   Font.Height = -16
   FormStyle = fsMDIChild
   Visible = True
-  ExplicitLeft = -118
   ExplicitWidth = 1556
   ExplicitHeight = 810
   PixelsPerInch = 96
@@ -793,7 +792,8 @@ inherited frmSalesContractList: TfrmSalesContractList
           Caption = #21333#20215
           DataBinding.FieldName = 'ConPrice'
           DataBinding.IsNullValueType = True
-          PropertiesClassName = 'TcxTextEditProperties'
+          PropertiesClassName = 'TcxCurrencyEditProperties'
+          Properties.DisplayFormat = ',0.00;-,0.00'
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Options.Sorting = False
@@ -803,7 +803,8 @@ inherited frmSalesContractList: TfrmSalesContractList
           Caption = #37329#39069
           DataBinding.FieldName = 'ConTotalAmount'
           DataBinding.IsNullValueType = True
-          PropertiesClassName = 'TcxTextEditProperties'
+          PropertiesClassName = 'TcxCurrencyEditProperties'
+          Properties.DisplayFormat = ',0.00;-,0.00'
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Width = 84

B01基础合同管理/U_SalesContractList.pas

@@ -29,7 +29,8 @@ uses
   dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinTheBezier, dxSkinValentine,
   dxSkinVisualStudio2013Blue, dxSkinVisualStudio2013Dark,
   dxSkinVisualStudio2013Light, dxSkinVS2010, dxSkinWhiteprint, dxSkinWXI,
-  dxSkinXmas2008Blue, dxScrollbarAnnotations, cxImage, cxDBEdit, cxProgressBar;
+  dxSkinXmas2008Blue, dxScrollbarAnnotations, cxImage, cxDBEdit, cxProgressBar,
+  cxCurrencyEdit;
 
 type
   TfrmSalesContractList = class(TfrmBaseList)
@@ -1063,8 +1064,8 @@ begin
     application.MessageBox('请选择数据', '提示');
     Exit;
   end;
-  if Order_Sub.IsEmpty then
+//  if Order_Sub.IsEmpty then
-      raise Exception.Create('明细不能为空！');
+//      raise Exception.Create('明细不能为空！');
   with CDS_1 do
   begin
     DisableControls;

B02基础纱线仓库/U_CJDJ.dfm

@@ -0,0 +1,150 @@
+object frmCJDJ: TfrmCJDJ
+  Left = 682
+  Top = 315
+  Caption = #25277#26816#30331#35760
+  ClientHeight = 254
+  ClientWidth = 801
+  Color = clWhite
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'MS Sans Serif'
+  Font.Style = []
+  OldCreateOrder = False
+  Position = poMainFormCenter
+  OnShow = FormShow
+  PixelsPerInch = 96
+  TextHeight = 13
+  object Panel1: TPanel
+    Left = 0
+    Top = 0
+    Width = 801
+    Height = 254
+    Align = alClient
+    TabOrder = 0
+    ExplicitLeft = -1
+    object Label1: TLabel
+      Left = 32
+      Top = 36
+      Width = 110
+      Height = 21
+      Caption = #25277#26816#26102#38388#65306
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -21
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label3: TLabel
+      Left = 32
+      Top = 110
+      Width = 120
+      Height = 21
+      AutoSize = False
+      Caption = #20869'    '#23481#65306
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -21
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label2: TLabel
+      Left = 32
+      Top = 189
+      Width = 120
+      Height = 21
+      AutoSize = False
+      Caption = #25277' '#26816' '#20154#65306
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -21
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Button1: TButton
+      Left = 397
+      Top = 33
+      Width = 83
+      Height = 29
+      Caption = #30830#35748
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -21
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 0
+      OnClick = Button1Click
+    end
+    object CJDate: TcxDateEdit
+      Left = 137
+      Top = 34
+      AutoSize = False
+      ParentFont = False
+      Properties.ImmediatePost = True
+      Properties.ShowTime = False
+      Style.Font.Charset = ANSI_CHARSET
+      Style.Font.Color = clWindowText
+      Style.Font.Height = -21
+      Style.Font.Name = #23435#20307
+      Style.Font.Style = [fsBold]
+      Style.IsFontAssigned = True
+      TabOrder = 1
+      Height = 33
+      Width = 218
+    end
+    object CJNote: TcxTextEdit
+      Tag = 2
+      Left = 137
+      Top = 107
+      ParentFont = False
+      Style.Font.Charset = ANSI_CHARSET
+      Style.Font.Color = clWindowText
+      Style.Font.Height = -21
+      Style.Font.Name = #23435#20307
+      Style.Font.Style = [fsBold]
+      Style.IsFontAssigned = True
+      TabOrder = 2
+      Width = 430
+    end
+    object CJer: TcxButtonEdit
+      Tag = 2
+      Left = 137
+      Top = 186
+      Hint = 'CJer/'#25277#26816#20154
+      ParentFont = False
+      Properties.Buttons = <
+        item
+          Default = True
+          Kind = bkEllipsis
+        end>
+      Properties.ReadOnly = False
+      Properties.OnButtonClick = BegPortPropertiesButtonClick
+      Style.Font.Charset = ANSI_CHARSET
+      Style.Font.Color = clWindowText
+      Style.Font.Height = -21
+      Style.Font.Name = #23435#20307
+      Style.Font.Style = [fsBold]
+      Style.ButtonStyle = btsDefault
+      Style.IsFontAssigned = True
+      TabOrder = 3
+      Width = 430
+    end
+  end
+  object ADOQueryTemp: TADOQuery
+    Connection = DataLink_YarnStk.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 643
+    Top = 109
+  end
+  object ADOQueryCmd: TADOQuery
+    Connection = DataLink_YarnStk.ADOLink
+    Parameters = <>
+    Left = 713
+    Top = 128
+  end
+end

B02基础纱线仓库/U_CJDJ.pas

@@ -0,0 +1,121 @@
+unit U_CJDJ;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, StdCtrls, ExtCtrls, DB, ADODB, cxGraphics, cxControls, cxLookAndFeels,
+  cxLookAndFeelPainters, cxContainer, cxEdit, Vcl.ComCtrls, dxCore, cxDateUtils,
+  dxSkinsCore, dxSkinsDefaultPainters, cxTextEdit, cxMaskEdit, cxDropDownEdit,
+  cxCalendar, cxButtonEdit;
+
+type
+  TfrmCJDJ = class(TForm)
+    Panel1: TPanel;
+    Button1: TButton;
+    Label1: TLabel;
+    CJDate: TcxDateEdit;
+    Label3: TLabel;
+    CJNote: TcxTextEdit;
+    Label2: TLabel;
+    CJer: TcxButtonEdit;
+    ADOQueryTemp: TADOQuery;
+    ADOQueryCmd: TADOQuery;
+    procedure Button1Click(Sender: TObject);
+    procedure BegPortPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+    procedure FormShow(Sender: TObject);
+  private
+    { Private declarations }
+  public
+    FFFIDS, FBYIOID: string;
+    { Public declarations }
+  end;
+
+var
+  frmCJDJ: TfrmCJDJ;
+
+implementation
+
+uses
+  U_ZDYHelp, U_RTFun;
+
+
+{$R *.dfm}
+
+procedure TfrmCJDJ.BegPortPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+var
+  fsj: string;
+  FWZ: Integer;
+begin
+  fsj := Trim(TcxButtonEdit(Sender).Hint);
+  FWZ := Pos('/', fsj);
+  try
+    frmZDYHelp := TfrmZDYHelp.Create(Application);
+    with frmZDYHelp do
+    begin
+      MainType := 'SalesCon';
+      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;
+
+procedure TfrmCJDJ.Button1Click(Sender: TObject);
+begin
+  try
+    ADOQueryCmd.Connection.BeginTrans;
+    with ADOQueryCmd do
+    begin
+      Close;
+      Sql.Clear;
+      Sql.Add('update BS_Yarn_IO set CJDate=''' + Trim(FormatDateTime('yyyy-MM-dd', CJDate.Date)) + '''');
+      Sql.Add(',CJNote=''' + Trim(CJNote.text) + '''');
+      Sql.Add(',CJer=''' + Trim(CJer.text) + '''');
+      Sql.Add('where BYIOID=''' + Trim(FBYIOID) + '''');
+      ExecSQL;
+    end;
+
+    ADOQueryCmd.Connection.CommitTrans;
+
+  except
+    ADOQueryCmd.Connection.RollbackTrans;
+    application.MessageBox(PChar(Exception(ExceptObject).Message), 'ÌáʾÐÅÏ¢', 0);
+  end;
+  ModalResult := 1;
+end;
+
+procedure TfrmCJDJ.FormShow(Sender: TObject);
+begin
+
+  with ADOQueryCmd do
+  begin
+    Close;
+    Sql.Clear;
+    Sql.Add('select * from BS_Yarn_IO ');
+    Sql.Add('where BYIOID=''' + Trim(FBYIOID) + '''');
+    showmessage(Sql.text);
+    Open;
+  end;
+
+  if ADOQueryCmd.fieldbyname('CJDate').asstring = '' then
+  begin
+    CJDate.Date := SGetServerDate(ADOQueryTemp);
+
+  end
+  else
+  begin
+    CJDate.Date := ADOQueryCmd.fieldbyname('CJDate').asdatetime;
+    CJNote.text := ADOQueryCmd.fieldbyname('CJNote').asstring;
+    CJer.text := ADOQueryCmd.fieldbyname('CJer').asstring;
+  end;
+
+end;
+
+end.
+

B02基础纱线仓库/U_YarnInEdit.dfm

@@ -334,7 +334,6 @@ inherited frmYarnInEdit: TfrmYarnInEdit
       AutoSize = True
       Caption = #37319#36141#35745#21010#21333
       ImageIndex = 12
-      Visible = False
       OnClick = ToolButton2Click
     end
     object ToolButton4: TToolButton

B02基础纱线仓库/U_YarnInList.dfm

@@ -84,12 +84,13 @@ inherited frmYarnInList: TfrmYarnInList
     object ToolButton6: TToolButton
       Left = 474
       Top = 0
+      AutoSize = True
       Caption = #38468#20214
       ImageIndex = 22
       OnClick = ToolButton6Click
     end
     object ToolButton3: TToolButton
-      Left = 605
+      Left = 537
       Top = 0
       AutoSize = True
       Caption = #23454#27979'D'#25968
@@ -97,8 +98,16 @@ inherited frmYarnInList: TfrmYarnInList
       Visible = False
       OnClick = ToolButton3Click
     end
+    object ToolButton7: TToolButton
+      Left = 618
+      Top = 0
+      AutoSize = True
+      Caption = #25277#26816#30331#35760
+      ImageIndex = 3
+      OnClick = ToolButton7Click
+    end
     object ToolButton2: TToolButton
-      Left = 686
+      Left = 705
       Top = 0
       AutoSize = True
       Caption = #25171#21360
@@ -106,7 +115,7 @@ inherited frmYarnInList: TfrmYarnInList
       OnClick = ToolButton2Click
     end
     object TBDel: TToolButton
-      Left = 749
+      Left = 768
       Top = 0
       AutoSize = True
       Caption = #21024#38500
@@ -114,7 +123,7 @@ inherited frmYarnInList: TfrmYarnInList
       OnClick = TBDelClick
     end
     object TBExport: TToolButton
-      Left = 812
+      Left = 831
       Top = 0
       AutoSize = True
       Caption = #23548#20986
@@ -122,7 +131,7 @@ inherited frmYarnInList: TfrmYarnInList
       OnClick = TBExportClick
     end
     object ToolButton1: TToolButton
-      Left = 875
+      Left = 894
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -130,7 +139,7 @@ inherited frmYarnInList: TfrmYarnInList
       OnClick = ToolButton1Click
     end
     object TBClose: TToolButton
-      Left = 962
+      Left = 981
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -149,9 +158,10 @@ inherited frmYarnInList: TfrmYarnInList
     Color = clWhite
     ParentBackground = False
     TabOrder = 4
+    ExplicitTop = 24
     object Label3: TLabel
-      Left = 252
+      Left = 248
-      Top = 47
+      Top = 46
       Width = 40
       Height = 21
       AutoSize = False
@@ -159,7 +169,7 @@ inherited frmYarnInList: TfrmYarnInList
     end
     object Label4: TLabel
       Left = 450
-      Top = 47
+      Top = 46
       Width = 70
       Height = 21
       AutoSize = False
@@ -191,7 +201,7 @@ inherited frmYarnInList: TfrmYarnInList
     end
     object Label6: TLabel
       Left = 24
-      Top = 47
+      Top = 46
       Width = 70
       Height = 21
       AutoSize = False
@@ -199,7 +209,7 @@ inherited frmYarnInList: TfrmYarnInList
     end
     object Label5: TLabel
       Left = 678
-      Top = 47
+      Top = 46
       Width = 60
       Height = 21
       AutoSize = False
@@ -215,8 +225,8 @@ inherited frmYarnInList: TfrmYarnInList
     end
     object Y_Name: TcxTextEdit
       Tag = 2
-      Left = 294
+      Left = 288
-      Top = 41
+      Top = 42
       Properties.OnChange = BYIOIDPropertiesChange
       TabOrder = 0
       Width = 150
@@ -224,7 +234,7 @@ inherited frmYarnInList: TfrmYarnInList
     object FromCoName: TcxTextEdit
       Tag = 2
       Left = 524
-      Top = 41
+      Top = 42
       Properties.OnChange = BYIOIDPropertiesChange
       TabOrder = 1
       Width = 150
@@ -248,7 +258,7 @@ inherited frmYarnInList: TfrmYarnInList
     object BYIOID: TcxTextEdit
       Tag = 2
       Left = 98
-      Top = 41
+      Top = 42
       Properties.OnChange = BYIOIDPropertiesChange
       TabOrder = 4
       Width = 150
@@ -256,7 +266,7 @@ inherited frmYarnInList: TfrmYarnInList
     object Supplier: TcxTextEdit
       Tag = 2
       Left = 742
-      Top = 41
+      Top = 42
       Properties.OnChange = BYIOIDPropertiesChange
       TabOrder = 5
       Width = 150
@@ -271,8 +281,8 @@ inherited frmYarnInList: TfrmYarnInList
       ParentBackground = False
       ParentColor = False
       TabOrder = 6
-      ExplicitLeft = 2
+      ExplicitLeft = 4
-      ExplicitTop = 2
+      ExplicitTop = 3
       ExplicitWidth = 1536
       ExplicitHeight = 37
       inherited lbl2: TLabel
@@ -281,6 +291,12 @@ inherited frmYarnInList: TfrmYarnInList
         ExplicitWidth = 16
         ExplicitHeight = 21
       end
+      inherited BegDate: TcxDateEdit
+        Left = 93
+        Top = 0
+        ExplicitLeft = 93
+        ExplicitTop = 0
+      end
     end
     object IOType: TcxComboBox
       Left = 96
@@ -312,6 +328,7 @@ inherited frmYarnInList: TfrmYarnInList
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
+    ExplicitTop = 143
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -502,6 +519,7 @@ inherited frmYarnInList: TfrmYarnInList
         DataBinding.FieldName = 'TestDenier'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Width = 100
       end
       object Tv1Column13: TcxGridDBColumn
@@ -578,6 +596,24 @@ inherited frmYarnInList: TfrmYarnInList
         Options.Editing = False
         Width = 79
       end
+      object Tv1Column6: TcxGridDBColumn
+        Caption = #38468#20214
+        DataBinding.FieldName = 'FJFlag'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxCheckBoxProperties'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 50
+      end
+      object Tv1Column7: TcxGridDBColumn
+        Caption = #26159#21542#25277#26816
+        DataBinding.FieldName = 'ISCJ'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxCheckBoxProperties'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 100
+      end
     end
     object cxGrid1Level1: TcxGridLevel
       GridView = Tv1
@@ -624,7 +660,7 @@ inherited frmYarnInList: TfrmYarnInList
     LockType = ltReadOnly
     Parameters = <>
     Left = 848
-    Top = 264
+    Top = 263
   end
   object DS_1: TDataSource
     DataSet = CDS_Main

B02基础纱线仓库/U_YarnInList.pas

@@ -102,6 +102,9 @@ type
     Tv1Column16: TcxGridDBColumn;
     Tv1Column17: TcxGridDBColumn;
     ToolButton6: TToolButton;
+    Tv1Column6: TcxGridDBColumn;
+    ToolButton7: TToolButton;
+    Tv1Column7: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBRafreshClick(Sender: TObject);
@@ -126,6 +129,7 @@ type
     procedure BYIOIDPropertiesChange(Sender: TObject);
     procedure ToolButton5Click(Sender: TObject);
     procedure ToolButton6Click(Sender: TObject);
+    procedure ToolButton7Click(Sender: TObject);
   private
     canshu1, FStkName, canshu3: string;
     procedure InitGrid();
@@ -140,7 +144,7 @@ implementation
 
 uses
   U_DataLink, U_RTFun, U_YarnInEdit, U_LabelPrint, U_YarnOutReturnList,
-  U_YarnOutReturnList1, U_AttachmentUpload;
+  U_YarnOutReturnList1, U_AttachmentUpload, U_CJDJ;
 
 {$R *.dfm}
 procedure TfrmYarnInList.setStatus();
@@ -175,6 +179,13 @@ begin
       Close;
       sql.Clear;
       sql.Add(' select A.* ');
+
+      sql.Add(',Case when ISnull(CJDate,'''') <> '''' ');
+      sql.Add('then Cast(1 as bit) else Cast(0 as bit) end as ISCJ');
+
+      sql.Add(',Case when isnull((select count(*) from FJ_File where WBID=A.BYIOID and TFType=''É´Ïß'' ),0)>0 ');
+      sql.Add('then Cast(1 as bit) else Cast(0 as bit) end as FJFlag');
+
       sql.Add(' from BS_Yarn_IO A');
       sql.add(' where A.IOTime>=''' + Trim(FormatDateTime('yyyy-MM-dd', Frame11.BegDate.Date)) + '''');
       sql.Add(' and A.IOTime<''' + Trim(FormatDateTime('yyyy-MM-dd', Frame11.enddate.Date + 1)) + '''');
@@ -356,6 +367,26 @@ begin
     frmAttachmentUpload.Free;
   end;
 
+end;
+
+procedure TfrmYarnInList.ToolButton7Click(Sender: TObject);
+var
+  MBYIOIDs: string;
+begin
+
+  try
+    frmCJDJ := TfrmCJDJ.Create(Application);
+    with frmCJDJ do
+    begin
+      FBYIOID := Trim(CDS_Main.fieldbyname('BYIOID').AsString);
+      if ShowModal = 1 then
+      begin
+        InitGrid();
+      end;
+    end;
+  finally
+    frmCJDJ.Free;
+  end;
 
 end;
 

B02基础纱线仓库/U_YarnInfoInPut.dfm

@@ -289,8 +289,8 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
     end
     object Y_Name: TcxTextEdit
       Tag = 2
-      Left = 69
+      Left = 68
-      Top = 31
+      Top = 35
       ParentColor = True
       ParentFont = False
       Style.Font.Charset = GB2312_CHARSET

B02基础纱线仓库/U_YarnInfoInPut.pas

@@ -344,7 +344,7 @@ begin
 //  end;
   ToolBar1.SetFocus;
 
-  Y_Name.text := Trim(Y_Composition.text) + Trim(ZS.text) + Trim(Y_Color.text) + Trim(FF.text) + Trim(CJ.text);
+  Y_Name.text := Trim(Y_Composition.text) + Trim(ZS.text) + 'S' + Trim(Y_Color.text) + Trim(FF.text); //+ Trim(CJ.text)
   if Trim(Y_Name.Text) = '' then
   begin
     Application.MessageBox('Ãû³Æ²»ÄÜΪ¿Õ!', 'Ìáʾ', 0);
@@ -373,7 +373,7 @@ begin
   ZS.Style.Color := clMoneyGreen;
   Y_Color.Style.Color := clMoneyGreen;
   FF.Style.Color := clMoneyGreen;
-  CJ.Style.Color := clMoneyGreen;
+//  CJ.Style.Color := clMoneyGreen;
 end;
 
 procedure TfrmYarnInfoInPut.Y_NameExit(Sender: TObject);
@@ -382,12 +382,12 @@ begin
   ZS.Style.Color := clWhite;
   Y_Color.Style.Color := clWhite;
   FF.Style.Color := clWhite;
-  CJ.Style.Color := clWhite;
+//  CJ.Style.Color := clWhite;
 end;
 
 procedure TfrmYarnInfoInPut.Y_SpecPropertiesChange(Sender: TObject);
 begin
-  Y_Name.text := Trim(Y_Composition.text) + Trim(ZS.text) + Trim(Y_Color.text) + Trim(FF.text) + Trim(CJ.text);
+  Y_Name.text := Trim(Y_Composition.text) + Trim(ZS.text) + 'S' + Trim(Y_Color.text) + Trim(FF.text);   //+ Trim(CJ.text)
 end;
 
 procedure TfrmYarnInfoInPut.ZSClick(Sender: TObject);
@@ -404,16 +404,15 @@ procedure TfrmYarnInfoInPut.ZSPropertiesChange(Sender: TObject);
 begin
   UpdateYarnName;
 end;
+
 procedure TfrmYarnInfoInPut.ZSPropertiesEditValueChanged(Sender: TObject);
 begin
   Denier.text := floattostr(roundfloat(5315.5 / strtofloatdef(ZS.text, 0), 0));
 end;
 
-
 procedure TfrmYarnInfoInPut.UpdateYarnName;
 begin
-  Y_Name.Text := Trim(Y_Composition.Text) + Trim(ZS.Text) +
+  Y_Name.Text := Trim(Y_Composition.Text) + Trim(ZS.Text) + 'S' + Trim(Y_Color.Text) + Trim(FF.Text);  // + Trim(CJ.Text)
-                 Trim(Y_Color.Text) + Trim(FF.Text) + Trim(CJ.Text);
 end;
 
 end.

B02基础纱线仓库/YarnStk.dpr

@@ -38,7 +38,7 @@ uses
   U_YarnInfoList in 'U_YarnInfoList.pas' {frmYarnInfoList},
   U_YarnInfoInPut in 'U_YarnInfoInPut.pas' {frmYarnInfoInPut},
   FrameDateSel in '..\A00ͨÓÃ×é¼þ\FrameDateSel.pas' {frmFrameDateSel: TFrame},
-  U_InputBoxSingleNumber in '..\A00通用窗体\U_InputBoxSingleNumber.pas' {frmInputBoxSingleNumber},
+  U_CJDJ in 'U_CJDJ.pas' {frmCJDJ},
   U_YarnOutReturnList1 in 'U_YarnOutReturnList1.pas' {frmYarnOutReturnList1},
   U_cxGridCustomCss in '..\..\..\public10\design\U_cxGridCustomCss.pas',
   U_cxGridCustomSet in '..\..\..\public10\design\U_cxGridCustomSet.pas',
@@ -49,7 +49,8 @@ uses
   U_YarnInList_RC in 'U_YarnInList_RC.pas' {frmYarnInList_RC},
   U_YarnPurchasePlanSel in '..\A00ͨÓô°Ìå\U_YarnPurchasePlanSel.pas' {frmYarnPurchasePlanSel},
   uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas',
-  U_CompanySel in '..\A00通用窗体\U_CompanySel.pas' {frmCompanySel};
+  U_CompanySel in '..\A00通用窗体\U_CompanySel.pas' {frmCompanySel},
+  U_InputBoxSingleNumber in '..\A00通用窗体\U_InputBoxSingleNumber.pas' {frmInputBoxSingleNumber};
 
 {$R *.res}
 

B02基础纱线仓库/YarnStk.dproj

@@ -244,8 +244,8 @@
             <FormType>dfm</FormType>
             <DesignClass>TFrame</DesignClass>
         </DCCReference>
-        <DCCReference Include="..\A00通用窗体\U_InputBoxSingleNumber.pas">
+        <DCCReference Include="U_CJDJ.pas">
-            <Form>frmInputBoxSingleNumber</Form>
+            <Form>frmCJDJ</Form>
             <FormType>dfm</FormType>
         </DCCReference>
         <DCCReference Include="U_YarnOutReturnList1.pas">
@@ -274,6 +274,10 @@
             <Form>frmCompanySel</Form>
             <FormType>dfm</FormType>
         </DCCReference>
+        <DCCReference Include="..\A00通用窗体\U_InputBoxSingleNumber.pas">
+            <Form>frmInputBoxSingleNumber</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

B02基础纱线仓库/YarnStk.dproj.local

@@ -1,92 +1,97 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
+    <Transaction>1899-12-30 00:00:00.000.147,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.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.614,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.674,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_testdll.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.334,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.969,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutReturnList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.688,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.517,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.147,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.687,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.670,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutInput1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.572,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_FactoryInput2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.376,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.688,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList1.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.344,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.796,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnStkList.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.630,=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.969,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutReturnList.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.670,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutInput1.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.224,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.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.976,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.dfm</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.224,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.517,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.376,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.000,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn1.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.334,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.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.630,=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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.065,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.079,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.536,=D:\Dp10Repo\项目代码\路尚\A00通用窗体\U_ProductInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.065,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.878,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.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.344,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.267,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.688,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList1.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.065,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.642,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.872,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList_RC.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.670,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutInput1.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.887,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.976,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.670,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutInput1.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.079,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.065,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.511,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothPurchasePlanSel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.572,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_FactoryInput2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.800,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_CPSelBig.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.891,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.800,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.008,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.976,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.800,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.907,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\YarnStk.dproj=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\InformationBase.dproj</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.356,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B03基础物料仓库\U_JWLPurchasePlanSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.267,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.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.511,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothPurchasePlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.800,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_CPSelBig.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.517,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.891,D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.981,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.907,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\YarnStk.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.000,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn1.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.073,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutWBList.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutInput1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.073,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutInput1.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutWBList.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.935,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.471,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.864,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.534,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.511,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothPurchasePlanSel.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.339,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnInEdit.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.534,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.864,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.935,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.976,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.471,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.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.969,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutReturnList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.356,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B03基础物料仓库\U_JWLPurchasePlanSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.209,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.224,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.356,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B03基础物料仓库\U_JWLPurchasePlanSel.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnInEdit.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.316,=D:\Dp10Repo\项目代码\路尚\T00贸易通用窗体\U_PurchaseContractSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.517,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.dfm</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.802,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</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.073,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutWBList.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutInput1.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.802,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.000,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.073,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutInput1.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutWBList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.511,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothPurchasePlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.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.046,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnStkSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.420,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInfoInPut.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.688,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList1.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.768,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnPurOutReturn.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.803,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnInfoList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.356,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B03基础物料仓库\U_JWLPurchasePlanSel.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.420,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInfoInPut.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\Unit1.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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.891,D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.969,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutReturnList.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.344,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.344,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.111,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnWeighing.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.425,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.000,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn1.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.334,=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用窗体\U_InputBoxSingleNumber.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.111,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnWeighing.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.891,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.425,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</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.768,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnPurOutReturn.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.796,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnStkList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
+    <Transaction>2025-05-19 17:06:38.950,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_InputBoxSingleNumber.dfm</Transaction>
+    <Transaction>2025-05-19 17:06:38.950,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_InputBoxSingleNumber.pas</Transaction>
+    <Transaction>2025-05-19 17:08:19.006,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B02基础纱线仓库\U_CJDJ.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.pas</Transaction>
+    <Transaction>2025-05-19 17:08:19.006,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B02基础纱线仓库\U_CJDJ.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.dfm</Transaction>
+    <Transaction>2025-05-19 17:08:44.548,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_InputBoxSingleNumber.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="android-support-v4.dex.jar"/>
@@ -117,7 +122,7 @@
     <File Path="fmx.dex.jar"/>
     <File Path="google-play-billing.dex.jar"/>
     <File Path="google-play-licensing.dex.jar"/>
-    <File Path="..\..\D10SZKaiXiYa"/>
+    <File Path="..\..\D10szKaiXiYa"/>
     <File Path="..\A00通用窗体"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.pas"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.dfm"/>
@@ -129,8 +134,6 @@
     <File Path="..\A00通用窗体\U_CompanySel.dfm"/>
     <File Path="..\A00通用窗体\U_EmployeeSel.pas"/>
     <File Path="..\A00通用窗体\U_EmployeeSel.dfm"/>
-    <File Path="..\A00通用窗体\U_InputBoxSingleNumber.pas"/>
-    <File Path="..\A00通用窗体\U_InputBoxSingleNumber.dfm"/>
     <File Path="..\A00通用窗体\U_LabelMapSet.pas"/>
     <File Path="..\A00通用窗体\U_LabelMapSet.dfm"/>
     <File Path="..\A00通用窗体\U_LabelPrint.pas"/>
@@ -143,6 +146,8 @@
     <File Path="..\A00通用窗体\U_YarnInfoSel.dfm"/>
     <File Path="..\A00通用窗体\U_YarnPurchasePlanSel.pas"/>
     <File Path="..\A00通用窗体\U_YarnPurchasePlanSel.dfm"/>
+    <File Path="..\A00通用窗体\U_InputBoxSingleNumber.pas"/>
+    <File Path="..\A00通用窗体\U_InputBoxSingleNumber.dfm"/>
     <File Path="..\A00通用组件"/>
     <File Path="..\A00通用组件\FrameDateSel.pas"/>
     <File Path="..\A00通用组件\FrameDateSel.dfm"/>
@@ -204,5 +209,7 @@
     <File Path="U_YarnStkSel.dfm"/>
     <File Path="U_YarnWeighing.pas"/>
     <File Path="U_YarnWeighing.dfm"/>
+    <File Path="U_CJDJ.pas"/>
+    <File Path="U_CJDJ.dfm"/>
   </ProjectSortOrder>
 </BorlandProject>

B04采购计划管理/U_YarnPurchasePlanPut.dfm

@@ -64,7 +64,7 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
     Height = 30
     AutoSize = True
     ButtonHeight = 30
-    ButtonWidth = 95
+    ButtonWidth = 115
     Caption = 'ToolBar1'
     Color = clBtnFace
     DisabledImages = DataLink_PurchasePlan.cxImageList_bar
@@ -75,8 +75,6 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
     ParentColor = False
     ShowCaptions = True
     TabOrder = 1
-    ExplicitLeft = -2
-    ExplicitTop = 157
     object ToolButton1: TToolButton
       Left = 0
       Top = 0
@@ -86,7 +84,7 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
       OnClick = ToolButton1Click
     end
     object ToolButton4: TToolButton
-      Left = 87
+      Left = 103
       Top = 0
       AutoSize = True
       Caption = #26426#29289#26009#26723#26696
@@ -94,13 +92,13 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
       OnClick = ToolButton4Click
     end
     object ToolButton5: TToolButton
-      Left = 186
+      Left = 222
       Top = 0
       Caption = #38144#21806#21512#21516
       ImageIndex = 2
     end
     object ToolButton2: TToolButton
-      Left = 281
+      Left = 337
       Top = 0
       AutoSize = True
       Caption = #21024#34892
@@ -208,7 +206,7 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
       end
       object Tv1Column16: TcxGridDBColumn
         Caption = #21697#21517
-        DataBinding.FieldName = 'Y_Code'
+        DataBinding.FieldName = 'Y_Name'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False