260727cai

A01基础公司管理/Company.dpr

@@ -30,7 +30,8 @@ uses
   U_BankList in 'U_BankList.pas' {frmBankList},
   U_LabelMapSet in '..\A00通用窗体\U_LabelMapSet.pas' {frmLabelMapSet},
   U_LabelPrint in '..\A00通用窗体\U_LabelPrint.pas' {frmLabelPrint},
-  uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas';
+  uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas',
+  U_BMQXManage in 'U_BMQXManage.pas' {frmBMQXManage};
 
 {$R *.res}
 

A01基础公司管理/Company.dproj

@@ -151,6 +151,10 @@
             <FormType>dfm</FormType>
         </DCCReference>
         <DCCReference Include="..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas"/>
+        <DCCReference Include="U_BMQXManage.pas">
+            <Form>frmBMQXManage</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

A01基础公司管理/Company.dproj.local

@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.592,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.076,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_ZdyAttachGYS.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.525,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_BankList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.076,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_ZdyAttachGYS.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.956,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_EmployeeList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.525,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_BankList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.592,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.411,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_YGSel.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm=D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm=D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.pas=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.pas=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.411,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_YGSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.521,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.dfm=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.435,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.342,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.294,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.dfm=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.531,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.342,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.294,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.333,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.531,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.435,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.333,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas=D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.956,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_EmployeeList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas=D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.pas</Transaction>
-    <Transaction>2025/12/26 16:17:37.521,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.pas</Transaction>
+    <Transaction>2026-06-26 10:37:03.527,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A01基础公司管理\U_BMQXManage.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10sxYilanbuyi"/>
@@ -69,5 +70,7 @@
     <File Path="U_ZDYHelpSel.dfm"/>
     <File Path="U_BankList.pas"/>
     <File Path="U_BankList.dfm"/>
+    <File Path="U_BMQXManage.pas"/>
+    <File Path="U_BMQXManage.dfm"/>
   </ProjectSortOrder>
 </BorlandProject>

A01基础公司管理/U_BMQXManage.dfm

@@ -0,0 +1,371 @@
+inherited frmBMQXManage: TfrmBMQXManage
+  Left = 297
+  Top = 109
+  Caption = #26426#21488#31649#29702
+  ClientHeight = 667
+  ClientWidth = 1112
+  KeyPreview = True
+  ExplicitWidth = 1128
+  ExplicitHeight = 706
+  PixelsPerInch = 96
+  TextHeight = 12
+  object ToolBar1: TToolBar [0]
+    Tag = 1
+    Left = 0
+    Top = 0
+    Width = 1112
+    Height = 38
+    AutoSize = True
+    ButtonHeight = 38
+    ButtonWidth = 75
+    Caption = 'ToolBar1'
+    Color = clSkyBlue
+    Images = DataLink_Company.ImageList_new32
+    List = True
+    ParentColor = False
+    ShowCaptions = True
+    TabOrder = 0
+    object TBRafresh: TToolButton
+      Left = 0
+      Top = 0
+      AutoSize = True
+      Caption = #21047#26032
+      ImageIndex = 1
+      OnClick = TBRafreshClick
+    end
+    object ToolButton2: TToolButton
+      Left = 71
+      Top = 0
+      AutoSize = True
+      Caption = #36807#28388
+      ImageIndex = 0
+      OnClick = ToolButton2Click
+    end
+    object TBClose: TToolButton
+      Left = 142
+      Top = 0
+      AutoSize = True
+      Caption = #20851#38381
+      ImageIndex = 7
+      OnClick = TBCloseClick
+    end
+  end
+  object cxGrid2: TcxGrid [1]
+    Left = 0
+    Top = 96
+    Width = 449
+    Height = 571
+    Align = alLeft
+    PopupMenu = PopupMenu1
+    TabOrder = 2
+    ExplicitLeft = -5
+    ExplicitTop = 102
+    object Tv2: TcxGridDBTableView
+      Navigator.Buttons.CustomButtons = <>
+      Navigator.Buttons.Delete.Enabled = False
+      Navigator.Buttons.Delete.Visible = False
+      ScrollbarAnnotations.CustomAnnotations = <>
+      OnFocusedRecordChanged = Tv2FocusedRecordChanged
+      DataController.DataSource = DS_HZ
+      DataController.Filter.AutoDataSetFilter = True
+      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+      DataController.Summary.DefaultGroupSummaryItems = <>
+      DataController.Summary.FooterSummaryItems = <
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end>
+      DataController.Summary.SummaryGroups = <>
+      OptionsCustomize.ColumnFiltering = False
+      OptionsData.Deleting = False
+      OptionsData.DeletingConfirmation = False
+      OptionsView.Footer = True
+      OptionsView.GroupByBox = False
+      object v2Column12: TcxGridDBColumn
+        Caption = #21592#24037
+        DataBinding.FieldName = 'UserName'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxTextEditProperties'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 190
+      end
+      object Tv2Column1: TcxGridDBColumn
+        Caption = #37096#38376
+        DataBinding.FieldName = 'Udept'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 242
+      end
+    end
+    object cxGridLevel1: TcxGridLevel
+      GridView = Tv2
+    end
+  end
+  object Panel1: TPanel [2]
+    Left = 0
+    Top = 38
+    Width = 1112
+    Height = 58
+    Align = alTop
+    BevelInner = bvRaised
+    BevelOuter = bvLowered
+    Color = clSkyBlue
+    TabOrder = 1
+    ExplicitTop = 18
+    object Label1: TLabel
+      Left = 66
+      Top = 20
+      Width = 24
+      Height = 12
+      Caption = #37096#38376
+    end
+    object Udept: TEdit
+      Tag = 2
+      Left = 96
+      Top = 16
+      Width = 145
+      Height = 20
+      TabOrder = 0
+      OnChange = CustomerChange
+    end
+  end
+  object Panel2: TPanel [3]
+    Left = 449
+    Top = 96
+    Width = 663
+    Height = 571
+    Align = alClient
+    Caption = 'Panel2'
+    TabOrder = 3
+    ExplicitTop = 76
+    ExplicitHeight = 591
+    object cxGrid1: TcxGrid
+      Left = 1
+      Top = 39
+      Width = 661
+      Height = 531
+      Align = alClient
+      PopupMenu = PopupMenu1
+      TabOrder = 0
+      ExplicitLeft = 6
+      ExplicitTop = 45
+      object TV1: TcxGridDBTableView
+        Navigator.Buttons.CustomButtons = <>
+        Navigator.Buttons.Delete.Enabled = False
+        Navigator.Buttons.Delete.Visible = False
+        ScrollbarAnnotations.CustomAnnotations = <>
+        DataController.DataSource = DS_1
+        DataController.Filter.AutoDataSetFilter = True
+        DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+        DataController.Summary.DefaultGroupSummaryItems = <>
+        DataController.Summary.FooterSummaryItems = <
+          item
+            Kind = skSum
+          end
+          item
+            Kind = skSum
+          end
+          item
+            Kind = skSum
+          end
+          item
+            Kind = skSum
+          end
+          item
+            Kind = skSum
+          end
+          item
+            Kind = skSum
+          end>
+        DataController.Summary.SummaryGroups = <>
+        OptionsCustomize.ColumnFiltering = False
+        OptionsData.Deleting = False
+        OptionsData.DeletingConfirmation = False
+        OptionsView.Footer = True
+        OptionsView.GroupByBox = False
+        object cxGridDBColumn2: TcxGridDBColumn
+          Caption = #24037#24207#26435#38480
+          DataBinding.FieldName = 'GX'
+          DataBinding.IsNullValueType = True
+          PropertiesClassName = 'TcxTextEditProperties'
+          HeaderAlignmentHorz = taCenter
+          Width = 223
+        end
+      end
+      object cxGridLevel2: TcxGridLevel
+        GridView = TV1
+      end
+    end
+    object ToolBar2: TToolBar
+      Tag = 1
+      Left = 1
+      Top = 1
+      Width = 661
+      Height = 38
+      AutoSize = True
+      ButtonHeight = 38
+      ButtonWidth = 75
+      Caption = 'ToolBar1'
+      Color = clSkyBlue
+      Images = DataLink_Company.ImageList_new32
+      List = True
+      ParentColor = False
+      ShowCaptions = True
+      TabOrder = 1
+      object ToolButton6: TToolButton
+        Left = 0
+        Top = 0
+        AutoSize = True
+        Caption = #28155#21152
+        ImageIndex = 2
+        OnClick = ToolButton6Click
+      end
+      object ToolButton7: TToolButton
+        Left = 71
+        Top = 0
+        AutoSize = True
+        Caption = #21024#38500
+        ImageIndex = 6
+        OnClick = ToolButton7Click
+      end
+    end
+  end
+  inherited ADOQueryBaseCmd: TADOQuery
+    Connection = DataLink_Company.ADOLink
+    Left = 76
+    Top = 270
+  end
+  inherited ADOQueryBaseTemp: TADOQuery
+    Connection = DataLink_Company.ADOLink
+    Left = 76
+    Top = 167
+  end
+  object ADOQueryTemp: TADOQuery
+    Connection = DataLink_Company.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 390
+    Top = 159
+  end
+  object ADOQueryCmd: TADOQuery
+    Connection = DataLink_Company.ADOLink
+    Parameters = <>
+    Left = 304
+    Top = 159
+  end
+  object ADOQueryMain: TADOQuery
+    Connection = DataLink_Company.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 208
+    Top = 159
+  end
+  object RM1: TRMGridReport
+    ThreadPrepareReport = True
+    InitialZoom = pzDefault
+    PreviewButtons = [rmpbZoom, rmpbLoad, rmpbSave, rmpbPrint, rmpbFind, rmpbPageSetup, rmpbExit, rmpbExport, rmpbNavigator]
+    DefaultCollate = False
+    ShowPrintDialog = False
+    SaveReportOptions.RegistryPath = 'Software\ReportMachine\ReportSettings\'
+    PreviewOptions.RulerUnit = rmutScreenPixels
+    PreviewOptions.RulerVisible = False
+    PreviewOptions.DrawBorder = False
+    PreviewOptions.BorderPen.Color = clGray
+    PreviewOptions.BorderPen.Style = psDash
+    Dataset = RMDB_Main
+    CompressLevel = rmzcFastest
+    CompressThread = False
+    LaterBuildEvents = True
+    OnlyOwnerDataSet = False
+    Left = 283
+    Top = 344
+    ReportData = {}
+  end
+  object RMDB_Main: TRMDBDataSet
+    Visible = True
+    DataSet = ADOQueryPrt
+    Left = 216
+    Top = 344
+  end
+  object cxGridPopupMenu2: TcxGridPopupMenu
+    Grid = cxGrid2
+    PopupMenus = <>
+    Left = 608
+    Top = 256
+  end
+  object DS_HZ: TDataSource
+    DataSet = CDS_HZ
+    Left = 283
+    Top = 267
+  end
+  object CDS_HZ: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 384
+    Top = 216
+  end
+  object PopupMenu1: TPopupMenu
+    Left = 216
+    Top = 264
+    object N1: TMenuItem
+      Caption = #20840#36873
+      OnClick = N1Click
+    end
+    object N2: TMenuItem
+      Caption = #20840#24323
+      OnClick = N2Click
+    end
+  end
+  object RMXLSExport2: TRMXLSExport
+    ShowAfterExport = False
+    ExportPrecision = 1
+    PagesOfSheet = 1
+    ExportImages = True
+    ExportFrames = True
+    ExportImageFormat = ifBMP
+    JPEGQuality = 0
+    ScaleX = 1.000000000000000000
+    ScaleY = 1.000000000000000000
+    CompressFile = False
+    Left = 396
+    Top = 344
+  end
+  object ADOQueryPrt: TADOQuery
+    Connection = DataLink_Company.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 80
+    Top = 335
+  end
+  object CDS_1: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 616
+    Top = 360
+  end
+  object DS_1: TDataSource
+    DataSet = CDS_1
+    Left = 691
+    Top = 355
+  end
+  object RMBarCodeObject1: TRMBarCodeObject
+    Left = 488
+    Top = 260
+  end
+end

A01基础公司管理/U_BMQXManage.pas

@@ -0,0 +1,347 @@
+unit U_BMQXManage;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, cxGraphics, cxCustomData, cxStyles, cxTL, cxMaskEdit, DB, ADODB,
+  cxInplaceContainer, cxDBTL, cxControls, cxTLData, ComCtrls, ToolWin, StdCtrls,
+  cxFilter, cxData, cxDataStorage, cxEdit, cxDBData, DBClient,
+  cxGridCustomTableView, cxGridTableView, cxGridDBTableView, ExtCtrls,
+  cxSplitter, cxGridLevel, cxClasses, cxGridCustomView, cxGrid,
+  cxGridCustomPopupMenu, cxGridPopupMenu, RM_Dataset, RM_System, RM_Common,
+  RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
+  IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
+  cxTextEdit, cxPC, cxCheckComboBox, cxDropDownEdit, Menus, RM_e_Xls,
+  cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, U_BaseList, dxDateRanges,
+  dxBarBuiltInMenu, RM_BarCode, dxScrollbarAnnotations, dxSkinsCore, dxSkinWXI,
+  dxSkinsDefaultPainters;
+
+type
+  TfrmBMQXManage = class(TfrmBaseList)
+    ToolBar1: TToolBar;
+    TBRafresh: TToolButton;
+    TBClose: TToolButton;
+    ADOQueryTemp: TADOQuery;
+    ADOQueryCmd: TADOQuery;
+    ToolButton2: TToolButton;
+    ADOQueryMain: TADOQuery;
+    RM1: TRMGridReport;
+    RMDB_Main: TRMDBDataSet;
+    cxGrid2: TcxGrid;
+    Tv2: TcxGridDBTableView;
+    cxGridLevel1: TcxGridLevel;
+    cxGridPopupMenu2: TcxGridPopupMenu;
+    DS_HZ: TDataSource;
+    CDS_HZ: TClientDataSet;
+    PopupMenu1: TPopupMenu;
+    N1: TMenuItem;
+    N2: TMenuItem;
+    Panel1: TPanel;
+    Udept: TEdit;
+    RMXLSExport2: TRMXLSExport;
+    Label1: TLabel;
+    v2Column12: TcxGridDBColumn;
+    ADOQueryPrt: TADOQuery;
+    Panel2: TPanel;
+    cxGrid1: TcxGrid;
+    TV1: TcxGridDBTableView;
+    cxGridDBColumn2: TcxGridDBColumn;
+    cxGridLevel2: TcxGridLevel;
+    ToolBar2: TToolBar;
+    ToolButton6: TToolButton;
+    ToolButton7: TToolButton;
+    CDS_1: TClientDataSet;
+    DS_1: TDataSource;
+    RMBarCodeObject1: TRMBarCodeObject;
+    Tv2Column1: TcxGridDBColumn;
+    procedure FormDestroy(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure TBCloseClick(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure TBRafreshClick(Sender: TObject);
+    procedure ToolButton2Click(Sender: TObject);
+    procedure cxTabControl1Change(Sender: TObject);
+    procedure N1Click(Sender: TObject);
+    procedure N2Click(Sender: TObject);
+    procedure CustomerChange(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
+    procedure ToolButton6Click(Sender: TObject);
+    procedure ToolButton7Click(Sender: TObject);
+    procedure Tv2FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean);
+  private
+    { Private declarations }
+    procedure PrintReport(FZDYNo: string);
+    procedure InitGrid();
+    procedure InitBDJT();
+  public
+    fFlag: integer;
+    { Public declarations }
+    RKFlag, FCYID, fmanage: string;
+  end;
+
+var
+  frmBMQXManage: TfrmBMQXManage;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun, U_ZDYHelp, U_QXSel;
+
+{$R *.dfm}
+procedure TfrmBMQXManage.InitBDJT();
+begin
+
+  with ADOQueryTemp do
+  begin
+    Close;
+    SQL.Clear;
+    sql.Add(' select A.* from  User_BGQX A  ');
+    sql.Add(' where UDept=' + quotedstr(trim(Self.CDS_HZ.fieldbyname('UDept').AsString)));
+    sql.Add(' AND UserName=' + quotedstr(trim(Self.CDS_HZ.fieldbyname('UserName').AsString)));
+    Open;
+  end;
+  SCreateCDS(ADOQueryTemp, CDS_1);
+  SInitCDSData(ADOQueryTemp, CDS_1);
+
+end;
+
+procedure TfrmBMQXManage.PrintReport(FZDYNo: string);
+var
+  fPrintFile, FFCYID: string;
+  i, j: Integer;
+  Txt, fImagePath: string;
+  Moudle: THandle;
+  Makebar: TMakebar;
+  Mixtext: TMixtext;
+begin
+  if CDS_HZ.IsEmpty then
+    Exit;
+
+  ExportFtErpFile('机台标签.rmf', ADOQueryTemp);
+  fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\机台标签.rmf';
+  with ADOQueryPrt do
+  begin
+    close;
+    sql.Clear;
+    sql.Add(' select * from  BS_Machine where MachId=''' + Trim(FZDYNo) + '''');
+    open;
+  end;
+  try
+    Moudle := LoadLibrary('MakeQRBarcode.dll');
+    @Makebar := GetProcAddress(Moudle, 'Make');
+    @Mixtext := GetProcAddress(Moudle, 'MixText');
+    Txt := Trim(FZDYNo);
+    fImagePath := ExtractFilePath(Application.ExeName) + 'image\temp.bmp';
+    if not DirectoryExists(pchar(ExtractFilePath(Application.ExeName) + 'image')) then
+      CreateDirectory(pchar(ExtractFilePath(Application.ExeName) + 'image'), nil);
+    if FileExists(fImagePath) then
+      DeleteFile(fImagePath);
+    Makebar(pchar(Txt), Length(Txt), 3, 3, 0, PChar(fImagePath), 3);
+  except
+    CDS_HZ.EnableControls;
+    application.MessageBox('条形码生成失败！', '提示信息', MB_ICONERROR);
+    exit;
+  end;
+  RMVariables['QRBARCODE'] := fImagePath;
+  if FileExists(fPrintFile) then
+  begin
+    RM1.LoadFromFile(fPrintFile);
+    RM1.PrintReport;
+  //  RM1.ShowReport;
+  end
+  else
+  begin
+    Application.MessageBox(PChar('没有找' + fPrintFile + '!'), '提示', 0);
+    Exit;
+  end;
+end;
+
+procedure TfrmBMQXManage.InitGrid();
+begin
+  try
+    ADOQueryMain.DisableControls;
+    with ADOQueryMain do
+    begin
+      Close;
+      SQL.Clear;
+      sql.Add(' select * from sy_user  ');
+      Open;
+    end;
+    SCreateCDS(ADOQueryMain, CDS_HZ);
+    SInitCDSData(ADOQueryMain, CDS_HZ);
+  finally
+    ADOQueryMain.EnableControls;
+    ToolButton2.Click;
+  end;
+end;
+
+procedure TfrmBMQXManage.FormDestroy(Sender: TObject);
+begin
+  inherited;
+  frmBMQXManage := nil;
+end;
+
+procedure TfrmBMQXManage.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  inherited;
+  Action := caFree;
+end;
+
+procedure TfrmBMQXManage.TBCloseClick(Sender: TObject);
+begin
+  WriteCxGrid(Trim(Self.Caption), Tv2, '机台管理');
+  Close;
+end;
+
+procedure TfrmBMQXManage.FormShow(Sender: TObject);
+begin
+  inherited;
+  ReadCxGrid(Trim(Self.Caption), Tv2, '机台管理');
+//  Enddate.DateTime:=SGetServerDate(ADOQueryTemp);
+//  begdate.DateTime:=Enddate.DateTime-30;
+  InitGrid();
+end;
+
+procedure TfrmBMQXManage.TBRafreshClick(Sender: TObject);
+begin
+  InitGrid();
+end;
+
+procedure TfrmBMQXManage.ToolButton2Click(Sender: TObject);
+var
+  sql: string;
+begin
+  if ADOQueryMain.Active then
+  begin
+    sql := SGetFilters(Panel1, 1, 2);
+    SDofilter(ADOQueryMain, sql);
+    SCreateCDS(ADOQueryMain, CDS_HZ);
+    SInitCDSData(ADOQueryMain, CDS_HZ);
+  end;
+end;
+
+procedure TfrmBMQXManage.cxTabControl1Change(Sender: TObject);
+begin
+  InitGrid;
+end;
+
+procedure TfrmBMQXManage.N1Click(Sender: TObject);
+begin
+  if CDS_HZ.IsEmpty then
+    exit;
+  with CDS_HZ do
+  begin
+    DisableControls;
+    first;
+    while not eof do
+    begin
+      edit;
+      fieldbyname('ssel').Value := true;
+      post;
+      next;
+    end;
+    First;
+    EnableControls;
+  end;
+end;
+
+procedure TfrmBMQXManage.N2Click(Sender: TObject);
+begin
+  if CDS_HZ.IsEmpty then
+    exit;
+  with CDS_HZ do
+  begin
+    DisableControls;
+    first;
+    while not eof do
+    begin
+      edit;
+      fieldbyname('ssel').Value := false;
+      post;
+      next;
+    end;
+    First;
+    EnableControls;
+  end;
+end;
+
+procedure TfrmBMQXManage.CustomerChange(Sender: TObject);
+begin
+  ToolButton2.Click;
+end;
+
+procedure TfrmBMQXManage.FormCreate(Sender: TObject);
+begin
+  inherited;
+  fmanage := Trim(DParameters1);
+end;
+
+procedure TfrmBMQXManage.ToolButton6Click(Sender: TObject);
+var
+  maxno: string;
+begin
+
+  try
+    frmQXSel := TfrmQXSel.create(self);
+    with frmQXSel do
+    begin
+      if showmodal = 1 then
+      begin
+        CDS_HZ.First;
+        while not CDS_HZ.eof do
+        begin
+          if CDS_HZ.fieldbyname('SSEL').AsBoolean then
+          begin
+            if GetLSNo(Self.ADOQueryTemp, maxno, 'QX', 'User_BGQX', 3, 1) = False then
+            begin
+              Application.MessageBox('取最大号失败!', '提示', 0);
+              Exit;
+            end;
+            with Self.ADOQueryCmd do
+            begin
+              Close;
+              sql.Clear;
+              sql.Add(' insert into User_BGQX(QXID,UDEPT,GX,UserName) ');
+              sql.Add(' values(' + quotedstr(trim(maxno)));
+              sql.Add(',' + quotedstr(trim(Self.CDS_HZ.fieldbyname('UDEPT').AsString)));
+              sql.Add(',' + quotedstr(trim(CDS_HZ.fieldbyname('PSType').AsString)));
+              sql.Add(',' + quotedstr(trim(Self.CDS_HZ.fieldbyname('UserName').AsString)));
+              sql.Add(') ');
+              ExecSQL;
+            end;
+          end;
+
+          CDS_HZ.Next;
+        end;
+      end;
+    end;
+  finally
+    frmQXSel.Free;
+    InitBDJT();
+  end;
+end;
+
+procedure TfrmBMQXManage.ToolButton7Click(Sender: TObject);
+begin
+  if CDS_1.IsEmpty then
+    Exit;
+  if Application.MessageBox('确定要删除数据吗？', '提示', 32 + 4) <> IDYES then
+    Exit;
+  with ADOQueryCmd do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('delete User_BGQX where QXID=' + QuotedStr(CDS_1.FieldByName('QXID').AsString));
+    ExecSQL;
+  end;
+  CDS_1.Delete;
+end;
+
+procedure TfrmBMQXManage.Tv2FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean);
+begin
+  InitBDJT();
+end;
+
+end.
+

A01基础公司管理/U_GetDllForm.pas

@@ -14,7 +14,7 @@ implementation
 
 uses
   U_DataLink, U_Customer, U_Factory, U_Company, U_EmployeeList, U_SYDept,
-  U_BankList, U_ModulePromptList;
+  U_BankList, U_ModulePromptList,U_BMQXManage;
 
        /////////////////////////////////////////////////////////////////
       //         功能说明:取Dll中得窗体                              //
@@ -136,6 +136,19 @@ begin
           mnewHandle := Handle;
         end;
       end;
+
+    101:  //员工报工权限管理
+      begin
+        with TfrmBMQXManage.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do       //
+        begin
+          fFormID := FormID;
+          FormStyle := mstyle;
+          WindowState := mstate;
+          BorderStyle := mborderstyle;
+          mnewHandle := Handle;
+        end;
+      end;
+
     111:  //客户管理
       begin
         with TfrmCustomer.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do       //

A01基础公司管理/U_QXSel.dfm

@@ -0,0 +1,223 @@
+object frmQXSel: TfrmQXSel
+  Left = 189
+  Top = 78
+  Caption = #26435#38480#22810#36873#26597#35810
+  ClientHeight = 519
+  ClientWidth = 524
+  Color = clWhite
+  Font.Charset = GB2312_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -12
+  Font.Name = #23435#20307
+  Font.Style = []
+  OldCreateOrder = False
+  Position = poMainFormCenter
+  WindowState = wsMaximized
+  OnClose = FormClose
+  OnDestroy = FormDestroy
+  OnShow = FormShow
+  PixelsPerInch = 96
+  TextHeight = 12
+  object ToolBar1: TToolBar
+    Left = 0
+    Top = 0
+    Width = 524
+    Height = 38
+    AutoSize = True
+    ButtonHeight = 38
+    ButtonWidth = 75
+    Caption = 'ToolBar1'
+    Color = clSkyBlue
+    DisabledImages = DataLink_Company.ImageList_new32
+    Images = DataLink_Company.ImageList_new32
+    List = True
+    ParentColor = False
+    ShowCaptions = True
+    TabOrder = 0
+    object TSsel: TToolButton
+      Left = 0
+      Top = 0
+      AutoSize = True
+      Caption = #30830#23450
+      ImageIndex = 12
+      OnClick = TSselClick
+    end
+    object TBRafresh: TToolButton
+      Left = 71
+      Top = 0
+      AutoSize = True
+      Caption = #21047#26032
+      ImageIndex = 1
+      OnClick = TBRafreshClick
+    end
+    object ToolButton2: TToolButton
+      Left = 142
+      Top = 0
+      AutoSize = True
+      Caption = #36807#28388
+      ImageIndex = 0
+      OnClick = ToolButton2Click
+    end
+    object TBClose: TToolButton
+      Left = 213
+      Top = 0
+      AutoSize = True
+      Caption = #20851#38381
+      ImageIndex = 7
+      OnClick = TBCloseClick
+    end
+  end
+  object Panel1: TPanel
+    Left = 0
+    Top = 38
+    Width = 524
+    Height = 38
+    Align = alTop
+    BevelInner = bvRaised
+    BevelOuter = bvLowered
+    Color = clSkyBlue
+    TabOrder = 1
+    ExplicitTop = 18
+    object Label1: TLabel
+      Left = 31
+      Top = 12
+      Width = 24
+      Height = 12
+      Caption = #26435#38480
+    end
+    object QXName: TEdit
+      Tag = 2
+      Left = 83
+      Top = 8
+      Width = 89
+      Height = 20
+      TabOrder = 0
+      OnChange = ZdyNameChange
+    end
+  end
+  object cxGrid2: TcxGrid
+    Left = 0
+    Top = 76
+    Width = 524
+    Height = 443
+    Align = alClient
+    TabOrder = 2
+    ExplicitTop = 72
+    object Tv2: TcxGridDBTableView
+      Navigator.Buttons.CustomButtons = <>
+      Navigator.Buttons.Delete.Enabled = False
+      Navigator.Buttons.Delete.Visible = False
+      ScrollbarAnnotations.CustomAnnotations = <>
+      DataController.DataSource = DS_HZ
+      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
+      DataController.Summary.DefaultGroupSummaryItems = <>
+      DataController.Summary.FooterSummaryItems = <
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end>
+      DataController.Summary.SummaryGroups = <>
+      OptionsBehavior.GoToNextCellOnEnter = True
+      OptionsCustomize.ColumnFiltering = False
+      OptionsData.Deleting = False
+      OptionsData.DeletingConfirmation = False
+      OptionsView.Footer = True
+      OptionsView.GroupByBox = False
+      Styles.Header = DataLink_Company.handBlack
+      Styles.Selection = DataLink_Company.SHuangSe
+      object Tv2Column1: TcxGridDBColumn
+        Caption = #36873#25321
+        DataBinding.FieldName = 'SSEL'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxCheckBoxProperties'
+        Properties.ImmediatePost = True
+        HeaderAlignmentHorz = taCenter
+        Width = 54
+      end
+      object v2PSType: TcxGridDBColumn
+        Caption = #24037#24207
+        DataBinding.FieldName = 'PSType'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxButtonEditProperties'
+        Properties.Buttons = <
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 245
+      end
+    end
+    object cxGridLevel1: TcxGridLevel
+      GridView = Tv2
+    end
+  end
+  object ADOQueryTemp: TADOQuery
+    Connection = DataLink_Company.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 789
+    Top = 9
+  end
+  object ADOQueryCmd: TADOQuery
+    Connection = DataLink_Company.ADOLink
+    Parameters = <>
+    Left = 829
+    Top = 1
+  end
+  object ADOQueryMain: TADOQuery
+    Connection = DataLink_Company.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 200
+    Top = 305
+  end
+  object RM1: TRMGridReport
+    ThreadPrepareReport = True
+    InitialZoom = pzDefault
+    PreviewButtons = [rmpbZoom, rmpbLoad, rmpbSave, rmpbPrint, rmpbFind, rmpbPageSetup, rmpbExit, rmpbExport, rmpbNavigator]
+    DefaultCollate = False
+    SaveReportOptions.RegistryPath = 'Software\ReportMachine\ReportSettings\'
+    PreviewOptions.RulerUnit = rmutScreenPixels
+    PreviewOptions.RulerVisible = False
+    PreviewOptions.DrawBorder = False
+    PreviewOptions.BorderPen.Color = clGray
+    PreviewOptions.BorderPen.Style = psDash
+    Dataset = RMDB_Main
+    CompressLevel = rmzcFastest
+    CompressThread = False
+    LaterBuildEvents = True
+    OnlyOwnerDataSet = False
+    Left = 268
+    Top = 294
+    ReportData = {}
+  end
+  object RMDB_Main: TRMDBDataSet
+    Visible = True
+    Left = 328
+    Top = 198
+  end
+  object cxGridPopupMenu2: TcxGridPopupMenu
+    Grid = cxGrid2
+    PopupMenus = <>
+    Left = 380
+    Top = 288
+  end
+  object DS_HZ: TDataSource
+    DataSet = CDS_HZ
+    Left = 271
+    Top = 183
+  end
+  object CDS_HZ: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 375
+    Top = 197
+  end
+end

A01基础公司管理/U_QXSel.pas

@@ -0,0 +1,142 @@
+unit U_QXSel;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, cxGraphics, cxCustomData, cxStyles, cxTL, cxMaskEdit, DB, ADODB,
+  cxInplaceContainer, cxDBTL, cxControls, cxTLData, ComCtrls, ToolWin, StdCtrls,
+  cxFilter, cxData, cxDataStorage, cxEdit, cxDBData, DBClient,
+  cxGridCustomTableView, cxGridTableView, cxGridDBTableView, ExtCtrls,
+  cxSplitter, cxGridLevel, cxClasses, cxGridCustomView, cxGrid,
+  cxGridCustomPopupMenu, cxGridPopupMenu, RM_Dataset, RM_System, RM_Common,
+  RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
+  IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
+  cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, 
+   dxDateRanges, dxBarBuiltInMenu, dxSkinsCore, dxSkinsDefaultPainters,
+  dxScrollbarAnnotations;
+
+type
+  TfrmQXSel = class(TForm)
+    ToolBar1: TToolBar;
+    TBRafresh: TToolButton;
+    TBClose: TToolButton;
+    ADOQueryTemp: TADOQuery;
+    ADOQueryCmd: TADOQuery;
+    Panel1: TPanel;
+    ToolButton2: TToolButton;
+    ADOQueryMain: TADOQuery;
+    RM1: TRMGridReport;
+    RMDB_Main: TRMDBDataSet;
+    cxGridPopupMenu2: TcxGridPopupMenu;
+    DS_HZ: TDataSource;
+    CDS_HZ: TClientDataSet;
+    Label1: TLabel;
+    QXName: TEdit;
+    cxGrid2: TcxGrid;
+    Tv2: TcxGridDBTableView;
+    v2PSType: TcxGridDBColumn;
+    cxGridLevel1: TcxGridLevel;
+    TSsel: TToolButton;
+    Tv2Column1: TcxGridDBColumn;
+    procedure FormDestroy(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure TBCloseClick(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure TBRafreshClick(Sender: TObject);
+    procedure ToolButton2Click(Sender: TObject);
+    procedure ZdyNameChange(Sender: TObject);
+    procedure TSselClick(Sender: TObject);
+    procedure TV1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
+  private
+    { Private declarations }
+    procedure InitGrid();
+  public
+    fDEFstr5: string;
+  end;
+
+var
+  frmQXSel: TfrmQXSel;
+
+implementation
+
+uses
+  U_DataLink, U_RTFun, U_ZDYHelp;
+
+{$R *.dfm}
+
+procedure TfrmQXSel.InitGrid();
+begin
+  try
+    ADOQueryMain.DisableControls;
+    with ADOQueryMain do
+    begin
+      Filtered := False;
+      Close;
+      SQL.Clear;
+      sql.Add(' select * from Dye_Technics ');
+      Open;
+    end;
+    SCreateCDS(ADOQueryMain, CDS_HZ);
+    SInitCDSData(ADOQueryMain, CDS_HZ);
+  finally
+    ADOQueryMain.EnableControls;
+  end;
+end;
+
+procedure TfrmQXSel.FormDestroy(Sender: TObject);
+begin
+  frmQXSel := nil;
+end;
+
+procedure TfrmQXSel.FormClose(Sender: TObject; var Action: TCloseAction);
+begin
+  Action := caFree;
+end;
+
+procedure TfrmQXSel.TBCloseClick(Sender: TObject);
+begin
+  WriteCxGrid('工序查询', Tv2, '客户自定义');
+  Close;
+end;
+
+procedure TfrmQXSel.FormShow(Sender: TObject);
+begin
+  ReadCxGrid('工序查询', Tv2, '客户自定义');
+  InitGrid();
+end;
+
+procedure TfrmQXSel.TBRafreshClick(Sender: TObject);
+begin
+  InitGrid();
+end;
+
+procedure TfrmQXSel.ToolButton2Click(Sender: TObject);
+begin
+  if ADOQueryMain.Active then
+  begin
+    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+    SCreateCDS(ADOQueryMain, CDS_HZ);
+    SInitCDSData(ADOQueryMain, CDS_HZ);
+  end;
+end;
+
+procedure TfrmQXSel.ZdyNameChange(Sender: TObject);
+begin
+  ToolButton2.Click;
+end;
+
+procedure TfrmQXSel.TSselClick(Sender: TObject);
+begin
+  if CDS_HZ.IsEmpty then
+    exit;
+  ModalResult := 1;
+end;
+
+procedure TfrmQXSel.TV1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
+begin
+  CDS_HZ.Delete;
+end;
+
+end.
+

A02基础产品管理/ClothInfo.dproj.local

@@ -9,7 +9,7 @@
     <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.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</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.472,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.480,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A00通用窗体\U_ProductInfoSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
@@ -39,14 +39,14 @@
     <Transaction>1899-12-30 00:00:00.000.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.743,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.472,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.146,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.340,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_CloInfoFileUp.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\ClothInfo.dproj</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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10sxYilanbuyi"/>

A05基础资料管理/BaseInfo.dproj.local

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.260,D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_PositionList.dfm=D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_KuWeiManage.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.260,D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_KuWeiManage.dfm=D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_PositionList.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.260,D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_PositionList.pas=D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_KuWeiManage.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.260,D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_KuWeiManage.pas=D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_PositionList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.872,D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_LbaelMapList.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.872,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_LbaelMapList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.872,D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_LbaelMapList.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.872,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_LbaelMapList.dfm</Transaction>
-    <Transaction>2025/12/26 16:33:50.878,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
+    <Transaction>2025-12-26 16:33:50.000.878,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
   </Transactions>
 </BorlandProject>

B03基础物料仓库/ProductStk.dproj.local

@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.242,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.242,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.840,=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.840,=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.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.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.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.997,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.659,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtDyeInList.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.659,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtDyeInList.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.943,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\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.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.526,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_PrtDyeInfoInPut.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.526,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_PrtDyeInfoInPut.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.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.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.233,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProductInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.233,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProductInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.048,=D:\Dp10Repo\public10\design\U_BaseList.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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.923,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\Unit1.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.923,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\Unit1.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.997,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.686,=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.486,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\ProductStk.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.486,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\ProductStk.dproj</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.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.659,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtDyeInList.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.659,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtDyeInList.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInList.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.233,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProductInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.233,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProductInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.713,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.713,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</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.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.526,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_PrtDyeInfoInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.526,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_PrtDyeInfoInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.686,=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_ProductInfoInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.943,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.495,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.495,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10sxYilanbuyi"/>

F01染色坯布仓库/DyeGreyClothStk.dproj.local

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <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.398,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.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.844,=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.394,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.pas</Transaction>
@@ -9,8 +9,8 @@
     <Transaction>1899-12-30 00:00:00.000.865,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.253,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F01染色坯布仓库\U_DyePlanForCardSel.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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.796,=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.398,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.440,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanCardSel.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.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
@@ -37,11 +37,11 @@
     <Transaction>1899-12-30 00:00:00.000.070,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMacStkSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.492,=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.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.069,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.278,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.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.069,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.394,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
   </Transactions>

F01染色坯布仓库/U_DyeGreyClothInEdit.pas

@@ -835,7 +835,7 @@ begin
   begin
     Close;
     SQL.Clear;
-    SQL.Add('select * from BS_Cloth_Info where C_Name = ' + QuotedStr(Trim(CDS_Sub.FieldByName('C_Name').Value)));
+    SQL.Add('select * from BS_Cloth_Info where C_Name = ' + QuotedStr(Trim(CDS_Sub.FieldByName('C_Name').asString)));
     Open;
   end;
   with CDS_Sub do

F01染色坯布仓库/U_DyeGreyClothInList.dfm

@@ -5,7 +5,6 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList
   ClientHeight = 543
   ClientWidth = 1284
   OnKeyDown = FormKeyDown
-  ExplicitLeft = -125
   ExplicitWidth = 1300
   ExplicitHeight = 582
   PixelsPerInch = 96
@@ -117,7 +116,6 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList
     Color = clWhite
     ParentBackground = False
     TabOrder = 1
-    ExplicitTop = 44
     object Label1: TLabel
       Left = 28
       Top = 12
@@ -231,7 +229,6 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
-    ExplicitTop = 97
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -593,5 +590,9 @@ inherited frmDyeGreyClothInList: TfrmDyeGreyClothInList
       Caption = #20840#24323
       OnClick = N2Click
     end
+    object N3: TMenuItem
+      Caption = #22797#21046
+      OnClick = N3Click
+    end
   end
 end

F01染色坯布仓库/U_DyeGreyClothInList.pas

@@ -13,7 +13,7 @@ uses
   RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxPC,
   cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters,
   cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, dxSkinWXI,
-  dxScrollbarAnnotations;
+  dxScrollbarAnnotations,Clipbrd;
 
 type
   TfrmDyeGreyClothInList = class(TfrmBaseList)
@@ -78,6 +78,7 @@ type
     Tv1finishDescription: TcxGridDBColumn;
     Tv1DlyDate: TcxGridDBColumn;
     Tv1F_description: TcxGridDBColumn;
+    N3: TMenuItem;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBRafreshClick(Sender: TObject);
@@ -98,7 +99,7 @@ type
     procedure OrderNoKeyPress(Sender: TObject; var Key: Char);
     procedure IOTypeChange(Sender: TObject);
     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
-
+    procedure N3Click(Sender: TObject);
   private
     canshu1, canshu2, canshu3, FWorkshop: string;
     procedure InitGrid();
@@ -143,8 +144,7 @@ begin
 
 end;
 
-procedure TfrmDyeGreyClothInList.FormKeyDown(Sender: TObject; var Key: Word;
+procedure TfrmDyeGreyClothInList.FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
-  Shift: TShiftState);
 begin
   if Key = VK_ESCAPE then  // VK_ESCAPE ÊÇ ESC ¼üµÄ³£Á¿
   begin
@@ -307,8 +307,6 @@ begin
   end;
 end;
 
-
-
 procedure TfrmDyeGreyClothInList.N1Click(Sender: TObject);
 begin
   SelOKNo(CDS_Main, True);
@@ -319,8 +317,12 @@ begin
   SelOKNo(CDS_Main, False);
 end;
 
-procedure TfrmDyeGreyClothInList.OrderNoKeyPress(Sender: TObject;
+procedure TfrmDyeGreyClothInList.N3Click(Sender: TObject);
-  var Key: Char);
+begin
+  Clipboard.SetTextBuf(PChar(Trim(CDS_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)));
+end;
+
+procedure TfrmDyeGreyClothInList.OrderNoKeyPress(Sender: TObject; var Key: Char);
 begin
   if Key = #13 then
   begin
@@ -444,8 +446,6 @@ begin
   end;
 end;
 
-
-
 procedure TfrmDyeGreyClothInList.cxTabControl1Change(Sender: TObject);
 begin
   InitGrid();

F01染色坯布仓库/U_DyeGreyClothOutList.dfm

@@ -595,5 +595,9 @@ inherited frmDyeGreyClothOutList: TfrmDyeGreyClothOutList
       Caption = #20840#24323
       OnClick = N2Click
     end
+    object N3: TMenuItem
+      Caption = #22797#21046
+      OnClick = N3Click
+    end
   end
 end

F01染色坯布仓库/U_DyeGreyClothOutList.pas

@@ -12,7 +12,7 @@ uses
   cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset,
   RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxPC,
   cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters,
-  cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList,
+  cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList,Clipbrd,
   dxScrollbarAnnotations;
 
 type
@@ -79,6 +79,7 @@ type
     v1Column12: TcxGridDBColumn;
     cxGrid2Level1: TcxGridLevel;
     Tv1F_description: TcxGridDBColumn;
+    N3: TMenuItem;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -99,6 +100,7 @@ type
     procedure ToolButton2Click(Sender: TObject);
     procedure OrderNoKeyPress(Sender: TObject; var Key: Char);
     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
+    procedure N3Click(Sender: TObject);
   private
     canshu1, canshu2, FWorkshop: string;
     procedure InitGrid();
@@ -305,6 +307,11 @@ begin
   SelOKNo(CDS_Main, False);
 end;
 
+procedure TfrmDyeGreyClothOutList.N3Click(Sender: TObject);
+begin
+  Clipboard.SetTextBuf(PChar(Trim(CDS_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)));
+end;
+
 procedure TfrmDyeGreyClothOutList.OrderNoKeyPress(Sender: TObject;
   var Key: Char);
 begin

F01染色坯布仓库/U_DyeGreyClothStkList.dfm

@@ -454,6 +454,10 @@ inherited frmDyeGreyClothStkList: TfrmDyeGreyClothStkList
   object PopupMenu1: TPopupMenu
     Left = 368
     Top = 240
+    object N1: TMenuItem
+      Caption = #22797#21046
+      OnClick = N1Click
+    end
   end
   object ADOQueryTmp: TADOQuery
     Connection = DataLink_DyeGreyClothStk.ADOLink

F01染色坯布仓库/U_DyeGreyClothStkList.pas

@@ -12,7 +12,7 @@ uses
   cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset,
   RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit,
   cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters,
-  cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList,
+  cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList,Clipbrd,
   dxScrollbarAnnotations;
 
 type
@@ -63,6 +63,7 @@ type
     Tv1Note: TcxGridDBColumn;
     TbExport: TToolButton;
     Tv1F_description: TcxGridDBColumn;
+    N1: TMenuItem;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBRafreshClick(Sender: TObject);
@@ -83,6 +84,7 @@ type
     procedure TbExportClick(Sender: TObject);
     procedure OrderNoKeyPress(Sender: TObject; var Key: Char);
     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
+    procedure N1Click(Sender: TObject);
   private
     procedure InitGrid();
     { Private declarations }
@@ -203,6 +205,11 @@ begin
   TBFind.Click;
 end;
 
+procedure TfrmDyeGreyClothStkList.N1Click(Sender: TObject);
+begin
+  Clipboard.SetTextBuf(PChar(Trim(CDS_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)));
+end;
+
 procedure TfrmDyeGreyClothStkList.OrderNoKeyPress(Sender: TObject;
   var Key: Char);
 begin

F01染色坯布仓库/U_DyePlanForCardSel.dfm

@@ -186,7 +186,6 @@ object frmProductOrderListSel: TfrmProductOrderListSel
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
-    ExplicitTop = 109
     object Tv1: TcxGridDBTableView
       OnDblClick = Tv1DblClick
       Navigator.Buttons.CustomButtons = <>

F01染色坯布仓库/U_DyePlanForCardSel.pas

@@ -165,7 +165,7 @@ begin
     v1Column4.Visible := False;
     v1Column4.Hidden := True;
   end;
-//  InitGrid();
+  InitGrid();
 end;
 
 procedure TfrmProductOrderListSel.ToolButton1Click(Sender: TObject);

F02染色计划单/DyePlan.dproj.local

@@ -1,67 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <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.327,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.934,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.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.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.pas</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.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.625,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelpSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.291,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\A00通用窗体\U_ProductInfoSel.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.875,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.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.934,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.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.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.459,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_DyeTechnicsinputKaika.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.017,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeGreyClothStkSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.613,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_DyeSimpleTechnicsKaiKa.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.577,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.017,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeGreyClothStkSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.459,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_DyeTechnicsinputKaika.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.188,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanCardSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.621,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_DyeProcessDefin.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.037,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_Cust_Cloth_PSC.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.362,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.359,D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.dfm</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.943,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_DyeSimpleTechnicsList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.722,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeGreyClothOutSel.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.495,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeProcessList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.986,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\DyePlan.dproj=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\InformationBase.dproj</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.577,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.722,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeGreyClothOutSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.352,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_framePDList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.782,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.943,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_DyeSimpleTechnicsList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.495,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeProcessList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.014,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.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.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm</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.986,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\DyePlan.dproj</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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.571,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.dfm</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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.571,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.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.359,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.dfm=D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.782,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.dfm</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.058,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeTechnicsSel.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.905,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput1.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.046,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeProcessSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.531,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsList.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeTechnicsinput.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.383,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F02染色计划单\U_CraftSel.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.359,D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.344,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.pas=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanCardInput.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.819,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeInspSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.058,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyeTechnicsSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.855,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList1.dfm=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanList.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.213,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyeCardInput.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.286,=D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.359,D:\Dp10Repo\项目代码\RTBasics\F02染色计划单\U_DyePlanInPut.pas=D:\Dp10Repo\项目代码\傲唐\财务管理(Financial.dll)\U_YWTCInPut.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">

F02染色计划单/SpliterPosition.INI

@@ -3,4 +3,4 @@ Position1=804
 Position2=1025
 
 [DyeTechnicsList_Spliter]
-Position=1219
+Position=1481

F02染色计划单/U_DyePlanCardInput.dfm

@@ -174,7 +174,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
             end
             object PCType: TComboBox
               Left = 683
-              Top = 10
+              Top = 8
               Width = 93
               Height = 20
               Font.Charset = GB2312_CHARSET
@@ -186,6 +186,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
               ParentFont = False
               TabOrder = 3
               Text = #26679#24067#21345
+              OnChange = PCTypeChange
               Items.Strings = (
                 #27491#24120#21345
                 #26679#24067#21345
@@ -396,7 +397,6 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
               Font.Name = #23435#20307
               Font.Style = [fsBold]
               ParentFont = False
-              Visible = False
             end
             object Label8: TLabel
               Left = 43
@@ -425,6 +425,19 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
               ParentFont = False
               Visible = False
             end
+            object Label35: TLabel
+              Left = 894
+              Top = 75
+              Width = 52
+              Height = 12
+              Caption = #22383#24067#21517#31216
+              Font.Charset = GB2312_CHARSET
+              Font.Color = clMaroon
+              Font.Height = -12
+              Font.Name = #23435#20307
+              Font.Style = [fsBold]
+              ParentFont = False
+            end
             object OrderNo: TBtnEditA
               Tag = 2
               Left = 101
@@ -574,7 +587,6 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
               Font.Style = []
               ParentFont = False
               TabOrder = 9
-              Visible = False
             end
             object CINote: TEdit
               Tag = 2
@@ -619,6 +631,20 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
               ParentFont = False
               TabOrder = 12
             end
+            object F_Name: TEdit
+              Tag = 2
+              Left = 952
+              Top = 71
+              Width = 201
+              Height = 20
+              Font.Charset = GB2312_CHARSET
+              Font.Color = clBlue
+              Font.Height = -12
+              Font.Name = #23435#20307
+              Font.Style = []
+              ParentFont = False
+              TabOrder = 13
+            end
           end
           object cxGrid2: TcxGrid
             Left = 0
@@ -634,7 +660,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
             ParentFont = False
             PopupMenu = PM_2
             TabOrder = 2
-            ExplicitLeft = -1
+            ExplicitTop = 5
             object TV2: TcxGridDBTableView
               OnDblClick = TV2DblClick
               Navigator.Buttons.CustomButtons = <>
@@ -819,6 +845,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
             Color = clWhite
             ParentBackground = False
             TabOrder = 0
+            ExplicitTop = 420
             object Label20: TLabel
               Left = 594
               Top = 58
@@ -1014,6 +1041,47 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
               Font.Style = []
               ParentFont = False
             end
+            object Label33: TLabel
+              Left = 343
+              Top = 12
+              Width = 59
+              Height = 12
+              Caption = #20135#21697#24037#24207'2'
+              Font.Charset = GB2312_CHARSET
+              Font.Color = clMaroon
+              Font.Height = -12
+              Font.Name = #23435#20307
+              Font.Style = [fsBold]
+              ParentFont = False
+              Visible = False
+            end
+            object Label34: TLabel
+              Left = 833
+              Top = 11
+              Width = 54
+              Height = 12
+              Caption = #24037#33402#20027#38190'2'
+              Font.Charset = GB2312_CHARSET
+              Font.Color = clBlack
+              Font.Height = -12
+              Font.Name = #23435#20307
+              Font.Style = []
+              ParentFont = False
+              Visible = False
+            end
+            object Label36: TLabel
+              Left = 1277
+              Top = 21
+              Width = 48
+              Height = 12
+              Caption = #22383#24067#21517#31216
+              Font.Charset = GB2312_CHARSET
+              Font.Color = clBlack
+              Font.Height = -12
+              Font.Name = #23435#20307
+              Font.Style = []
+              ParentFont = False
+            end
             object TbAbnormalKaiKa: TButton
               Left = 501
               Top = 51
@@ -1091,7 +1159,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
             end
             object AbnormalKaZu: TBtnEditA
               Left = 720
-              Top = 50
+              Top = 54
               Width = 224
               Height = 30
               TabOrder = 5
@@ -1171,21 +1239,21 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
             object PCType1: TComboBox
               Left = 127
               Top = 17
-              Width = 93
+              Width = 130
               Height = 20
               Font.Charset = GB2312_CHARSET
               Font.Color = clWindowText
               Font.Height = -12
               Font.Name = #23435#20307
               Font.Style = []
-              ItemIndex = 0
               ParentFont = False
               TabOrder = 11
-              Text = #27491#24120#21345
+              Text = #27491#24120#21345'+'#27491#24120#21345
+              OnChange = PCType1Change
               Items.Strings = (
-                #27491#24120#21345
+                #27491#24120#21345'+'#27491#24120#21345
-                #26679#24067#21345
+                #27491#24120#21345'+'#20869#22238#20462
-                #22806#22238#20462)
+                #20869#22238#20462'+'#20869#22238#20462)
             end
             object DTMPSlist1: TBtnEditA
               Left = 1027
@@ -1216,6 +1284,52 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
               ParentFont = False
               TabOrder = 13
             end
+            object DTMPSlist2: TBtnEditA
+              Left = 409
+              Top = 7
+              Width = 414
+              Height = 20
+              Font.Charset = GB2312_CHARSET
+              Font.Color = clBlue
+              Font.Height = -12
+              Font.Name = #23435#20307
+              Font.Style = []
+              ParentFont = False
+              ReadOnly = True
+              TabOrder = 14
+              Visible = False
+              OnBtnClick = DTMPSlist1BtnClick
+            end
+            object DTMID2: TEdit
+              Tag = 2
+              Left = 893
+              Top = 6
+              Width = 80
+              Height = 20
+              Font.Charset = GB2312_CHARSET
+              Font.Color = clBlack
+              Font.Height = -12
+              Font.Name = #23435#20307
+              Font.Style = []
+              ParentFont = False
+              TabOrder = 15
+              Visible = False
+            end
+            object F_Name1: TEdit
+              Tag = 2
+              Left = 1331
+              Top = 14
+              Width = 110
+              Height = 20
+              Font.Charset = GB2312_CHARSET
+              Font.Color = clBlack
+              Font.Height = -12
+              Font.Name = #23435#20307
+              Font.Style = []
+              ParentFont = False
+              ReadOnly = True
+              TabOrder = 16
+            end
           end
           object cxGrid3: TcxGrid
             Left = 0
@@ -1757,6 +1871,7 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
           AutoSize = True
           Caption = #24037#24207#23450#20041
           ImageIndex = 2
+          Visible = False
           OnClick = ToolButton1Click
         end
         object ToolButton2: TToolButton
@@ -1806,8 +1921,8 @@ inherited frmDyePlanCardInput: TfrmDyePlanCardInput
   object ADO_Car: TADOQuery
     Connection = DataLink_DyePlan.ADOLink
     Parameters = <>
-    Left = 216
+    Left = 296
-    Top = 553
+    Top = 481
   end
   object ADOQueryCmd: TADOQuery
     Connection = DataLink_DyePlan.ADOLink

F02染色计划单/U_DyePlanCardInput.pas

@@ -194,6 +194,14 @@ type
     Tv3note: TcxGridDBColumn;
     TV2note: TcxGridDBColumn;
     TbKaiKa: TButton;
+    DTMPSlist2: TBtnEditA;
+    Label33: TLabel;
+    Label34: TLabel;
+    DTMID2: TEdit;
+    Label35: TLabel;
+    F_Name: TEdit;
+    Label36: TLabel;
+    F_Name1: TEdit;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -229,8 +237,11 @@ type
     procedure PCPiece1Change(Sender: TObject);
     procedure PCQty1Change(Sender: TObject);
     procedure TbKaiKaClick(Sender: TObject);
+    procedure PCTypeChange(Sender: TObject);
+    procedure PCType1Change(Sender: TObject);
   private
     FC_Code: string;
+    FDTMID1, FDTMPSlist1: string;
     FRollNum: integer;
     FGC_BatchNo, FGC_Piece, FGC_STKID, FGC_Position: string;
     FFromCoNo, FFromCoName, FSaleser, FC_Name, fbzunit: string;
@@ -242,7 +253,6 @@ type
     { Private declarations }
     procedure ShowDistributionResult(cardCount: Integer; pieceArray, qtyArray: array of Double);
     procedure CalculateDistribution(totalValue: Double; cardCount: Integer; var resultArray: array of Double);
-
   public
     FWorkshop, FPCIDS, FMainID: string;
 
@@ -341,7 +351,7 @@ begin
       SQL.Add(' ,SUM(A.StkQty) as StkQty, SUM(A.StkPiece) as StkPiece ,A.note');
       sql.add(' ,B.custNo,B.CustName,B.MainID');
       SQL.Add(' ,C.C_Name,C.C_Code,C.C_Width,C.C_GramWeight,C.C_COLOR,C.C_COLORNO ');
-      SQL.Add(' ,C.F_Name,C.F_Width,C.Material,C.CINote,b.C_description,C.DTMID ');
+      SQL.Add(' ,A.F_Name,C.F_Width,C.Material,C.CINote,b.C_description,C.DTMID ');
       sql.Add(' from BS_Cloth_IO A left join Dye_Plan_Main B on A.OrderNo= B.OrderNo ');
       SQL.Add(' left join BS_Cloth_Info C on C.C_Name=B.C_Name');
       SQL.Add(' where isnull(A.STKName,'''')=''染色坯布'' and A.IOFlag=''入库''   ');
@@ -353,7 +363,7 @@ begin
       end;
       SQL.Add(' group by A.OrderNo,A.QtyUnit,A.ioType,A.note,B.custNo,B.CustName,B.MainID');
       SQL.Add(' ,C.C_Name,C.C_Code,C.C_Width,C.C_GramWeight,C.C_COLOR,C.C_COLORNO');
-      SQL.Add(' ,C.F_Name,C.F_Width,C.Material,C.CINote,B.C_description,C.DTMID ');
+      SQL.Add(' ,A.F_Name,C.F_Width,C.Material,C.CINote,B.C_description,C.DTMID ');
 //      ShowMessage(sql.Text);
       Open;
     end;
@@ -384,6 +394,7 @@ begin
       SQL.Add(' and A.IOFlag=''入库''   ');
 //      SQL.Add(' and EXISTS(select * from [dbo].[F_Tool_SplitString](' + quotedstr(FGC_STKID) + ','','' ) X where X.RTValue=A.StkId AND ISNULL(RTValue,'''')<>'''')  ');
       SQL.Add(' and A.OrderNo= ' + QuotedStr(trim(OrderNo.Text)));
+      SQL.Add(' and A.F_Name= ' + QuotedStr(trim(F_Name.Text)));
 //      ShowMessage(sql.Text);
       Open;
     end;
@@ -477,7 +488,7 @@ begin
       SQL.Add(' ,SUM(A.StkQty) as StkQty, SUM(A.StkPiece) as StkPiece ,A.note');
       sql.add(' ,B.custNo,B.CustName,B.MainID');
       SQL.Add(' ,C.C_Name,C.C_Code,C.C_Width,C.C_GramWeight,C.C_COLOR,C.C_COLORNO ');
-      SQL.Add(' ,C.F_Name,C.F_Width,C.Material,C.CINote,b.C_description,C.DTMID ');
+      SQL.Add(' ,A.F_Name,C.F_Width,C.Material,C.CINote,b.C_description,C.DTMID ');
       sql.Add(' from BS_Cloth_IO A left join Dye_Plan_Main B on A.OrderNo= B.OrderNo ');
       SQL.Add(' left join BS_Cloth_Info C on C.C_Name=B.C_Name');
       SQL.Add(' where isnull(A.STKName,'''')=''染色坯布'' and A.IOFlag=''入库''   ');
@@ -485,6 +496,7 @@ begin
       if trim(OrderNo1.Text) <> '' then
       begin
         SQL.Add(' and A.OrderNo= ' + QuotedStr(trim(OrderNo1.Text)));
+        SQL.Add(' and A.F_Name= ' + QuotedStr(trim(F_Name1.Text)));
       end;
       SQL.Add(' group by A.OrderNo,A.QtyUnit,A.ioType,A.note,B.custNo,B.CustName,B.MainID');
       SQL.Add(' ,C.C_Name,C.C_Code,C.C_Width,C.C_GramWeight,C.C_COLOR,C.C_COLORNO');
@@ -499,7 +511,24 @@ begin
     begin
       Application.MessageBox('未设置默认工序！', '提示信息', MB_OK);
     end;
+    FDTMID1 := ADO_PB.FieldByName('DTMID').AsString;
+
+    if PCType1.text = '正常卡+正常卡' then
+    begin
       DTMID1.Text := ADO_PB.FieldByName('DTMID').AsString;
+      DTMID2.Text := ADO_PB.FieldByName('DTMID').AsString;
+    end
+    else if PCType1.text = '正常卡+内回修' then
+    begin
+      DTMID1.Text := ADO_PB.FieldByName('DTMID').AsString;
+      DTMID2.Text := 'GY260407009';
+    end
+    else if PCType1.text = '内回修+内回修' then
+    begin
+      DTMID1.Text := 'GY260407009';
+      DTMID2.Text := 'GY260407009';
+    end;
+
     with ADOQueryCmd do
     begin
       Close;
@@ -507,7 +536,22 @@ begin
       SQL.Add(' select * from Dye_Technics_Main where DTMID = ' + QuotedStr(Trim(DTMID1.Text)));
       Open;
     end;
+    FDTMPSlist1 := ADOQueryCmd.FieldByName('DTMPSlist').AsString;
+    if PCType1.text = '正常卡+正常卡' then
+    begin
       DTMPSlist1.Text := ADOQueryCmd.FieldByName('DTMPSlist').AsString;
+      DTMPSlist2.Text := ADOQueryCmd.FieldByName('DTMPSlist').AsString;
+    end
+    else if PCType1.text = '正常卡+内回修' then
+    begin
+      DTMPSlist1.Text := ADOQueryCmd.FieldByName('DTMPSlist').AsString;
+      DTMPSlist2.Text := '1.定型回修';
+    end
+    else if PCType1.text = '内回修+内回修' then
+    begin
+      DTMPSlist1.Text := '1.定型回修';
+      DTMPSlist2.Text := '1.定型回修';
+    end;
 
     with ADO_PB do
     begin
@@ -519,6 +563,7 @@ begin
       SQL.Add(' and A.IOFlag=''入库''   ');
 //      SQL.Add(' and EXISTS(select * from [dbo].[F_Tool_SplitString](' + quotedstr(FGC_STKID) + ','','' ) X where X.RTValue=A.StkId AND ISNULL(RTValue,'''')<>'''')  ');
       SQL.Add(' and A.OrderNo= ' + QuotedStr(trim(OrderNo1.Text)));
+      SQL.Add(' and A.F_Name= ' + QuotedStr(trim(F_Name1.Text)));
 //      ShowMessage(sql.Text);
       Open;
     end;
@@ -544,26 +589,39 @@ begin
 end;
 
 procedure TfrmDyePlanCardInput.MenuItem1Click(Sender: TObject);
+var
+  topIndex: Integer;
 begin
+  topIndex := tv1.Controller.TopRowIndex;
   SelOKNo(CDS_1, True);
-
+  tv1.Controller.TopRowIndex := topIndex;
 end;
 
 procedure TfrmDyePlanCardInput.MenuItem2Click(Sender: TObject);
+var
+  topIndex: Integer;
 begin
+  topIndex := tv1.Controller.TopRowIndex;
   SelOKNo(CDS_1, False);
-
+  tv1.Controller.TopRowIndex := topIndex;
 end;
 
 procedure TfrmDyePlanCardInput.N1Click(Sender: TObject);
+var
+  topIndex: Integer;
 begin
+  topIndex := tv1.Controller.TopRowIndex;
   SelOKNo(CDS_2, True);
-
+  tv1.Controller.TopRowIndex := topIndex;
 end;
 
 procedure TfrmDyePlanCardInput.N2Click(Sender: TObject);
+var
+  topIndex: Integer;
 begin
-  SelOKNo(CDS_2, False);
+  topIndex := tv1.Controller.TopRowIndex;
+  SelOKNo(CDS_2, false);
+  tv1.Controller.TopRowIndex := topIndex;
 end;
 
 procedure TfrmDyePlanCardInput.N3Click(Sender: TObject);
@@ -578,9 +636,12 @@ begin
 end;
 
 procedure TfrmDyePlanCardInput.N5Click(Sender: TObject);
+var
+  topIndex: Integer;
 begin
+  topIndex := tv1.Controller.TopRowIndex;
   SelOKNo(CDS_3, false);
-
+  tv1.Controller.TopRowIndex := topIndex;
 end;
 
 procedure TfrmDyePlanCardInput.N6Click(Sender: TObject);
@@ -626,7 +687,6 @@ begin
 //      close;
 //      sql.Clear;
 //      sql.Add('exec P_OrderCR');
-
 //    ShowMessage(sql.Text);
 //      execsql;
 //    end;
@@ -659,10 +719,55 @@ begin
   PCQty2.Text := IntToStr(StrToInt(KaZuQty.Text) - StrToInt(PCQty1.Text));
 end;
 
-procedure TfrmDyePlanCardInput.q1Click(Sender: TObject);
+procedure TfrmDyePlanCardInput.PCType1Change(Sender: TObject);
 begin
-  SelOKNo(CDS_3, True);
+  if PCType1.text = '正常卡+正常卡' then
+  begin
+    DTMID1.Text := FDTMID1;
+    DTMID2.Text := FDTMID1;
+    DTMPSlist1.Text := FDTMPSlist1;
+    DTMPSlist2.Text := FDTMPSlist1;
 
+  end
+  else if PCType1.text = '正常卡+内回修' then
+  begin
+    DTMID1.Text := FDTMID1;
+    DTMPSlist1.Text := FDTMPSlist1;
+    DTMID2.Text := 'GY260407009';
+    DTMPSlist2.Text := '1.定型回修';
+  end
+  else if PCType1.text = '内回修+内回修' then
+  begin
+    DTMID1.Text := 'GY260407009';
+    DTMPSlist1.Text := '1.定型回修';
+    DTMID2.Text := 'GY260407009';
+    DTMPSlist2.Text := '1.定型回修';
+  end;
+
+end;
+
+procedure TfrmDyePlanCardInput.PCTypeChange(Sender: TObject);
+begin
+  if PCType.text = '外回修' then
+  begin
+    Self.DTMPSlist.Text := '1.定型回修';
+    Self.DTMID.Text := 'GY260407009';
+  end
+  else
+  begin
+    Self.DTMPSlist.Text := '';
+    Self.DTMID.Text := '';
+  end;
+
+end;
+
+procedure TfrmDyePlanCardInput.q1Click(Sender: TObject);
+var
+  topIndex: Integer;
+begin
+  topIndex := tv1.Controller.TopRowIndex;
+  SelOKNo(CDS_3, True);
+  tv1.Controller.TopRowIndex := topIndex;
 end;
 
 //procedure TfrmDyePlanCardInput.PCIDKeyPress(Sender: TObject; var Key: Char);
@@ -729,6 +834,9 @@ begin
         begin
           Self.DTMPSlist1.Text := frmCraftSel.CDS_1.FieldByName('DTMPSlist').Value;
           Self.DTMID1.Text := frmCraftSel.CDS_1.FieldByName('DTMID').Value;
+
+          Self.FDTMID1 := frmCraftSel.CDS_1.FieldByName('DTMID').Value;
+          Self.FDTMPSlist1 := frmCraftSel.CDS_1.FieldByName('DTMPSlist').Value;
         end;
       end;
     end;
@@ -777,10 +885,10 @@ begin
       KaZuPiece.Text := frmDye_AbnormalCardSel.CDS_1.FieldByName('PCPiece').AsString;
       KaZuQty.Text := frmDye_AbnormalCardSel.CDS_1.FieldByName('PCQty').AsString;
       OrderNo1.Text := frmDye_AbnormalCardSel.CDS_1.FieldByName('OrderNo').AsString;
+      F_Name1.Text := frmDye_AbnormalCardSel.CDS_1.FieldByName('F_Name').AsString;
 //      fmainID := Order_Main.fieldbyname('mainID').asstring;
 //      fC_Code := Order_Main.fieldbyname('C_Code').asstring;
 //      fC_name := Order_Main.fieldbyname('C_name').asstring;
-
 //      InitOrder();
       InitGreyClothStk1();
 //      if CDS_2.IsEmpty then
@@ -896,6 +1004,7 @@ begin
         FieldByName('C_Name').Value := trim(FC_Name);
         FieldByName('C_Code').Value := trim(FC_Code);
         FieldByName('C_GramWeight').Value := trim(C_GramWeight.Text);
+        FieldByName('F_Name').Value := trim(F_Name.Text);
         FieldByName('C_Width').Value := trim(C_Width.Text);
         FieldByName('C_Color').Value := trim(C_Color.Text);
         FieldByName('PCUnit').Value := trim(OrdUnit.Text);
@@ -1030,6 +1139,7 @@ var
   pieceArray1, pieceArray2: array of Double;
   qtyArray1, qtyArray2: array of Double;
   mQRCode: string;
+  HXmaxNo: string;
 begin
 
   // 验证输入
@@ -1082,12 +1192,56 @@ begin
 //    exit;
 //  end;
 //
-  if DTMPSlist1.Text = '' then
+  if (DTMPSlist1.Text = '') or (DTMPSlist2.Text = '') then
   begin
     application.MessageBox('产品工序不能为空！', '提示信息', MB_OK);
     exit;
   end;
 
+
+  //回修卡特殊设置回修工艺
+  if PCType1.text <> '正常卡+正常卡' then
+  begin
+    with ADOQueryTmp do
+    begin
+      Close;
+      SQL.Clear;
+      sql.Add(' select * from Bs_Cloth_Dye_Technics where C_Code = ' + QuotedStr(trim(CDS_3.FieldByName('C_Code').AsString)));
+      sql.Add(' and DTMID = ''GY260407009'' ');
+      Open;
+    end;
+    if ADOQueryTmp.IsEmpty then
+    begin
+      if GetLSNo(ADOQueryCmd, HXmaxNo, 'CG', 'Dye_Plan_Glide', 4, 1) = False then
+      begin
+        Application.MessageBox('取最大号失败!', '提示', 0);
+        Exit;
+      end;
+
+      with ADOQueryCmd do
+      begin
+        Close;
+        sql.Clear;
+        sql.Add(' INSERT into Bs_Cloth_Dye_Technics(BCIID,TechnicsID,DTMID,C_Name,C_Code,DTMNo,DTMName,DTMPSlist,F_Name) ');
+        sql.Add(' VALUES(' + QuotedStr(Trim(CDS_3.FieldByName('C_Code').AsString)));       //BCIID
+        SQL.Add(' ,' + QuotedStr(Trim(HXmaxNo)));         // TechnicsID
+        SQL.Add(' ,''GY260407009'' ');               // DTMID
+        SQL.Add(' ,' + QuotedStr(Trim(CDS_3.FieldByName('C_Name').AsString)));     //C_Name
+        SQL.Add(' ,' + QuotedStr(Trim(CDS_3.FieldByName('C_Code').AsString)));   //C_Code
+        SQL.Add(' ,''定型回修'' ');              // DTMNo
+        SQL.Add(' ,''定型回修'' ');               // DTMName
+        SQL.Add(' ,''1.定型回修'' ');               //  DTMPSlist
+        SQL.Add(' ,' + QuotedStr(Trim(CDS_3.FieldByName('F_Name').AsString)) + ')');     // F_Name
+//        SQL.Add(' ,' + QuotedStr(Trim(CDS_2.FieldByName('F_Code').AsString)) + ')');        // F_Code
+        ExecSQL;
+      end;
+    end;
+  end;
+
+
+
+
+
   // 获取车数
   if strtointdef(trim(carNum1.text), 0) <= 1 then
     k := 1
@@ -1201,16 +1355,46 @@ begin
         FieldByName('Mainid').Value := Trim(CDS_3.FieldByName('MainID').AsString);
         FieldByName('Filler').Value := trim(DName);
         FieldByName('Workshop').Value := trim(FWorkshop);
-        FieldByName('PCType').Value := trim(PCType1.Text);
+
         FieldByName('PCID').Value := trim(maxId);
 
         if i > k - 1 then
         begin
           FieldByName('KaZu').Value := trim(KZmaxID2);
+          FieldByName('DTMPSlist').Value := trim(DTMPSlist2.Text);
+          FieldByName('DTMID').Value := Trim(DTMID2.Text);
+          if PCType1.Text = '正常卡+正常卡' then
+          begin
+            FieldByName('PCType').Value := trim('正常卡');
+          end
+          else if PCType1.Text = '正常卡+内回修' then
+          begin
+            FieldByName('PCType').Value := trim('内回修');
+          end
+          else if PCType1.Text = '内回修+内回修' then
+          begin
+            FieldByName('PCType').Value := trim('内回修');
+          end;
+
         end
         else
         begin
           FieldByName('KaZu').Value := trim(KZmaxID);
+          FieldByName('DTMPSlist').Value := trim(DTMPSlist1.Text);
+          FieldByName('DTMID').Value := Trim(DTMID1.Text);
+          if PCType1.Text = '正常卡+正常卡' then
+          begin
+            FieldByName('PCType').Value := trim('正常卡');
+          end
+          else if PCType1.Text = '正常卡+内回修' then
+          begin
+            FieldByName('PCType').Value := trim('正常卡');
+          end
+          else if PCType1.Text = '内回修+内回修' then
+          begin
+            FieldByName('PCType').Value := trim('内回修');
+          end;
+
         end;
 
 //        FieldByName('PCTime').Value := formatdateTime('yyyy-MM-dd', PCTime.DateTime);
@@ -1219,8 +1403,7 @@ begin
 //        FieldByName('GC_Piece').Value := trim(FGC_Piece);
         FieldByName('GC_STKID').Value := trim(FGC_STKID);
 //        FieldByName('GC_Position').Value := trim(FGC_Position);
-        FieldByName('DTMPSlist').Value := trim(DTMPSlist1.Text);
+
-        FieldByName('DTMID').Value := Trim(DTMID1.Text);
         FieldByName('C_description').Value := Trim(CDS_3.FieldByName('C_description').AsString);
 
 //        FieldByName('bzunit').Value := trim(Fbzunit);
@@ -1228,6 +1411,7 @@ begin
         FieldByName('CustName').Value := Trim(CDS_3.FieldByName('CustName').AsString);
 //        FieldByName('Saleser').Value := trim(FSaleser);
         FieldByName('C_Name').Value := Trim(CDS_3.FieldByName('C_Name').AsString);
+        FieldByName('F_Name').Value := Trim(CDS_3.FieldByName('F_Name').AsString);
         FieldByName('C_Code').Value := Trim(CDS_3.FieldByName('C_Code').AsString);
         FieldByName('C_GramWeight').Value := Trim(CDS_3.FieldByName('C_GramWeight').AsString);
         FieldByName('C_Width').Value := Trim(CDS_3.FieldByName('C_Width').AsString);
@@ -1254,7 +1438,7 @@ begin
         FieldByName('QRCode').Value := trim(mQRCode);
         FieldByName('PrtCount').Value := 0;
 
-        FieldByName('FromPCID').Value := AbnormalKaZu.Text;//À´×Ô¿¨×éºÅ
+        FieldByName('FromPCID').Value := AbnormalKaZu.Text; //来自卡组号
 
         post;
       end;
@@ -1322,7 +1506,7 @@ begin
       sql.add(',@dname=' + QuotedStr(trim(dname)));
       SQL.Add(',@C_Name=' + QuotedStr(Trim(CDS_3.FieldByName('C_Name').AsString)));
       SQL.Add(',@OrderNo=' + QuotedStr(Trim(OrderNo1.Text)));
-      SQL.Add(',@DTMID=' + QuotedStr(Trim(DTMID1.Text)));
+      SQL.Add(',@DTMID=' + QuotedStr(Trim(DTMID2.Text)));
       execsql;
     end;
 
@@ -1356,7 +1540,48 @@ begin
 end;
 
 procedure TfrmDyePlanCardInput.TbKaiKaClick(Sender: TObject);
+var
+  HXmaxNo: string;
 begin
+  //回修卡特殊设置回修工艺
+  if PCType.text = '外回修' then
+  begin
+    with ADOQueryTmp do
+    begin
+      Close;
+      SQL.Clear;
+      sql.Add(' select * from Bs_Cloth_Dye_Technics where C_Code = ' + QuotedStr(trim(FC_Code)));
+      sql.Add(' and DTMID = ''GY260407009'' ');
+      Open;
+    end;
+    if ADOQueryTmp.IsEmpty then
+    begin
+      if GetLSNo(ADOQueryCmd, HXmaxNo, 'CG', 'Dye_Plan_Glide', 4, 1) = False then
+      begin
+        Application.MessageBox('取最大号失败!', '提示', 0);
+        Exit;
+      end;
+
+      with ADOQueryCmd do
+      begin
+        Close;
+        sql.Clear;
+        sql.Add(' INSERT into Bs_Cloth_Dye_Technics(BCIID,TechnicsID,DTMID,C_Name,C_Code,DTMNo,DTMName,DTMPSlist,F_Name) ');
+        sql.Add(' VALUES(' + QuotedStr(Trim(FC_Code)));       //BCIID
+        SQL.Add(' ,' + QuotedStr(Trim(HXmaxNo)));         // TechnicsID
+        SQL.Add(' ,''GY260407009'' ');               // DTMID
+        SQL.Add(' ,' + QuotedStr(Trim(C_Name.Text)));     //C_Name
+        SQL.Add(' ,' + QuotedStr(Trim(FC_Code)));   //C_Code
+        SQL.Add(' ,''定型回修'' ');              // DTMNo
+        SQL.Add(' ,''定型回修'' ');               // DTMName
+        SQL.Add(' ,''1.定型回修'' ');               //  DTMPSlist
+        SQL.Add(' ,' + QuotedStr(Trim(CDS_2.FieldByName('F_Name').AsString)) + ')');     // F_Name
+//        SQL.Add(' ,' + QuotedStr(Trim(CDS_2.FieldByName('F_Code').AsString)) + ')');        // F_Code
+        ExecSQL;
+      end;
+    end;
+  end;
+
   if strtointdef(trim(carNum.text), 1) <= 1 then
   begin
     Button2.Click;
@@ -1553,6 +1778,7 @@ begin
         FieldByName('C_Name').Value := trim(FC_Name);
         FieldByName('C_Code').Value := trim(FC_Code);
         FieldByName('C_GramWeight').Value := trim(C_GramWeight.Text);
+        FieldByName('F_Name').Value := trim(F_Name.Text);
         FieldByName('C_Width').Value := trim(C_Width.Text);
         FieldByName('C_Color').Value := trim(C_Color.Text);
         FieldByName('PCUnit').Value := trim(OrdUnit.Text);
@@ -1612,6 +1838,7 @@ begin
     SQL.Add(',@C_Name=' + QuotedStr(Trim(C_Name.Text)));
     SQL.Add(',@OrderNo=' + QuotedStr(Trim(OrderNo.Text)));
     SQL.Add(',@DTMID=' + QuotedStr(Trim(DTMID.Text)));
+//    showMessage(SQL.Text);
     execsql;
   end;
 
@@ -1817,9 +2044,9 @@ begin
                 ExecSQL;
               end;
             end;
-
+           //取消限制正常卡
-            if (Trim(CDS_1.fieldbyname('PCType').AsString) = 'Õý³£¿¨') then
+//            if (Trim(CDS_1.fieldbyname('PCType').AsString) = '正常卡') then
-            begin
+//            begin
             with ADOQueryCmd do
             begin
               Close;
@@ -1832,7 +2059,7 @@ begin
 
             if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
               raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
-            end;
+//            end;
 //            else
 //            begin
 //              with ADOQueryCmd do
@@ -2076,6 +2303,7 @@ begin
   end;
 
   OrderNo.Text := CDS_2.FieldByName('OrderNo').AsString;
+  F_Name.Text := CDS_2.FieldByName('F_Name').AsString;
   C_Width.Text := ADOQueryTmp.FieldByName('C_Width').AsString;
 
   C_GramWeight.Text := ADOQueryTmp.FieldByName('C_GramWeight').AsString;
@@ -2085,6 +2313,10 @@ begin
   if CDS_2.FieldByName('note').AsString <> '' then
   begin
     CINote.Text := CDS_2.FieldByName('note').AsString + '/' + ADOQueryTmp.FieldByName('CINote').AsString;
+  end
+  else
+  begin
+    CINote.Text := ADOQueryTmp.FieldByName('CINote').AsString;
   end;
 
 //  CINote.Text := ADOQueryTmp.FieldByName('CINote').AsString;

F02染色计划单/U_DyePlanCardList.dfm

@@ -1,10 +1,10 @@
 inherited frmDyePlanCardList: TfrmDyePlanCardList
   Caption = #29983#20135#27969#31243#21345
-  ClientHeight = 632
+  ClientHeight = 639
   ClientWidth = 1503
   OnKeyDown = FormKeyDown
   ExplicitWidth = 1519
-  ExplicitHeight = 671
+  ExplicitHeight = 678
   PixelsPerInch = 96
   TextHeight = 12
   object ToolBar1: TToolBar [0]
@@ -385,10 +385,11 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
     Left = 0
     Top = 119
     Width = 1503
-    Height = 513
+    Height = 520
     Align = alClient
     PopupMenu = PM_1
     TabOrder = 2
+    ExplicitLeft = 8
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -787,6 +788,34 @@ inherited frmDyePlanCardList: TfrmDyePlanCardList
         Visible = False
         Width = 80
       end
+      object Tv1GYDTMNo: TcxGridDBColumn
+        Caption = #24037#33402#32534#21495
+        DataBinding.FieldName = 'GYDTMNo'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1GYDTMName: TcxGridDBColumn
+        Caption = #24037#33402#21517#31216
+        DataBinding.FieldName = 'GYDTMName'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1GYEditer: TcxGridDBColumn
+        Caption = #24037#33402#26368#21518#20462#25913#20154
+        DataBinding.FieldName = 'GYEditer'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 121
+      end
+      object Tv1GYEdittime: TcxGridDBColumn
+        Caption = #24037#33402#26368#21518#20462#25913#26102#38388
+        DataBinding.FieldName = 'GYEdittime'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 125
+      end
     end
     object cxGrid1Level1: TcxGridLevel
       GridView = Tv1

F02染色计划单/U_DyePlanCardList.pas

@@ -132,6 +132,10 @@ type
     Tv1isStop: TcxGridDBColumn;
     Tv1Status: TcxGridDBColumn;
     N4: TMenuItem;
+    Tv1GYDTMNo: TcxGridDBColumn;
+    Tv1GYDTMName: TcxGridDBColumn;
+    Tv1GYEditer: TcxGridDBColumn;
+    Tv1GYEdittime: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -346,10 +350,11 @@ begin
       sql.Add(',GlideList=[dbo].[F_Dye_Card_GlideList](A.PCID) ');
       sql.Add(',KaZuQty=(SELECT SUM(PCQty) from Dye_Plan_Card X where X.KaZu = A.KaZu)');
       sql.Add(',KaZuPiece=(SELECT SUM(PCPiece) from Dye_Plan_Card X where X.KaZu = A.KaZu)');
-
+      SQL.Add(',D.DTMNo as GYDTMNo,D.DTMName as GYDTMName,D.Editer as GYEditer,D.Edittime as GYEdittime ');
       sql.Add('from Dye_Plan_Card A ');
       sql.Add('left join Dye_Plan_sub B on B.subID=A.subID ');
       sql.Add('left join Dye_Plan_Main C on C.mainID=A.mainID ');
+      SQL.Add(' left join Dye_Technics_Main D on D.DTMID=A.DTMID ');
       sql.Add('where A.PCTime>=''' + formatdateTime('yyyy-MM-dd', begdate.Date) + ''' ');
       sql.Add('and A.PCTime<''' + formatdateTime('yyyy-MM-dd', enddate.Date + 1) + ''' ');
       case cxTabControl1.TabIndex of
@@ -375,7 +380,9 @@ begin
 //        sql.Add(' and C.Workshop=''' + trim(FWorkshop) + ''' ');
       if Trim(canshu1) = '' then
         sql.Add(' and A.Filler=''' + trim(DName) + ''' ');
+      SQL.Add(' Order By PCID ');
 
+//      ShowMessage(SQL.Text);
       Open;
     end;
     SCreateCDS(ADOQueryMain, CDS_1);
@@ -513,9 +520,9 @@ begin
                 ExecSQL;
               end;
             end;
-
+           //恢复库存取消限制正常卡
-            if (Trim(CDS_1.fieldbyname('PCType').AsString) = '正常卡') then
+//            if (Trim(CDS_1.fieldbyname('PCType').AsString) = '正常卡') then
-            begin
+//            begin
               with ADOQueryCmd do
               begin
                 Close;
@@ -527,7 +534,7 @@ begin
               end;
               if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
                 raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
-            end;
+//            end;
 //            else
 //            begin
 //              with ADOQueryCmd do
@@ -836,13 +843,21 @@ begin
 end;
 
 procedure TfrmDyePlanCardList.N1Click(Sender: TObject);
+var
+  topIndex: Integer;
 begin
-  SelOKNo(CDS_1, true);
+  topIndex := tv1.Controller.TopRowIndex;
+  SelOKNoFiler(Tv1, True);
+  tv1.Controller.TopRowIndex := topIndex;
 end;
 
 procedure TfrmDyePlanCardList.N2Click(Sender: TObject);
+var
+  topIndex: Integer;
 begin
-  SelOKNo(CDS_1, False);
+  topIndex := tv1.Controller.TopRowIndex;
+  SelOKNoFiler(Tv1, false);
+  tv1.Controller.TopRowIndex := topIndex;
 end;
 
 procedure TfrmDyePlanCardList.N3Click(Sender: TObject);
@@ -900,25 +915,23 @@ begin
 //      ShowMessage(Format('结束行不能超过总行数(%d)', [Order_Main.RecordCount]));
 //      Exit;
 //    end;
-
     // 循环设置指定范围内的行
-    CDS_1.DisableControls;
+    Tv1.BeginUpdate();
-    try
+    for i := 0 to Tv1.DataController.RecordCount - 1 do
-      CDS_1.First;
-      for i := 1 to CDS_1.RecordCount do
     begin
-        if (i >= StartRow) and (i <= EndRow) then
+      Tv1.DataController.FocusedRowIndex := i;
+
+      if (i + 1 >= StartRow) and (i + 1 <= EndRow) then
       begin
         CDS_1.Edit;
         CDS_1.FieldByName('ssel').Value := True;
-          CDS_1.post;
+        CDS_1.Post;
       end;
 
-        CDS_1.Next;
+      if i + 1 >= EndRow then
-      end;
+        Break;
-    finally
-      CDS_1.EnableControls;
     end;
+    Tv1.endUpdate();
 
   end;
 
@@ -933,7 +946,7 @@ var
   firstCurrentValue, CurrentValue: string;
 begin
   I := 0;
-  j := 0;//第一个被选中的
+  j := 0; //第一个被选中的
   with CDS_1 do
   begin
     DisableControls;
@@ -949,7 +962,7 @@ begin
         if j = 0 then
         begin
           firstCurrentValue := VarToStr(Tv1.DataController.Values[I, Column.Index]);
-          j := 1;//第一个选中值执行其余不执行
+          j := 1; //第一个选中值执行其余不执行
         end;
 
         if (Column = nil) or (Tv1.DataController.RecordCount = 0) then

F02染色计划单/U_DyePlanList.dfm

@@ -325,7 +325,6 @@ inherited frmDyePlanList: TfrmDyePlanList
     Align = alClient
     PopupMenu = PM_1
     TabOrder = 2
-    ExplicitTop = 165
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -519,7 +518,6 @@ inherited frmDyePlanList: TfrmDyePlanList
       Font.Style = []
       ParentFont = False
       TabOrder = 0
-      ExplicitTop = -2
       object TV2: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
         ScrollbarAnnotations.CustomAnnotations = <>

F02染色计划单/U_DyePlanList.pas

@@ -15,7 +15,7 @@ uses
   IdFTP, ShellAPI, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
   dxBarBuiltInMenu, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges,
   IdExplicitTLSClientServerBase, U_BaseList, cxCheckBox, cxDropDownEdit,
-  dxScrollbarAnnotations,Clipbrd;
+  dxScrollbarAnnotations, Clipbrd;
 
 type
   TfrmDyePlanList = class(TfrmBaseList)
@@ -661,14 +661,21 @@ begin
 end;
 
 procedure TfrmDyePlanList.N1Click(Sender: TObject);
+var
+  topIndex: Integer;
 begin
+  topIndex := tv1.Controller.TopRowIndex;
   SelOKNoFiler(Tv1, false);
+  tv1.Controller.TopRowIndex := topIndex;
 end;
 
 procedure TfrmDyePlanList.N2Click(Sender: TObject);
+var
+  topIndex: Integer;
 begin
-
+  topIndex := tv1.Controller.TopRowIndex;
-  SelOKNoFiler(Tv1, true);
+  SelOKNoFiler(Tv1, True);
+  tv1.Controller.TopRowIndex := topIndex;
 end;
 
 procedure TfrmDyePlanList.N3Click(Sender: TObject);
@@ -720,24 +727,38 @@ begin
 //      ShowMessage(Format('结束行不能超过总行数(%d)', [Order_Main.RecordCount]));
 //      Exit;
 //    end;
-
     // 循环设置指定范围内的行
-    Order_Main.DisableControls;
     try
-      Order_Main.First;
+//      Order_Main.First;
-      for i := 1 to Order_Main.RecordCount do
+//      for i := 1 to Order_Main.RecordCount do
+//      begin
+//        if (i >= StartRow) and (i <= EndRow) then
+//        begin
+//          Order_Main.Edit;
+//          Order_Main.FieldByName('ssel').Value := True;
+//          Order_Main.post;
+//        end;
+//
+//        Order_Main.Next;
+//      end;
+      Tv1.BeginUpdate();
+      for i := 0 to Tv1.DataController.RecordCount - 1 do
       begin
-        if (i >= StartRow) and (i <= EndRow) then
+        Tv1.DataController.FocusedRowIndex := i;
+
+        if (i + 1 >= StartRow) and (i + 1 <= EndRow) then
         begin
           Order_Main.Edit;
           Order_Main.FieldByName('ssel').Value := True;
-          Order_Main.post;
+          Order_Main.Post;
         end;
 
-        Order_Main.Next;
+        if i + 1 >= EndRow then
+          Break;
       end;
+      Tv1.endUpdate();
     finally
-      Order_Main.EnableControls;
+
     end;
 
   end;

F02染色计划单/U_DyeProcessDefin.dfm

@@ -246,6 +246,7 @@ object frmDyeProcessDefin: TfrmDyeProcessDefin
         Height = 317
         Align = alClient
         TabOrder = 0
+        ExplicitTop = -6
         object ccqx_note: TcxTextEdit
           Tag = 2
           Left = 58

F02染色计划单/U_DyeProcessList.dfm

@@ -223,6 +223,7 @@ inherited frmDyeProcessList: TfrmDyeProcessList
     Height = 455
     Align = alClient
     TabOrder = 2
+    ExplicitTop = 110
     object TV2: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False

F02染色计划单/U_DyeSimpleTechnicsList.dfm

@@ -5,7 +5,6 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
   ClientWidth = 1540
   Position = poDesigned
   OnKeyDown = FormKeyDown
-  ExplicitTop = -259
   ExplicitWidth = 1556
   ExplicitHeight = 884
   PixelsPerInch = 96
@@ -249,15 +248,16 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
     Height = 709
     Align = alLeft
     TabOrder = 3
-    ExplicitLeft = -2
-    ExplicitTop = 142
     object cxGrid2: TcxGrid
       Left = 1
       Top = 1
       Width = 630
       Height = 707
       Align = alLeft
+      PopupMenu = pm1
       TabOrder = 0
+      ExplicitLeft = -5
+      ExplicitTop = 0
       object Tv2: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
         Navigator.Buttons.Delete.Enabled = False
@@ -363,8 +363,6 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
       Height = 707
       Align = alClient
       TabOrder = 1
-      ExplicitLeft = 634
-      ExplicitTop = 6
       object cxGrid1: TcxGrid
         Left = 1
         Top = 1
@@ -409,7 +407,6 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
         List = True
         ShowCaptions = True
         TabOrder = 1
-        ExplicitTop = 299
         object ToolButton5: TToolButton
           Left = 0
           Top = 0
@@ -517,8 +514,6 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
           Align = alTop
           ReadOnly = True
           TabOrder = 0
-          ExplicitLeft = 2
-          ExplicitTop = 9
         end
       end
     end
@@ -635,4 +630,12 @@ inherited frmDyeSimpleTechnicsList: TfrmDyeSimpleTechnicsList
     Left = 519
     Top = 289
   end
+  object pm1: TPopupMenu
+    Left = 320
+    Top = 416
+    object N1: TMenuItem
+      Caption = #22797#21046
+      OnClick = N1Click
+    end
+  end
 end

F02染色计划单/U_DyeSimpleTechnicsList.pas

@@ -17,7 +17,7 @@ uses
   dxDateRanges, dxScrollbarAnnotations, cxContainer, cxDropDownEdit, cxLabel,
   cxButtons, cxMemo, U_frameFPList, U_frameGJList, U_frameGDXList, U_frameFSList,
   U_frameCCQXList, U_frameJGQXList, U_frameRGQXList, U_frameYMList,
-  U_framePDList;
+  U_framePDList,Clipbrd;
 
   //U_frameJGQXList, U_frameRGQXList, U_frameCCQXList, U_frameYMList
 
@@ -95,6 +95,8 @@ type
     Tv3Page: TcxGridDBColumn;
     Panel4: TPanel;
     GYNote: TMemo;
+    pm1: TPopupMenu;
+    N1: TMenuItem;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -125,6 +127,7 @@ type
     procedure TbMoveUpClick(Sender: TObject);
     procedure ToolButton7Click(Sender: TObject);
     procedure CharKeyPress(Sender: TObject; var Key: Char);
+    procedure N1Click(Sender: TObject);
   private
     { Private declarations }
 
@@ -771,6 +774,12 @@ begin
   end;
 end;
 
+procedure TfrmDyeSimpleTechnicsList.N1Click(Sender: TObject);
+begin
+  Clipboard.SetTextBuf(PChar(Trim(CDS_2.fieldbyname(TV2.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString)));
+
+end;
+
 procedure TfrmDyeSimpleTechnicsList.InitGlide();
 begin
   try

F02染色计划单/U_DyeTechnicsList.dfm

@@ -157,6 +157,7 @@ inherited frmDyeTechnicsList: TfrmDyeTechnicsList
     Height = 494
     Align = alLeft
     TabOrder = 2
+    ExplicitLeft = -3
     object Tv2: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False

F02染色计划单/U_DyeTechnicsinput.dfm

@@ -175,6 +175,8 @@ inherited frmDyeTechnicsinput: TfrmDyeTechnicsinput
       Align = alClient
       PopupMenu = PM_1
       TabOrder = 0
+      ExplicitLeft = 5
+      ExplicitTop = 119
       object TV1: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
         Navigator.Buttons.Delete.Enabled = False

F02染色计划单/U_DyeTechnicsinputKaika.dfm

@@ -31,8 +31,6 @@ inherited frmDyeTechnicsinputKaika: TfrmDyeTechnicsinputKaika
       Align = alClient
       PopupMenu = PM_1
       TabOrder = 0
-      ExplicitLeft = -4
-      ExplicitTop = 72
       object TV1: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
         Navigator.Buttons.Delete.Enabled = False

F02染色计划单/U_DyeTechnicsinputKaika.pas

@@ -145,7 +145,8 @@ begin
     sql.Add(' select C.DTMNo,C.DTMName FROM  Dye_Plan_Glide A ');
     sql.Add(' inner join Dye_Technics_Sub B on A.PSID = B.PSID ');
     sql.Add(' inner join Dye_Technics_Main C on B.DTMID = C.DTMID ');
-
+    sql.Add(' Where A.PCID=''' + trim(FPCID) + '''');
+//    ShowMessage(sql.text);
     Open;
 //    ShowMessage(sql.Text);
   end;

F03染色配方管理/Formula.dproj.local

@@ -1,36 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.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.734,=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.939,=D:\Dp10Repo\public10\design\U_BaseInput.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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.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.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.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.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.172,=D:\Dp10Repo\项目代码\红绿蓝\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.172,=D:\Dp10Repo\项目代码\红绿蓝\A00通用窗体\U_LabelMapSet.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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.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.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.047,D:\Dp10Repo\项目代码\RTBasics\F03染色配方管理\Unit1.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.047,D:\Dp10Repo\项目代码\RTBasics\F03染色配方管理\Unit1.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.979,=D:\Dp10Repo\项目代码\红绿蓝\A00通用窗体\U_LabelPrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.979,=D:\Dp10Repo\项目代码\红绿蓝\A00通用窗体\U_LabelPrint.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.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.756,D:\Dp10Repo\项目代码\RTBasics\F03染色配方管理\Formula.dproj=D:\Dp10Repo\项目代码\RTBasics\F03染色配方管理\InformationBase.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.756,D:\Dp10Repo\项目代码\RTBasics\F03染色配方管理\Formula.dproj=D:\Dp10Repo\项目代码\RTBasics\F03染色配方管理\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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.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.048,=D:\Dp10Repo\public10\design\U_BaseList.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.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
+    <File Path="android-support-v4.dex.jar"/>
+    <File Path="cloud-messaging.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-ads-base.17.2.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-ads.17.2.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-analytics.16.0.8.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-base.16.0.1.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-basement.16.2.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-gass.17.2.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-identity.16.0.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-maps.16.1.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-stats.16.0.1.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-tasks.16.0.1.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-wallet.16.0.1.dex.jar"/>
+    <File Path="com-google-firebase.firebase-analytics.16.4.0.dex.jar"/>
+    <File Path="com-google-firebase.firebase-common.16.1.0.dex.jar"/>
+    <File Path="com-google-firebase.firebase-iid-interop.16.0.1.dex.jar"/>
+    <File Path="com-google-firebase.firebase-iid.17.1.1.dex.jar"/>
+    <File Path="com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar"/>
+    <File Path="com-google-firebase.firebase-messaging.17.5.0.dex.jar"/>
+    <File Path="fmx.dex.jar"/>
+    <File Path="google-play-billing.dex.jar"/>
+    <File Path="google-play-licensing.dex.jar"/>
     <File Path="..\..\D10sxYilanbuyi"/>
     <File Path="..\A00通用窗体"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.pas"/>

F04染色刷卡/DyeProcess.dproj.local

@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.326,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\DyeProcess.dproj=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\InformationBase.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.606,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCDetailsList.pas=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\Unit2.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.788,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCList.dfm=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyeOutputList.dfm</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.963,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutputList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.788,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyeOutputList.dfm=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCList.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.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.517,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_BS_MachineSel.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.620,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_MachTaskList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.138,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.517,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_BS_MachineSel.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.606,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCDetailsList.dfm=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\Unit2.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.811,=D:\Dp10Repo\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.836,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyeProcessDefin.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.998,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\Unit1.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.788,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCList.pas=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyeOutputList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.788,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyeOutputList.pas=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCList.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.326,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\DyeProcess.dproj</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.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\Unit2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.606,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\Unit2.pas=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCDetailsList.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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.606,D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\Unit2.dfm=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\U_DyePCDetailsList.dfm</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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.963,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutputList.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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F04染色刷卡\Unit2.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10sxYilanbuyi"/>

F04染色刷卡/U_DyeOutputList.dfm

@@ -114,9 +114,9 @@ inherited frmDyeOutputList: TfrmDyeOutputList
     object Label3: TLabel
       Left = 252
       Top = 36
-      Width = 48
+      Width = 36
       Height = 13
-      Caption = #27969#31243#21345#21495
+      Caption = #21345#32452#21495
     end
     object Label1: TLabel
       Left = 24
@@ -140,17 +140,19 @@ inherited frmDyeOutputList: TfrmDyeOutputList
       Caption = #35745#21010#21333#21495
     end
     object Label10: TLabel
-      Left = 504
+      Left = 952
-      Top = 36
+      Top = 41
       Width = 3
       Height = 13
+      Visible = False
     end
     object Label16: TLabel
-      Left = 576
+      Left = 1024
-      Top = 12
+      Top = 17
       Width = 24
       Height = 13
       Caption = #24037#24207
+      Visible = False
     end
     object Label13: TLabel
       Left = 288
@@ -167,18 +169,20 @@ inherited frmDyeOutputList: TfrmDyeOutputList
       Caption = #19994#21153#21592
     end
     object Label4: TLabel
-      Left = 428
+      Left = 876
-      Top = 12
+      Top = 17
       Width = 24
       Height = 13
       Caption = #39068#33394
+      Visible = False
     end
     object Label6: TLabel
-      Left = 428
+      Left = 876
-      Top = 36
+      Top = 41
       Width = 24
       Height = 13
       Caption = #33394#21495
+      Visible = False
     end
     object Label7: TLabel
       Left = 604
@@ -188,20 +192,21 @@ inherited frmDyeOutputList: TfrmDyeOutputList
       Caption = #33457#22411#21495
     end
     object Label9: TLabel
-      Left = 576
+      Left = 1024
-      Top = 36
+      Top = 41
       Width = 24
       Height = 13
       Caption = #29677#32452
+      Visible = False
     end
-    object pcid: TEdit
+    object KaZu: TEdit
       Tag = 2
       Left = 302
       Top = 32
       Width = 80
       Height = 21
       TabOrder = 0
-      OnChange = pcidChange
+      OnChange = KaZuChange
     end
     object BegDate: TDateTimePicker
       Left = 73
@@ -228,7 +233,7 @@ inherited frmDyeOutputList: TfrmDyeOutputList
       Width = 80
       Height = 21
       TabOrder = 3
-      OnChange = pcidChange
+      OnChange = KaZuChange
     end
     object customerNoName: TEdit
       Tag = 2
@@ -237,7 +242,7 @@ inherited frmDyeOutputList: TfrmDyeOutputList
       Width = 100
       Height = 21
       TabOrder = 4
-      OnChange = pcidChange
+      OnChange = KaZuChange
     end
     object ywy: TEdit
       Tag = 2
@@ -246,25 +251,27 @@ inherited frmDyeOutputList: TfrmDyeOutputList
       Width = 100
       Height = 21
       TabOrder = 5
-      OnChange = pcidChange
+      OnChange = KaZuChange
     end
     object C_Color: TEdit
       Tag = 2
-      Left = 454
+      Left = 902
-      Top = 8
+      Top = 13
       Width = 80
       Height = 21
       TabOrder = 6
-      OnChange = pcidChange
+      Visible = False
+      OnChange = KaZuChange
     end
     object C_ColorNo: TEdit
       Tag = 2
-      Left = 454
+      Left = 902
-      Top = 32
+      Top = 37
       Width = 80
       Height = 21
       TabOrder = 7
-      OnChange = pcidChange
+      Visible = False
+      OnChange = KaZuChange
     end
     object lbHx: TEdit
       Tag = 2
@@ -273,26 +280,28 @@ inherited frmDyeOutputList: TfrmDyeOutputList
       Width = 80
       Height = 21
       TabOrder = 8
-      OnChange = pcidChange
+      OnChange = KaZuChange
     end
     object GlideName: TComboBox
       Tag = 2
-      Left = 602
+      Left = 1050
-      Top = 8
+      Top = 13
       Width = 80
       Height = 21
       Style = csDropDownList
       TabOrder = 9
-      OnChange = pcidChange
+      Visible = False
+      OnChange = KaZuChange
     end
     object StaffName: TEdit
       Tag = 2
-      Left = 602
+      Left = 1050
-      Top = 32
+      Top = 37
       Width = 80
       Height = 21
       TabOrder = 10
-      OnChange = pcidChange
+      Visible = False
+      OnChange = KaZuChange
     end
     object begtime: TDateTimePicker
       Left = 157
@@ -324,7 +333,7 @@ inherited frmDyeOutputList: TfrmDyeOutputList
     Height = 482
     Align = alClient
     TabOrder = 2
-    ExplicitTop = 97
+    ExplicitLeft = 8
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -383,13 +392,6 @@ inherited frmDyeOutputList: TfrmDyeOutputList
         HeaderAlignmentHorz = taCenter
         Width = 80
       end
-      object Tv1PCID: TcxGridDBColumn
-        Caption = #27969#31243#21345#21495
-        DataBinding.FieldName = 'PCID'
-        DataBinding.IsNullValueType = True
-        HeaderAlignmentHorz = taCenter
-        Width = 80
-      end
       object Tv1KaZu: TcxGridDBColumn
         Caption = #21345#32452#21495
         DataBinding.FieldName = 'KaZu'
@@ -419,18 +421,18 @@ inherited frmDyeOutputList: TfrmDyeOutputList
         Width = 120
       end
       object Tv1Column8: TcxGridDBColumn
-        Caption = #25968#37327
+        Caption = #21345#32452#31859#25968
-        DataBinding.FieldName = 'EndQty'
+        DataBinding.FieldName = 'KaZuQty'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Width = 81
+        Width = 93
       end
       object Tv1Column3: TcxGridDBColumn
-        Caption = #21305#25968
+        Caption = #21345#32452#21305#25968
-        DataBinding.FieldName = 'Endrollnum'
+        DataBinding.FieldName = 'KaZuPiece'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Width = 69
+        Width = 85
       end
       object Tv1Column15: TcxGridDBColumn
         Caption = #21333#20301
@@ -544,6 +546,20 @@ inherited frmDyeOutputList: TfrmDyeOutputList
         HeaderAlignmentHorz = taCenter
         Width = 84
       end
+      object Tv1UseTime: TcxGridDBColumn
+        Caption = #24037#24207#29992#26102'(min)'
+        DataBinding.FieldName = 'UseTime'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
+      object Tv1actualSpeed: TcxGridDBColumn
+        Caption = #23454#38469#36710#36895'(m/min)'
+        DataBinding.FieldName = 'actualSpeed'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
     end
     object cxGrid2Level1: TcxGridLevel
       GridView = Tv1

F04染色刷卡/U_DyeOutputList.pas

@@ -29,7 +29,7 @@ type
     DataSource1: TDataSource;
     cxGridPopupMenu1: TcxGridPopupMenu;
     Label3: TLabel;
-    pcid: TEdit;
+    KaZu: TEdit;
     Label1: TLabel;
     Label2: TLabel;
     BegDate: TDateTimePicker;
@@ -87,7 +87,6 @@ type
     Tv1C_PlanQty: TcxGridDBColumn;
     Tv1F_description: TcxGridDBColumn;
     Tv1C_description: TcxGridDBColumn;
-    Tv1PCID: TcxGridDBColumn;
     Tv1PCType: TcxGridDBColumn;
     Tv1PCTime: TcxGridDBColumn;
     Tv1DTMPSlist: TcxGridDBColumn;
@@ -99,6 +98,8 @@ type
     N2: TMenuItem;
     N3: TMenuItem;
     N4: TMenuItem;
+    Tv1UseTime: TcxGridDBColumn;
+    Tv1actualSpeed: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -108,7 +109,7 @@ type
     procedure FormShow(Sender: TObject);
     procedure TBExportClick(Sender: TObject);
     procedure TBFindClick(Sender: TObject);
-    procedure pcidChange(Sender: TObject);
+    procedure KaZuChange(Sender: TObject);
     procedure PRTColorChange(Sender: TObject);
     procedure TBdelClick(Sender: TObject);
     procedure ToolButton1Click(Sender: TObject);
@@ -421,7 +422,7 @@ begin
   end;
 end;
 
-procedure TfrmDyeOutputList.pcidChange(Sender: TObject);
+procedure TfrmDyeOutputList.KaZuChange(Sender: TObject);
 begin
   TBFind.Click;
 end;

F04染色刷卡/U_DyePCDetailsList.dfm

@@ -803,7 +803,7 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
       Align = alClient
       PopupMenu = PM_2
       TabOrder = 1
-      ExplicitTop = -4
+      ExplicitTop = 6
       object Tv2: TcxGridDBTableView
         Navigator.Buttons.CustomButtons = <>
         ScrollbarAnnotations.CustomAnnotations = <>
@@ -932,6 +932,13 @@ inherited frmDyePCDetailsList: TfrmDyePCDetailsList
           HeaderAlignmentHorz = taCenter
           Width = 80
         end
+        object Tv2fillTime: TcxGridDBColumn
+          Caption = #24320#21345#26102#38388
+          DataBinding.FieldName = 'fillTime'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Width = 80
+        end
       end
       object cxGridLevel1: TcxGridLevel
         GridView = Tv2

F04染色刷卡/U_DyePCDetailsList.pas

@@ -139,6 +139,7 @@ type
     Tv2MCNo: TcxGridDBColumn;
     SBTK1: TSpeedButton;
     SBTK2: TSpeedButton;
+    Tv2fillTime: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -1180,7 +1181,7 @@ begin
     begin
       if msql1 = '' then
       begin
-        msql1 := ' (PC_FLAG = 0) ';
+        msql1 := ' (PC_FLAG = 0 and BG=0 and Complete=0) ';
       end
       else
       begin
@@ -1204,7 +1205,7 @@ begin
     begin
       if msql1 = '' then
       begin
-        msql1 := ' (PC_FLAG = 1) ';
+        msql1 := ' (PC_FLAG = 1 and BG=0 and Complete=0) ';
       end
       else
       begin

F04染色刷卡/U_GetDllForm.pas

@@ -169,7 +169,7 @@ begin
         end;
       end;
 
-    221:  //╡За©цВо╦
+    221:  //产量明细   刷卡信息管理
       begin
         with TfrmDyeOutputList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do       //
         begin

F05染色检验/DyeInsp.dproj.local

@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</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.048,=D:\Dp10Repo\public10\design\U_BaseList.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.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.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.664,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</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.958,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\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.983,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\Unit1.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.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj</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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.320,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.532,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeMachInsp.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.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.743,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</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.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.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.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.958,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.471,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F05染色检验\U_DyeCardRoll.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.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.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10sxYilanbuyi"/>

F05染色检验/DyeInspLogin.dproj.local

@@ -1,6 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<ProjectSortOrder AutoSort="0" SortType="0">
+    <File Path="android-support-v4.dex.jar"/>
+    <File Path="cloud-messaging.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-ads-base.17.2.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-ads.17.2.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-analytics.16.0.8.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-base.16.0.1.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-basement.16.2.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-gass.17.2.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-identity.16.0.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-maps.16.1.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-stats.16.0.1.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-tasks.16.0.1.dex.jar"/>
+    <File Path="com-google-android-gms.play-services-wallet.16.0.1.dex.jar"/>
+    <File Path="com-google-firebase.firebase-analytics.16.4.0.dex.jar"/>
+    <File Path="com-google-firebase.firebase-common.16.1.0.dex.jar"/>
+    <File Path="com-google-firebase.firebase-iid-interop.16.0.1.dex.jar"/>
+    <File Path="com-google-firebase.firebase-iid.17.1.1.dex.jar"/>
+    <File Path="com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar"/>
+    <File Path="com-google-firebase.firebase-messaging.17.5.0.dex.jar"/>
+    <File Path="fmx.dex.jar"/>
+    <File Path="google-play-billing.dex.jar"/>
+    <File Path="google-play-licensing.dex.jar"/>
     <File Path="logon.pas"/>
     <File Path="logon.dfm"/>
     <File Path="spmain.pas"/>
@@ -21,6 +49,6 @@
     <File Path="JDAESExtend.pas"/>
   </ProjectSortOrder>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.635,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInspLogin.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\WFBProduction.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.635,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\WFBProduction.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInspLogin.dproj</Transaction>
   </Transactions>
 </BorlandProject>

F06染色成品仓库/DyeClothStk.dproj.local

@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.443,=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothWaitStorage.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.642,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F06染色成品仓库\U_DyeClothOutPut.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.443,=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothWaitStorage.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.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.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.144,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.420,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\DyeClothStk.dproj=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\InformationBase.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.420,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\DyeClothStk.dproj=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\InformationBase.dproj</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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.982,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.982,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.783,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\Unit1.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.783,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\Unit1.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.615,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothInEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothOutEdit.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.615,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothInEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothOutEdit.dfm</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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.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.939,=D:\Dp10Repo\public10\design\U_BaseInput.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.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.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.710,=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothIOFlow.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.944,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F06染色成品仓库\U_DyeClothStkSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.361,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.710,=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothIOFlow.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.537,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.361,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanSel.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.537,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.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.123,=D:\Dp10Repo\public10\design\U_globalVar.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.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.755,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.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.615,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothInEdit.pas=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothOutEdit.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.615,D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothInEdit.pas=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothOutEdit.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.845,=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothInEdit.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.845,=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothInEdit.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.755,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.045,=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothPSI.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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>2025/11/01 16:37:51.000.144,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.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>2025/11/04 12:26:10.000.642,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F06染色成品仓库\U_DyeClothOutPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>2025/11/04 12:30:50.000.944,=D:\Dp10Repo\项目代码\D10sxYilanbuyi\F06染色成品仓库\U_DyeClothStkSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.045,=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeClothPSI.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="..\..\D10sxYilanbuyi"/>

F06染色成品仓库/U_DyeClothOutPut.dfm

@@ -139,6 +139,21 @@ inherited frmDyeClothOutPut: TfrmDyeClothOutPut
         HeaderAlignmentHorz = taCenter
         Width = 41
       end
+      object v1Column4: TcxGridDBColumn
+        Tag = 2
+        Caption = #20986#24211#31867#22411
+        DataBinding.FieldName = 'IOType'
+        DataBinding.IsNullValueType = True
+        PropertiesClassName = 'TcxComboBoxProperties'
+        Properties.DropDownListStyle = lsFixedList
+        Properties.Items.Strings = (
+          #27491#24120#20837#24211
+          #29983#20135#36864#22238
+          #26399#21021#20837#24211)
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 81
+      end
       object v1Column6: TcxGridDBColumn
         Tag = 2
         Caption = #20986#24211#21333#21495
@@ -161,21 +176,6 @@ inherited frmDyeClothOutPut: TfrmDyeClothOutPut
         Options.Editing = False
         Width = 101
       end
-      object v1Column4: TcxGridDBColumn
-        Tag = 2
-        Caption = #20986#24211#31867#22411
-        DataBinding.FieldName = 'IOType'
-        DataBinding.IsNullValueType = True
-        PropertiesClassName = 'TcxComboBoxProperties'
-        Properties.DropDownListStyle = lsFixedList
-        Properties.Items.Strings = (
-          #27491#24120#20837#24211
-          #29983#20135#36864#22238
-          #26399#21021#20837#24211)
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 81
-      end
       object Tv1OrderNo: TcxGridDBColumn
         Tag = 2
         Caption = #29983#20135#35746#21333#21495