diff --git a/A02基础产品管理/ClothInfo.dpr b/A02基础产品管理/ClothInfo.dpr
index e9ca23a..be17697 100644
--- a/A02基础产品管理/ClothInfo.dpr
+++ b/A02基础产品管理/ClothInfo.dpr
@@ -35,7 +35,8 @@ uses
   U_ClothInfoSel in '..\A00ͨ�ô���\U_ClothInfoSel.pas' {frmClothInfoSel},
   U_YarnInfoSel in '..\A00ͨ�ô���\U_YarnInfoSel.pas' {frmYarnInfoSel},
   uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas',
-  U_CraftInfo in 'U_CraftInfo.pas';
+  U_CraftInfo in 'U_CraftInfo.pas',
+  U_TatClothInfoInput in 'U_TatClothInfoInput.pas' {frmTatClothInfoInput};
 
 {$R *.res}
 
diff --git a/A02基础产品管理/ClothInfo.dproj b/A02基础产品管理/ClothInfo.dproj
index 9dd126d..742f240 100644
--- a/A02基础产品管理/ClothInfo.dproj
+++ b/A02基础产品管理/ClothInfo.dproj
@@ -170,6 +170,10 @@
         </DCCReference>
         <DCCReference Include="..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas"/>
         <DCCReference Include="U_CraftInfo.pas"/>
+        <DCCReference Include="U_TatClothInfoInput.pas">
+            <Form>frmTatClothInfoInput</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
diff --git a/A02基础产品管理/U_CraftInfo.dfm b/A02基础产品管理/U_CraftInfo.dfm
index 7bc503d..5ac4c8f 100644
--- a/A02基础产品管理/U_CraftInfo.dfm
+++ b/A02基础产品管理/U_CraftInfo.dfm
@@ -59,16 +59,24 @@ inherited frmCraftInfo: TfrmCraftInfo
       ImageIndex = 5
       OnClick = TBDelClick
     end
-    object TBExport: TToolButton
+    object TbPrint: TToolButton
       Left = 284
       Top = 0
       AutoSize = True
+      Caption = #25171#21360
+      ImageIndex = 21
+      OnClick = TbPrintClick
+    end
+    object TBExport: TToolButton
+      Left = 355
+      Top = 0
+      AutoSize = True
       Caption = #23548#20986
       ImageIndex = 20
       OnClick = TBExportClick
     end
     object ToolButton2: TToolButton
-      Left = 355
+      Left = 426
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -76,7 +84,7 @@ inherited frmCraftInfo: TfrmCraftInfo
       OnClick = ToolButton2Click
     end
     object TBClose: TToolButton
-      Left = 450
+      Left = 521
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -219,6 +227,7 @@ inherited frmCraftInfo: TfrmCraftInfo
         Caption = #22836#20221
         DataBinding.FieldName = 'head_count'
         DataBinding.IsNullValueType = True
+        Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_ClothInfo.Default
@@ -228,6 +237,7 @@ inherited frmCraftInfo: TfrmCraftInfo
         Caption = #26465#23485
         DataBinding.FieldName = 'strip_width'
         DataBinding.IsNullValueType = True
+        Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_ClothInfo.Default
@@ -246,6 +256,7 @@ inherited frmCraftInfo: TfrmCraftInfo
         Caption = #19978#25490#25968
         DataBinding.FieldName = 'row_count_top'
         DataBinding.IsNullValueType = True
+        Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_ClothInfo.Default
@@ -255,6 +266,7 @@ inherited frmCraftInfo: TfrmCraftInfo
         Caption = #20301#31227
         DataBinding.FieldName = 'displace'
         DataBinding.IsNullValueType = True
+        Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_ClothInfo.Default
@@ -264,6 +276,7 @@ inherited frmCraftInfo: TfrmCraftInfo
         Caption = #23450#24133#31576
         DataBinding.FieldName = 'reed_width'
         DataBinding.IsNullValueType = True
+        Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Styles.Header = DataLink_ClothInfo.Default
@@ -278,6 +291,33 @@ inherited frmCraftInfo: TfrmCraftInfo
         Styles.Header = DataLink_ClothInfo.Default
         Width = 66
       end
+      object Tv1ends_per_dent: TcxGridDBColumn
+        Caption = #20837#25968
+        DataBinding.FieldName = 'ends_per_dent'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Styles.Header = DataLink_ClothInfo.Default
+        Width = 80
+      end
+      object Tv1selvage_yarn: TcxGridDBColumn
+        Caption = #36793#32433
+        DataBinding.FieldName = 'selvage_yarn'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Styles.Header = DataLink_ClothInfo.Default
+        Width = 70
+      end
+      object Tv1yardage: TcxGridDBColumn
+        Caption = #35745#30721
+        DataBinding.FieldName = 'yardage'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Styles.Header = DataLink_ClothInfo.Default
+        Width = 60
+      end
       object Tv1FILLER: TcxGridDBColumn
         Caption = #24405#20837#20154
         DataBinding.FieldName = 'FILLER'
diff --git a/A02基础产品管理/U_CraftInfo.pas b/A02基础产品管理/U_CraftInfo.pas
index a7bfcba..bbd2faa 100644
--- a/A02基础产品管理/U_CraftInfo.pas
+++ b/A02基础产品管理/U_CraftInfo.pas
@@ -44,6 +44,9 @@ type
     Tv1displace: TcxGridDBColumn;
     Tv1reed_width: TcxGridDBColumn;
     Tv1C_ReedNo: TcxGridDBColumn;
+    Tv1ends_per_dent: TcxGridDBColumn;
+    Tv1selvage_yarn: TcxGridDBColumn;
+    Tv1yardage: TcxGridDBColumn;
     Tv1FILLER: TcxGridDBColumn;
     Tv1FILLTIME: TcxGridDBColumn;
     cxGrid1Level1: TcxGridLevel;
@@ -55,6 +58,7 @@ type
     PM_1: TPopupMenu;
     N1: TMenuItem;
     N2: TMenuItem;
+    TbPrint: TToolButton;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -68,6 +72,7 @@ type
     procedure CRCodeKeyPress(Sender: TObject; var Key: Char);
     procedure N1Click(Sender: TObject);
     procedure N2Click(Sender: TObject);
+    procedure TbPrintClick(Sender: TObject);
   private
     { Private declarations }
     procedure InitGrid();
@@ -81,7 +86,7 @@ var
 implementation
 
 uses
-  U_DataLink, U_RTFun, U_CraftInfoInput;
+  U_DataLink, U_RTFun, U_CraftInfoInput,U_LabelPrint;
 
 {$R *.dfm}
 
@@ -304,6 +309,24 @@ begin
   TcxGridToExcel(self.Caption, cxGrid1);
 end;
 
+procedure TfrmCraftInfo.TbPrintClick(Sender: TObject);
+begin
+  try
+    frmLabelPrint := TfrmLabelPrint.Create(Application);
+    with frmLabelPrint do
+    begin
+      FLMType := 'CraftInfoPrint';
+      FFiltration1 := CDS_1.fieldbyname('CRID').AsString;
+      if ShowModal = 1 then
+      begin
+//        Self.InitGrid();
+      end;
+    end;
+  finally
+    frmLabelPrint.Free;
+  end;
+end;
+
 procedure TfrmCraftInfo.ToolButton2Click(Sender: TObject);
 begin
   WriteCxGrid(self.Caption + 'TV1', Tv1, '���չ���');
diff --git a/A02基础产品管理/U_CraftInfoInput.dfm b/A02基础产品管理/U_CraftInfoInput.dfm
index 0e93fae..9dfdfc2 100644
--- a/A02基础产品管理/U_CraftInfoInput.dfm
+++ b/A02基础产品管理/U_CraftInfoInput.dfm
@@ -150,8 +150,8 @@ object frmCraftInfoInput: TfrmCraftInfoInput
       ParentFont = False
     end
     object Label7: TLabel
-      Left = 360
-      Top = 68
+      Left = 1067
+      Top = 40
       Width = 39
       Height = 12
       Caption = #22836#20221#65306
@@ -161,10 +161,11 @@ object frmCraftInfoInput: TfrmCraftInfoInput
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
+      Visible = False
     end
     object Label8: TLabel
-      Left = 675
-      Top = 70
+      Left = 1067
+      Top = 61
       Width = 39
       Height = 12
       Caption = #26465#23485#65306
@@ -174,6 +175,7 @@ object frmCraftInfoInput: TfrmCraftInfoInput
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
+      Visible = False
     end
     object Label9: TLabel
       Left = 29
@@ -189,8 +191,8 @@ object frmCraftInfoInput: TfrmCraftInfoInput
       ParentFont = False
     end
     object Label10: TLabel
-      Left = 360
-      Top = 102
+      Left = 1067
+      Top = 103
       Width = 52
       Height = 12
       Caption = #19978#25490#25968#65306
@@ -200,10 +202,11 @@ object frmCraftInfoInput: TfrmCraftInfoInput
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
+      Visible = False
     end
     object Label11: TLabel
-      Left = 675
-      Top = 101
+      Left = 1067
+      Top = 85
       Width = 39
       Height = 12
       Caption = #20301#31227#65306
@@ -213,10 +216,11 @@ object frmCraftInfoInput: TfrmCraftInfoInput
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
+      Visible = False
     end
     object Label12: TLabel
-      Left = 29
-      Top = 130
+      Left = 1067
+      Top = 17
       Width = 52
       Height = 12
       Caption = #23450#24133#31576#65306
@@ -226,10 +230,11 @@ object frmCraftInfoInput: TfrmCraftInfoInput
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
+      Visible = False
     end
     object Label13: TLabel
-      Left = 360
-      Top = 130
+      Left = 362
+      Top = 68
       Width = 39
       Height = 12
       Caption = #31576#21495#65306
@@ -240,6 +245,45 @@ object frmCraftInfoInput: TfrmCraftInfoInput
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object Label14: TLabel
+      Left = 675
+      Top = 68
+      Width = 39
+      Height = 12
+      Caption = #20837#25968#65306
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label15: TLabel
+      Left = 362
+      Top = 99
+      Width = 39
+      Height = 12
+      Caption = #36793#32433#65306
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label16: TLabel
+      Left = 675
+      Top = 99
+      Width = 39
+      Height = 12
+      Caption = #35745#30721#65306
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
     object CR_Code: TEdit
       Tag = 2
       Left = 93
@@ -334,8 +378,8 @@ object frmCraftInfoInput: TfrmCraftInfoInput
     end
     object head_count: TEdit
       Tag = 2
-      Left = 426
-      Top = 68
+      Left = 1125
+      Top = 35
       Width = 234
       Height = 18
       Font.Charset = GB2312_CHARSET
@@ -345,11 +389,12 @@ object frmCraftInfoInput: TfrmCraftInfoInput
       Font.Style = [fsBold]
       ParentFont = False
       TabOrder = 6
+      Visible = False
     end
     object strip_width: TEdit
       Tag = 2
-      Left = 738
-      Top = 68
+      Left = 1125
+      Top = 59
       Width = 234
       Height = 18
       Font.Charset = GB2312_CHARSET
@@ -359,6 +404,7 @@ object frmCraftInfoInput: TfrmCraftInfoInput
       Font.Style = [fsBold]
       ParentFont = False
       TabOrder = 7
+      Visible = False
     end
     object C_MachLatitudeDensity: TEdit
       Tag = 2
@@ -375,6 +421,79 @@ object frmCraftInfoInput: TfrmCraftInfoInput
       TabOrder = 8
     end
     object row_count_top: TEdit
+      Tag = 2
+      Left = 1125
+      Top = 107
+      Width = 234
+      Height = 18
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 9
+      Visible = False
+    end
+    object displace: TEdit
+      Tag = 2
+      Left = 1125
+      Top = 83
+      Width = 234
+      Height = 18
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 10
+      Visible = False
+    end
+    object reed_width: TEdit
+      Tag = 2
+      Left = 1125
+      Top = 11
+      Width = 234
+      Height = 18
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 11
+      Visible = False
+    end
+    object C_ReedNo: TEdit
+      Tag = 2
+      Left = 426
+      Top = 68
+      Width = 234
+      Height = 18
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 12
+    end
+    object ends_per_dent: TEdit
+      Tag = 2
+      Left = 738
+      Top = 68
+      Width = 234
+      Height = 18
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 13
+    end
+    object selvage_yarn: TEdit
       Tag = 2
       Left = 426
       Top = 99
@@ -386,9 +505,9 @@ object frmCraftInfoInput: TfrmCraftInfoInput
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
-      TabOrder = 9
+      TabOrder = 14
     end
-    object displace: TEdit
+    object yardage: TEdit
       Tag = 2
       Left = 738
       Top = 99
@@ -400,35 +519,7 @@ object frmCraftInfoInput: TfrmCraftInfoInput
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
-      TabOrder = 10
-    end
-    object reed_width: TEdit
-      Tag = 2
-      Left = 93
-      Top = 127
-      Width = 234
-      Height = 18
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
-      TabOrder = 11
-    end
-    object C_ReedNo: TEdit
-      Tag = 2
-      Left = 426
-      Top = 127
-      Width = 234
-      Height = 18
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -12
-      Font.Name = #23435#20307
-      Font.Style = [fsBold]
-      ParentFont = False
-      TabOrder = 12
+      TabOrder = 15
     end
   end
   object cxPageControl3: TcxPageControl
@@ -2050,6 +2141,10 @@ object frmCraftInfoInput: TfrmCraftInfoInput
     object cxTabSheet7: TcxTabSheet
       Caption = #31359#32508#27861
       ImageIndex = 6
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       object Panel9: TPanel
         Left = 0
         Top = 0
diff --git a/A02基础产品管理/U_CraftInfoInput.pas b/A02基础产品管理/U_CraftInfoInput.pas
index 0424bc2..da3ba35 100644
--- a/A02基础产品管理/U_CraftInfoInput.pas
+++ b/A02基础产品管理/U_CraftInfoInput.pas
@@ -48,6 +48,12 @@ type
     displace: TEdit;
     reed_width: TEdit;
     C_ReedNo: TEdit;
+    Label14: TLabel;
+    ends_per_dent: TEdit;
+    Label15: TLabel;
+    selvage_yarn: TEdit;
+    Label16: TLabel;
+    yardage: TEdit;
     cxPageControl3: TcxPageControl;
     cxTabSheet1: TcxTabSheet;
     Panel1: TPanel;
diff --git a/A02基础产品管理/U_CraftSync.pas b/A02基础产品管理/U_CraftSync.pas
index 3dd2c7a..a8a5c76 100644
--- a/A02基础产品管理/U_CraftSync.pas
+++ b/A02基础产品管理/U_CraftSync.pas
@@ -70,6 +70,7 @@ begin
       SQL.Add(',B.C_YarnQty=C.C_YarnQty,B.head_count=C.head_count,B.strip_width=C.strip_width');
       SQL.Add(',B.C_MachLatitudeDensity=C.C_MachLatitudeDensity,B.row_count_top=C.row_count_top');
       SQL.Add(',B.displace=C.displace,B.reed_width=C.reed_width,B.C_ReedNo=C.C_ReedNo');
+      SQL.Add(',B.ends_per_dent=C.ends_per_dent,B.selvage_yarn=C.selvage_yarn,B.yardage=C.yardage');
       SQL.Add(',B.warp_arrange=C.warp_arrange,B.weft_arrange=C.weft_arrange,B.threading_method=C.threading_method');
       SQL.Add('from BS_Cloth_Info B join BS_Craft_Info C on C.CRID=B.CRID');
       SQL.Add('where B.CRID=' + QuotedStr(Trim(ACRID)));
diff --git a/A02基础产品管理/U_GetDllForm.pas b/A02基础产品管理/U_GetDllForm.pas
index 65bfa49..4c49052 100644
--- a/A02基础产品管理/U_GetDllForm.pas
+++ b/A02基础产品管理/U_GetDllForm.pas
@@ -76,7 +76,7 @@ begin
     pswd := 'right,.soft@2377';
 
     DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
-//   DParameters1:='��Ȩ��';
+   Parameters1:='����';
     Parameters2 := '��֯';
   end
   else
diff --git a/A02基础产品管理/U_TatClothInfo.dfm b/A02基础产品管理/U_TatClothInfo.dfm
index 1ff0291..76bea6f 100644
--- a/A02基础产品管理/U_TatClothInfo.dfm
+++ b/A02基础产品管理/U_TatClothInfo.dfm
@@ -354,8 +354,6 @@ inherited frmTatClothInfo: TfrmTatClothInfo
       Align = alClient
       PopupMenu = PM_1
       TabOrder = 0
-      ExplicitLeft = 6
-      ExplicitTop = 66
       object Tv1: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
         Navigator.Buttons.Delete.Enabled = False
@@ -574,6 +572,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo
           Caption = #22836#20221
           DataBinding.FieldName = 'head_count'
           DataBinding.IsNullValueType = True
+          Visible = False
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Styles.Header = DataLink_ClothInfo.Default
@@ -583,6 +582,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo
           Caption = #26465#23485
           DataBinding.FieldName = 'strip_width'
           DataBinding.IsNullValueType = True
+          Visible = False
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Styles.Header = DataLink_ClothInfo.Default
@@ -601,6 +601,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo
           Caption = #19978#25490#25968
           DataBinding.FieldName = 'row_count_top'
           DataBinding.IsNullValueType = True
+          Visible = False
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Styles.Header = DataLink_ClothInfo.Default
@@ -610,6 +611,7 @@ inherited frmTatClothInfo: TfrmTatClothInfo
           Caption = #20301#31227
           DataBinding.FieldName = 'displace'
           DataBinding.IsNullValueType = True
+          Visible = False
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Styles.Header = DataLink_ClothInfo.Default
@@ -619,11 +621,39 @@ inherited frmTatClothInfo: TfrmTatClothInfo
           Caption = #23450#24133#31576
           DataBinding.FieldName = 'reed_width'
           DataBinding.IsNullValueType = True
+          Visible = False
           HeaderAlignmentHorz = taCenter
           Options.Editing = False
           Styles.Header = DataLink_ClothInfo.Default
           Width = 81
         end
+        object Tv1ends_per_dent: TcxGridDBColumn
+          Caption = #20837#25968
+          DataBinding.FieldName = 'ends_per_dent'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Styles.Header = DataLink_ClothInfo.Default
+          Width = 80
+        end
+        object Tv1selvage_yarn: TcxGridDBColumn
+          Caption = #36793#32433
+          DataBinding.FieldName = 'selvage_yarn'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Styles.Header = DataLink_ClothInfo.Default
+          Width = 70
+        end
+        object Tv1yardage: TcxGridDBColumn
+          Caption = #35745#30721
+          DataBinding.FieldName = 'yardage'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Styles.Header = DataLink_ClothInfo.Default
+          Width = 60
+        end
       end
       object cxGrid1Level1: TcxGridLevel
         GridView = Tv1
@@ -833,6 +863,8 @@ inherited frmTatClothInfo: TfrmTatClothInfo
         #20840#37096
         #27491#22312#20351#29992)
       OnChange = cxTabControl1Change
+      ExplicitLeft = 6
+      ExplicitTop = 4
       ClientRectBottom = 23
       ClientRectLeft = 2
       ClientRectRight = 1210
diff --git a/A02基础产品管理/U_TatClothInfo.pas b/A02基础产品管理/U_TatClothInfo.pas
index 8a96bd9..d247545 100644
--- a/A02基础产品管理/U_TatClothInfo.pas
+++ b/A02基础产品管理/U_TatClothInfo.pas
@@ -131,6 +131,9 @@ type
     Tv1row_count_top: TcxGridDBColumn;
     Tv1displace: TcxGridDBColumn;
     Tv1reed_width: TcxGridDBColumn;
+    Tv1ends_per_dent: TcxGridDBColumn;
+    Tv1selvage_yarn: TcxGridDBColumn;
+    Tv1yardage: TcxGridDBColumn;
     cxTabControl1: TcxTabControl;
     tbStart: TToolButton;
     tbPause: TToolButton;
@@ -178,6 +181,7 @@ type
     PState: Integer;
     FCTID, FTopID, FJurisdiction, FCTType: string;
     procedure SetStatus();
+    procedure SetJurisdiction();
     procedure InitTree();
     procedure InitGrid();
     procedure ReadINIFile();
@@ -248,6 +252,28 @@ begin
 
 end;
 
+procedure TfrmTatClothInfo.SetJurisdiction();
+begin
+  //�����Ȩ�����ذ�ť:��ѯ=ֻ��;¼��=������ͣ��ť
+  if FJurisdiction = '��ѯ' then
+  begin
+    TBAdd.Visible := False;
+    TBCopy.Visible := False;
+    TBEdit.Visible := False;
+    TBMLEdit.Visible := False;
+    TBBindCraft.Visible := False;
+    tbStart.Visible := False;
+    tbPause.Visible := False;
+    TBDel.Visible := False;
+    TBUP.Visible := False;
+  end
+  else if FJurisdiction = '¼��' then
+  begin
+    tbStart.Visible := False;
+    tbPause.Visible := False;
+  end;
+end;
+
 procedure TfrmTatClothInfo.InitTree();
 begin
   with ADOQueryTree do
@@ -397,6 +423,7 @@ begin
   TBMLEdit.Visible := True;
   TBDel.Visible    := True;
   tbPause.Visible  := False;
+  SetJurisdiction();
 
 end;
 
@@ -425,6 +452,7 @@ begin
   TBDel.Visible    := IsAllTab;
 
   tbPause.Visible  := not IsAllTab;
+  SetJurisdiction();
 
   CurrentPage := 1;
   InitGrid();
diff --git a/A02基础产品管理/U_TatClothInfoInput.dfm b/A02基础产品管理/U_TatClothInfoInput.dfm
index bb88989..eefa49e 100644
--- a/A02基础产品管理/U_TatClothInfoInput.dfm
+++ b/A02基础产品管理/U_TatClothInfoInput.dfm
@@ -147,7 +147,7 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput
     end
     object Label2: TLabel
       Left = 360
-      Top = 158
+      Top = 122
       Width = 67
       Height = 12
       Caption = #22836'    '#32441#65306
@@ -202,7 +202,7 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput
     end
     object Label6: TLabel
       Left = 29
-      Top = 158
+      Top = 122
       Width = 67
       Height = 12
       Caption = #31576'    '#21495#65306
@@ -256,8 +256,8 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput
       Visible = False
     end
     object Label10: TLabel
-      Left = 675
-      Top = 70
+      Left = 29
+      Top = 65
       Width = 65
       Height = 12
       Caption = #19978#26426#32428#23494#65306
@@ -269,7 +269,7 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput
       ParentFont = False
     end
     object Label11: TLabel
-      Left = 675
+      Left = 666
       Top = 40
       Width = 67
       Height = 12
@@ -282,8 +282,8 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput
       ParentFont = False
     end
     object Label13: TLabel
-      Left = 675
-      Top = 101
+      Left = 362
+      Top = 65
       Width = 65
       Height = 12
       Caption = #39044#35745#24046#20540#65306
@@ -295,8 +295,8 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput
       ParentFont = False
     end
     object Label14: TLabel
-      Left = 675
-      Top = 130
+      Left = 29
+      Top = 94
       Width = 65
       Height = 12
       Caption = #32463#32433#25209#21495#65306
@@ -308,8 +308,8 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput
       ParentFont = False
     end
     object Label16: TLabel
-      Left = 675
-      Top = 156
+      Left = 362
+      Top = 94
       Width = 65
       Height = 12
       Caption = #32428#32433#25209#21495#65306
@@ -321,8 +321,8 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput
       ParentFont = False
     end
     object Label17: TLabel
-      Left = 29
-      Top = 68
+      Left = 1296
+      Top = 40
       Width = 67
       Height = 12
       Caption = #22836'    '#20221#65306
@@ -332,10 +332,11 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
+      Visible = False
     end
     object Label19: TLabel
-      Left = 30
-      Top = 102
+      Left = 965
+      Top = 3
       Width = 66
       Height = 12
       Caption = #19978' '#25490' '#25968#65306
@@ -345,10 +346,11 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
+      Visible = False
     end
     object Label23: TLabel
-      Left = 29
-      Top = 130
+      Left = 965
+      Top = 168
       Width = 66
       Height = 12
       Caption = #23450' '#24133' '#31576#65306
@@ -358,10 +360,11 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
+      Visible = False
     end
     object Label24: TLabel
-      Left = 360
-      Top = 68
+      Left = 1277
+      Top = 5
       Width = 67
       Height = 12
       Caption = #26465'    '#23485#65306
@@ -371,10 +374,11 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
+      Visible = False
     end
     object Label25: TLabel
-      Left = 362
-      Top = 102
+      Left = 964
+      Top = 22
       Width = 67
       Height = 12
       Caption = #20301'    '#31227#65306
@@ -384,6 +388,46 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
+      Visible = False
+    end
+    object Label74: TLabel
+      Left = 666
+      Top = 65
+      Width = 67
+      Height = 12
+      Caption = #20837'    '#25968#65306
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label75: TLabel
+      Left = 666
+      Top = 94
+      Width = 67
+      Height = 12
+      Caption = #36793'    '#32433#65306
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label76: TLabel
+      Left = 666
+      Top = 122
+      Width = 67
+      Height = 12
+      Caption = #35745'    '#30721#65306
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
     end
     object C_Code: TEdit
       Tag = 2
@@ -418,7 +462,7 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput
     object C_YarnQty: TEdit
       Tag = 2
       Left = 426
-      Top = 155
+      Top = 120
       Width = 234
       Height = 18
       Font.Charset = GB2312_CHARSET
@@ -542,8 +586,8 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput
     end
     object strip_width: TEdit
       Tag = 2
-      Left = 426
-      Top = 68
+      Left = 1296
+      Top = 16
       Width = 234
       Height = 18
       Font.Charset = GB2312_CHARSET
@@ -553,6 +597,7 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput
       Font.Style = [fsBold]
       ParentFont = False
       TabOrder = 10
+      Visible = False
     end
     object C_Spec: TEdit
       Tag = 2
@@ -572,17 +617,17 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput
     end
     object C_MachLatitudeDensity: TEdit
       Tag = 2
-      Left = 739
-      Top = 68
-      Width = 120
+      Left = 93
+      Top = 64
+      Width = 236
       Height = 18
       TabOrder = 12
     end
     object C_Color: TEdit
       Tag = 2
-      Left = 738
+      Left = 739
       Top = 38
-      Width = 121
+      Width = 219
       Height = 18
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
@@ -595,32 +640,32 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput
     end
     object estimated_diff: TEdit
       Tag = 2
-      Left = 738
-      Top = 100
-      Width = 120
+      Left = 426
+      Top = 64
+      Width = 234
       Height = 18
       TabOrder = 14
     end
     object C_LongitudeBatchNo: TEdit
       Tag = 2
-      Left = 738
-      Top = 128
-      Width = 120
+      Left = 93
+      Top = 92
+      Width = 236
       Height = 18
       TabOrder = 15
     end
     object C_LatitudeBatchNo: TEdit
       Tag = 2
-      Left = 738
-      Top = 154
-      Width = 120
+      Left = 426
+      Top = 92
+      Width = 234
       Height = 18
       TabOrder = 16
     end
     object head_count: TEdit
       Tag = 2
-      Left = 93
-      Top = 68
+      Left = 1325
+      Top = 40
       Width = 234
       Height = 18
       Font.Charset = GB2312_CHARSET
@@ -630,12 +675,13 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput
       Font.Style = [fsBold]
       ParentFont = False
       TabOrder = 17
+      Visible = False
     end
     object C_ReedNo: TEdit
       Tag = 2
       Left = 93
-      Top = 155
-      Width = 234
+      Top = 120
+      Width = 236
       Height = 18
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
@@ -647,8 +693,8 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput
     end
     object row_count_top: TEdit
       Tag = 2
-      Left = 93
-      Top = 100
+      Left = 1037
+      Top = -2
       Width = 234
       Height = 18
       Font.Charset = GB2312_CHARSET
@@ -658,11 +704,12 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput
       Font.Style = [fsBold]
       ParentFont = False
       TabOrder = 19
+      Visible = False
     end
     object displace: TEdit
       Tag = 2
-      Left = 426
-      Top = 99
+      Left = 1037
+      Top = 16
       Width = 234
       Height = 18
       Font.Charset = GB2312_CHARSET
@@ -672,12 +719,13 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput
       Font.Style = [fsBold]
       ParentFont = False
       TabOrder = 20
+      Visible = False
     end
     object reed_width: TEdit
       Tag = 2
-      Left = 93
-      Top = 124
-      Width = 567
+      Left = 1037
+      Top = 160
+      Width = 201
       Height = 18
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
@@ -686,6 +734,49 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput
       Font.Style = [fsBold]
       ParentFont = False
       TabOrder = 21
+      Visible = False
+    end
+    object ends_per_dent: TEdit
+      Tag = 2
+      Left = 739
+      Top = 64
+      Width = 219
+      Height = 18
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 22
+    end
+    object selvage_yarn: TEdit
+      Tag = 2
+      Left = 739
+      Top = 92
+      Width = 219
+      Height = 18
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 23
+    end
+    object yardage: TEdit
+      Tag = 2
+      Left = 739
+      Top = 120
+      Width = 219
+      Height = 18
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 24
     end
   end
   object cxPageControl3: TcxPageControl
diff --git a/A02基础产品管理/U_TatClothInfoInput.pas b/A02基础产品管理/U_TatClothInfoInput.pas
index e47bddb..da1ecad 100644
--- a/A02基础产品管理/U_TatClothInfoInput.pas
+++ b/A02基础产品管理/U_TatClothInfoInput.pas
@@ -231,6 +231,12 @@ type
     row_count_top: TEdit;
     displace: TEdit;
     reed_width: TEdit;
+    Label74: TLabel;
+    ends_per_dent: TEdit;
+    Label75: TLabel;
+    selvage_yarn: TEdit;
+    Label76: TLabel;
+    yardage: TEdit;
     warp_arrange: TMemo;
     reed_weave_method: TMemo;
     weft_arrange: TMemo;
@@ -532,6 +538,9 @@ begin
     displace.Tag := 0;
     reed_width.Tag := 0;
     C_ReedNo.Tag := 0;
+    ends_per_dent.Tag := 0;
+    selvage_yarn.Tag := 0;
+    yardage.Tag := 0;
 
     C_Width.Enabled := False;
     C_GramWeight.Enabled := False;
@@ -544,6 +553,9 @@ begin
     displace.Enabled := False;
     reed_width.Enabled := False;
     C_ReedNo.Enabled := False;
+    ends_per_dent.Enabled := False;
+    selvage_yarn.Enabled := False;
+    yardage.Enabled := False;
 
     warp_arrange.ReadOnly := True;
     weft_arrange.ReadOnly := True;
@@ -566,6 +578,9 @@ begin
     displace.Tag := 2;
     reed_width.Tag := 2;
     C_ReedNo.Tag := 2;
+    ends_per_dent.Tag := 2;
+    selvage_yarn.Tag := 2;
+    yardage.Tag := 2;
 
     C_Width.Enabled := True;
     C_GramWeight.Enabled := True;
@@ -578,6 +593,9 @@ begin
     displace.Enabled := True;
     reed_width.Enabled := True;
     C_ReedNo.Enabled := True;
+    ends_per_dent.Enabled := True;
+    selvage_yarn.Enabled := True;
+    yardage.Enabled := True;
 
     warp_arrange.ReadOnly := False;
     weft_arrange.ReadOnly := False;
diff --git a/A05基础资料管理/BaseInfo.dpr b/A05基础资料管理/BaseInfo.dpr
index 0484344..354737c 100644
--- a/A05基础资料管理/BaseInfo.dpr
+++ b/A05基础资料管理/BaseInfo.dpr
@@ -27,6 +27,7 @@ uses
   U_LabelMapSet in '..\A00ͨ�ô���\U_LabelMapSet.pas' {frmLabelMapSet},
   U_LabelPrint in '..\A00ͨ�ô���\U_LabelPrint.pas' {frmLabelPrint},
   U_TatClothInfoSel in '..\A00ͨ�ô���\U_TatClothInfoSel.pas' {frmTatClothInfoSel},
+  U_SalesContractSel in '..\A00ͨ�ô���\U_SalesContractSel.pas' {frmSalesContractSel},
   U_BaseDataLink in '..\..\..\public10\design\U_BaseDataLink.pas' {BaseDataLink: TDataModule},
   uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas';
 
diff --git a/A05基础资料管理/U_MachineManage.dfm b/A05基础资料管理/U_MachineManage.dfm
index 8d17fc3..ba4107d 100644
--- a/A05基础资料管理/U_MachineManage.dfm
+++ b/A05基础资料管理/U_MachineManage.dfm
@@ -3,9 +3,9 @@ inherited frmMachineManage: TfrmMachineManage
   Top = 109
   Caption = #26426#21488#31649#29702
   ClientHeight = 523
-  ClientWidth = 1107
+  ClientWidth = 1230
   KeyPreview = True
-  ExplicitWidth = 1123
+  ExplicitWidth = 1246
   ExplicitHeight = 562
   PixelsPerInch = 96
   TextHeight = 12
@@ -13,11 +13,11 @@ inherited frmMachineManage: TfrmMachineManage
     Tag = 1
     Left = 0
     Top = 0
-    Width = 1107
+    Width = 1230
     Height = 38
     AutoSize = True
     ButtonHeight = 38
-    ButtonWidth = 98
+    ButtonWidth = 97
     Caption = 'ToolBar1'
     Color = clSkyBlue
     DisabledImages = DataLink_BaseInfo.ImageList_new32
@@ -92,16 +92,32 @@ inherited frmMachineManage: TfrmMachineManage
       ImageIndex = 4
       OnClick = tbBindProdClick
     end
+    object tbBindCon1: TToolButton
+      Left = 598
+      Top = 0
+      AutoSize = True
+      Caption = #32465#23450#21512#21516'1'
+      ImageIndex = 4
+      OnClick = tbBindCon1Click
+    end
     object tbBindProd2: TToolButton
-      Left = 599
+      Left = 699
       Top = 0
       AutoSize = True
       Caption = #32465#23450#20135#21697'2'
       ImageIndex = 4
       OnClick = tbBindProd2Click
     end
+    object tbBindCon2: TToolButton
+      Left = 800
+      Top = 0
+      AutoSize = True
+      Caption = #32465#23450#21512#21516'2'
+      ImageIndex = 4
+      OnClick = tbBindCon2Click
+    end
     object ToolButton3: TToolButton
-      Left = 701
+      Left = 901
       Top = 0
       AutoSize = True
       Caption = #25171#21360
@@ -109,7 +125,7 @@ inherited frmMachineManage: TfrmMachineManage
       OnClick = ToolButton3Click
     end
     object ToolButton1: TToolButton
-      Left = 772
+      Left = 972
       Top = 0
       AutoSize = True
       Caption = #23548#20986
@@ -117,7 +133,7 @@ inherited frmMachineManage: TfrmMachineManage
       OnClick = ToolButton1Click
     end
     object TbSaveFormat: TToolButton
-      Left = 843
+      Left = 1043
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -125,7 +141,7 @@ inherited frmMachineManage: TfrmMachineManage
       OnClick = TbSaveFormatClick
     end
     object TBClose: TToolButton
-      Left = 938
+      Left = 1138
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -136,7 +152,7 @@ inherited frmMachineManage: TfrmMachineManage
   object cxGrid2: TcxGrid [1]
     Left = 0
     Top = 121
-    Width = 1107
+    Width = 1230
     Height = 402
     Align = alClient
     PopupMenu = PopupMenu1
@@ -205,6 +221,14 @@ inherited frmMachineManage: TfrmMachineManage
         HeaderAlignmentHorz = taCenter
         Width = 180
       end
+      object v2Column13: TcxGridDBColumn
+        Caption = #21512#21516#21495'1'
+        DataBinding.FieldName = 'm_ConNo'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxTextEditProperties'
+        HeaderAlignmentHorz = taCenter
+        Width = 120
+      end
       object v2Column9: TcxGridDBColumn
         Caption = #20135#21697#32534#21495'1'
         DataBinding.FieldName = 'C_CodeName'
@@ -221,6 +245,14 @@ inherited frmMachineManage: TfrmMachineManage
         Options.Editing = False
         Width = 150
       end
+      object v2Column14: TcxGridDBColumn
+        Caption = #21512#21516#21495'2'
+        DataBinding.FieldName = 'm_ConNo2'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxTextEditProperties'
+        HeaderAlignmentHorz = taCenter
+        Width = 120
+      end
       object v2Column10: TcxGridDBColumn
         Caption = #20135#21697#32534#21495'2'
         DataBinding.FieldName = 'C_CodeName2'
@@ -245,7 +277,7 @@ inherited frmMachineManage: TfrmMachineManage
   object Panel1: TPanel [2]
     Left = 0
     Top = 38
-    Width = 1107
+    Width = 1230
     Height = 58
     Align = alTop
     BevelInner = bvRaised
@@ -272,7 +304,7 @@ inherited frmMachineManage: TfrmMachineManage
   object cxTabControl1: TcxTabControl [3]
     Left = 0
     Top = 96
-    Width = 1107
+    Width = 1230
     Height = 25
     Align = alTop
     TabOrder = 3
@@ -284,7 +316,7 @@ inherited frmMachineManage: TfrmMachineManage
     OnChange = cxTabControl1Change
     ClientRectBottom = 23
     ClientRectLeft = 2
-    ClientRectRight = 1105
+    ClientRectRight = 1228
     ClientRectTop = 22
   end
   inherited ADOQueryBaseCmd: TADOQuery
@@ -351,5 +383,13 @@ inherited frmMachineManage: TfrmMachineManage
       Caption = #35299#32465#20135#21697'2'
       OnClick = N4Click
     end
+    object N5: TMenuItem
+      Caption = #35299#32465#21512#21516'1'
+      OnClick = N5Click
+    end
+    object N6: TMenuItem
+      Caption = #35299#32465#21512#21516'2'
+      OnClick = N6Click
+    end
   end
 end
diff --git a/A05基础资料管理/U_MachineManage.pas b/A05基础资料管理/U_MachineManage.pas
index b1d7bd8..5b65693 100644
--- a/A05基础资料管理/U_MachineManage.pas
+++ b/A05基础资料管理/U_MachineManage.pas
@@ -38,6 +38,8 @@ type
     N2: TMenuItem;
     N3: TMenuItem;
     N4: TMenuItem;
+    N5: TMenuItem;
+    N6: TMenuItem;
     Panel1: TPanel;
     MCNO: TEdit;
     v2Column8: TcxGridDBColumn;
@@ -53,9 +55,13 @@ type
     tbPause: TToolButton;
     tbBindProd: TToolButton;
     tbBindProd2: TToolButton;
+    tbBindCon1: TToolButton;
+    tbBindCon2: TToolButton;
     Tv2C_Name: TcxGridDBColumn;
     v2Column10: TcxGridDBColumn;
     Tv2C_Name2: TcxGridDBColumn;
+    v2Column13: TcxGridDBColumn;
+    v2Column14: TcxGridDBColumn;
     TbSaveFormat: TToolButton;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
@@ -81,11 +87,17 @@ type
     procedure tbPauseClick(Sender: TObject);
     procedure tbBindProdClick(Sender: TObject);
     procedure tbBindProd2Click(Sender: TObject);
+    procedure tbBindCon1Click(Sender: TObject);
+    procedure tbBindCon2Click(Sender: TObject);
+    procedure N5Click(Sender: TObject);
+    procedure N6Click(Sender: TObject);
     procedure TbSaveFormatClick(Sender: TObject);
   private
     { Private declarations }
     procedure BindProduct(AFieldName, ALogAction: string);
     procedure UnbindProduct(AFieldName, ALogAction: string);
+    procedure BindContract(AFieldName, AConFieldName, ALogAction: string);
+    procedure UnbindContract(AFieldName, AConFieldName, ALogAction: string);
     procedure InitGrid();
     procedure EditValueT();
     procedure EditValueF();
@@ -101,7 +113,8 @@ var
 implementation
 
 uses
-  U_DataLink, U_RTFun, U_ZDYHelp, U_LabelPrint, U_TatClothInfoSel;
+  U_DataLink, U_RTFun, U_ZDYHelp, U_LabelPrint, U_TatClothInfoSel,
+  U_SalesContractSel;
 
 {$R *.dfm}
 
@@ -382,6 +395,16 @@ begin
   BindProduct('C_CodeName2', '�󶨲�Ʒ2');
 end;
 
+procedure TfrmMachineManage.tbBindCon1Click(Sender: TObject);
+begin
+  BindContract('C_CodeName', 'm_ConNo', '�󶨺�ͬ1');
+end;
+
+procedure TfrmMachineManage.tbBindCon2Click(Sender: TObject);
+begin
+  BindContract('C_CodeName2', 'm_ConNo2', '�󶨺�ͬ2');
+end;
+
 procedure TfrmMachineManage.BindProduct(AFieldName, ALogAction: string);
 var
   MMCIDS, MCodeName: string;
@@ -544,6 +567,178 @@ begin
   end;
 end;
 
+procedure TfrmMachineManage.BindContract(AFieldName, AConFieldName, ALogAction: string);
+var
+  MMCIDS, MCodeName, MConNo: string;
+begin
+  if CDS_HZ.IsEmpty then
+    Exit;
+  if not CDS_HZ.Locate('SSel', True, []) then
+  begin
+    Application.MessageBox('û��ѡ������!', '��ʾ', 0);
+    Exit;
+  end;
+
+  MMCIDS := '';
+  CDS_HZ.DisableControls;
+  try
+    CDS_HZ.First;
+    while not CDS_HZ.Eof do
+    begin
+      if CDS_HZ.fieldbyname('SSel').AsBoolean then
+      begin
+        if MMCIDS <> '' then
+          MMCIDS := MMCIDS + ',' + QuotedStr(Trim(CDS_HZ.fieldbyname('MCID').AsString))
+        else
+          MMCIDS := QuotedStr(Trim(CDS_HZ.fieldbyname('MCID').AsString));
+      end;
+      CDS_HZ.Next;
+    end;
+  finally
+    CDS_HZ.EnableControls;
+  end;
+
+  if MMCIDS = '' then
+    Exit;
+
+  //ѡ���ͬ�У�ͬʱ������ͬ�źͶ�Ӧ��Ʒ���
+  MCodeName := '';
+  MConNo := '';
+  try
+    frmSalesContractSel := TfrmSalesContractSel.Create(Application);
+    if frmSalesContractSel.ShowModal = 1 then
+    begin
+      if not frmSalesContractSel.CDS_1.IsEmpty then
+      begin
+        MConNo := Trim(frmSalesContractSel.CDS_1.fieldbyname('ConNo').AsString);
+        MCodeName := Trim(frmSalesContractSel.CDS_1.fieldbyname('C_Code').AsString);
+      end;
+    end;
+  finally
+    frmSalesContractSel.Free;
+  end;
+  if (MConNo = '') or (MCodeName = '') then
+    Exit;
+
+  try
+    ADOQueryCmd.Connection.BeginTrans;
+    with ADOQueryCmd do
+    begin
+      Close;
+      SQL.Clear;
+      SQL.Add('update BS_Machine set ' + AFieldName + '=' + QuotedStr(MCodeName));
+      SQL.Add(' , ' + AConFieldName + '=' + QuotedStr(MConNo));
+      SQL.Add(' , Editer=''' + Trim(DName) + '''');
+      SQL.Add(' , Edittime=getdate()');
+      SQL.Add(' where MCID in (' + MMCIDS + ')');
+      ExecSQL;
+    end;
+    with ADOQueryCmd do
+    begin
+      Close;
+      SQL.Clear;
+      SQL.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
+      SQL.Add(' ' + QuotedStr(Trim(DName)));
+      SQL.Add(',getdate() ');
+      SQL.Add(',' + QuotedStr(Trim(self.Caption)));
+      SQL.Add(',' + QuotedStr(Trim(ALogAction)));
+      SQL.Add(',' + QuotedStr(Trim(MMCIDS + ' -> ' + MConNo + '/' + MCodeName)));
+      SQL.Add(',' + QuotedStr(Trim('�ɹ�')));
+      SQL.Add(')');
+      ExecSQL;
+    end;
+    ADOQueryCmd.Connection.CommitTrans;
+
+    CDS_HZ.DisableControls;
+    try
+      CDS_HZ.First;
+      while not CDS_HZ.Eof do
+      begin
+        if CDS_HZ.fieldbyname('SSel').AsBoolean then
+        begin
+          CDS_HZ.Edit;
+          CDS_HZ.fieldbyname(AFieldName).AsString := MCodeName;
+          CDS_HZ.fieldbyname(AConFieldName).AsString := MConNo;
+          CDS_HZ.Post;
+        end;
+        CDS_HZ.Next;
+      end;
+    finally
+      CDS_HZ.EnableControls;
+    end;
+    InitGrid();
+    Application.MessageBox('�󶨳ɹ���', '��ʾ��Ϣ');
+  except
+    ADOQueryCmd.Connection.RollbackTrans;
+    Application.MessageBox(PChar(Exception(ExceptObject).Message), '��ʾ��Ϣ', 0);
+  end;
+end;
+
+procedure TfrmMachineManage.UnbindContract(AFieldName, AConFieldName, ALogAction: string);
+var
+  MMCID, MConNo: string;
+begin
+  if CDS_HZ.IsEmpty then
+    Exit;
+
+  //�����Խ����У�������ڻ�̨�������ù�ѡ
+  MMCID := Trim(CDS_HZ.fieldbyname('MCID').AsString);
+  if MMCID = '' then
+    Exit;
+
+  MConNo := Trim(CDS_HZ.fieldbyname(AConFieldName).AsString);
+  if MConNo = '' then
+  begin
+    Application.MessageBox('��ǰ������û�а󶨸ú�ͬ��������', '��ʾ', 0);
+    Exit;
+  end;
+
+  if Application.MessageBox(PChar('ȷ��Ҫ����̨ ' + Trim(CDS_HZ.fieldbyname('MCNO').AsString)
+    + ' �󶨵ĺ�ͬ ' + MConNo + ' �𣿣�ͬʱ����Ӧ��Ʒ��'), '��ʾ', 32 + 4) <> IDYES then
+    Exit;
+
+  try
+    ADOQueryCmd.Connection.BeginTrans;
+    with ADOQueryCmd do
+    begin
+      Close;
+      SQL.Clear;
+      SQL.Add('update BS_Machine set ' + AFieldName + '=' + QuotedStr(''));
+      //����ͬͬʱ��ն�Ӧ��Ʒ
+      SQL.Add(' , ' + AConFieldName + '=' + QuotedStr(''));
+      SQL.Add(' , Editer=''' + Trim(DName) + '''');
+      SQL.Add(' , Edittime=getdate()');
+      SQL.Add(' where MCID=' + QuotedStr(MMCID));
+      ExecSQL;
+    end;
+    with ADOQueryCmd do
+    begin
+      Close;
+      SQL.Clear;
+      SQL.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( ');
+      SQL.Add(' ' + QuotedStr(Trim(DName)));
+      SQL.Add(',getdate() ');
+      SQL.Add(',' + QuotedStr(Trim(self.Caption)));
+      SQL.Add(',' + QuotedStr(Trim(ALogAction)));
+      SQL.Add(',' + QuotedStr(Trim(MMCID + ' -> ' + MConNo)));
+      SQL.Add(',' + QuotedStr(Trim('�ɹ�')));
+      SQL.Add(')');
+      ExecSQL;
+    end;
+    ADOQueryCmd.Connection.CommitTrans;
+
+    CDS_HZ.Edit;
+    CDS_HZ.fieldbyname(AFieldName).AsString := '';
+    CDS_HZ.fieldbyname(AConFieldName).AsString := '';
+    CDS_HZ.Post;
+    InitGrid();
+    Application.MessageBox('���ɹ���', '��ʾ��Ϣ');
+  except
+    ADOQueryCmd.Connection.RollbackTrans;
+    Application.MessageBox(PChar(Exception(ExceptObject).Message), '��ʾ��Ϣ', 0);
+  end;
+end;
+
 procedure TfrmMachineManage.N1Click(Sender: TObject);
 begin
   if CDS_HZ.IsEmpty then
@@ -568,6 +763,16 @@ begin
   UnbindProduct('C_CodeName2', '����Ʒ2');
 end;
 
+procedure TfrmMachineManage.N5Click(Sender: TObject);
+begin
+  UnbindContract('C_CodeName', 'm_ConNo', '����ͬ1');
+end;
+
+procedure TfrmMachineManage.N6Click(Sender: TObject);
+begin
+  UnbindContract('C_CodeName2', 'm_ConNo2', '����ͬ2');
+end;
+
 procedure TfrmMachineManage.CustomerChange(Sender: TObject);
 begin
   ToolButton2.Click;
diff --git a/B01基础合同管理/U_SalesConInPut.dfm b/B01基础合同管理/U_SalesConInPut.dfm
index beaa80d..0502e6e 100644
--- a/B01基础合同管理/U_SalesConInPut.dfm
+++ b/B01基础合同管理/U_SalesConInPut.dfm
@@ -539,8 +539,9 @@ inherited frmSalesConInPut: TfrmSalesConInPut
       Top = 111
       Width = 125
       Height = 20
+      ItemIndex = 0
       TabOrder = 11
-      Text = 'USD'
+      Text = 'CNY'
       Items.Strings = (
         'CNY'
         'USD'
diff --git a/E03梭织坯布检验/U_GetDllForm.pas b/E03梭织坯布检验/U_GetDllForm.pas
index e5f37dc..e3dba1d 100644
--- a/E03梭织坯布检验/U_GetDllForm.pas
+++ b/E03梭织坯布检验/U_GetDllForm.pas
@@ -76,7 +76,7 @@ begin
     user := 'rightsoftsa';
     pswd := 'right,.soft@2377';
     DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
-    DParameters1 := '����';
+    Parameters1 := '��ѯ';
     dname := '666';
 //    dname := '777';
   end
diff --git a/E03梭织坯布检验/U_TatClothInspList.pas b/E03梭织坯布检验/U_TatClothInspList.pas
index 9933160..57ad983 100644
--- a/E03梭织坯布检验/U_TatClothInspList.pas
+++ b/E03梭织坯布检验/U_TatClothInspList.pas
@@ -438,6 +438,14 @@ var
 begin
   inherited;
   canshu1 := self.fParameters1;
+  //��ѯģʽֻ��:���ر༭/����/�޸ı��/�ӳ���ť
+  if Trim(canshu1) = '��ѯ' then
+  begin
+    btnEdit.Visible := False;
+    TBZF.Visible := False;
+    ToolButton2.Visible := False;
+    tbAddLen.Visible := False;
+  end;
   CurrentPage := 1;
   RecordsNumber := 500;
   ReadCxGrid(Trim(self.Caption) + 'Tv1', Tv1, 'ó�׼������');
diff --git a/E04梭织坯布仓库/TatClothStk.dpr b/E04梭织坯布仓库/TatClothStk.dpr
index 7e2a94e..df4bd41 100644
--- a/E04梭织坯布仓库/TatClothStk.dpr
+++ b/E04梭织坯布仓库/TatClothStk.dpr
@@ -32,6 +32,7 @@ uses
   U_TatClothOutList in 'U_TatClothOutList.pas' {frmTatClothOutList},
   U_TatClothStkHZListSEL in 'U_TatClothStkHZListSEL.pas' {frmTatClothStkHZListSEL},
   U_TatClothInfoSel in '..\A00ͨ�ô���\U_TatClothInfoSel.pas' {frmTatClothInfoSel},
+  U_SalesContractSel in '..\A00ͨ�ô���\U_SalesContractSel.pas' {frmSalesContractSel},
   uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas';
 
 {$R *.res}
diff --git a/E04梭织坯布仓库/U_TatDRtInPut.dfm b/E04梭织坯布仓库/U_TatDRtInPut.dfm
index 54e34ef..aba587a 100644
--- a/E04梭织坯布仓库/U_TatDRtInPut.dfm
+++ b/E04梭织坯布仓库/U_TatDRtInPut.dfm
@@ -253,6 +253,7 @@ object frmTatDRtInPut: TfrmTatDRtInPut
       AutoSize = True
       Caption = #36873#20135#21697
       ImageIndex = 12
+      Visible = False
       OnClick = ToolButton3Click
     end
     object ToolButton5: TToolButton
@@ -261,17 +262,26 @@ object frmTatDRtInPut: TfrmTatDRtInPut
       AutoSize = True
       Caption = #36873#35745#21010#21333
       ImageIndex = 12
+      Visible = False
       OnClick = ToolButton5Click
     end
-    object ToolButton6: TToolButton
+    object ToolButton7: TToolButton
       Left = 178
       Top = 0
+      AutoSize = True
+      Caption = #36873#21512#21516
+      ImageIndex = 12
+      OnClick = ToolButton7Click
+    end
+    object ToolButton6: TToolButton
+      Left = 261
+      Top = 0
       Caption = #36873#24211#23384
       ImageIndex = 12
       OnClick = ToolButton6Click
     end
     object ToolButton1: TToolButton
-      Left = 269
+      Left = 352
       Top = 0
       AutoSize = True
       Caption = #22686#34892
@@ -280,7 +290,7 @@ object frmTatDRtInPut: TfrmTatDRtInPut
       OnClick = ToolButton1Click
     end
     object ToolButton2: TToolButton
-      Left = 340
+      Left = 423
       Top = 0
       AutoSize = True
       Caption = #21024#34892
diff --git a/E04梭织坯布仓库/U_TatDRtInPut.pas b/E04梭织坯布仓库/U_TatDRtInPut.pas
index 21aa715..628b494 100644
--- a/E04梭织坯布仓库/U_TatDRtInPut.pas
+++ b/E04梭织坯布仓库/U_TatDRtInPut.pas
@@ -58,6 +58,7 @@ type
     Tv1C_code: TcxGridDBColumn;
     Tv1DR_LongitudeBatchNo: TcxGridDBColumn;
     Tv1DR_LatitudeBatchNo: TcxGridDBColumn;
+    ToolButton7: TToolButton;
     procedure TBCloseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure TBSaveClick(Sender: TObject);
@@ -72,6 +73,7 @@ type
     procedure SHDANWEIBtnDnClick(Sender: TObject);
     procedure ToolButton5Click(Sender: TObject);
     procedure ToolButton6Click(Sender: TObject);
+    procedure ToolButton7Click(Sender: TObject);
   private
     fuserName: string;
     procedure InitData();
@@ -91,7 +93,7 @@ implementation
 
 uses
   U_DataLink, U_ZDYHelp, U_RTFun, U_CompanySel, U_TatPlanSel, U_TatClothInfoSel,
-  U_TatClothStkHZListSEL;
+  U_TatClothStkHZListSEL, U_SalesContractSel;
 
 {$R *.dfm}
 
@@ -569,6 +571,58 @@ begin
   end;
 end;
 
+procedure TfrmTatDRtInPut.ToolButton7Click(Sender: TObject);
+begin
+  try
+    frmSalesContractSel := TfrmSalesContractSel.Create(Application);
+    with frmSalesContractSel do
+    begin
+      if ShowModal = 1 then
+      begin
+        while CDS_1.locate('SSel', true, []) do
+        begin
+          if not self.Order_Sub.locate('ConSId', trim(frmSalesContractSel.CDS_1.Fieldbyname('ConSId').AsString), []) then
+          begin
+            with Self.Order_Sub do
+            begin
+              Append;
+              FieldByName('ConNo').Value := Trim(frmSalesContractSel.CDS_1.fieldbyname('ConNo').AsString);
+              FieldByName('ConMId').Value := Trim(frmSalesContractSel.CDS_1.fieldbyname('ConMId').AsString);
+              FieldByName('ConSId').Value := frmSalesContractSel.CDS_1.fieldbyname('ConSId').Value;
+              FieldByName('BuyConNo').Value := frmSalesContractSel.CDS_1.fieldbyname('BuyConNo').Value;
+              FieldByName('C_Code').Value := frmSalesContractSel.CDS_1.fieldbyname('C_Code').Value;
+              FieldByName('C_Name').Value := frmSalesContractSel.CDS_1.fieldbyname('C_Name').Value;
+              FieldByName('C_Spec').Value := frmSalesContractSel.CDS_1.fieldbyname('C_Spec').Value;
+              FieldByName('C_Width').Value := frmSalesContractSel.CDS_1.fieldbyname('C_Width').Value;
+              FieldByName('C_GramWeight').Value := frmSalesContractSel.CDS_1.fieldbyname('C_GramWeight').Value;
+              FieldByName('C_Color').Value := frmSalesContractSel.CDS_1.fieldbyname('C_Color').Value;
+              FieldByName('C_ColorNo').Value := frmSalesContractSel.CDS_1.fieldbyname('C_ColorNo').Value;
+              FieldByName('C_Pattern').Value := frmSalesContractSel.CDS_1.fieldbyname('C_Pattern').Value;
+              FieldByName('Piece').Value := frmSalesContractSel.CDS_1.fieldbyname('ConPiece').Value; //��ͬƥ��
+              FieldByName('Qty').Value := frmSalesContractSel.CDS_1.fieldbyname('ConQty').Value; //��ͬ����
+            end;
+            //��ͷ�����ͻ���������λ������ֵʱ�����ǣ�
+//            if Trim(self.ToCoName.Text) = '' then
+//            begin
+              self.ToCoName.TxtCode := Trim(frmSalesContractSel.CDS_1.fieldbyname('BuyNo').AsString);
+              self.ToCoName.Text := Trim(frmSalesContractSel.CDS_1.fieldbyname('BuyName').AsString);
+//            end;
+//            if Trim(self.QtyUnit.Text) = '' then
+//            begin
+              if QtyUnit.Items.IndexOf(Trim(frmSalesContractSel.CDS_1.fieldbyname('ConUnit').AsString)) >= 0 then
+                QtyUnit.ItemIndex := QtyUnit.Items.IndexOf(Trim(frmSalesContractSel.CDS_1.fieldbyname('ConUnit').AsString));
+//            end;
+          end;
+          CDS_1.Edit;
+          CDS_1.fieldbyname('SSel').value := false;
+        end;
+      end;
+    end;
+  finally
+    frmSalesContractSel.Free;
+  end;
+end;
+
 procedure TfrmTatDRtInPut.ToCoNameBtnUpClick(Sender: TObject);
 begin
 
diff --git a/T02贸易汇总仓库/U_TradeGreyClothOutEdit.pas b/T02贸易汇总仓库/U_TradeGreyClothOutEdit.pas
index cc2655f..ae16159 100644
--- a/T02贸易汇总仓库/U_TradeGreyClothOutEdit.pas
+++ b/T02贸易汇总仓库/U_TradeGreyClothOutEdit.pas
@@ -406,7 +406,7 @@ begin
     frmCompanySel := TfrmCompanySel.Create(Application);
     with frmCompanySel do
     begin
-      FCoType := '��Ӧ��';
+      FCoType := '�ͻ�';
       if ShowModal = 1 then
       begin
         with Self.CDS_Sub do