111

A00通用窗体/U_UserSel.dfm

@@ -22,7 +22,7 @@ inherited frmUserSel: TfrmUserSel
     Height = 30
     AutoSize = True
     ButtonHeight = 30
-    ButtonWidth = 59
+    ButtonWidth = 67
     Caption = 'ToolBar1'
     Color = clSkyBlue
     Images = DataLink_Company.cxImageList_bar
@@ -39,7 +39,7 @@ inherited frmUserSel: TfrmUserSel
       OnClick = TBRafreshClick
     end
     object ToolButton2: TToolButton
-      Left = 63
+      Left = 71
       Top = 0
       AutoSize = True
       Caption = #36807#28388
@@ -47,7 +47,7 @@ inherited frmUserSel: TfrmUserSel
       OnClick = ToolButton2Click
     end
     object btnOK: TToolButton
-      Left = 126
+      Left = 142
       Top = 0
       AutoSize = True
       Caption = #30830#35748
@@ -55,7 +55,7 @@ inherited frmUserSel: TfrmUserSel
       OnClick = btnOKClick
     end
     object TBClose: TToolButton
-      Left = 189
+      Left = 213
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -73,7 +73,6 @@ inherited frmUserSel: TfrmUserSel
     BevelOuter = bvLowered
     Color = clSkyBlue
     TabOrder = 1
-    ExplicitTop = 38
     object Label3: TLabel
       Left = 206
       Top = 9
@@ -116,13 +115,12 @@ inherited frmUserSel: TfrmUserSel
     Height = 453
     Align = alClient
     TabOrder = 2
-    ExplicitTop = 77
-    ExplicitHeight = 445
     object Tv1: TcxGridDBTableView
       OnDblClick = Tv1DblClick
       Navigator.Buttons.CustomButtons = <>
       Navigator.Buttons.Delete.Enabled = False
       Navigator.Buttons.Delete.Visible = False
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DS_1
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
       DataController.Summary.DefaultGroupSummaryItems = <>
@@ -134,6 +132,7 @@ inherited frmUserSel: TfrmUserSel
       object VC_SSel: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'SSel'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.ImmediatePost = True
         HeaderAlignmentHorz = taCenter
@@ -142,6 +141,7 @@ inherited frmUserSel: TfrmUserSel
       object v2Column1: TcxGridDBColumn
         Caption = #32534#21495
         DataBinding.FieldName = 'UserID'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 76
@@ -149,6 +149,7 @@ inherited frmUserSel: TfrmUserSel
       object v2Column2: TcxGridDBColumn
         Caption = #21517#31216
         DataBinding.FieldName = 'UserName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 171
@@ -156,6 +157,7 @@ inherited frmUserSel: TfrmUserSel
       object v2Column3: TcxGridDBColumn
         Caption = #37096#38376
         DataBinding.FieldName = 'Udept'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 71

A00通用窗体/U_UserSel.pas

@@ -13,8 +13,24 @@ uses
   RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, cxDBLookupComboBox, ComObj, cxLookAndFeels, cxLookAndFeelPainters,
-    cxNavigator, dxDateRanges, U_BaseHelp,
+  cxNavigator, dxDateRanges, U_BaseHelp, dxBarBuiltInMenu, System.ImageList,
-  dxBarBuiltInMenu, System.ImageList, Vcl.ImgList;
+  Vcl.ImgList, dxSkinsCore, dxSkinBasic, dxSkinBlack, dxSkinBlue,
+  dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkroom, dxSkinDarkSide,
+  dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinOffice2013White, dxSkinOffice2016Colorful, dxSkinOffice2016Dark,
+  dxSkinOffice2019Black, dxSkinOffice2019Colorful, dxSkinOffice2019DarkGray,
+  dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
+  dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringtime, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinTheBezier,
+  dxSkinsDefaultPainters, dxSkinValentine, dxSkinVisualStudio2013Blue,
+  dxSkinVisualStudio2013Dark, dxSkinVisualStudio2013Light, dxSkinVS2010,
+  dxSkinWhiteprint, dxSkinWXI, dxSkinXmas2008Blue, dxScrollbarAnnotations;
 
 type
   FdDy = record
@@ -91,7 +107,7 @@ begin
 
       if Trim(Fdept) <> '' then
       begin
-        sql.Add('and Udept=' + QuotedStr(Trim(Fdept)));
+        sql.Add('and Udept like ' + QuotedStr(Trim('%' + Fdept + '%')));
       end;
       Open;
     end;

A00通用窗体/U_WBSpecSel.pas

@@ -11,7 +11,23 @@ uses
   cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
   cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu,
   System.ImageList, U_BaseInput, cxButtonEdit, cxCheckBox, Vcl.Menus,
-  dxScrollbarAnnotations, cxImageList, dxSkinsCore, dxSkinsDefaultPainters;
+  dxScrollbarAnnotations, cxImageList, dxSkinsCore, dxSkinsDefaultPainters,
+  dxSkinBasic, dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel,
+  dxSkinCoffee, dxSkinDarkroom, dxSkinDarkSide, dxSkinDevExpressDarkStyle,
+  dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast,
+  dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky,
+  dxSkinMcSkin, dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins,
+  dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green,
+  dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black,
+  dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
+  dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinOffice2016Colorful,
+  dxSkinOffice2016Dark, dxSkinOffice2019Black, dxSkinOffice2019Colorful,
+  dxSkinOffice2019DarkGray, dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven,
+  dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, dxSkinSilver,
+  dxSkinSpringtime, dxSkinStardust, dxSkinSummer2008, dxSkinTheAsphaltWorld,
+  dxSkinTheBezier, dxSkinValentine, dxSkinVisualStudio2013Blue,
+  dxSkinVisualStudio2013Dark, dxSkinVisualStudio2013Light, dxSkinVS2010,
+  dxSkinWhiteprint, dxSkinWXI, dxSkinXmas2008Blue;
 
 type
   TfrmWBSpecSel = class(TfrmBaseHelp)
@@ -144,6 +160,8 @@ begin
       sql.Clear;
       sql.Add(' select A.* ');
       sql.Add(' from Tat_WB_Spec A');
+      SQL.Add(' where 1=1');
+      sql.Add(' and isnull(ISSizing,''·ñ'')=''·ñ'' ');
 //      if Trim(FYType) <> '' then
 //        sql.Add(' where Y_Type=' + QuotedStr(FYType));
       Open;

A00通用组件/FrameDateSel.pas

@@ -8,7 +8,23 @@ uses
   cxControls, cxLookAndFeels, cxLookAndFeelPainters, cxContainer, cxEdit,
   Vcl.ComCtrls, dxCore, cxDateUtils, cxTextEdit, cxMaskEdit, cxDropDownEdit,
   cxCalendar, Vcl.StdCtrls, Vcl.Menus, cxButtons, Vcl.ExtCtrls, DateUtils,
-   dxSkinsDefaultPainters, dxSkinsCore;
+   dxSkinsDefaultPainters, dxSkinsCore, dxSkinBasic, dxSkinBlack, dxSkinBlue,
+  dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkroom, dxSkinDarkSide,
+  dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinOffice2013White, dxSkinOffice2016Colorful, dxSkinOffice2016Dark,
+  dxSkinOffice2019Black, dxSkinOffice2019Colorful, dxSkinOffice2019DarkGray,
+  dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
+  dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringtime, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinTheBezier, dxSkinValentine,
+  dxSkinVisualStudio2013Blue, dxSkinVisualStudio2013Dark,
+  dxSkinVisualStudio2013Light, dxSkinVS2010, dxSkinWhiteprint, dxSkinWXI,
+  dxSkinXmas2008Blue;
 
 type
   TfrmFrameDateSel = class(TFrame)

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

@@ -23,11 +23,11 @@
     <Transaction>1899-12-30 00:00:00.000.222,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_Company.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.227,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXInPut.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_EmployeeInPut.dfm</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.618,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_CustomerInput.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.863,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_FactoryInput.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.385,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.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.076,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_ZdyAttachGYS.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.618,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A01基础公司管理\U_CustomerInput.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.227,D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_LXInPut.pas=D:\Dp10RepoV1\项目代码\D10szJinCheng\A01基础公司管理\U_EmployeeInPut.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.dfm</Transaction>
@@ -67,7 +67,7 @@
     <File Path="fmx.dex.jar"/>
     <File Path="google-play-billing.dex.jar"/>
     <File Path="google-play-licensing.dex.jar"/>
-    <File Path="..\..\D10szKaiXiYa"/>
+    <File Path="..\..\D10SZKaiXiYa"/>
     <File Path="..\A00通用窗体"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.pas"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.dfm"/>

A01基础公司管理/U_Customer.pas

@@ -17,7 +17,23 @@ uses
   FireDAC.Stan.Intf, FireDAC.Stan.Option, FireDAC.Stan.Param, FireDAC.Stan.Error,
   FireDAC.DatS, FireDAC.Phys.Intf, FireDAC.DApt.Intf, FireDAC.Stan.Async,
   FireDAC.DApt, FireDAC.Comp.DataSet, FireDAC.Comp.Client, cxContainer,
-  dxScrollbarAnnotations, cxProgressBar, dxSkinsCore, dxSkinsDefaultPainters;
+  dxScrollbarAnnotations, cxProgressBar, dxSkinsCore, dxSkinsDefaultPainters,
+  dxSkinBasic, dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel,
+  dxSkinCoffee, dxSkinDarkroom, dxSkinDarkSide, dxSkinDevExpressDarkStyle,
+  dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast,
+  dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky,
+  dxSkinMcSkin, dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins,
+  dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green,
+  dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black,
+  dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
+  dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinOffice2016Colorful,
+  dxSkinOffice2016Dark, dxSkinOffice2019Black, dxSkinOffice2019Colorful,
+  dxSkinOffice2019DarkGray, dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven,
+  dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, dxSkinSilver,
+  dxSkinSpringtime, dxSkinStardust, dxSkinSummer2008, dxSkinTheAsphaltWorld,
+  dxSkinTheBezier, dxSkinValentine, dxSkinVisualStudio2013Blue,
+  dxSkinVisualStudio2013Dark, dxSkinVisualStudio2013Light, dxSkinVS2010,
+  dxSkinWhiteprint, dxSkinWXI, dxSkinXmas2008Blue;
 
 type
   TfrmCustomer = class(TfrmBaseList)

A01基础公司管理/U_DataLink.pas

@@ -23,7 +23,23 @@ uses
      
    
      
-   dxCore, dxLayoutLookAndFeels, dxSkinsCore, dxSkinsDefaultPainters;
+   dxCore, dxLayoutLookAndFeels, dxSkinsCore, dxSkinsDefaultPainters,
+  dxSkinBasic, dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel,
+  dxSkinCoffee, dxSkinDarkroom, dxSkinDarkSide, dxSkinDevExpressDarkStyle,
+  dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast,
+  dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky,
+  dxSkinMcSkin, dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins,
+  dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green,
+  dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black,
+  dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
+  dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinOffice2016Colorful,
+  dxSkinOffice2016Dark, dxSkinOffice2019Black, dxSkinOffice2019Colorful,
+  dxSkinOffice2019DarkGray, dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven,
+  dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, dxSkinSilver,
+  dxSkinSpringtime, dxSkinStardust, dxSkinSummer2008, dxSkinTheAsphaltWorld,
+  dxSkinTheBezier, dxSkinValentine, dxSkinVisualStudio2013Blue,
+  dxSkinVisualStudio2013Dark, dxSkinVisualStudio2013Light, dxSkinVS2010,
+  dxSkinWhiteprint, dxSkinWXI, dxSkinXmas2008Blue;
 
 type
   TMyThread = class(TThread)

A01基础公司管理/U_EmployeeInPut.pas

@@ -12,7 +12,23 @@ uses
   cxDropDownEdit, jpeg, IdBaseComponent, IdComponent, IdTCPConnection,
   IdTCPClient, IdFTP, cxPC, cxGridCustomPopupMenu, cxGridPopupMenu, Menus,
   ExtDlgs, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges,
-  dxBarBuiltInMenu, dxScrollbarAnnotations, dxSkinsCore, dxSkinsDefaultPainters;
+  dxBarBuiltInMenu, dxScrollbarAnnotations, dxSkinsCore, dxSkinsDefaultPainters,
+  dxSkinBasic, dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel,
+  dxSkinCoffee, dxSkinDarkroom, dxSkinDarkSide, dxSkinDevExpressDarkStyle,
+  dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast,
+  dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky,
+  dxSkinMcSkin, dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins,
+  dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green,
+  dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black,
+  dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
+  dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinOffice2016Colorful,
+  dxSkinOffice2016Dark, dxSkinOffice2019Black, dxSkinOffice2019Colorful,
+  dxSkinOffice2019DarkGray, dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven,
+  dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, dxSkinSilver,
+  dxSkinSpringtime, dxSkinStardust, dxSkinSummer2008, dxSkinTheAsphaltWorld,
+  dxSkinTheBezier, dxSkinValentine, dxSkinVisualStudio2013Blue,
+  dxSkinVisualStudio2013Dark, dxSkinVisualStudio2013Light, dxSkinVS2010,
+  dxSkinWhiteprint, dxSkinWXI, dxSkinXmas2008Blue;
 
 type
   TfrmYGInPut = class(TForm)

A01基础公司管理/U_EmployeeList.pas

@@ -13,7 +13,23 @@ uses
   cxDropDownEdit, cxPC, cxTL, cxMaskEdit, cxInplaceContainer, cxDBTL, cxTLData,
   cxLookAndFeels, cxLookAndFeelPainters, cxTLdxBarBuiltInMenu, dxBarBuiltInMenu,
   cxNavigator, U_BaseList, dxDateRanges, cxContainer, cxTextEdit,
-  dxScrollbarAnnotations, cxProgressBar, dxSkinsCore, dxSkinsDefaultPainters;
+  dxScrollbarAnnotations, cxProgressBar, dxSkinsCore, dxSkinsDefaultPainters,
+  dxSkinBasic, dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel,
+  dxSkinCoffee, dxSkinDarkroom, dxSkinDarkSide, dxSkinDevExpressDarkStyle,
+  dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast,
+  dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky,
+  dxSkinMcSkin, dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins,
+  dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green,
+  dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black,
+  dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
+  dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinOffice2016Colorful,
+  dxSkinOffice2016Dark, dxSkinOffice2019Black, dxSkinOffice2019Colorful,
+  dxSkinOffice2019DarkGray, dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven,
+  dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, dxSkinSilver,
+  dxSkinSpringtime, dxSkinStardust, dxSkinSummer2008, dxSkinTheAsphaltWorld,
+  dxSkinTheBezier, dxSkinValentine, dxSkinVisualStudio2013Blue,
+  dxSkinVisualStudio2013Dark, dxSkinVisualStudio2013Light, dxSkinVS2010,
+  dxSkinWhiteprint, dxSkinWXI, dxSkinXmas2008Blue;
 
 type
   TfrmEmployeeList = class(TfrmBaseList)

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

@@ -12,26 +12,26 @@
     <Transaction>1899-12-30 00:00:00.000.558,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_ReceivableEdit.pas</Transaction>
     <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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.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.536,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.096,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_TatClothInfo_CB.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_TatClothInfo.dfm</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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.034,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\uSZHN_JSON.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.003,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_InputBoxSingleNumber.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.816,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInfoInPut.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.431,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.921,=D:\Dp10RepoV1\public10\ThreeFun\Form\U_SysLogHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.003,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_InputBoxSingleNumber.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.034,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\uSZHN_JSON.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.346,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.226,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut2.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.441,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A02基础产品管理\U_ClothInfo.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.337,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.980,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\uFomat_JSON.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.418,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A02基础产品管理\U_ClothInfoInput.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.993,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ReportImgSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.418,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A02基础产品管理\U_ClothInfoInput.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.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>
@@ -46,9 +46,9 @@
     <Transaction>1899-12-30 00:00:00.000.944,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\U_HttpFun.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.629,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_WBSpecSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.272,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.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.504,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothType.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.833,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用组件\FrameDateTimeSel.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.217,=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.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.pas=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.pas</Transaction>
@@ -58,19 +58,19 @@
     <Transaction>1899-12-30 00:00:00.000.290,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_TatClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.754,D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_TatClothInfo.dfm=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfo_Tat.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.684,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用组件\FrameDateSel.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.503,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.129,=D:\Dp10Repo\项目代码\RTBasics\A02基础产品管理\U_ClothInfoImport.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\A00通用模板\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\ClothInfo.dproj</Transaction>
     <Transaction>1899-12-30 00:00:00.000.243,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用方法\AES\untAES.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.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.187,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.305,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_KnitClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.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.187,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.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.518,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.503,=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.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
   </Transactions>
@@ -103,7 +103,7 @@
     <File Path="fmx.dex.jar"/>
     <File Path="google-play-billing.dex.jar"/>
     <File Path="google-play-licensing.dex.jar"/>
-    <File Path="..\..\D10szKaiXiYa"/>
+    <File Path="..\..\D10SZKaiXiYa"/>
     <File Path="..\A00通用方法"/>
     <File Path="..\A00通用方法\AES"/>
     <File Path="..\A00通用方法\AES\ElAES.pas"/>

A02基础产品管理/U_TatClothInfoInput.dfm

@@ -698,6 +698,9 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
     object cxTabSheet2: TcxTabSheet
       Caption = #32428#19997#32452#21512
       ImageIndex = 1
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       object GroupBox2: TGroupBox
         Left = 961
         Top = 0
@@ -930,6 +933,9 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
     object cxTabSheet3: TcxTabSheet
       Caption = #36215#32508#27861
       ImageIndex = 3
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       object Panel8: TPanel
         Left = 0
         Top = 0
@@ -1013,6 +1019,9 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
     object cxTabSheet4: TcxTabSheet
       Caption = #31359#32508#27861
       ImageIndex = 3
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       object CZF: TMemo
         Tag = 2
         Left = 0
@@ -1027,6 +1036,9 @@ inherited frmTatClothInfoInput: TfrmTatClothInfoInput
     object cxTabSheet5: TcxTabSheet
       Caption = #31359#31576#27861
       ImageIndex = 3
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       object CKF: TMemo
         Tag = 2
         Left = 0

A02基础产品管理/U_TatClothInfoInput.pas

@@ -615,7 +615,6 @@ begin
 //  end;
 //
 //  C_GramWeight.text := floattostr(roundfloat((SumJS + SumWS) / 3, 2));
-
   /////////////生成规格 /////////////
 
   FC_Spec := '';
@@ -883,7 +882,6 @@ begin
       end;
     end;
 //////////////////////////            保存纬丝配比表              //////////////////////////
-
 //////////////////////////            保存起综              //////////////////////////
 //    with CDS_4 do
 //    begin
@@ -931,7 +929,6 @@ begin
 //      end;
 //    end;
 //////////////////////////            保存起综              //////////////////////////
-
 //    dxSpreadSheet1.SaveToFile('D:\FilesExcel.xlsx');
 //    with ADOQueryCmd do
 //    begin
@@ -962,7 +959,6 @@ begin
 //      myStream.Free;
 //      Post;
 //    end;
-
 //    if pos('接口异常', JsonStr) > 0 then
 //    begin
 //      raise Exception.Create(pchar(JsonStr));
@@ -1333,6 +1329,11 @@ begin
   mvalue := TcxTextEdit(Sender).EditingText;
   FFieldName := Trim(Tv1.Controller.FocusedColumn.DataBinding.FilterFieldName);
 
+  if mvalue = '' then
+  begin
+    mvalue := '0';
+  end;
+
   with CDS_1 do
   begin
     Edit;

B02基础纱线仓库/U_YarnInfoInPut.dfm

@@ -77,10 +77,9 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
     ParentCtl3D = False
     ParentFont = False
     TabOrder = 1
-    ExplicitTop = 29
     object Label2: TLabel
       Left = 16
-      Top = 156
+      Top = 159
       Width = 32
       Height = 21
       Caption = #31867#22411
@@ -93,7 +92,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
     end
     object Label6: TLabel
       Left = 16
-      Top = 239
+      Top = 243
       Width = 32
       Height = 21
       Caption = #21697#29260
@@ -145,7 +144,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
     end
     object Label4: TLabel
       Left = 16
-      Top = 72
+      Top = 74
       Width = 32
       Height = 21
       Caption = #35268#26684
@@ -158,7 +157,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
     end
     object Label8: TLabel
       Left = 387
-      Top = 72
+      Top = 74
       Width = 60
       Height = 21
       Caption = #29702#35770'D'#25968
@@ -171,7 +170,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
     end
     object Label9: TLabel
       Left = 387
-      Top = 196
+      Top = 201
       Width = 32
       Height = 21
       Caption = #39068#33394
@@ -184,7 +183,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
     end
     object Label5: TLabel
       Left = 16
-      Top = 115
+      Top = 116
       Width = 32
       Height = 21
       Caption = #25104#20998
@@ -197,7 +196,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
     end
     object Label10: TLabel
       Left = 387
-      Top = 156
+      Top = 159
       Width = 32
       Height = 21
       Caption = #32442#27861
@@ -210,7 +209,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
     end
     object Label11: TLabel
       Left = 16
-      Top = 196
+      Top = 201
       Width = 32
       Height = 21
       Caption = #25467#24230
@@ -223,7 +222,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
     end
     object Label12: TLabel
       Left = 387
-      Top = 115
+      Top = 116
       Width = 32
       Height = 21
       Caption = #25903#25968
@@ -235,8 +234,8 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
       ParentFont = False
     end
     object Label13: TLabel
-      Left = 374
+      Left = 387
-      Top = 238
+      Top = 243
       Width = 64
       Height = 21
       Caption = #26631#26679#26085#26399
@@ -250,7 +249,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
     object Brand: TcxTextEdit
       Tag = 2
       Left = 68
-      Top = 235
+      Top = 237
       ParentColor = True
       ParentFont = False
       Style.Font.Charset = GB2312_CHARSET
@@ -298,7 +297,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
     object Denier: TcxTextEdit
       Tag = 2
       Left = 458
-      Top = 68
+      Top = 69
       ParentColor = True
       ParentFont = False
       Properties.OnEditValueChanged = DenierPropertiesEditValueChanged
@@ -347,7 +346,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
     object ND: TcxTextEdit
       Tag = 2
       Left = 68
-      Top = 192
+      Top = 194
       ParentColor = True
       ParentFont = False
       Style.Font.Charset = GB2312_CHARSET
@@ -380,7 +379,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
     object BYDate: TcxDateEdit
       Tag = 2
       Left = 458
-      Top = 235
+      Top = 237
       ParentFont = False
       Properties.ShowTime = False
       Style.Font.Charset = GB2312_CHARSET
@@ -395,7 +394,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
     object Y_Color: TcxButtonEdit
       Tag = 2
       Left = 458
-      Top = 192
+      Top = 194
       Hint = 'Y_Color/'#39068#33394
       ParentFont = False
       Properties.Buttons = <
@@ -419,7 +418,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
     object Y_Type: TcxButtonEdit
       Tag = 2
       Left = 68
-      Top = 157
+      Top = 152
       Hint = 'Y_Type/'#31867#22411
       ParentFont = False
       Properties.Buttons = <
@@ -467,7 +466,7 @@ inherited frmYarnInfoInPut: TfrmYarnInfoInPut
     object Y_Spec: TcxButtonEdit
       Tag = 2
       Left = 68
-      Top = 68
+      Top = 69
       Hint = 'Y_Spec/'#35268#26684
       ParentFont = False
       Properties.Buttons = <

B02基础纱线仓库/U_YarnInfoInPut.pas

@@ -12,7 +12,23 @@ uses
   cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges,
   dxBarBuiltInMenu, U_BaseInput, U_BaseList, System.ImageList, Vcl.ImgList,
   cxContainer, cxMaskEdit, cxMemo, cxImageList, dxSkinsCore,
-  dxSkinsDefaultPainters, dxCore, cxDateUtils;
+  dxSkinsDefaultPainters, dxCore, cxDateUtils, dxSkinBasic, dxSkinBlack,
+  dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkroom,
+  dxSkinDarkSide, dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinOffice2013White, dxSkinOffice2016Colorful, dxSkinOffice2016Dark,
+  dxSkinOffice2019Black, dxSkinOffice2019Colorful, dxSkinOffice2019DarkGray,
+  dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
+  dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringtime, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinTheBezier, dxSkinValentine,
+  dxSkinVisualStudio2013Blue, dxSkinVisualStudio2013Dark,
+  dxSkinVisualStudio2013Light, dxSkinVS2010, dxSkinWhiteprint, dxSkinWXI,
+  dxSkinXmas2008Blue;
 
 type
   TfrmYarnInfoInPut = class(TfrmBaseInput)
@@ -254,7 +270,7 @@ begin
     frmZDYHelp := TfrmZDYHelp.Create(Application);
     with frmZDYHelp do
     begin
-      MainType := 'Cust';
+      MainType := 'É´Ïßµµ°¸';
       flag := Copy(fsj, 1, FWZ - 1);
       flagname := Copy(fsj, FWZ + 1, Length(fsj) - FWZ);
       if ShowModal = 1 then

B02基础纱线仓库/U_YarnInfoList.pas

@@ -13,7 +13,23 @@ uses
   RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxPC,
   cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu,
   dxDateRanges, U_BaseList, dxScrollbarAnnotations, cxContainer, cxMaskEdit,
-  dxSkinsCore, dxSkinsDefaultPainters, cxProgressBar;
+  dxSkinsCore, dxSkinsDefaultPainters, cxProgressBar, dxSkinBasic, dxSkinBlack,
+  dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkroom,
+  dxSkinDarkSide, dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinOffice2013White, dxSkinOffice2016Colorful, dxSkinOffice2016Dark,
+  dxSkinOffice2019Black, dxSkinOffice2019Colorful, dxSkinOffice2019DarkGray,
+  dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
+  dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringtime, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinTheBezier, dxSkinValentine,
+  dxSkinVisualStudio2013Blue, dxSkinVisualStudio2013Dark,
+  dxSkinVisualStudio2013Light, dxSkinVS2010, dxSkinWhiteprint, dxSkinWXI,
+  dxSkinXmas2008Blue;
 
 type
   TfrmYarnInfoList = class(TfrmBaseList)

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

@@ -1,92 +1,92 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.687,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.147,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.614,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.674,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_testdll.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.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.572,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_FactoryInput2.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.688,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList1.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.969,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutReturnList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.000,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn1.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.976,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.376,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.224,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.517,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.334,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.907,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\YarnStk.dproj=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\InformationBase.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.688,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.344,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.517,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.065,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.147,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.079,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.687,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.670,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutInput1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.376,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.344,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.796,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnStkList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.969,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutReturnList.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.670,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutInput1.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.224,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.536,=D:\Dp10Repo\项目代码\路尚\A00通用窗体\U_ProductInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.065,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.688,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList1.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.642,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.887,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.670,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutInput1.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.872,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList_RC.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.878,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.800,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_CPSelBig.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.670,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutInput1.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.008,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.800,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.356,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B03基础物料仓库\U_JWLPurchasePlanSel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.267,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.511,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothPurchasePlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.267,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.065,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.642,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.872,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList_RC.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.887,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.976,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.079,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.891,D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.065,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.dfm=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.511,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothPurchasePlanSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.572,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_FactoryInput2.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.800,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_CPSelBig.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.891,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.800,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.008,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.976,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.dfm=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.981,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.000,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn1.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.907,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\YarnStk.dproj</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.073,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutInput1.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutWBList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.073,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutWBList.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutInput1.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.534,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.864,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.935,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.976,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.471,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.969,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutReturnList.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.935,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.356,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B03基础物料仓库\U_JWLPurchasePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.471,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.209,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.864,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.224,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.534,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.511,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothPurchasePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnInEdit.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.209,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.224,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.356,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B03基础物料仓库\U_JWLPurchasePlanSel.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.316,=D:\Dp10Repo\项目代码\路尚\T00贸易通用窗体\U_PurchaseContractSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.517,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.802,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.073,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutInput1.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutWBList.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.511,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothPurchasePlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnPurchasePlanSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.073,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutWBList.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutInput1.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.000,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.046,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnStkSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.420,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInfoInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.688,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList1.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.768,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnPurOutReturn.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.803,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnInfoList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.356,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B03基础物料仓库\U_JWLPurchasePlanSel.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\Unit1.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.891,D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.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.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.969,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutReturnList.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.517,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.dfm</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.344,D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.796,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnStkList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.803,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnInfoList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.046,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnStkSel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.344,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInList.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_YarnInList_Sel.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.334,=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用窗体\U_InputBoxSingleNumber.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.111,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnWeighing.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.425,=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.000,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnPurOutReturn1.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.420,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInfoInPut.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.768,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnPurOutReturn.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.334,=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用窗体\U_InputBoxSingleNumber.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.891,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.dfm</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="android-support-v4.dex.jar"/>
@@ -117,7 +117,7 @@
     <File Path="fmx.dex.jar"/>
     <File Path="google-play-billing.dex.jar"/>
     <File Path="google-play-licensing.dex.jar"/>
-    <File Path="..\..\D10szKaiXiYa"/>
+    <File Path="..\..\D10SZKaiXiYa"/>
     <File Path="..\A00通用窗体"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.pas"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.dfm"/>

E00梭织通用窗体/U_TatGYSel.pas

@@ -11,7 +11,23 @@ uses
   cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
   cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu,
   System.ImageList, U_BaseInput, cxCheckBox, cxCalendar, dxScrollbarAnnotations,
-  dxSkinsCore, dxSkinsDefaultPainters;
+  dxSkinsCore, dxSkinsDefaultPainters, dxSkinBasic, dxSkinBlack, dxSkinBlue,
+  dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkroom, dxSkinDarkSide,
+  dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinOffice2013White, dxSkinOffice2016Colorful, dxSkinOffice2016Dark,
+  dxSkinOffice2019Black, dxSkinOffice2019Colorful, dxSkinOffice2019DarkGray,
+  dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
+  dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringtime, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinTheBezier, dxSkinValentine,
+  dxSkinVisualStudio2013Blue, dxSkinVisualStudio2013Dark,
+  dxSkinVisualStudio2013Light, dxSkinVS2010, dxSkinWhiteprint, dxSkinWXI,
+  dxSkinXmas2008Blue;
 
 type
   TfrmTatGYSel = class(TfrmBaseHelp)

E00梭织通用窗体/U_TatPlanSel.dfm

@@ -233,7 +233,7 @@ inherited frmTatPlanSel: TfrmTatPlanSel
       Top = 33
       Width = 120
       Height = 20
-      TabOrder = 3
+      TabOrder = 7
       OnChange = OrderNoChange
     end
     object C_Pattern: TEdit
@@ -242,7 +242,7 @@ inherited frmTatPlanSel: TfrmTatPlanSel
       Top = 6
       Width = 120
       Height = 20
-      TabOrder = 4
+      TabOrder = 3
       OnChange = OrderNoChange
     end
     object C_Code: TEdit
@@ -251,7 +251,7 @@ inherited frmTatPlanSel: TfrmTatPlanSel
       Top = 33
       Width = 120
       Height = 20
-      TabOrder = 5
+      TabOrder = 6
       OnChange = OrderNoChange
     end
     object ConNo: TEdit
@@ -260,7 +260,7 @@ inherited frmTatPlanSel: TfrmTatPlanSel
       Top = 33
       Width = 120
       Height = 20
-      TabOrder = 6
+      TabOrder = 5
       OnChange = OrderNoChange
     end
     object CustName: TEdit
@@ -269,7 +269,7 @@ inherited frmTatPlanSel: TfrmTatPlanSel
       Top = 33
       Width = 120
       Height = 20
-      TabOrder = 7
+      TabOrder = 8
       OnChange = OrderNoChange
     end
     object XH: TEdit
@@ -278,7 +278,7 @@ inherited frmTatPlanSel: TfrmTatPlanSel
       Top = 6
       Width = 120
       Height = 20
-      TabOrder = 8
+      TabOrder = 4
       OnChange = OrderNoChange
     end
     object OrdNote: TEdit

E00梭织通用窗体/U_TatPlanSel.pas

@@ -11,7 +11,23 @@ uses
   cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
   cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu,
   System.ImageList, U_BaseInput, cxCheckBox, cxCalendar, dxScrollbarAnnotations,
-  dxSkinsCore, dxSkinsDefaultPainters;
+  dxSkinsCore, dxSkinsDefaultPainters, dxSkinBasic, dxSkinBlack, dxSkinBlue,
+  dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkroom, dxSkinDarkSide,
+  dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinOffice2013White, dxSkinOffice2016Colorful, dxSkinOffice2016Dark,
+  dxSkinOffice2019Black, dxSkinOffice2019Colorful, dxSkinOffice2019DarkGray,
+  dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
+  dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringtime, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinTheBezier, dxSkinValentine,
+  dxSkinVisualStudio2013Blue, dxSkinVisualStudio2013Dark,
+  dxSkinVisualStudio2013Light, dxSkinVS2010, dxSkinWhiteprint, dxSkinWXI,
+  dxSkinXmas2008Blue;
 
 type
   TfrmTatPlanSel = class(TfrmBaseHelp)

E01梭织生产计划/ProjectGroup1.groupproj

@@ -3,6 +3,9 @@
         <ProjectGuid>{A2E09526-CCB8-4B87-A664-0FBEC44EA651}</ProjectGuid>
     </PropertyGroup>
     <ItemGroup>
+        <Projects Include="TatPlan.dproj">
+            <Dependencies/>
+        </Projects>
         <Projects Include="testDll.dproj">
             <Dependencies/>
         </Projects>
@@ -14,6 +17,15 @@
             <Default.Personality/>
         </BorlandProject>
     </ProjectExtensions>
+    <Target Name="TatPlan">
+        <MSBuild Projects="TatPlan.dproj"/>
+    </Target>
+    <Target Name="TatPlan:Clean">
+        <MSBuild Projects="TatPlan.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="TatPlan:Make">
+        <MSBuild Projects="TatPlan.dproj" Targets="Make"/>
+    </Target>
     <Target Name="testDll">
         <MSBuild Projects="testDll.dproj"/>
     </Target>
@@ -24,13 +36,13 @@
         <MSBuild Projects="testDll.dproj" Targets="Make"/>
     </Target>
     <Target Name="Build">
-        <CallTarget Targets="testDll"/>
+        <CallTarget Targets="TatPlan;testDll"/>
     </Target>
     <Target Name="Clean">
-        <CallTarget Targets="testDll:Clean"/>
+        <CallTarget Targets="TatPlan:Clean;testDll:Clean"/>
     </Target>
     <Target Name="Make">
-        <CallTarget Targets="testDll:Make"/>
+        <CallTarget Targets="TatPlan:Make;testDll:Make"/>
     </Target>
     <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
 </Project>

E01梭织生产计划/ProjectGroup1.groupproj.local

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Default.Personality>
-		<Projects ActiveProject="D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\testDll.dproj"/>
+		<Projects ActiveProject="D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E01梭织生产计划\TatPlan.dproj"/>
 	</Default.Personality>
 </BorlandProject>

E01梭织生产计划/TatPlan.dproj.local

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>1899-12-30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\Unit1.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.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.555,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.220,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.873,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.577,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_FactoryInput2.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.759,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCard1.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.383,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard1.dfm</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>
-    <Transaction>1899-12-30 00:00:00.000.452,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\TatPlan.dproj</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.220,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.959,D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.469,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanMachInput.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.452,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\TatPlan.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.959,D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.806,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\Unit1.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.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.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.460,=D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
@@ -24,26 +24,26 @@
     <Transaction>1899-12-30 00:00:00.000.308,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnInfoInPut.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.957,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYInPut.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanInPut.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.258,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.709,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_PlanWBList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.812,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_PlanWBList.pas=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatWBCardInPut.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.709,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_PlanWBList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.628,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.228,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.552,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatPlanCard.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.248,=D:\Dp10RepoV1\项目代码\花蝴蝶\T00贸易通用窗体\U_TradeSalesContractSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.383,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanCard1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.600,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatGYSel.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.600,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatGYSel.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.228,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.600,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatPlanSel.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E00梭织通用窗体\U_TatGYSel.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.354,=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.747,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatGYList.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\E01梭织生产计划\U_TatPlanList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.812,D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_PlanWBList.dfm=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatWBCardInPut.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.926,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.719,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.203,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_WBSpecSel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_JHDTJ.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.354,=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.414,D:\Dp10Repo\项目代码\路尚\E00梭织通用窗体\U_TatPlanSel.dfm=D:\Dp10Repo\项目代码\路尚\E02梭织经轴仓库\U_WBTatPlanSel.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.556,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
@@ -65,8 +65,8 @@
     <Transaction>1899-12-30 00:00:00.000.876,=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatPlanInPut.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.416,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut1.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.416,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut1.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.416,D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\E01梭织生产计划\U_TatCardInPut1.dfm</Transaction>
     <Transaction>1899-12-30 00:00:00.000.561,=D:\Dp10Repo\项目代码\RTBasics\E01梭织生产计划\U_TatCardInPut.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.736,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_JHDTJ.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E01梭织生产计划\U_TatPlanCardWJY.dfm</Transaction>
@@ -101,7 +101,7 @@
     <File Path="fmx.dex.jar"/>
     <File Path="google-play-billing.dex.jar"/>
     <File Path="google-play-licensing.dex.jar"/>
-    <File Path="..\..\D10szKaiXiYa"/>
+    <File Path="..\..\D10SZKaiXiYa"/>
     <File Path="..\A00通用窗体"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.pas"/>
     <File Path="..\A00通用窗体\U_AttachmentUpload.dfm"/>

E01梭织生产计划/U_TatGYInPut.dfm

@@ -896,9 +896,6 @@ inherited frmTatGYInPut: TfrmTatGYInPut
     object cxTabSheet2: TcxTabSheet
       Caption = #32428#19997#32452#21512
       ImageIndex = 1
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 417
       object GroupBox2: TGroupBox
         Left = 863
         Top = 0
@@ -913,7 +910,6 @@ inherited frmTatGYInPut: TfrmTatGYInPut
         Font.Style = [fsBold]
         ParentFont = False
         TabOrder = 0
-        ExplicitHeight = 417
         object Y_Note_PLW: TMemo
           Tag = 2
           Left = 2
@@ -928,7 +924,6 @@ inherited frmTatGYInPut: TfrmTatGYInPut
           Font.Style = [fsBold]
           ParentFont = False
           TabOrder = 0
-          ExplicitHeight = 384
         end
       end
       object Panel2: TPanel
@@ -938,7 +933,6 @@ inherited frmTatGYInPut: TfrmTatGYInPut
         Height = 445
         Align = alLeft
         TabOrder = 1
-        ExplicitHeight = 417
         object cxPageControl1: TcxPageControl
           Left = 1
           Top = 1
@@ -958,7 +952,6 @@ inherited frmTatGYInPut: TfrmTatGYInPut
           Visible = False
           Properties.CustomButtons.Buttons = <>
           Properties.Style = 6
-          ExplicitHeight = 415
           ClientRectBottom = 443
           ClientRectRight = 861
           ClientRectTop = 0
@@ -970,7 +963,6 @@ inherited frmTatGYInPut: TfrmTatGYInPut
           Height = 443
           Align = alClient
           TabOrder = 1
-          ExplicitHeight = 415
           object Tv2: TcxGridDBTableView
             Navigator.Buttons.CustomButtons = <>
             ScrollbarAnnotations.CustomAnnotations = <>
@@ -1149,9 +1141,6 @@ inherited frmTatGYInPut: TfrmTatGYInPut
     object cxTabSheet3: TcxTabSheet
       Caption = #36215#32508#27861
       ImageIndex = 3
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 417
       object cxGrid4: TcxGrid
         Left = 0
         Top = 403
@@ -1160,7 +1149,6 @@ inherited frmTatGYInPut: TfrmTatGYInPut
         Align = alBottom
         TabOrder = 0
         Visible = False
-        ExplicitTop = 375
         object TV4: TcxGridDBTableView
           Navigator.Buttons.CustomButtons = <>
           ScrollbarAnnotations.CustomAnnotations = <>
@@ -1254,15 +1242,11 @@ inherited frmTatGYInPut: TfrmTatGYInPut
         ImeName = #20013#25991'('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
         ParentFont = False
         TabOrder = 1
-        ExplicitHeight = 375
       end
     end
     object cxTabSheet4: TcxTabSheet
       Caption = #31359#32508#27861
       ImageIndex = 3
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 417
       object CZF: TMemo
         Tag = 2
         Left = 0
@@ -1278,15 +1262,11 @@ inherited frmTatGYInPut: TfrmTatGYInPut
         ImeName = #20013#25991'('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
         ParentFont = False
         TabOrder = 0
-        ExplicitHeight = 417
       end
     end
     object cxTabSheet5: TcxTabSheet
       Caption = #31359#31576#27861
       ImageIndex = 3
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 417
       object CKF: TMemo
         Tag = 2
         Left = 0
@@ -1302,7 +1282,6 @@ inherited frmTatGYInPut: TfrmTatGYInPut
         ImeName = #20013#25991'('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
         ParentFont = False
         TabOrder = 0
-        ExplicitHeight = 417
       end
     end
   end

E01梭织生产计划/U_TatGYInPut.pas

@@ -273,31 +273,30 @@ begin
 //  Self.CKF.Text := ADOQueryTemp.fieldbyname('CKF').AsString;
 //  Self.Y_Note_PLJ.Text := ADOQueryTemp.fieldbyname('Y_Note_PLJ').AsString;
 //  Self.Y_Note_PLW.Text := ADOQueryTemp.fieldbyname('Y_Note_PLW').AsString;
-//
+  with ADOQueryTemp do
-//  with ADOQueryTemp do
+  begin
-//  begin
+    Close;
-//    Close;
+    sql.Clear;
-//    sql.Clear;
+    sql.Add('select A.*,MainId=cast('''' as varchar(30)),SubId=cast('''' as varchar(30)) from BS_Cloth_Yarn A inner join Bs_Cloth_Info B on A.BCIID=B.BCIID');
-//    sql.Add('select A.*,MainId=cast('''' as varchar(30)),SubId=cast('''' as varchar(30)) from BS_Cloth_Yarn A inner join Bs_Cloth_Info B on A.BCIID=B.BCIID');
+    sql.Add(' where A.YRType=''经丝'' and B.C_Code=''' + Trim(MC_Code) + '''');
-//    sql.Add(' where A.YRType=''经丝'' and B.C_Code=''' + Trim(MC_Code) + '''');
+    Open;
-//    Open;
+  end;
-//  end;
+  SCreateCDS(ADOQueryTemp, CDS_1);
-//  SCreateCDS(ADOQueryTemp, CDS_1);
+  SInitCDSData(ADOQueryTemp, CDS_1);
-//  SInitCDSData(ADOQueryTemp, CDS_1);
+  ClearCDSColumn(CDS_1, ['YRId', 'SubId', 'MainId']);
-//  ClearCDSColumn(CDS_1, ['YRId', 'SubId', 'MainId']);
+
-//
+  with ADOQueryTemp do
-//  with ADOQueryTemp do
+  begin
-//  begin
+    Close;
-//    Close;
+    sql.Clear;
-//    sql.Clear;
+    sql.Add('select A.*,MainId=cast('''' as varchar(30)),SubId=cast('''' as varchar(30))   from BS_Cloth_Yarn A inner join Bs_Cloth_Info B on A.BCIID=B.BCIID');
-//    sql.Add('select A.*,MainId=cast('''' as varchar(30)),SubId=cast('''' as varchar(30))   from BS_Cloth_Yarn A inner join Bs_Cloth_Info B on A.BCIID=B.BCIID');
+    sql.Add(' where A.YRType=''纬丝'' and B.C_Code=''' + Trim(MC_Code) + '''');
-//    sql.Add(' where A.YRType=''纬丝'' and B.C_Code=''' + Trim(MC_Code) + '''');
+    Open;
-//    Open;
+  end;
-//  end;
+  SCreateCDS(ADOQueryTemp, CDS_2);
-//  SCreateCDS(ADOQueryTemp, CDS_2);
+  SInitCDSData(ADOQueryTemp, CDS_2);
-//  SInitCDSData(ADOQueryTemp, CDS_2);
+  ClearCDSColumn(CDS_2, ['YRId', 'SubId', 'MainId']);
-//  ClearCDSColumn(CDS_2, ['YRId', 'SubId', 'MainId']);
+
-//
 //  with ADOQueryTemp do
 //  begin
 //    Close;
@@ -843,11 +842,11 @@ begin
   OrdDate.SetFocus;
   CALCYarnQty();
 
-  if Trim(CustName.Text) = '' then
+//  if Trim(CustName.Text) = '' then
-  begin
+//  begin
-    Application.MessageBox('客户不能为空!', '提示', 0);
+//    Application.MessageBox('客户不能为空!', '提示', 0);
-    Exit;
+//    Exit;
-  end;
+//  end;
 
   if Trim(OrdType.Text) = '' then
   begin
@@ -877,11 +876,11 @@ begin
 //    Application.MessageBox('总数量不能为空!', '提示', 0);
 //    Exit;
 //  end;
-  if Trim(OrdPieceLen.Text) = '' then
+//  if Trim(OrdPieceLen.Text) = '' then
-  begin
+//  begin
-    Application.MessageBox('匹长不能为空!', '提示', 0);
+//    Application.MessageBox('匹长不能为空!', '提示', 0);
-    Exit;
+//    Exit;
-  end;
+//  end;
 //  if Trim(OrdPiece.Text) = '' then
 //  begin
 //    Application.MessageBox('匹数不能为空!', '提示', 0);
@@ -893,11 +892,11 @@ begin
 //    Application.MessageBox('总数量非法数字!', '提示', 0);
 //    Exit;
 //  end;
-  if TryStrToFloat(OrdPiecelen.Text, FReal) = False then
+//  if TryStrToFloat(OrdPiecelen.Text, FReal) = False then
-  begin
+//  begin
-    Application.MessageBox('匹长非法数字!', '提示', 0);
+//    Application.MessageBox('匹长非法数字!', '提示', 0);
-    Exit;
+//    Exit;
-  end;
+//  end;
 //  if TryStrToFloat(OrdPiece.Text, FReal) = False then
 //  begin
 //    Application.MessageBox('匹数非法数字!', '提示', 0);

E01梭织生产计划/U_TatPlanInPut.dfm

@@ -102,21 +102,21 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
     end
     object Label8: TLabel
       Left = 294
-      Top = 152
+      Top = 155
       Width = 48
       Height = 21
       Caption = #21305#25968#65306
     end
     object Label12: TLabel
       Left = 857
-      Top = 152
+      Top = 155
       Width = 73
       Height = 21
       Caption = #21305'     '#38271#65306
     end
     object Label13: TLabel
       Left = 582
-      Top = 152
+      Top = 155
       Width = 74
       Height = 21
       Caption = #24635' '#25968' '#37327#65306
@@ -309,7 +309,7 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
     object OrdPieceLen: TcxTextEdit
       Tag = 2
       Left = 963
-      Top = 148
+      Top = 149
       Properties.OnEditValueChanged = OrdPiecePropertiesEditValueChanged
       TabOrder = 2
       OnKeyPress = ConNoKeyPress
@@ -318,7 +318,7 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
     object OrdPiece: TcxTextEdit
       Tag = 2
       Left = 409
-      Top = 148
+      Top = 149
       Properties.OnEditValueChanged = OrdPiecePropertiesEditValueChanged
       TabOrder = 3
       OnKeyPress = ConNoKeyPress
@@ -640,7 +640,7 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
     object GYNo: TcxButtonEdit
       Tag = 2
       Left = 117
-      Top = 148
+      Top = 149
       Properties.Buttons = <
         item
           Default = True
@@ -664,15 +664,12 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
     Properties.ActivePage = cxTabSheet1
     Properties.CustomButtons.Buttons = <>
     Properties.Style = 9
-    ExplicitTop = 489
-    ExplicitHeight = 277
     ClientRectBottom = 431
     ClientRectRight = 1595
     ClientRectTop = 28
     object cxTabSheet1: TcxTabSheet
       Caption = #32463#19997#32452#21512
       ImageIndex = 0
-      ExplicitHeight = 249
       object GroupBox1: TGroupBox
         Left = 931
         Top = 0
@@ -687,7 +684,6 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
         Font.Style = [fsBold]
         ParentFont = False
         TabOrder = 0
-        ExplicitHeight = 249
         object Y_Note_PLJ: TMemo
           Tag = 2
           Left = 2
@@ -702,7 +698,6 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
           Font.Style = [fsBold]
           ParentFont = False
           TabOrder = 0
-          ExplicitHeight = 216
         end
       end
       object Panel1: TPanel
@@ -712,7 +707,6 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
         Height = 403
         Align = alLeft
         TabOrder = 1
-        ExplicitHeight = 249
         object cxPageControl2: TcxPageControl
           Left = 1
           Top = 1
@@ -732,7 +726,6 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
           Visible = False
           Properties.CustomButtons.Buttons = <>
           Properties.Style = 6
-          ExplicitHeight = 247
           ClientRectBottom = 401
           ClientRectRight = 929
           ClientRectTop = 0
@@ -744,7 +737,6 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
           Height = 401
           Align = alClient
           TabOrder = 1
-          ExplicitHeight = 247
           object TV1: TcxGridDBTableView
             Navigator.Buttons.CustomButtons = <>
             ScrollbarAnnotations.CustomAnnotations = <>
@@ -923,7 +915,6 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
     object cxTabSheet2: TcxTabSheet
       Caption = #32428#19997#32452#21512
       ImageIndex = 1
-      ExplicitHeight = 249
       object GroupBox2: TGroupBox
         Left = 863
         Top = 0
@@ -938,7 +929,6 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
         Font.Style = [fsBold]
         ParentFont = False
         TabOrder = 0
-        ExplicitHeight = 249
         object Y_Note_PLW: TMemo
           Tag = 2
           Left = 2
@@ -953,7 +943,6 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
           Font.Style = [fsBold]
           ParentFont = False
           TabOrder = 0
-          ExplicitHeight = 216
         end
       end
       object Panel2: TPanel
@@ -963,7 +952,6 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
         Height = 403
         Align = alLeft
         TabOrder = 1
-        ExplicitHeight = 249
         object cxPageControl1: TcxPageControl
           Left = 1
           Top = 1
@@ -983,7 +971,6 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
           Visible = False
           Properties.CustomButtons.Buttons = <>
           Properties.Style = 6
-          ExplicitHeight = 247
           ClientRectBottom = 401
           ClientRectRight = 861
           ClientRectTop = 0
@@ -995,7 +982,6 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
           Height = 401
           Align = alClient
           TabOrder = 1
-          ExplicitHeight = 247
           object Tv2: TcxGridDBTableView
             Navigator.Buttons.CustomButtons = <>
             ScrollbarAnnotations.CustomAnnotations = <>
@@ -1174,7 +1160,6 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
     object cxTabSheet3: TcxTabSheet
       Caption = #36215#32508#27861
       ImageIndex = 3
-      ExplicitHeight = 249
       object cxGrid4: TcxGrid
         Left = 0
         Top = 361
@@ -1183,7 +1168,6 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
         Align = alBottom
         TabOrder = 0
         Visible = False
-        ExplicitTop = 207
         object TV4: TcxGridDBTableView
           Navigator.Buttons.CustomButtons = <>
           ScrollbarAnnotations.CustomAnnotations = <>
@@ -1277,13 +1261,11 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
         ImeName = #20013#25991'('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
         ParentFont = False
         TabOrder = 1
-        ExplicitHeight = 207
       end
     end
     object cxTabSheet4: TcxTabSheet
       Caption = #31359#32508#27861
       ImageIndex = 3
-      ExplicitHeight = 249
       object CZF: TMemo
         Tag = 2
         Left = 0
@@ -1299,13 +1281,11 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
         ImeName = #20013#25991'('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
         ParentFont = False
         TabOrder = 0
-        ExplicitHeight = 249
       end
     end
     object cxTabSheet5: TcxTabSheet
       Caption = #31359#31576#27861
       ImageIndex = 3
-      ExplicitHeight = 249
       object CKF: TMemo
         Tag = 2
         Left = 0
@@ -1321,17 +1301,16 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
         ImeName = #20013#25991'('#31616#20307') - '#25628#29399#25340#38899#36755#20837#27861
         ParentFont = False
         TabOrder = 0
-        ExplicitHeight = 249
       end
     end
   end
   inherited ADOQueryBaseCmd: TADOQuery
-    Left = 606
+    Left = 558
-    Top = 315
+    Top = 323
   end
   inherited ADOQueryBaseTemp: TADOQuery
-    Left = 663
+    Left = 631
-    Top = 313
+    Top = 305
   end
   inherited ImageList_new32: TImageList
     Left = 703
@@ -1347,14 +1326,14 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
     Connection = DataLink_TatPlan.ADOLink
     LockType = ltReadOnly
     Parameters = <>
-    Left = 921
+    Left = 961
-    Top = 314
+    Top = 282
   end
   object ADOQueryCmd: TADOQuery
     Connection = DataLink_TatPlan.ADOLink
     Parameters = <>
-    Left = 695
+    Left = 703
-    Top = 313
+    Top = 329
   end
   object CDS_2: TClientDataSet
     Aggregates = <>
@@ -1405,7 +1384,14 @@ inherited frmTatPlanInPut: TfrmTatPlanInPut
     Connection = DataLink_TatPlan.ADOLink
     LockType = ltReadOnly
     Parameters = <>
-    Left = 1019
+    Left = 1043
-    Top = 320
+    Top = 312
+  end
+  object ADOQueryMain: TADOQuery
+    Connection = DataLink_TatPlan.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 713
+    Top = 514
   end
 end

E01梭织生产计划/U_TatPlanInPut.pas

@@ -187,6 +187,7 @@ type
     ADOQuery1: TADOQuery;
     Label27: TLabel;
     GYNo: TcxButtonEdit;
+    ADOQueryMain: TADOQuery;
     procedure TBCloseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure TBSaveClick(Sender: TObject);
@@ -222,7 +223,6 @@ type
     procedure InitData();
     procedure Initexcel();
     procedure CALCYarnQty();
-
     procedure JSJS(); //计算经丝
     procedure JSWS(); //计算纬丝
     procedure JSKZ(); //计算克重
@@ -360,36 +360,32 @@ procedure TfrmTatPlanInPut.InitData();
 var
   PBNO, PBFlag: string;
 begin
-  if PState = 1 then
-  begin
-    ConNo.enabled := false;
-  end;
 
-  with ADOQueryTemp do
+  with ADOQueryMain do
   begin
     Close;
     SQL.Clear;
     sql.Add('select * from Tat_Plan_Main A where A.MainId=''' + Trim(FMainId) + '''');
     Open;
   end;
-  SCSHData(ADOQueryTemp, ScrollBox1, 0);
+  SCSHData(ADOQueryMain, ScrollBox1, 0);
 
-  QZF.Text := Trim(ADOQueryTemp.FieldByName('QZF').AsString);
+  QZF.Text := Trim(ADOQueryMain.FieldByName('QZF').AsString);
-  CZF.Text := Trim(ADOQueryTemp.FieldByName('CZF').AsString);
+  CZF.Text := Trim(ADOQueryMain.FieldByName('CZF').AsString);
-  CKF.Text := Trim(ADOQueryTemp.FieldByName('CKF').AsString);
+  CKF.Text := Trim(ADOQueryMain.FieldByName('CKF').AsString);
 
-  with ADOQueryTemp do
+  with ADOQueryMain do
   begin
     Close;
     SQL.Clear;
     sql.Add('select * from Tat_Plan_Sub A where A.MainId=''' + Trim(FMainId) + '''');
     Open;
   end;
-  SCSHData(ADOQueryTemp, ScrollBox1, 2);
+  SCSHData(ADOQueryMain, ScrollBox1, 2);
-  Y_Note_PLJ.Text := ADOQueryTemp.FieldByName('Y_Note_PLJ').AsString;
+  Y_Note_PLJ.Text := ADOQueryMain.FieldByName('Y_Note_PLJ').AsString;
 
-  Y_Note_PLW.Text := ADOQueryTemp.FieldByName('Y_Note_PLW').AsString;
+  Y_Note_PLW.Text := ADOQueryMain.FieldByName('Y_Note_PLW').AsString;
-  with ADOQueryTemp do
+  with ADOQueryMain do
   begin
     Close;
     sql.Clear;
@@ -397,9 +393,9 @@ begin
     sql.Add(' where YRType=''经丝'' and A.MainId=''' + Trim(FMainId) + '''');
     Open;
   end;
-  SCreateCDS(ADOQueryTemp, CDS_1);
+  SCreateCDS(ADOQueryMain, CDS_1);
-  SInitCDSData(ADOQueryTemp, CDS_1);
+  SInitCDSData(ADOQueryMain, CDS_1);
-  with ADOQueryTemp do
+  with ADOQueryMain do
   begin
     Close;
     sql.Clear;
@@ -407,19 +403,19 @@ begin
     sql.Add(' where YRType=''纬丝'' and A.MainId=''' + Trim(FMainId) + '''');
     Open;
   end;
-  SCreateCDS(ADOQueryTemp, CDS_2);
+  SCreateCDS(ADOQueryMain, CDS_2);
-  SInitCDSData(ADOQueryTemp, CDS_2);
+  SInitCDSData(ADOQueryMain, CDS_2);
 
     /////////////////刷新起综工艺单信息/////////////////////////
-  with ADOQueryTemp do
+  with ADOQueryMain do
   begin
     Close;
     sql.Clear;
     sql.Add('select * from Tat_Plan_QZ where MainId=''' + Trim(FMainId) + '''');
     Open;
   end;
-  SCreateCDS(ADOQueryTemp, CDS_QZ);
+  SCreateCDS(ADOQueryMain, CDS_QZ);
-  SInitCDSData(ADOQueryTemp, CDS_QZ);
+  SInitCDSData(ADOQueryMain, CDS_QZ);
 
  /////////////////刷新起综工艺单信息/////////////////////////
   if FMainId = '' then
@@ -509,6 +505,11 @@ begin
     end;
 
   end;
+  if PState = 1 then
+  begin
+    ConNo.enabled := false;
+    ScrollBox1.Enabled := False;
+  end;
 end;
 
 procedure TfrmTatPlanInPut.Initexcel();
@@ -1103,6 +1104,12 @@ begin
       begin
 
         Self.GYNo.text := Trim(CDS_1.FieldByName('MainID').AsString);
+        if Self.OurCoName.Text <> '' then
+          Self.OurCoName.Tag := 99;
+        if Self.FtyCoName.Text <> '' then
+          Self.FtyCoName.Tag := 99;
+        Self.orderno.Tag := 99;
+        Self.conno.Tag := 99;
 
         with ADOQueryTemp do
         begin
@@ -1124,6 +1131,7 @@ begin
           sql.Add('select * from Tat_Plan_Sub A where A.MainId=''' + Trim(Self.GYNo.text) + '''');
           Open;
         end;
+
         SCSHData(ADOQueryTemp, ScrollBox1, 2);
 
         Self.Y_Note_PLJ.Text := ADOQueryTemp.FieldByName('Y_Note_PLJ').AsString;
@@ -1153,7 +1161,7 @@ begin
         SCreateCDS(ADOQueryTemp, self.CDS_2);
         SInitCDSData(ADOQueryTemp, self.CDS_2);
 
-        Self.OrderNo.text := '';
+//        Self.OrderNo.text := '';
 
         with self.CDS_1 do
         begin
@@ -1187,6 +1195,10 @@ begin
     end;
   finally
     frmTatGYSel.Free;
+    Self.OurCoName.Tag := 0;
+    Self.FtyCoName.Tag := 0;
+    Self.orderno.Tag := 0;
+    Self.conno.Tag := 2;
   end;
 end;
 

E01梭织生产计划/U_TatPlanList.dfm

@@ -314,6 +314,7 @@ inherited frmTatPlanList: TfrmTatPlanList
     Height = 444
     Align = alClient
     TabOrder = 2
+    ExplicitLeft = -6
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>

E01梭织生产计划/U_TatPlanList.pas

@@ -575,7 +575,7 @@ begin
       FSubId := Trim(Self.CDS_1.fieldbyname('SubId').AsString);
       FConNo := Trim(Self.CDS_1.fieldbyname('ConNo').AsString);
       TBSave.Visible := False;
-      ScrollBox1.Enabled := False;
+
       if ShowModal = 1 then
       begin
 

E02梭织经轴仓库/U_DataLink.dfm

@@ -4,6 +4,10 @@ inherited DataLink_WarpBeamStk: TDataLink_WarpBeamStk
   Height = 349
   Width = 482
   inherited cxEditStyleController1: TcxEditStyleController
+    Style.LookAndFeel.SkinName = ''
+    StyleDisabled.LookAndFeel.SkinName = ''
+    StyleFocused.LookAndFeel.SkinName = ''
+    StyleHot.LookAndFeel.SkinName = ''
     PixelsPerInch = 96
   end
   inherited cxImageList_bar: TcxImageList

E02梭织经轴仓库/U_DataLink.pas

@@ -23,7 +23,23 @@ uses
     
      U_BaseDataLink, dxCore,
   cxLocalization, cxImageList, cxGraphics, cxEdit, cxContainer, dxSkinsForm,
-  dxLayoutLookAndFeels, dxSkinsCore, dxSkinsDefaultPainters, dxSkinWXI;
+  dxLayoutLookAndFeels, dxSkinsCore, dxSkinsDefaultPainters, dxSkinWXI,
+  dxSkinBasic, dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel,
+  dxSkinCoffee, dxSkinDarkroom, dxSkinDarkSide, dxSkinDevExpressDarkStyle,
+  dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast,
+  dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky,
+  dxSkinMcSkin, dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins,
+  dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green,
+  dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black,
+  dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
+  dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinOffice2016Colorful,
+  dxSkinOffice2016Dark, dxSkinOffice2019Black, dxSkinOffice2019Colorful,
+  dxSkinOffice2019DarkGray, dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven,
+  dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, dxSkinSilver,
+  dxSkinSpringtime, dxSkinStardust, dxSkinSummer2008, dxSkinTheAsphaltWorld,
+  dxSkinTheBezier, dxSkinValentine, dxSkinVisualStudio2013Blue,
+  dxSkinVisualStudio2013Dark, dxSkinVisualStudio2013Light, dxSkinVS2010,
+  dxSkinWhiteprint, dxSkinXmas2008Blue;
 
 type
   TMyThread = class(TThread)

E02梭织经轴仓库/U_TatWBCardInPut.dfm

@@ -702,6 +702,7 @@ inherited frmTatWBCardInPut: TfrmTatWBCardInPut
       Color = clWhite
       ParentBackground = False
       TabOrder = 1
+      ExplicitLeft = -4
       object Label15: TLabel
         Left = 277
         Top = 18
@@ -725,7 +726,7 @@ inherited frmTatWBCardInPut: TfrmTatWBCardInPut
       end
       object Label16: TLabel
         Left = 7
-        Top = 367
+        Top = 408
         Width = 64
         Height = 21
         Caption = #29301#32463#25490#21015
@@ -741,88 +742,102 @@ inherited frmTatWBCardInPut: TfrmTatWBCardInPut
       end
       object Label8: TLabel
         Left = 7
-        Top = 291
+        Top = 332
         Width = 48
         Height = 21
         Caption = #20301#31227#37327
       end
       object Label11: TLabel
         Left = 7
-        Top = 96
+        Top = 137
         Width = 48
         Height = 21
         Caption = #24635#22836#20221
       end
       object Label12: TLabel
         Left = 7
-        Top = 213
+        Top = 254
         Width = 64
         Height = 21
         Caption = #31576#31359#20837#27861
       end
       object Label13: TLabel
         Left = 7
-        Top = 135
+        Top = 176
         Width = 32
         Height = 21
         Caption = #21514#25968
       end
       object Label14: TLabel
         Left = 7
-        Top = 174
+        Top = 215
         Width = 64
         Height = 21
         Caption = #32463#36724#38376#24133
       end
       object Label17: TLabel
         Left = 7
-        Top = 252
+        Top = 293
         Width = 64
         Height = 21
         Caption = #22987#21514#20301#32622
       end
       object Label18: TLabel
         Left = 277
-        Top = 96
+        Top = 137
         Width = 64
         Height = 21
         Caption = #19978#25490#39063#25968
       end
       object Label19: TLabel
         Left = 277
-        Top = 135
+        Top = 176
         Width = 32
         Height = 21
         Caption = #38646#22836
       end
       object Label20: TLabel
         Left = 277
-        Top = 174
+        Top = 215
         Width = 64
         Height = 21
         Caption = #29301#32463#31576#21495
       end
       object Label22: TLabel
         Left = 277
-        Top = 213
+        Top = 254
         Width = 64
         Height = 21
         Caption = #22369#26012#24230#25968
       end
       object Label23: TLabel
         Left = 277
-        Top = 251
+        Top = 292
         Width = 96
         Height = 21
         Caption = #29301#32463#24352#21147#21442#25968
       end
       object Label37: TLabel
         Left = 277
-        Top = 291
+        Top = 332
         Width = 32
         Height = 21
         Caption = #32463#23494
       end
+      object Label38: TLabel
+        Left = 7
+        Top = 96
+        Width = 64
+        Height = 21
+        Caption = #32455#36896#21333#21495
+      end
+      object Label47: TLabel
+        Left = 277
+        Top = 95
+        Width = 32
+        Height = 21
+        Caption = #23458#25143
+      end
       object WBCNO: TcxTextEdit
         Tag = 1
         Left = 106
@@ -869,7 +884,7 @@ inherited frmTatWBCardInPut: TfrmTatWBCardInPut
       object WB_YarnQty: TcxTextEdit
         Tag = 1
         Left = 106
-        Top = 90
+        Top = 131
         ParentColor = True
         TabOrder = 4
         Width = 150
@@ -877,7 +892,7 @@ inherited frmTatWBCardInPut: TfrmTatWBCardInPut
       object WB_Move: TcxTextEdit
         Tag = 1
         Left = 106
-        Top = 285
+        Top = 326
         ParentColor = True
         TabOrder = 5
         Width = 150
@@ -885,7 +900,7 @@ inherited frmTatWBCardInPut: TfrmTatWBCardInPut
       object WB_ReedNote: TcxTextEdit
         Tag = 1
         Left = 106
-        Top = 207
+        Top = 248
         ParentColor = True
         TabOrder = 6
         Width = 150
@@ -893,7 +908,7 @@ inherited frmTatWBCardInPut: TfrmTatWBCardInPut
       object WB_YarnStripQty: TcxTextEdit
         Tag = 1
         Left = 106
-        Top = 129
+        Top = 170
         ParentColor = True
         TabOrder = 7
         Width = 150
@@ -901,7 +916,7 @@ inherited frmTatWBCardInPut: TfrmTatWBCardInPut
       object WB_Width: TcxTextEdit
         Tag = 1
         Left = 106
-        Top = 168
+        Top = 209
         ParentColor = True
         TabOrder = 8
         Width = 150
@@ -909,7 +924,7 @@ inherited frmTatWBCardInPut: TfrmTatWBCardInPut
       object WB_Arg_SDWZ: TcxTextEdit
         Tag = 1
         Left = 106
-        Top = 246
+        Top = 287
         ParentColor = True
         TabOrder = 9
         Width = 150
@@ -917,7 +932,7 @@ inherited frmTatWBCardInPut: TfrmTatWBCardInPut
       object WB_YarnArr: TcxTextEdit
         Tag = 1
         Left = 379
-        Top = 90
+        Top = 131
         ParentColor = True
         TabOrder = 10
         Width = 150
@@ -925,7 +940,7 @@ inherited frmTatWBCardInPut: TfrmTatWBCardInPut
       object WB_YarnStripRemainder: TcxTextEdit
         Tag = 1
         Left = 379
-        Top = 129
+        Top = 170
         ParentColor = True
         TabOrder = 11
         Width = 150
@@ -933,7 +948,7 @@ inherited frmTatWBCardInPut: TfrmTatWBCardInPut
       object WB_ReedNo: TcxTextEdit
         Tag = 1
         Left = 379
-        Top = 168
+        Top = 209
         ParentColor = True
         TabOrder = 12
         Width = 150
@@ -941,7 +956,7 @@ inherited frmTatWBCardInPut: TfrmTatWBCardInPut
       object WB_Arg_PXDS: TcxTextEdit
         Tag = 1
         Left = 379
-        Top = 207
+        Top = 248
         ParentColor = True
         TabOrder = 13
         Width = 150
@@ -949,7 +964,7 @@ inherited frmTatWBCardInPut: TfrmTatWBCardInPut
       object WB_Arg_QJZL: TcxTextEdit
         Tag = 1
         Left = 379
-        Top = 246
+        Top = 287
         ParentColor = True
         TabOrder = 14
         Width = 150
@@ -957,16 +972,16 @@ inherited frmTatWBCardInPut: TfrmTatWBCardInPut
       object WB_YarnArrNote: TcxMemo
         Tag = 1
         Left = 106
-        Top = 322
+        Top = 363
         TabOrder = 15
         Height = 111
         Width = 423
       end
       object cxGrid3: TcxGrid
         Left = 2
-        Top = 453
+        Top = 528
         Width = 542
-        Height = 315
+        Height = 240
         Align = alBottom
         TabOrder = 16
         object TV3: TcxGridDBTableView
@@ -1157,11 +1172,43 @@ inherited frmTatWBCardInPut: TfrmTatWBCardInPut
       object WB_YarnDensity: TcxTextEdit
         Tag = 1
         Left = 379
-        Top = 285
+        Top = 326
         ParentColor = True
         TabOrder = 17
         Width = 150
       end
+      object GYNo: TcxButtonEdit
+        Tag = 1
+        Left = 106
+        Top = 90
+        Properties.Buttons = <
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        Properties.ReadOnly = True
+        Properties.OnButtonClick = GYNoPropertiesButtonClick
+        Style.ButtonStyle = btsDefault
+        TabOrder = 18
+        OnDblClick = GYNoDblClick
+        Width = 150
+      end
+      object CustName: TcxButtonEdit
+        Tag = 1
+        Left = 379
+        Top = 92
+        Properties.Buttons = <
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        Properties.ReadOnly = True
+        Properties.OnButtonClick = CustNamePropertiesButtonClick
+        Style.ButtonStyle = btsDefault
+        TabOrder = 19
+        OnDblClick = GYNoDblClick
+        Width = 150
+      end
     end
   end
   inherited ADOQueryBaseCmd: TADOQuery

E02梭织经轴仓库/U_TatWBCardInPut.pas

@@ -13,7 +13,23 @@ uses
   Menus, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu,
   dxDateRanges, BtnEdit, U_BaseInput, System.ImageList, Vcl.ImgList, cxContainer,
   cxMaskEdit, cxDropDownEdit, cxRichEdit, cxMemo, dxScrollbarAnnotations,
-  dxSkinsCore, dxSkinsDefaultPainters, cxImageList;
+  dxSkinsCore, dxSkinsDefaultPainters, cxImageList, dxSkinBasic, dxSkinBlack,
+  dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkroom,
+  dxSkinDarkSide, dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinOffice2013White, dxSkinOffice2016Colorful, dxSkinOffice2016Dark,
+  dxSkinOffice2019Black, dxSkinOffice2019Colorful, dxSkinOffice2019DarkGray,
+  dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
+  dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringtime, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinTheBezier, dxSkinValentine,
+  dxSkinVisualStudio2013Blue, dxSkinVisualStudio2013Dark,
+  dxSkinVisualStudio2013Light, dxSkinVS2010, dxSkinWhiteprint, dxSkinWXI,
+  dxSkinXmas2008Blue;
 
 type
   TfrmTatWBCardInPut = class(TfrmBaseInput)
@@ -154,6 +170,10 @@ type
     TV3Column2: TcxGridDBColumn;
     TV3Column3: TcxGridDBColumn;
     TV3Column4: TcxGridDBColumn;
+    Label38: TLabel;
+    GYNo: TcxButtonEdit;
+    Label47: TLabel;
+    CustName: TcxButtonEdit;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormShow(Sender: TObject);
     procedure N2Click(Sender: TObject);
@@ -172,6 +192,9 @@ type
     procedure TV2Column5PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure TV2Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure TV2Column8PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+    procedure CustNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+    procedure GYNoPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+    procedure GYNoDblClick(Sender: TObject);
   private
     function TestData(): Boolean;
     procedure PrtDate(MWBCID: string);
@@ -192,7 +215,7 @@ implementation
 
 uses
   U_DataLink, U_RTFun, U_ZDYHelp, U_LabelPrint, U_WBTatPlanSel, U_WBSpecSel,
-  U_WarpBeamInfoSel, U_WBTypeSel, U_CompanySel;
+  U_WarpBeamInfoSel, U_WBTypeSel, U_CompanySel, U_TatGYSel, U_TatPlanSel;
 
 {$R *.dfm} procedure TfrmTatWBCardInPut.InitCard3();
 begin
@@ -219,6 +242,8 @@ begin
     Open;
   end;
   SCSHData(ADOQueryTemp, Panel1, 1);
+  GYNo.Properties.LookupItems.Text := Trim(ADOQueryTemp.fieldbyname('GYSubid').AsString);
+  CustName.Properties.LookupItems.Text := Trim(ADOQueryTemp.fieldbyname('CustNo').AsString);
 //  WBFtyName.Properties.LookupItems.Text := Trim(ADOQueryTemp.fieldbyname('WBFtyNo').AsString);
 
 end;
@@ -432,6 +457,25 @@ begin
   end;
 end;
 
+procedure TfrmTatWBCardInPut.CustNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+begin
+  inherited;
+  try
+    frmCompanySel := TfrmCompanySel.Create(Application);
+    with frmCompanySel do
+    begin
+      FCoType := '¿Í»§';
+      if ShowModal = 1 then
+      begin
+        CustName.Properties.LookupItems.Text := Trim(CDS_1.fieldbyname('CoCode').AsString);
+        CustName.Text := Trim(CDS_1.fieldbyname('CoAbbrName').AsString);
+      end;
+    end;
+  finally
+    frmCompanySel.Free;
+  end;
+end;
+
 procedure TfrmTatWBCardInPut.cxButtonEdit1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
 begin
   try
@@ -468,6 +512,63 @@ begin
   InitCard3();
 end;
 
+procedure TfrmTatWBCardInPut.GYNoDblClick(Sender: TObject);
+begin
+  inherited;
+  TcxButtonEdit(Sender).Properties.LookupItems.Text := '';
+  TcxButtonEdit(Sender).Text := '';
+end;
+
+procedure TfrmTatWBCardInPut.GYNoPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+begin
+  inherited;
+  try
+    frmTatPlanSel := TfrmTatPlanSel.Create(Application);
+    with frmTatPlanSel do
+    begin
+      if ShowModal = 1 then
+      begin
+        Self.GYNo.Text := CDS_1.FieldByName('OrderNo').asstring;
+        Self.GYNo.Properties.LookupItems.Text := CDS_1.FieldByName('Subid').asstring;
+        Self.CustName.Text := CDS_1.FieldByName('CustName').asstring;
+
+        Self.WB_Code.Text := CDS_1.FieldByName('WB_Code').asstring;
+
+        with ADOQueryTemp do
+        begin
+          close;
+          sql.Clear;
+          sql.Add(' select A.* ');
+          sql.Add(' from Tat_WB_Spec A');
+          sql.Add(' where WB_Code=''' + trim(WB_Code.Text) + ''' ');
+          Open;
+        end;
+
+        Self.WB_Code.Text := Trim(ADOQueryTemp.fieldbyname('WB_Code').AsString);
+        Self.WB_Name.Text := Trim(ADOQueryTemp.fieldbyname('WB_Name').AsString);
+        Self.WB_YarnQty.Text := ADOQueryTemp.fieldbyname('WB_YarnQty').asstring;
+        Self.WB_YarnArr.Text := Trim(ADOQueryTemp.fieldbyname('WB_YarnArr').AsString);
+        Self.WB_YarnStripQty.Text := Trim(ADOQueryTemp.fieldbyname('WB_YarnStripQty').AsString);
+        Self.WB_YarnStripRemainder.Text := Trim(ADOQueryTemp.fieldbyname('WB_YarnStripRemainder').AsString);
+        Self.WB_Width.Text := Trim(ADOQueryTemp.fieldbyname('WB_Width').AsString);
+        Self.WB_ReedNo.Text := Trim(ADOQueryTemp.fieldbyname('WB_ReedNo').AsString);
+        Self.WB_ReedNote.Text := Trim(ADOQueryTemp.fieldbyname('WB_ReedNote').AsString);
+        Self.WB_Arg_PXDS.Text := Trim(ADOQueryTemp.fieldbyname('WB_Arg_PXDS').AsString);
+        Self.WB_Arg_SDWZ.Text := Trim(ADOQueryTemp.fieldbyname('WB_Arg_SDWZ').AsString);
+        Self.WB_Arg_QJZL.Text := Trim(ADOQueryTemp.fieldbyname('WB_Arg_QJZL').AsString);
+        Self.WB_Move.Text := Trim(ADOQueryTemp.fieldbyname('WB_Move').AsString);
+        Self.WB_YarnArrNote.Text := Trim(ADOQueryTemp.fieldbyname('WB_YarnArrNote').AsString);
+        Self.WB_YarnDensity.Text := Trim(ADOQueryTemp.fieldbyname('WB_YarnDensity').AsString);
+        Self.Note.Text := Trim(ADOQueryTemp.fieldbyname('Note').AsString);
+        Self.InitCard3();
+
+      end;
+    end;
+  finally
+    frmTatPlanSel.Free;
+  end;
+end;
+
 procedure TfrmTatWBCardInPut.N2Click(Sender: TObject);
 begin
   SelOKNo(CDS_Card, True);
@@ -513,7 +614,9 @@ begin
       sql.Clear;
       //////////////////            ²åÈëÖῨ               //////////////////////
       sql.Add(' insert into Tat_WB_Card(WBCNO,WBCID,WBType,WB_ProcessType,WB_Code,WB_Name,WB_YarnQty,WB_YarnArr,WB_YarnLen,WB_Macher,WB_MachNo,WB_Type,Note,FillId,Filler,WB_YarnDensity');
-      sql.Add(' ,WB_YarnStripQty,WB_YarnStripRemainder,WB_Width,WB_ReedNo,WB_ReedNote,WB_Arg_PXDS,WB_Arg_SDWZ,WB_Arg_QJZL,WB_Move,WB_YarnArrNote,WBFtyNo,WBFtyName,WBBelong,WBBelongCoNo,WBBelongCoName  ) values');
+      sql.Add(' ,WB_YarnStripQty,WB_YarnStripRemainder,WB_Width,WB_ReedNo,WB_ReedNote,WB_Arg_PXDS,WB_Arg_SDWZ,WB_Arg_QJZL,WB_Move,WB_YarnArrNote,WBFtyNo,WBFtyName,WBBelong,WBBelongCoNo,WBBelongCoName  ');
+      sql.Add(' ,GYSubid,GYNo,CustNo,CustName');
+      sql.Add(' ) values');
       for i := 1 to MCardQty do
       begin
         if GetLSNo(ADOQueryTemp, MWBCID, fDate + trim(WB_MachNo.Text), 'Tat_WB_Card', 4, 0) = False then
@@ -557,6 +660,11 @@ begin
         sql.Add(',' + Quotedstr(Trim(MWBBelongCoNo)));
         sql.Add(',' + Quotedstr(Trim(MWBBelongCoName)));
 
+        sql.Add(',' + Quotedstr(Trim(GYNo.Properties.LookupItems.Text)));
+        sql.Add(',' + Quotedstr(Trim(GYNo.Text)));
+        sql.Add(',' + Quotedstr(Trim(CustName.Properties.LookupItems.Text)));
+        sql.Add(',' + Quotedstr(Trim(CustName.Text)));
+
         sql.Add(' )');
       end;
      //////////////////            ²åÈëÖῨ               //////////////////////

E02梭织经轴仓库/U_TatWBPlan.pas

@@ -12,7 +12,23 @@ uses
   RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, cxTextEdit, cxLookAndFeels,
   cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList,
   cxPC, cxCheckBox, dxScrollbarAnnotations, Vcl.Menus, cxContainer,
-  cxProgressBar, dxSkinsCore, dxSkinsDefaultPainters;
+  cxProgressBar, dxSkinsCore, dxSkinsDefaultPainters, dxSkinBasic, dxSkinBlack,
+  dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkroom,
+  dxSkinDarkSide, dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinOffice2013White, dxSkinOffice2016Colorful, dxSkinOffice2016Dark,
+  dxSkinOffice2019Black, dxSkinOffice2019Colorful, dxSkinOffice2019DarkGray,
+  dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
+  dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringtime, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinTheBezier, dxSkinValentine,
+  dxSkinVisualStudio2013Blue, dxSkinVisualStudio2013Dark,
+  dxSkinVisualStudio2013Light, dxSkinVS2010, dxSkinWhiteprint, dxSkinWXI,
+  dxSkinXmas2008Blue;
 
 type
   TfrmTatWBPlan = class(TfrmBaseList)

E02梭织经轴仓库/U_TatWBPlanCard.dfm

@@ -768,7 +768,7 @@ inherited frmTatWBPlanCard: TfrmTatWBPlanCard
     Top = 507
     Width = 1376
     Height = 193
-    ActivePage = TabSheet2
+    ActivePage = TabSheet1
     Align = alBottom
     TabOrder = 5
     Visible = False

E02梭织经轴仓库/U_TatWBPlanCard.pas

@@ -13,7 +13,23 @@ uses
   BtnEdit, RM_BarCode, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
   dxDateRanges, dxBarBuiltInMenu, U_BaseList, Vcl.Menus, cxContainer,
   dxScrollbarAnnotations, cxMemo, FrameDateSel, dxSkinsCore,
-  dxSkinsDefaultPainters, cxProgressBar;
+  dxSkinsDefaultPainters, cxProgressBar, dxSkinBasic, dxSkinBlack, dxSkinBlue,
+  dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkroom, dxSkinDarkSide,
+  dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinOffice2013White, dxSkinOffice2016Colorful, dxSkinOffice2016Dark,
+  dxSkinOffice2019Black, dxSkinOffice2019Colorful, dxSkinOffice2019DarkGray,
+  dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
+  dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringtime, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinTheBezier, dxSkinValentine,
+  dxSkinVisualStudio2013Blue, dxSkinVisualStudio2013Dark,
+  dxSkinVisualStudio2013Light, dxSkinVS2010, dxSkinWhiteprint, dxSkinWXI,
+  dxSkinXmas2008Blue;
 
 type
   TfrmTatWBPlanCard = class(TfrmBaseList)
@@ -215,6 +231,7 @@ begin
       sql.Add(' where  1=1');
       sql.add(' and A.WB_Date>=''' + Trim(FormatDateTime('yyyy-MM-dd', Frame11.BegDate.Date)) + '''');
       sql.Add(' and A.WB_Date<''' + Trim(FormatDateTime('yyyy-MM-dd', Frame11.enddate.Date + 1)) + '''');
+      sql.Add(' and WB_Type  not in (''½¬Öá'')');
 
 //      ShowMessage(sql.text);
 //      case cxTabControl1.TabIndex of

E02梭织经轴仓库/U_TatWBPlanCardInPut.pas

@@ -12,7 +12,23 @@ uses
   RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, cxTextEdit, cxCheckBox, cxPC,
   Menus, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu,
   dxDateRanges, BtnEdit, U_BaseInput, System.ImageList, Vcl.ImgList,
-  dxScrollbarAnnotations, cxImageList;
+  dxScrollbarAnnotations, cxImageList, dxSkinsCore, dxSkinBasic, dxSkinBlack,
+  dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkroom,
+  dxSkinDarkSide, dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinOffice2013White, dxSkinOffice2016Colorful, dxSkinOffice2016Dark,
+  dxSkinOffice2019Black, dxSkinOffice2019Colorful, dxSkinOffice2019DarkGray,
+  dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
+  dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringtime, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinTheBezier,
+  dxSkinsDefaultPainters, dxSkinValentine, dxSkinVisualStudio2013Blue,
+  dxSkinVisualStudio2013Dark, dxSkinVisualStudio2013Light, dxSkinVS2010,
+  dxSkinWhiteprint, dxSkinWXI, dxSkinXmas2008Blue;
 
 type
   TfrmTatWBPlanCardInPut = class(TfrmBaseInput)

E02梭织经轴仓库/U_WBSpecInPut.dfm

@@ -13,11 +13,13 @@ inherited frmWBSpecInPut: TfrmWBSpecInPut
   TextHeight = 21
   object cxGrid1: TcxGrid [0]
     Left = 0
-    Top = 461
+    Top = 455
     Width = 1115
-    Height = 294
+    Height = 300
     Align = alClient
     TabOrder = 0
+    ExplicitTop = 461
+    ExplicitHeight = 294
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -247,7 +249,7 @@ inherited frmWBSpecInPut: TfrmWBSpecInPut
     Left = 0
     Top = 30
     Width = 1115
-    Height = 401
+    Height = 395
     Align = alTop
     BevelInner = bvNone
     BevelOuter = bvNone
@@ -374,6 +376,13 @@ inherited frmWBSpecInPut: TfrmWBSpecInPut
       Height = 21
       Caption = #32463#23494
     end
+    object Label18: TLabel
+      Left = 361
+      Top = 285
+      Width = 64
+      Height = 21
+      Caption = #26159#21542#19978#27974
+    end
     object WB_Code: TcxTextEdit
       Tag = 2
       Left = 113
@@ -512,11 +521,23 @@ inherited frmWBSpecInPut: TfrmWBSpecInPut
       TabOrder = 16
       Width = 200
     end
+    object ISSizing: TcxComboBox
+      Tag = 2
+      Left = 431
+      Top = 281
+      Properties.DropDownListStyle = lsFixedList
+      Properties.Items.Strings = (
+        #21542
+        #26159)
+      TabOrder = 17
+      Text = #21542
+      Width = 200
+    end
   end
   object ToolBar2: TToolBar [3]
     Tag = 1
     Left = 0
-    Top = 431
+    Top = 425
     Width = 1115
     Height = 30
     AutoSize = True
@@ -529,6 +550,7 @@ inherited frmWBSpecInPut: TfrmWBSpecInPut
     ShowCaptions = True
     TabOrder = 3
     Visible = False
+    ExplicitTop = 431
     object ToolButton3: TToolButton
       Left = 0
       Top = 0

E02梭织经轴仓库/U_WBSpecInPut.pas

@@ -12,7 +12,23 @@ uses
   cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges,
   dxBarBuiltInMenu, U_BaseInput, U_BaseList, System.ImageList, Vcl.ImgList,
   cxMemo, dxScrollbarAnnotations, cxContainer, dxSkinsCore,
-  dxSkinsDefaultPainters, cxImageList;
+  dxSkinsDefaultPainters, cxImageList, dxSkinBasic, dxSkinBlack, dxSkinBlue,
+  dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkroom, dxSkinDarkSide,
+  dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinOffice2013White, dxSkinOffice2016Colorful, dxSkinOffice2016Dark,
+  dxSkinOffice2019Black, dxSkinOffice2019Colorful, dxSkinOffice2019DarkGray,
+  dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
+  dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringtime, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinTheBezier, dxSkinValentine,
+  dxSkinVisualStudio2013Blue, dxSkinVisualStudio2013Dark,
+  dxSkinVisualStudio2013Light, dxSkinVS2010, dxSkinWhiteprint, dxSkinWXI,
+  dxSkinXmas2008Blue, cxMaskEdit;
 
 type
   TfrmWBSpecInPut = class(TfrmBaseInput)
@@ -83,6 +99,8 @@ type
     Tv1Column5: TcxGridDBColumn;
     Tv1Column6: TcxGridDBColumn;
     Tv1Column7: TcxGridDBColumn;
+    Label18: TLabel;
+    ISSizing: TcxComboBox;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBAddClick(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);
@@ -92,6 +110,7 @@ type
     procedure ToolButton1Click(Sender: TObject);
     procedure Tv1Column2PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure btn1Click(Sender: TObject);
+    procedure GYNoDblClick(Sender: TObject);
   private
     { Private declarations }
     function SaveData(): Boolean;
@@ -106,7 +125,8 @@ var
 implementation
 
 uses
-  U_DataLink, U_RTFun, U_ZDYHelp, U_YarnInfoSel, U_TatClothInfoSel;
+  U_DataLink, U_RTFun, U_ZDYHelp, U_YarnInfoSel, U_TatClothInfoSel, U_TatGYSel,
+  U_CompanySel;
 
 {$R *.dfm}
 
@@ -391,6 +411,13 @@ begin
 
 end;
 
+procedure TfrmWBSpecInPut.GYNoDblClick(Sender: TObject);
+begin
+  inherited;
+  TcxButtonEdit(Sender).Properties.LookupItems.Text := '';
+  TcxButtonEdit(Sender).Text := '';
+end;
+
 procedure TfrmWBSpecInPut.TBDelClick(Sender: TObject);
 begin
   if CDS_Sub.IsEmpty then

E02梭织经轴仓库/U_WBSpecList.dfm

@@ -17,7 +17,7 @@ inherited frmWBSpecList: TfrmWBSpecList
     Height = 30
     AutoSize = True
     ButtonHeight = 30
-    ButtonWidth = 83
+    ButtonWidth = 99
     Caption = 'ToolBar1'
     DisabledImages = DataLink_WarpBeamStk.cxImageList_bar
     Images = DataLink_WarpBeamStk.cxImageList_bar
@@ -33,7 +33,7 @@ inherited frmWBSpecList: TfrmWBSpecList
       OnClick = TBRafreshClick
     end
     object TBFind: TToolButton
-      Left = 63
+      Left = 71
       Top = 0
       AutoSize = True
       Caption = #36807#28388
@@ -42,7 +42,7 @@ inherited frmWBSpecList: TfrmWBSpecList
       OnClick = TBFindClick
     end
     object TBAdd: TToolButton
-      Left = 126
+      Left = 142
       Top = 0
       AutoSize = True
       Caption = #26032#22686
@@ -50,7 +50,7 @@ inherited frmWBSpecList: TfrmWBSpecList
       OnClick = TBAddClick
     end
     object TBEdit: TToolButton
-      Left = 189
+      Left = 213
       Top = 0
       AutoSize = True
       Caption = #20462#25913
@@ -58,7 +58,7 @@ inherited frmWBSpecList: TfrmWBSpecList
       OnClick = TBEditClick
     end
     object TBDel: TToolButton
-      Left = 252
+      Left = 284
       Top = 0
       AutoSize = True
       Caption = #21024#38500
@@ -66,7 +66,7 @@ inherited frmWBSpecList: TfrmWBSpecList
       OnClick = TBDelClick
     end
     object ToolButton2: TToolButton
-      Left = 315
+      Left = 355
       Top = 0
       AutoSize = True
       Caption = #25171#21360
@@ -74,7 +74,7 @@ inherited frmWBSpecList: TfrmWBSpecList
       OnClick = ToolButton2Click
     end
     object TBExport: TToolButton
-      Left = 378
+      Left = 426
       Top = 0
       AutoSize = True
       Caption = #23548#20986
@@ -82,7 +82,7 @@ inherited frmWBSpecList: TfrmWBSpecList
       OnClick = TBExportClick
     end
     object ToolButton1: TToolButton
-      Left = 441
+      Left = 497
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -90,7 +90,7 @@ inherited frmWBSpecList: TfrmWBSpecList
       OnClick = ToolButton1Click
     end
     object TBClose: TToolButton
-      Left = 528
+      Left = 600
       Top = 0
       AutoSize = True
       Caption = #20851#38381

E02梭织经轴仓库/U_WBSpecList.pas

@@ -13,7 +13,23 @@ uses
   RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxPC,
   cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu,
   dxDateRanges, U_BaseList, dxScrollbarAnnotations, cxContainer, cxMemo,
-  dxSkinsCore, dxSkinsDefaultPainters, cxProgressBar;
+  dxSkinsCore, dxSkinsDefaultPainters, cxProgressBar, dxSkinBasic, dxSkinBlack,
+  dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkroom,
+  dxSkinDarkSide, dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
+  dxSkinOffice2013White, dxSkinOffice2016Colorful, dxSkinOffice2016Dark,
+  dxSkinOffice2019Black, dxSkinOffice2019Colorful, dxSkinOffice2019DarkGray,
+  dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
+  dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringtime, dxSkinStardust,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinTheBezier, dxSkinValentine,
+  dxSkinVisualStudio2013Blue, dxSkinVisualStudio2013Dark,
+  dxSkinVisualStudio2013Light, dxSkinVS2010, dxSkinWhiteprint, dxSkinWXI,
+  dxSkinXmas2008Blue;
 
 type
   TfrmWBSpecList = class(TfrmBaseList)

E02梭织经轴仓库/WarpBeamStk.dpr

@@ -65,7 +65,9 @@ uses
   U_TatWBOutputList_CZ in 'U_TatWBOutputList_CZ.pas' {frmTatWBOutputList_CZ},
   U_TatWBOutputList_XZ in 'U_TatWBOutputList_XZ.pas' {frmTatWBOutputList_XZ},
   U_TatWBOutputList_XB in 'U_TatWBOutputList_XB.pas' {frmTatWBOutputList_XB},
-  uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas';
+  uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas',
+  U_TatGYSel in '..\E00梭织通用窗体\U_TatGYSel.pas' {frmTatGYSel},
+  U_TatPlanSel in '..\E00梭织通用窗体\U_TatPlanSel.pas' {frmTatPlanSel};
 
 {$R *.res}
 

E02梭织经轴仓库/WarpBeamStk.dproj

@@ -324,6 +324,14 @@
             <FormType>dfm</FormType>
         </DCCReference>
         <DCCReference Include="..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas"/>
+        <DCCReference Include="..\E00梭织通用窗体\U_TatGYSel.pas">
+            <Form>frmTatGYSel</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
+        <DCCReference Include="..\E00梭织通用窗体\U_TatPlanSel.pas">
+            <Form>frmTatPlanSel</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

E02梭织经轴仓库/WarpBeamStk.dproj.local

@@ -78,6 +78,11 @@
     <File Path="..\B02基础纱线仓库"/>
     <File Path="..\B02基础纱线仓库\U_YarnInfoInPut.pas"/>
     <File Path="..\B02基础纱线仓库\U_YarnInfoInPut.dfm"/>
+    <File Path="..\E00梭织通用窗体"/>
+    <File Path="..\E00梭织通用窗体\U_TatGYSel.pas"/>
+    <File Path="..\E00梭织通用窗体\U_TatGYSel.dfm"/>
+    <File Path="..\E00梭织通用窗体\U_TatPlanSel.pas"/>
+    <File Path="..\E00梭织通用窗体\U_TatPlanSel.dfm"/>
     <File Path="D:\Dp10RepoV1"/>
     <File Path="..\..\..\public10"/>
     <File Path="..\..\..\public10\design"/>
@@ -153,10 +158,12 @@
     <Transaction>1899-12-30 00:00:00.000.556,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_SZ.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.318,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_XB.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_JT.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.584,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_CZ.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.535,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_JT.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.444,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_WBSpecInPut.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A02基础产品管理\U_WBSpecInPut.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.922,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.717,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A02基础产品管理\U_TatClothInfoInput.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.318,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_XB.dfm=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_JT.dfm</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.535,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\E02梭织经轴仓库\U_TatWBOutputList_JT.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.717,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A02基础产品管理\U_TatClothInfoInput.pas=</Transaction>
+    <Transaction>2025-04-01 10:15:57.158,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatGYSel.pas</Transaction>
+    <Transaction>2025-04-01 16:40:52.512,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E00梭织通用窗体\U_TatPlanSel.pas</Transaction>
   </Transactions>
 </BorlandProject>

E02梭织经轴仓库/WarpBeamStk.skincfg

@@ -2,61 +2,61 @@
 Default=1
 ShowNotifications=1
 Enabled=1
-dxSkinBasic=0
+dxSkinBasic=1
-dxSkinBlack=0
+dxSkinBlack=1
-dxSkinBlue=0
+dxSkinBlue=1
-dxSkinBlueprint=0
+dxSkinBlueprint=1
-dxSkinCaramel=0
+dxSkinCaramel=1
-dxSkinCoffee=0
+dxSkinCoffee=1
-dxSkinDarkroom=0
+dxSkinDarkroom=1
-dxSkinDarkSide=0
+dxSkinDarkSide=1
-dxSkinDevExpressDarkStyle=0
+dxSkinDevExpressDarkStyle=1
-dxSkinDevExpressStyle=0
+dxSkinDevExpressStyle=1
-dxSkinFoggy=0
+dxSkinFoggy=1
-dxSkinGlassOceans=0
+dxSkinGlassOceans=1
-dxSkinHighContrast=0
+dxSkinHighContrast=1
-dxSkiniMaginary=0
+dxSkiniMaginary=1
-dxSkinLilian=0
+dxSkinLilian=1
-dxSkinLiquidSky=0
+dxSkinLiquidSky=1
-dxSkinLondonLiquidSky=0
+dxSkinLondonLiquidSky=1
-dxSkinMcSkin=0
+dxSkinMcSkin=1
-dxSkinMetropolis=0
+dxSkinMetropolis=1
-dxSkinMetropolisDark=0
+dxSkinMetropolisDark=1
-dxSkinMoneyTwins=0
+dxSkinMoneyTwins=1
-dxSkinOffice2007Black=0
+dxSkinOffice2007Black=1
-dxSkinOffice2007Blue=0
+dxSkinOffice2007Blue=1
-dxSkinOffice2007Green=0
+dxSkinOffice2007Green=1
-dxSkinOffice2007Pink=0
+dxSkinOffice2007Pink=1
-dxSkinOffice2007Silver=0
+dxSkinOffice2007Silver=1
-dxSkinOffice2010Black=0
+dxSkinOffice2010Black=1
-dxSkinOffice2010Blue=0
+dxSkinOffice2010Blue=1
-dxSkinOffice2010Silver=0
+dxSkinOffice2010Silver=1
-dxSkinOffice2013DarkGray=0
+dxSkinOffice2013DarkGray=1
-dxSkinOffice2013LightGray=0
+dxSkinOffice2013LightGray=1
-dxSkinOffice2013White=0
+dxSkinOffice2013White=1
-dxSkinOffice2016Colorful=0
+dxSkinOffice2016Colorful=1
-dxSkinOffice2016Dark=0
+dxSkinOffice2016Dark=1
-dxSkinOffice2019Black=0
+dxSkinOffice2019Black=1
-dxSkinOffice2019Colorful=0
+dxSkinOffice2019Colorful=1
-dxSkinOffice2019DarkGray=0
+dxSkinOffice2019DarkGray=1
-dxSkinOffice2019White=0
+dxSkinOffice2019White=1
-dxSkinPumpkin=0
+dxSkinPumpkin=1
-dxSkinSeven=0
+dxSkinSeven=1
-dxSkinSevenClassic=0
+dxSkinSevenClassic=1
-dxSkinSharp=0
+dxSkinSharp=1
-dxSkinSharpPlus=0
+dxSkinSharpPlus=1
-dxSkinSilver=0
+dxSkinSilver=1
-dxSkinSpringtime=0
+dxSkinSpringtime=1
-dxSkinStardust=0
+dxSkinStardust=1
-dxSkinSummer2008=0
+dxSkinSummer2008=1
-dxSkinTheAsphaltWorld=0
+dxSkinTheAsphaltWorld=1
-dxSkinTheBezier=0
+dxSkinTheBezier=1
 dxSkinsDefaultPainters=1
-dxSkinValentine=0
+dxSkinValentine=1
-dxSkinVisualStudio2013Blue=0
+dxSkinVisualStudio2013Blue=1
-dxSkinVisualStudio2013Dark=0
+dxSkinVisualStudio2013Dark=1
-dxSkinVisualStudio2013Light=0
+dxSkinVisualStudio2013Light=1
-dxSkinVS2010=0
+dxSkinVS2010=1
-dxSkinWhiteprint=0
+dxSkinWhiteprint=1
 dxSkinWXI=1
-dxSkinXmas2008Blue=0
+dxSkinXmas2008Blue=1