111222333

A00通用窗体/U_SalesContract_SXSel.dfm

@@ -10,6 +10,7 @@ inherited frmSalesContract_SXSel: TfrmSalesContract_SXSel
   Font.Name = #23435#20307
   Position = poScreenCenter
   OnClose = FormClose
+  ExplicitLeft = -689
   ExplicitWidth = 1556
   ExplicitHeight = 597
   PixelsPerInch = 96
@@ -218,6 +219,13 @@ inherited frmSalesContract_SXSel: TfrmSalesContract_SXSel
         Options.Editing = False
         Width = 88
       end
+      object TV1Column17: TcxGridDBColumn
+        Caption = #20379#24212#21830
+        DataBinding.FieldName = 'GYS'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 77
+      end
       object TV1Column2: TcxGridDBColumn
         Caption = #20132#36135#26085#26399
         DataBinding.FieldName = 'DlyDate'
@@ -332,15 +340,6 @@ inherited frmSalesContract_SXSel: TfrmSalesContract_SXSel
         Options.Editing = False
         Width = 70
       end
-      object TV1Column13: TcxGridDBColumn
-        Caption = #32433#32447#32534#21495
-        DataBinding.FieldName = 'Y_Code'
-        DataBinding.IsNullValueType = True
-        FooterAlignmentHorz = taCenter
-        GroupSummaryAlignment = taCenter
-        HeaderAlignmentHorz = taCenter
-        Width = 75
-      end
       object v1OrderUnit: TcxGridDBColumn
         Caption = #21333#20301
         DataBinding.FieldName = 'ConUnit'
@@ -355,13 +354,14 @@ inherited frmSalesContract_SXSel: TfrmSalesContract_SXSel
         Options.Editing = False
         Width = 58
       end
-      object v1Column2: TcxGridDBColumn
+      object TV1Column13: TcxGridDBColumn
-        Caption = #22791#27880
+        Caption = #32433#32447#32534#21495
-        DataBinding.FieldName = 'ConSNote'
+        DataBinding.FieldName = 'Y_Code'
         DataBinding.IsNullValueType = True
+        FooterAlignmentHorz = taCenter
+        GroupSummaryAlignment = taCenter
         HeaderAlignmentHorz = taCenter
-        Options.Editing = False
+        Width = 75
-        Width = 70
       end
       object TV1Column14: TcxGridDBColumn
         Caption = #32433#32447#21517#31216
@@ -452,6 +452,28 @@ inherited frmSalesContract_SXSel: TfrmSalesContract_SXSel
         Options.Editing = False
         Width = 100
       end
+      object v1Column2: TcxGridDBColumn
+        Caption = #22791#27880
+        DataBinding.FieldName = 'ConSNote'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 70
+      end
+      object TV1Column18: TcxGridDBColumn
+        Caption = #24050#30003#35831#25968#37327
+        DataBinding.FieldName = 'SQQty'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 84
+      end
+      object TV1Column19: TcxGridDBColumn
+        Caption = #24050#39046#29992#25968#37327
+        DataBinding.FieldName = 'LYQty'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 81
+      end
     end
     object cxGridLevel1: TcxGridLevel
       GridView = TV1

A00通用窗体/U_SalesContract_SXSel.pas

@@ -12,7 +12,22 @@ uses
   cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu,
   System.ImageList, U_BaseInput, cxButtonEdit, cxDropDownEdit, cxCheckBox,
   Vcl.Menus, dxSkinsCore, dxSkinsDefaultPainters, dxScrollbarAnnotations,
-  Clipbrd;
+  Clipbrd, 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
   TfrmSalesContract_SXSel = class(TfrmBaseHelp)
@@ -89,6 +104,9 @@ type
     N3: TMenuItem;
     TV1Column15: TcxGridDBColumn;
     TV1Column16: TcxGridDBColumn;
+    TV1Column17: TcxGridDBColumn;
+    TV1Column18: TcxGridDBColumn;
+    TV1Column19: TcxGridDBColumn;
     procedure FormCreate(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormShow(Sender: TObject);
@@ -148,9 +166,7 @@ end;
 
 procedure TfrmSalesContract_SXSel.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
-
   ConNo.SetFocus;
-
   Action := cahide;
 end;
 
@@ -161,39 +177,93 @@ begin
     with ADOQueryMain do
     begin
       Close;
-      sql.Clear;
+//      sql.Clear;
-      //sql.Add('select A.*,B.* from BS_Contract_Main A inner join BS_Contract_Sub B on A.ConMId=B.ConMId  ');
+//      SQL.Add('SELECT DISTINCT');
-      //sql.Add(' and  isnull(A.status,''0'')=''9''');
+//      SQL.Add('    A.ConNo,');
-      SQL.Add('SELECT DISTINCT');
+//      SQL.Add('    A.BuyConNo,');
-      SQL.Add('    A.ConNo,');
+//      SQL.Add('    A.SellName,');
-      SQL.Add('    A.BuyConNo,');
+//      SQL.Add('    A.BuyName,');
-      SQL.Add('    A.SellName,');
+//      SQL.Add('    A.MiddleName,');
-      SQL.Add('    A.BuyName,');
+//      SQL.Add('    B.C_Spec,');
-      SQL.Add('    A.MiddleName,');
+//      SQL.Add('    A.DlyDate,');
-      SQL.Add('    B.C_Spec,');
+//      SQL.Add('    B.C_Code,');
-      SQL.Add('    A.DlyDate,');
+//      SQL.Add('    C.C_Name,');
-      SQL.Add('    B.C_Code,');
+//      SQL.Add('    C.C_EName,');
-      SQL.Add('    C.C_Name,');
+//      SQL.Add('    C.C_Composition,');
-      SQL.Add('    C.C_EName,');
+//      SQL.Add('    C.C_Color,');
-      SQL.Add('    C.C_Composition,');
+//      SQL.Add('    C.C_ColorNo,');
-      SQL.Add('    C.C_Color,');
+//      SQL.Add('    C.C_StyleNo,');
-      SQL.Add('    C.C_ColorNo,');
+//      SQL.Add('    C.C_Pattern,');
-      SQL.Add('    C.C_StyleNo,');
+//      SQL.Add('    C.C_Width,');
-      SQL.Add('    C.C_Pattern,');
+//      SQL.Add('    C.C_GramWeight,');
-      SQL.Add('    C.C_Width,');
+//      SQL.Add('    D.*,');
-      SQL.Add('    C.C_GramWeight,');
+//      SQL.Add('    KCQTy=(select Sum(StkQty) from Bs_Yarn_IO X where X.Y_Code = D.Y_Code),');
-      SQL.Add('    D.*,');
+//      SQL.Add('    SXQty= case when B.ConUnit =''Y'' then round(ConQty*0.9144*D.MeterQty/1000,2)');
-      SQL.Add('    KCQTy=(select Sum(StkQty) from Bs_Yarn_IO X where X.Y_Code =D.Y_Code ),');
+//      SQL.Add('      else round(ConQty*D.MeterQty/1000,2) end,');
-      SQL.Add('    SXQty= case when B.ConUnit =''Y'' then round(ConQty*0.9144*D.MeterQty/1000,2)');
+//      SQL.Add('    GYS=STUFF((');
-      SQL.Add('  else round(ConQty*D.MeterQty/1000,2) end ');
+//      SQL.Add('        SELECT ''/'' + T.FromCoName');
-
+//      SQL.Add('        FROM (');
-      SQL.Add('FROM Bs_Contract_Main A');
+//      SQL.Add('          SELECT DISTINCT FromCoName');
-      SQL.Add('INNER JOIN Bs_Contract_Sub B ON A.ConMId = B.ConMId');
+//      SQL.Add('          FROM Bs_Yarn_IO');
-      SQL.Add('INNER JOIN Bs_Cloth_Info C ON B.C_Code = C.C_Code');
+//      SQL.Add('          WHERE Y_Code = D.Y_Code AND FromCoName IS NOT NULL AND FromCoName <> ''''');
-      SQL.Add('INNER JOIN BS_Cloth_Yarn D ON C.BCIID = D.BCIID');
+//      SQL.Add('        ) T');
-      SQL.Add('WHERE A.Status = ''9'' and D.Y_Code <> '''' ');
+//      SQL.Add('        FOR XML PATH('''')');
-
+//      SQL.Add('    ), 1, 1, '''')');
-      Open;
+//      SQL.Add('FROM Bs_Contract_Main A');
+//      SQL.Add('INNER JOIN Bs_Contract_Sub B ON A.ConMId = B.ConMId');
+//      SQL.Add('INNER JOIN Bs_Cloth_Info C ON B.C_Code = C.C_Code');
+//      SQL.Add('INNER JOIN BS_Cloth_Yarn D ON C.BCIID = D.BCIID');
+//      SQL.Add('WHERE A.Status = ''9'' and D.Y_Code <> ''''');
+//      Open;
+    sql.Clear;
+    SQL.Add('SELECT DISTINCT');
+    SQL.Add('    A.ConNo,');
+    SQL.Add('    A.BuyConNo,');
+    SQL.Add('    A.SellName,');
+    SQL.Add('    A.BuyName,');
+    SQL.Add('    A.MiddleName,');
+    SQL.Add('    B.C_Spec,');
+    SQL.Add('    A.DlyDate,');
+    SQL.Add('    B.C_Code,');
+    SQL.Add('    C.C_Name,');
+    SQL.Add('    C.C_EName,');
+    SQL.Add('    C.C_Composition,');
+    SQL.Add('    C.C_Color,');
+    SQL.Add('    C.C_ColorNo,');
+    SQL.Add('    C.C_StyleNo,');
+    SQL.Add('    C.C_Pattern,');
+    SQL.Add('    C.C_Width,');
+    SQL.Add('    C.C_GramWeight,');
+    SQL.Add('    D.*,');
+    SQL.Add('    KCQTy = (SELECT SUM(StkQty) FROM Bs_Yarn_IO X WHERE X.Y_Code = D.Y_Code),');
+    SQL.Add('    SXQty = CASE WHEN B.ConUnit = ''Y'' THEN ROUND(ConQty*0.9144*D.MeterQty/1000,2)');
+    SQL.Add('                ELSE ROUND(ConQty*D.MeterQty/1000,2) END,');
+    SQL.Add('    GYS = STUFF((');
+    SQL.Add('        SELECT ''/'' + T.FromCoName');
+    SQL.Add('        FROM (');
+    SQL.Add('            SELECT DISTINCT FromCoName');
+    SQL.Add('            FROM Bs_Yarn_IO');
+    SQL.Add('            WHERE Y_Code = D.Y_Code AND FromCoName IS NOT NULL AND FromCoName <> ''''');
+    SQL.Add('        ) T');
+    SQL.Add('        FOR XML PATH('''')');
+    SQL.Add('    ), 1, 1, ''''),');
+    SQL.Add('    SQQty = (SELECT SUM(Y.Qty) ');
+    SQL.Add('             FROM Tat_Plan_Main T ');
+    SQL.Add('             INNER JOIN Tat_Plan_Yarn TP ON T.Mainid = TP.MainId');
+    SQL.Add('             INNER JOIN Pur_YarnPlan_Main X ON X.OrderNo = T.OrderNo');
+    SQL.Add('             INNER JOIN Pur_YarnPlan_Sub Y ON X.PurMId = Y.PurMId');
+    SQL.Add('             WHERE T.OrderNo = A.ConNo AND Y.Y_Code = D.Y_Code),');
+    SQL.Add('    LQQty = (SELECT SUM(X.Qty) ');
+    SQL.Add('             FROM Tat_Plan_Main T');
+    SQL.Add('             INNER JOIN Tat_Plan_Yarn TP ON T.Mainid = TP.MainId');
+    SQL.Add('             INNER JOIN Bs_Yarn_IO X ON X.ToOrdNo = T.OrderNo AND X.Y_Code = TP.Y_Code');
+    SQL.Add('             WHERE T.OrderNo = A.ConNo AND X.IOFlag = ''³ö¿â'' AND X.Y_Code = D.Y_Code)');
+    SQL.Add('FROM Bs_Contract_Main A');
+    SQL.Add('INNER JOIN Bs_Contract_Sub B ON A.ConMId = B.ConMId');
+    SQL.Add('INNER JOIN Bs_Cloth_Info C ON B.C_Code = C.C_Code');
+    SQL.Add('INNER JOIN BS_Cloth_Yarn D ON C.BCIID = D.BCIID');
+    SQL.Add('WHERE A.Status = ''9'' AND D.Y_Code <> ''''');
+    Open;
     end;
     SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
     SCreateCDS(ADOQueryMain, CDS_1);

B02基础纱线仓库/U_CJDJ.dfm

@@ -22,7 +22,8 @@ object frmCJDJ: TfrmCJDJ
     Height = 443
     Align = alClient
     TabOrder = 0
-    ExplicitLeft = -1
+    ExplicitLeft = -8
+    ExplicitTop = 8
     object Label1: TLabel
       Left = 33
       Top = 36
@@ -37,8 +38,8 @@ object frmCJDJ: TfrmCJDJ
       ParentFont = False
     end
     object Label3: TLabel
-      Left = 32
+      Left = 29
-      Top = 170
+      Top = 197
       Width = 120
       Height = 21
       AutoSize = False
@@ -51,8 +52,8 @@ object frmCJDJ: TfrmCJDJ
       ParentFont = False
     end
     object Label2: TLabel
-      Left = 32
+      Left = 33
-      Top = 249
+      Top = 353
       Width = 120
       Height = 21
       AutoSize = False
@@ -77,9 +78,37 @@ object frmCJDJ: TfrmCJDJ
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object Label5: TLabel
+      Left = 30
+      Top = 139
+      Width = 120
+      Height = 21
+      AutoSize = False
+      Caption = #26816#39564#32467#35770#65306
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -21
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label6: TLabel
+      Left = 29
+      Top = 277
+      Width = 120
+      Height = 21
+      AutoSize = False
+      Caption = #20869#23481#35814#24773#65306
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -21
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
     object Button1: TButton
-      Left = 397
+      Left = 396
-      Top = 33
+      Top = 350
       Width = 83
       Height = 29
       Caption = #30830#35748
@@ -104,8 +133,8 @@ object frmCJDJ: TfrmCJDJ
     end
     object CJer: TcxButtonEdit
       Tag = 2
-      Left = 137
+      Left = 138
-      Top = 246
+      Top = 350
       Hint = 'CJer/'#25277#26816#20154
       Properties.Buttons = <
         item
@@ -119,32 +148,68 @@ object frmCJDJ: TfrmCJDJ
       Width = 218
     end
     object CJNote: TRichEdit
-      Left = 282
+      Left = 138
-      Top = 139
+      Top = 242
       Width = 341
       Height = 89
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -16
+      Font.Name = 'MS Sans Serif'
+      Font.Style = []
+      ParentFont = False
       TabOrder = 3
       Zoom = 100
     end
     object CJQuantitly: TLabeledEdit
       Left = 138
-      Top = 89
+      Top = 87
-      Width = 209
+      Width = 216
       Height = 28
       EditLabel.Width = 4
       EditLabel.Height = 20
       TabOrder = 4
     end
-    object CJType: TcxComboBox
+    object CJJL: TcxComboBox
-      Left = 142
+      Left = 138
-      Top = 172
+      Top = 136
       Properties.Items.Strings = (
-        #32433#32455
+        #21512#26684
-        #24378#21147
+        #19981#21512#26684)
-        #26465#24863
-        #26825#32467)
       TabOrder = 5
-      Width = 118
+      Width = 216
+    end
+    object SZ: TCheckBox
+      Left = 147
+      Top = 200
+      Width = 97
+      Height = 17
+      Caption = #32433#32455
+      TabOrder = 6
+    end
+    object QL: TCheckBox
+      Left = 250
+      Top = 200
+      Width = 97
+      Height = 17
+      Caption = #24378#21147
+      TabOrder = 7
+    end
+    object TG: TCheckBox
+      Left = 353
+      Top = 200
+      Width = 97
+      Height = 17
+      Caption = #26465#24863
+      TabOrder = 8
+    end
+    object MJ: TCheckBox
+      Left = 456
+      Top = 200
+      Width = 97
+      Height = 17
+      Caption = #26825#32467
+      TabOrder = 9
     end
   end
   object ADOQueryTemp: TADOQuery

B02基础纱线仓库/U_CJDJ.pas

@@ -7,7 +7,23 @@ uses
   Dialogs, StdCtrls, ExtCtrls, DB, ADODB, cxGraphics, cxControls, cxLookAndFeels,
   cxLookAndFeelPainters, cxContainer, cxEdit, Vcl.ComCtrls, dxCore, cxDateUtils,
   dxSkinsCore, dxSkinsDefaultPainters, cxTextEdit, cxMaskEdit, cxDropDownEdit,
-  cxCalendar, cxButtonEdit;
+  cxCalendar, cxButtonEdit, 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
   TfrmCJDJ = class(TForm)
@@ -23,7 +39,13 @@ type
     CJNote: TRichEdit;
     CJQuantitly: TLabeledEdit;
     Label4: TLabel;
-    CJType: TcxComboBox;
+    CJJL: TcxComboBox;
+    Label5: TLabel;
+    SZ: TCheckBox;
+    Label6: TLabel;
+    QL: TCheckBox;
+    TG: TCheckBox;
+    MJ: TCheckBox;
     procedure Button1Click(Sender: TObject);
     procedure BegPortPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure FormShow(Sender: TObject);
@@ -71,6 +93,11 @@ end;
 
 procedure TfrmCJDJ.Button1Click(Sender: TObject);
 begin
+if (Trim(CJJL.Text) = '不合格') and (not SZ.Checked and not QL.Checked and not TG.Checked and not MJ.Checked) then
+  begin
+    Application.MessageBox('请填写内容！', '提示', MB_ICONWARNING);
+    Exit;
+  end;
   try
     ADOQueryCmd.Connection.BeginTrans;
     with ADOQueryCmd do
@@ -81,7 +108,11 @@ begin
       Sql.Add(',CJNote=''' + Trim(CJNote.text) + '''');
       Sql.Add(',CJer=''' + Trim(CJer.text) + '''');
       Sql.Add(',CJQuantitly=''' + Trim(CJQuantitly.text) + '''');
-      Sql.Add(',CJType=''' + Trim(CJType.text) + '''');
+      Sql.Add(',CJJL=''' + Trim(CJJL.text) + '''');
+      Sql.Add(',SZ=''' + IntToStr(Ord(SZ.Checked)) + '''');
+      Sql.Add(',QL=''' + IntToStr(Ord(QL.Checked)) + '''');
+      Sql.Add(',TG=''' + IntToStr(Ord(TG.Checked)) + '''');
+      Sql.Add(',MJ=''' + IntToStr(Ord(MJ.Checked)) + '''');
       Sql.Add('where BYIOID=''' + Trim(FBYIOID) + '''');
       ExecSQL;
     end;
@@ -97,21 +128,17 @@ end;
 
 procedure TfrmCJDJ.FormShow(Sender: TObject);
 begin
-
   with ADOQueryCmd do
   begin
     Close;
     Sql.Clear;
     Sql.Add('select * from BS_Yarn_IO ');
     Sql.Add('where BYIOID=''' + Trim(FBYIOID) + '''');
-//    showmessage(Sql.text);
     Open;
   end;
-
   if ADOQueryCmd.fieldbyname('CJDate').asstring = '' then
   begin
     CJDate.Date := SGetServerDate(ADOQueryTemp);
-
   end
   else
   begin
@@ -119,9 +146,16 @@ begin
     CJNote.text := ADOQueryCmd.fieldbyname('CJNote').asstring;
     CJer.text := ADOQueryCmd.fieldbyname('CJer').asstring;
     CJQuantitly.text := ADOQueryCmd.fieldbyname('CJQuantitly').asstring;
-    CJType.text := ADOQueryCmd.fieldbyname('CJType').asstring;
+    CJJL.text := ADOQueryCmd.fieldbyname('CJJL').asstring;
+    SZ.Checked := (ADOQueryCmd.fieldbyname('SZ').AsString = '1') or
+                    (ADOQueryCmd.fieldbyname('SZ').AsBoolean);
+    QL.Checked := (ADOQueryCmd.fieldbyname('QL').AsString = '1') or
+                    (ADOQueryCmd.fieldbyname('QL').AsBoolean);
+    TG.Checked := (ADOQueryCmd.fieldbyname('TG').AsString = '1') or
+                    (ADOQueryCmd.fieldbyname('TG').AsBoolean);
+    MJ.Checked := (ADOQueryCmd.fieldbyname('MJ').AsString = '1') or
+                    (ADOQueryCmd.fieldbyname('MJ').AsBoolean);
   end;
-
 end;
 
 end.

B02基础纱线仓库/U_YarnInEdit.dfm

@@ -21,8 +21,6 @@ inherited frmYarnInEdit: TfrmYarnInEdit
     Height = 433
     Align = alClient
     TabOrder = 0
-    ExplicitLeft = -1
-    ExplicitTop = 31
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>

B02基础纱线仓库/U_YarnInEdit.pas

@@ -11,7 +11,23 @@ uses
   cxGridPopupMenu, ADODB, DBClient, cxButtonEdit, cxTextEdit, StdCtrls, ExtCtrls,
   cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges,
   dxBarBuiltInMenu, U_BaseInput, System.ImageList, Vcl.ImgList, ComObj,
-  dxScrollbarAnnotations, dxSkinsCore, dxSkinsDefaultPainters, cxImageList;
+  dxScrollbarAnnotations, 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
   TfrmYarnInEdit = class(TfrmBaseInput)

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

@@ -3,9 +3,9 @@
 	<Transactions>
     <Transaction>1899/12/30 00:00:00.000.334,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <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.674,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_testdll.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.687,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
@@ -17,18 +17,18 @@
     <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.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.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.376,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.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.969,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutReturnList.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutList.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.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.670,D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutEdit.pas=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnOutInput1.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.688,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutReturnList1.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.878,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.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.800,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_CPSelBig.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.536,=D:\Dp10Repo\项目代码\路尚\A00通用窗体\U_ProductInfoSel.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.887,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas</Transaction>
@@ -41,13 +41,13 @@
     <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.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.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.800,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\Unit1.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\Unit1.pas=</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.356,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B03基础物料仓库\U_JWLPurchasePlanSel.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.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.981,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInList.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.907,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\YarnStk.dproj</Transaction>
     <Transaction>1899/12/30 00:00:00.000.073,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutWBList.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\B02基础纱线仓库\U_YarnOutInput1.pas</Transaction>
@@ -59,11 +59,11 @@
     <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.006,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_CJDJ.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B02基础纱线仓库\U_CJDJ.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.802,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.209,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.224,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.356,D:\Dp10RepoV1\项目代码\D10gmHuahudie\B03基础物料仓库\U_JWLPurchasePlanSel.pas=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnInEdit.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.209,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_YarnPurchasePlanSel.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.316,=D:\Dp10Repo\项目代码\路尚\T00贸易通用窗体\U_PurchaseContractSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>

B04采购计划管理/PurchasePlan.dproj.local

@@ -14,7 +14,7 @@
     <Transaction>1899/12/30 00:00:00.000.106,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanPut.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.486,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_ZZDSXSel.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.741,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.608,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.462,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.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.424,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_YarnPurchasePlanList.pas</Transaction>
@@ -23,17 +23,17 @@
     <Transaction>1899/12/30 00:00:00.000.071,=D:\Dp10RepoV1\public10\design\U_FormLayOutDesign.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.555,=D:\Dp10RepoV1\项目代码\花蝴蝶\B02基础纱线仓库\U_YarnInfoInPut.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.608,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.486,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_ZZDSXSel.dfm</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.741,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContract_SXSel.dfm=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_SalesContractSel.dfm</Transaction>
     <Transaction>1899/12/30 00:00:00.000.085,D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanPut.pas=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanPut_ZZD.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.621,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanPut.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.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.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
     <Transaction>1899/12/30 00:00:00.000.819,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\T00贸易通用窗体\U_TradeSalesContractSel.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.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.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.503,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.510,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_TatClothInfoSel.pas</Transaction>
@@ -44,7 +44,7 @@
     <Transaction>1899/12/30 00:00:00.000.317,=D:\Dp10RepoV1\项目代码\花蝴蝶\A00通用组件\FrameDateSel.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.135,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.366,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.797,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\PurchasePlan.dproj=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\InformationBase.dproj</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.263,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\B04采购计划管理\U_YarnPurchasePlanList_ZZD.pas</Transaction>
@@ -53,7 +53,7 @@
     <Transaction>1899/12/30 00:00:00.000.023,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.915,=D:\Dp10RepoV1\项目代码\D10szKaiXiYa\A00通用窗体\U_ProductInfoSel.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.034,D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanDetailList.dfm=D:\Dp10RepoV1\项目代码\花蝴蝶\B04采购计划管理\U_YarnPurchasePlanList.dfm</Transaction>
-    <Transaction>1899/12/30 00:00:00.000.797,D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\PurchasePlan.dproj=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\InformationBase.dproj</Transaction>
+    <Transaction>1899/12/30 00:00:00.000.366,=D:\Dp10Repo\项目代码\RTBasics\B04采购计划管理\U_ClothPurchasePlanList.pas</Transaction>
     <Transaction>1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">

B04采购计划管理/U_YarnPurchasePlanList.dfm

@@ -7,6 +7,8 @@ inherited frmYarnPurchasePlanList: TfrmYarnPurchasePlanList
   Font.Height = -16
   FormStyle = fsMDIChild
   Visible = True
+  ExplicitLeft = -222
+  ExplicitTop = -245
   ExplicitWidth = 1380
   ExplicitHeight = 774
   PixelsPerInch = 96
@@ -619,6 +621,13 @@ inherited frmYarnPurchasePlanList: TfrmYarnPurchasePlanList
         Options.Editing = False
         Width = 122
       end
+      object Tv2Column1: TcxGridDBColumn
+        Caption = #32433#32447#21378#32534#21495
+        DataBinding.FieldName = 'SXCBH'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 118
+      end
       object Tv21Column11: TcxGridDBColumn
         Caption = #20998#29305'(Dtex)'
         DataBinding.FieldName = 'Denier'
@@ -627,6 +636,13 @@ inherited frmYarnPurchasePlanList: TfrmYarnPurchasePlanList
         Options.Editing = False
         Width = 117
       end
+      object Tv2Column2: TcxGridDBColumn
+        Caption = #32433#32447#21378#21697#21517
+        DataBinding.FieldName = 'SXCPM'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 113
+      end
       object Tv21Column14: TcxGridDBColumn
         Caption = #25903#25968
         DataBinding.FieldName = 'ZS'

B04采购计划管理/U_YarnPurchasePlanList.pas

@@ -129,6 +129,8 @@ type
     v1Column2: TcxGridDBColumn;
     cxGridLevel1: TcxGridLevel;
     d: TcxGridDBColumn;
+    Tv2Column1: TcxGridDBColumn;
+    Tv2Column2: TcxGridDBColumn;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);

B04采购计划管理/U_YarnPurchasePlanPut.dfm

@@ -10,6 +10,7 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
   OldCreateOrder = True
   Position = poScreenCenter
   WindowState = wsMaximized
+  ExplicitLeft = -23
   ExplicitWidth = 1540
   ExplicitHeight = 690
   PixelsPerInch = 96
@@ -115,6 +116,8 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
     Align = alClient
     BorderStyle = cxcbsNone
     TabOrder = 2
+    ExplicitLeft = -232
+    ExplicitTop = 192
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -197,6 +200,13 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
         Options.Editing = False
         Width = 72
       end
+      object Tv1Column6: TcxGridDBColumn
+        Caption = #20379#24212#21830
+        DataBinding.FieldName = 'FromCoName'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 79
+      end
       object Tv1Column2: TcxGridDBColumn
         Caption = #32534#21495
         DataBinding.FieldName = 'Y_Code'
@@ -229,6 +239,13 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
         Options.Editing = False
         Width = 122
       end
+      object Tv1Column10: TcxGridDBColumn
+        Caption = #32433#32447#21378#32534#21495
+        DataBinding.FieldName = 'SXCBH'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Width = 110
+      end
       object Tv1Column11: TcxGridDBColumn
         Caption = #20998#29305'(Dtex)'
         DataBinding.FieldName = 'Denier'
@@ -237,6 +254,12 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
         Options.Editing = False
         Width = 117
       end
+      object Tv1Column12: TcxGridDBColumn
+        Caption = #32433#32447#21378#21697#21517
+        DataBinding.FieldName = 'SXCPM'
+        DataBinding.IsNullValueType = True
+        Width = 98
+      end
       object Tv1Column14: TcxGridDBColumn
         Caption = #25903#25968
         DataBinding.FieldName = 'ZS'
@@ -371,6 +394,7 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut
     ParentColor = False
     ParentCtl3D = False
     TabOrder = 3
+    ExplicitTop = 36
     object lbl5: TLabel
       Left = 32
       Top = 50

B04采购计划管理/U_YarnPurchasePlanPut.pas

@@ -108,6 +108,9 @@ type
     ADOQuery1: TADOQuery;
     Label4: TLabel;
     Tv1Column8: TcxGridDBColumn;
+    Tv1Column6: TcxGridDBColumn;
+    Tv1Column10: TcxGridDBColumn;
+    Tv1Column12: TcxGridDBColumn;
     procedure TBCloseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure TBSaveClick(Sender: TObject);