20260211

合同管理(ContractManagement.dll)/U_ContractListCG.dfm

@@ -19,7 +19,8 @@ object frmContractListCG: TfrmContractListCG
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1366
+    Width = 1374
+    Height = 62
     AutoSize = True
     ButtonHeight = 30
     ButtonWidth = 107
@@ -99,35 +100,36 @@ object frmContractListCG: TfrmContractListCG
       AutoSize = True
       Caption = #25171#21360
       ImageIndex = 4
+      Wrap = True
       OnClick = TBPrintClick
     end
     object btnTijiao: TToolButton
-      Left = 528
+      Left = 0
-      Top = 0
+      Top = 30
       AutoSize = True
       Caption = #25552#20132
       ImageIndex = 31
       OnClick = btnTijiaoClick
     end
     object btnCXTijiao: TToolButton
-      Left = 591
+      Left = 63
-      Top = 0
+      Top = 30
       AutoSize = True
       Caption = #25764#38144#25552#20132
       ImageIndex = 52
       OnClick = btnCXTijiaoClick
     end
     object tchk: TToolButton
-      Left = 678
+      Left = 150
-      Top = 0
+      Top = 30
       AutoSize = True
       Caption = #23457#26680
       ImageIndex = 31
       OnClick = tchkClick
     end
     object Tnochk: TToolButton
-      Left = 741
+      Left = 213
-      Top = 0
+      Top = 30
       AutoSize = True
       Caption = #25764#38144#23457#26680
       ImageIndex = 52
@@ -135,32 +137,32 @@ object frmContractListCG: TfrmContractListCG
       OnClick = TnochkClick
     end
     object Tqx: TToolButton
-      Left = 828
+      Left = 300
-      Top = 0
+      Top = 30
       AutoSize = True
       Caption = #21512#21516#21462#28040
       ImageIndex = 3
       OnClick = TqxClick
     end
     object Tnoqx: TToolButton
-      Left = 915
+      Left = 387
-      Top = 0
+      Top = 30
       AutoSize = True
       Caption = #25764#38144#21512#21516#21462#28040
       ImageIndex = 52
       OnClick = TnoqxClick
     end
     object ToolButton3: TToolButton
-      Left = 1026
+      Left = 498
-      Top = 0
+      Top = 30
       AutoSize = True
       Caption = #25805#20316#26085#24535
       ImageIndex = 22
       OnClick = ToolButton3Click
     end
     object TBClose: TToolButton
-      Left = 1113
+      Left = 585
-      Top = 0
+      Top = 30
       AutoSize = True
       Caption = #20851#38381
       ImageIndex = 21
@@ -169,8 +171,8 @@ object frmContractListCG: TfrmContractListCG
   end
   object cxGrid1: TcxGrid
     Left = 0
-    Top = 97
+    Top = 127
-    Width = 1366
+    Width = 1374
     Height = 394
     Align = alTop
     TabOrder = 3
@@ -404,8 +406,8 @@ object frmContractListCG: TfrmContractListCG
   end
   object Panel1: TPanel
     Left = 0
-    Top = 32
+    Top = 62
-    Width = 1366
+    Width = 1374
     Height = 43
     Align = alTop
     BevelInner = bvRaised
@@ -633,8 +635,8 @@ object frmContractListCG: TfrmContractListCG
   end
   object cxTabControl1: TcxTabControl
     Left = 0
-    Top = 75
+    Top = 105
-    Width = 1366
+    Width = 1374
     Height = 22
     Align = alTop
     TabOrder = 2
@@ -649,22 +651,22 @@ object frmContractListCG: TfrmContractListCG
       #20840#37096)
     OnChange = cxTabControl1Change
     ClientRectBottom = 22
-    ClientRectRight = 1366
+    ClientRectRight = 1374
     ClientRectTop = 19
   end
   object cxSplitter1: TcxSplitter
     Left = 0
-    Top = 707
+    Top = 715
-    Width = 1366
+    Width = 1374
     Height = 8
     HotZoneClassName = 'TcxMediaPlayer9Style'
     AlignSplitter = salBottom
   end
   object cxGrid2: TcxGrid
     Left = 0
-    Top = 491
+    Top = 521
-    Width = 1366
+    Width = 1374
-    Height = 216
+    Height = 194
     Align = alClient
     TabOrder = 4
     object TV2: TcxGridDBTableView

合同管理(ContractManagement.dll)/U_ContractListCG.pas

@@ -11,7 +11,20 @@ uses
   cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System,
   RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxPC, cxButtonEdit,
   cxTextEdit, cxDropDownEdit, cxLookAndFeels, cxLookAndFeelPainters,
-  cxNavigator, dxBarBuiltInMenu;
+  cxNavigator, dxBarBuiltInMenu, dxSkinsCore, 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, dxSkinPumpkin,
+  dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus,
+  dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008,
+  dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine,
+  dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter;
 
 type
   TfrmContractListCG = class(TForm)

合同管理(ContractManagement.dll)/U_ContractListJG.dfm

@@ -19,7 +19,7 @@ object frmContractListJG: TfrmContractListJG
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1366
+    Width = 1374
     Height = 62
     AutoSize = True
     ButtonHeight = 30
@@ -172,12 +172,12 @@ object frmContractListJG: TfrmContractListJG
   object cxGrid1: TcxGrid
     Left = 0
     Top = 127
-    Width = 1366
+    Width = 1374
     Height = 394
     Align = alTop
     TabOrder = 3
     object Tv1: TcxGridDBTableView
-      NavigatorButtons.ConfirmDelete = False
+      Navigator.Buttons.CustomButtons = <>
       OnCellDblClick = Tv1CellDblClick
       OnCustomDrawCell = Tv1CustomDrawCell
       OnFocusedRecordChanged = Tv1FocusedRecordChanged
@@ -270,7 +270,7 @@ object frmContractListJG: TfrmContractListJG
       object v1Column10: TcxGridDBColumn
         DataBinding.FieldName = 'status'
         Visible = False
-        Hidden = True
+        VisibleForCustomization = False
       end
       object v1Column12: TcxGridDBColumn
         Caption = #21512#21516#38468#20214
@@ -337,7 +337,7 @@ object frmContractListJG: TfrmContractListJG
   object Panel1: TPanel
     Left = 0
     Top = 62
-    Width = 1366
+    Width = 1374
     Height = 43
     Align = alTop
     BevelInner = bvRaised
@@ -551,13 +551,14 @@ object frmContractListJG: TfrmContractListJG
   object cxTabControl1: TcxTabControl
     Left = 0
     Top = 105
-    Width = 1366
+    Width = 1374
     Height = 22
     Align = alTop
-    Style = 9
-    TabIndex = 0
     TabOrder = 2
-    Tabs.Strings = (
+    Properties.CustomButtons.Buttons = <>
+    Properties.Style = 9
+    Properties.TabIndex = 0
+    Properties.Tabs.Strings = (
       #26410#25552#20132
       #24050#25552#20132
       #24050#23457#26680
@@ -565,13 +566,13 @@ object frmContractListJG: TfrmContractListJG
       #20840#37096)
     OnChange = cxTabControl1Change
     ClientRectBottom = 22
-    ClientRectRight = 1366
+    ClientRectRight = 1374
     ClientRectTop = 19
   end
   object cxSplitter1: TcxSplitter
     Left = 0
-    Top = 708
+    Top = 715
-    Width = 1366
+    Width = 1374
     Height = 8
     HotZoneClassName = 'TcxMediaPlayer9Style'
     AlignSplitter = salBottom
@@ -579,12 +580,12 @@ object frmContractListJG: TfrmContractListJG
   object cxGrid2: TcxGrid
     Left = 0
     Top = 521
-    Width = 1366
+    Width = 1374
-    Height = 187
+    Height = 194
     Align = alClient
     TabOrder = 4
     object TV2: TcxGridDBTableView
-      NavigatorButtons.ConfirmDelete = False
+      Navigator.Buttons.CustomButtons = <>
       DataController.DataSource = DS_Sub
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
       DataController.Summary.DefaultGroupSummaryItems = <

合同管理(ContractManagement.dll)/U_ContractListJG.pas

@@ -10,7 +10,22 @@ uses
   cxGridCustomView, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
   cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System,
   RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxPC, cxButtonEdit,
-  cxTextEdit, cxDropDownEdit;
+  cxTextEdit, cxDropDownEdit, cxLookAndFeels, cxLookAndFeelPainters,
+  dxSkinsCore, 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, dxSkinPumpkin,
+  dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus,
+  dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008,
+  dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine,
+  dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter,
+  cxNavigator, dxBarBuiltInMenu;
 
 type
   TfrmContractListJG = class(TForm)

合同管理(ContractManagement.dll)/U_ContractListNX.dfm

@@ -1,6 +1,6 @@
 object frmContractListNX: TfrmContractListNX
-  Left = 267
+  Left = 225
-  Top = 202
+  Top = 246
   Width = 1381
   Height = 716
   Caption = #38144#21806#21512#21516
@@ -701,7 +701,7 @@ object frmContractListNX: TfrmContractListNX
     TabOrder = 2
     Properties.CustomButtons.Buttons = <>
     Properties.Style = 9
-    Properties.TabIndex = 0
+    Properties.TabIndex = 4
     Properties.Tabs.Strings = (
       #26410#25552#20132
       #24050#25552#20132

合同管理(ContractManagement.dll)/U_JHFXLIST.dfm

@@ -1,6 +1,6 @@
 object frmjhfxlist: Tfrmjhfxlist
-  Left = 201
+  Left = 383
-  Top = 51
+  Top = 189
   Width = 1293
   Height = 795
   Caption = #35745#21010#20998#26512#34920

合同管理(ContractManagement.dll)/U_JHFXLIST.pas

@@ -11,7 +11,20 @@ uses
   StdCtrls, ToolWin, DBClient, ADODB, ExtCtrls, BtnEdit, cxCalendar, StrUtils,
   cxDropDownEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxImage, cxBlobEdit,
   cxImageComboBox, ImgList, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
-  dxSkinsCore, dxSkinsDefaultPainters, dxSkinscxPCPainter;
+  dxSkinsCore, dxSkinsDefaultPainters, dxSkinscxPCPainter, 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, dxSkinPumpkin,
+  dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus,
+  dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008,
+  dxSkinTheAsphaltWorld, dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint,
+  dxSkinXmas2008Blue;
 
 type
   Tfrmjhfxlist = class(TForm)
@@ -149,7 +162,7 @@ begin
     Close;
     SQL.Clear;
     sql.Add('exec P_ht_jhlist2 @consubid=''' + Trim(FMainId) + '''');
-
+    //showmessage(sql.text);
     Open;
   end;
   SCreateCDS20(ADOTemp, Order_Sub);

合同管理(ContractManagement.dll)/U_testdll.dfm

@@ -1,6 +1,6 @@
 object Form1: TForm1
-  Left = 240
+  Left = 287
-  Top = 237
+  Top = 401
   Width = 791
   Height = 554
   Caption = 'Form1'

客户供应商管理(Company.dll)/U_Customer.dfm

@@ -1,6 +1,6 @@
 object frmCustomer: TfrmCustomer
-  Left = 232
+  Left = 284
-  Top = 249
+  Top = 358
   Width = 1388
   Height = 650
   Caption = #23458#25143#36164#26009#31649#29702
@@ -137,6 +137,13 @@ object frmCustomer: TfrmCustomer
       Height = 12
       Caption = #22320#21306
     end
+    object Label5: TLabel
+      Left = 639
+      Top = 13
+      Width = 48
+      Height = 12
+      Caption = #23458#25143#31616#31216
+    end
     object Name: TEdit
       Tag = 2
       Left = 238
@@ -173,6 +180,15 @@ object frmCustomer: TfrmCustomer
       TabOrder = 3
       OnChange = NameChange
     end
+    object shortName: TEdit
+      Tag = 2
+      Left = 692
+      Top = 9
+      Width = 89
+      Height = 20
+      TabOrder = 4
+      OnChange = NameChange
+    end
   end
   object cxGrid2: TcxGrid
     Left = 0

客户供应商管理(Company.dll)/U_Customer.pas

@@ -83,6 +83,8 @@ type
     Tv2Column1: TcxGridDBColumn;
     ToolButton5: TToolButton;
     Tv1Column2: TcxGridDBColumn;
+    Label5: TLabel;
+    shortName: TEdit;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);

客户供应商管理(Company.dll)/U_testdll.dfm

@@ -1,6 +1,6 @@
 object Form1: TForm1
-  Left = 203
+  Left = 546
-  Top = 121
+  Top = 403
   Width = 791
   Height = 554
   Caption = 'Form1'
@@ -21,7 +21,7 @@ object Form1: TForm1
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 775
+    Width = 783
     Height = 25
     ButtonWidth = 57
     Caption = 'ToolBar1'

布匹检验(FabricInspection.dll)/U_CiPinChaiJian.pas

@@ -10,7 +10,20 @@ uses
   cxGrid, StdCtrls, cxContainer, cxTextEdit, cxCurrencyEdit, BtnEdit, ExtCtrls,
   ComCtrls, ToolWin, DBClient, ADODB, MovePanel, RM_Dataset, RM_System,
   RM_Common, RM_Class, RM_GridReport, cxLookAndFeels, cxLookAndFeelPainters,
-  cxNavigator;
+  cxNavigator, dxSkinsCore, 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, dxSkinPumpkin,
+  dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus,
+  dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008,
+  dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine,
+  dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter;
 
 function CommOpen(fhandle: hwnd; sCommName: PAnsiChar; IntTime: integer; IsMessage: integer): integer; stdcall; external 'JCYData.DLL';
 

布匹检验(FabricInspection.dll)/U_GetDllForm.pas

@@ -65,15 +65,15 @@ begin
   SetLength(pswd, 255);
   if Trim(DataBaseStr) = '' then
   begin
-    server := '101.132.143.144,7781';
+//    server := '101.132.143.144,7781';
-    dtbase := 'chenfengdata';
+//    dtbase := 'chenfengdata';
-    user := 'rtsa';
+//    user := 'rtsa';
-    pswd := 'rightsoft@5740';
+//    pswd := 'rightsoft@5740';
 
-//    server := '.';
+    server := '127.0.0.1';
-//    dtbase := 'yiduidata';
+    dtbase := 'delphichenfeng';
-//    user := 'sa';
+    user := 'sa';
-//    pswd := 'rightsoft';
+    pswd := 'rightsoft';
 
     DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
 

布匹检验(FabricInspection.dll)/U_GreyInspection.dfm

@@ -1,8 +1,8 @@
 object frmGreyInspection: TfrmGreyInspection
-  Left = 216
+  Left = 402
-  Top = 74
+  Top = 267
   Width = 1316
-  Height = 755
+  Height = 862
   Caption = #26797#32455#22383#24067#26816#39564
   Color = clBtnFace
   Font.Charset = GB2312_CHARSET
@@ -22,7 +22,7 @@ object frmGreyInspection: TfrmGreyInspection
     Left = 0
     Top = 85
     Width = 217
-    Height = 631
+    Height = 746
     Align = alLeft
     BevelInner = bvRaised
     BevelOuter = bvLowered
@@ -764,7 +764,7 @@ object frmGreyInspection: TfrmGreyInspection
     Left = 217
     Top = 85
     Width = 296
-    Height = 631
+    Height = 746
     Align = alLeft
     BevelInner = bvRaised
     BevelOuter = bvLowered
@@ -773,7 +773,7 @@ object frmGreyInspection: TfrmGreyInspection
       Left = 2
       Top = 113
       Width = 292
-      Height = 516
+      Height = 631
       Align = alClient
       Font.Charset = GB2312_CHARSET
       Font.Color = clBlue
@@ -893,14 +893,14 @@ object frmGreyInspection: TfrmGreyInspection
   object Panel5: TPanel
     Left = 0
     Top = 0
-    Width = 1300
+    Width = 1308
     Height = 85
     Align = alTop
     TabOrder = 0
     object Panel6: TPanel
       Left = 1
       Top = 31
-      Width = 1298
+      Width = 1306
       Height = 53
       Align = alClient
       BevelInner = bvRaised
@@ -1055,7 +1055,7 @@ object frmGreyInspection: TfrmGreyInspection
     object ToolBar1: TToolBar
       Left = 1
       Top = 1
-      Width = 1298
+      Width = 1306
       Height = 30
       ButtonHeight = 30
       ButtonWidth = 95
@@ -1144,8 +1144,8 @@ object frmGreyInspection: TfrmGreyInspection
   object cxGrid3: TcxGrid
     Left = 513
     Top = 85
-    Width = 787
+    Width = 795
-    Height = 631
+    Height = 746
     Align = alClient
     TabOrder = 3
     object Tv3: TcxGridDBTableView
@@ -1652,4 +1652,9 @@ object frmGreyInspection: TfrmGreyInspection
       Font.Style = [fsBold]
     end
   end
+  object ADOQuery1: TADOQuery
+    Parameters = <>
+    Left = 824
+    Top = 192
+  end
 end

布匹检验(FabricInspection.dll)/U_GreyInspection.pas

@@ -156,6 +156,7 @@ type
     ToolButton6: TToolButton;
     Tv3Column5: TcxGridDBColumn;
     Tv3Column6: TcxGridDBColumn;
+    ADOQuery1: TADOQuery;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -739,11 +740,12 @@ begin
   if not ADOTmp.IsEmpty then
   begin
 //    FAPID := Trim(ADOTmp.fieldbyname('apid').AsString);
+//    FBatchNO := Trim(ADOTmp.fieldbyname('BatchNO').AsString);
     FBatchNO := Trim(ADOTmp.fieldbyname('BatchNO').AsString);
     FMainId := Trim(ADOTmp.fieldbyname('MainId').AsString);
     FSubId := Trim(ADOTmp.fieldbyname('SubId').AsString);
     FMJCode := Trim(ADOTmp.fieldbyname('P_Code').AsString);
-    FMJName := Trim(ADOTmp.fieldbyname('P_CodeName').AsString);
+    FMJName := Trim(ADOTmp.fieldbyname('P_CodeName').AsStSring);
     FMJSpec := Trim(ADOTmp.fieldbyname('P_Spec').AsString);
     FMJMF := Trim(ADOTmp.fieldbyname('P_MF').AsString);
 
@@ -1290,13 +1292,21 @@ begin
         end;
       end;
 
+      with ADOQuery1 do
+      begin
+        Close;
+        sql.Clear;
+        SQL.Add('select * from PD_Plan_Card where PCID=''' + Trim(FPCID) + '''');
+        Open;
+      end;
+
       FieldByName('MainId').value := Trim(FMainId);
       FieldByName('SubId').value := Trim(FSubId);
       FieldByName('APId').value := Trim(FAPID);
 
       FieldByName('pcid').value := Trim(FPCID);
 
-      FieldByName('BatchNO').value := Trim(FBatchNO);
+      FieldByName('BatchNO').value := Trim(ADOQuery1.FieldByName('edzdfno').AsString);
       FieldByName('P_Code').value := Trim(FMJCode);
       FieldByName('P_CodeName').value := Trim(FMJName);
       FieldByName('P_Spec').value := Trim(FMJSpec);

应收应付/U_FKCR.dfm

@@ -1,6 +1,6 @@
 object frmFKCR: TfrmFKCR
-  Left = 348
+  Left = 350
-  Top = 170
+  Top = 226
   Width = 990
   Height = 618
   Caption = #20184#27454#30331#35760
@@ -19,7 +19,7 @@ object frmFKCR: TfrmFKCR
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 974
+    Width = 982
     Height = 31
     ButtonHeight = 30
     ButtonWidth = 83
@@ -116,7 +116,7 @@ object frmFKCR: TfrmFKCR
   object Panel1: TPanel
     Left = 0
     Top = 31
-    Width = 974
+    Width = 982
     Height = 66
     Align = alTop
     BevelInner = bvRaised
@@ -209,7 +209,7 @@ object frmFKCR: TfrmFKCR
   object cxTabControl1: TcxTabControl
     Left = 0
     Top = 97
-    Width = 974
+    Width = 982
     Height = 22
     Align = alTop
     TabOrder = 2
@@ -222,13 +222,13 @@ object frmFKCR: TfrmFKCR
       #20840#37096)
     OnChange = cxTabControl1Change
     ClientRectBottom = 22
-    ClientRectRight = 974
+    ClientRectRight = 982
     ClientRectTop = 19
   end
   object cxGrid1: TcxGrid
     Left = 0
-    Top = 342
+    Top = 350
-    Width = 974
+    Width = 982
     Height = 237
     Align = alBottom
     TabOrder = 4
@@ -308,8 +308,8 @@ object frmFKCR: TfrmFKCR
   object cxGrid2: TcxGrid
     Left = 0
     Top = 119
-    Width = 974
+    Width = 982
-    Height = 223
+    Height = 231
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 3
@@ -335,6 +335,7 @@ object frmFKCR: TfrmFKCR
         end
         item
           Kind = skSum
+          Column = v2Column5
         end>
       DataController.Summary.SummaryGroups = <>
       OptionsCustomize.ColumnFiltering = False

应收应付/U_YFCR.dfm

@@ -1,6 +1,6 @@
 object frmYFCR: TfrmYFCR
-  Left = 198
+  Left = 471
-  Top = 112
+  Top = 396
   Width = 1181
   Height = 661
   Caption = #24212#20184#27454#31649#29702
@@ -21,7 +21,7 @@ object frmYFCR: TfrmYFCR
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1165
+    Width = 1173
     Height = 31
     ButtonHeight = 30
     ButtonWidth = 83
@@ -124,7 +124,7 @@ object frmYFCR: TfrmYFCR
   object Panel1: TPanel
     Left = 0
     Top = 31
-    Width = 1165
+    Width = 1173
     Height = 65
     Align = alTop
     BevelInner = bvRaised
@@ -215,7 +215,7 @@ object frmYFCR: TfrmYFCR
   object cxTabControl1: TcxTabControl
     Left = 0
     Top = 96
-    Width = 1165
+    Width = 1173
     Height = 22
     Align = alTop
     TabOrder = 2
@@ -229,14 +229,14 @@ object frmYFCR: TfrmYFCR
       #20840#37096)
     OnChange = cxTabControl1Change
     ClientRectBottom = 22
-    ClientRectRight = 1165
+    ClientRectRight = 1173
     ClientRectTop = 19
   end
   object cxGrid2: TcxGrid
     Left = 0
     Top = 118
-    Width = 1165
+    Width = 1173
-    Height = 267
+    Height = 275
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 3
@@ -436,8 +436,8 @@ object frmYFCR: TfrmYFCR
   end
   object cxGrid1: TcxGrid
     Left = 0
-    Top = 385
+    Top = 393
-    Width = 1165
+    Width = 1173
     Height = 237
     Align = alBottom
     TabOrder = 4
@@ -466,6 +466,7 @@ object frmYFCR: TfrmYFCR
         end
         item
           Kind = skSum
+          Column = v1Column5
         end>
       DataController.Summary.SummaryGroups = <>
       OptionsCustomize.ColumnFiltering = False

应收应付/U_YFCRMXList.dfm

@@ -1,6 +1,6 @@
 object frmYFCRMXList: TfrmYFCRMXList
-  Left = 273
+  Left = 313
-  Top = 107
+  Top = 245
   Width = 1018
   Height = 688
   Caption = #24212#20184#27454#26126#32454#26597#35810
@@ -208,6 +208,18 @@ object frmYFCRMXList: TfrmYFCRMXList
         end
         item
           Kind = skSum
+        end
+        item
+          Kind = skSum
+          Column = v1Price
+        end
+        item
+          Kind = skSum
+          Column = v1Column7
+        end
+        item
+          Kind = skSum
+          Column = v1Column5
         end>
       DataController.Summary.SummaryGroups = <>
       OptionsCustomize.ColumnFiltering = False

应收应付/U_YFFKList.dfm

@@ -1,6 +1,6 @@
 object frmYFFKList: TfrmYFFKList
-  Left = 281
+  Left = 278
-  Top = 123
+  Top = 412
   Width = 1134
   Height = 618
   Caption = #24212#20184#27454#20184#27454#32479#35745
@@ -19,7 +19,7 @@ object frmYFFKList: TfrmYFFKList
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1118
+    Width = 1126
     Height = 31
     ButtonHeight = 30
     ButtonWidth = 83
@@ -84,7 +84,7 @@ object frmYFFKList: TfrmYFFKList
   object Panel1: TPanel
     Left = 0
     Top = 31
-    Width = 1118
+    Width = 1126
     Height = 39
     Align = alTop
     BevelInner = bvRaised
@@ -161,8 +161,8 @@ object frmYFFKList: TfrmYFFKList
   object cxGrid2: TcxGrid
     Left = 0
     Top = 92
-    Width = 1118
+    Width = 1126
-    Height = 487
+    Height = 495
     Align = alClient
     TabOrder = 3
     object Tv2: TcxGridDBTableView
@@ -194,6 +194,11 @@ object frmYFFKList: TfrmYFFKList
         end
         item
           Kind = skSum
+          Column = Tv2Column2
+        end
+        item
+          Kind = skSum
+          Column = Tv2Column3
         end
         item
           Kind = skSum
@@ -206,9 +211,7 @@ object frmYFFKList: TfrmYFFKList
         end
         item
           Kind = skSum
-        end
+          Column = Tv2Column3
-        item
-          Kind = skSum
         end
         item
           Kind = skSum
@@ -330,7 +333,7 @@ object frmYFFKList: TfrmYFFKList
   object cxTabControl1: TcxTabControl
     Left = 0
     Top = 70
-    Width = 1118
+    Width = 1126
     Height = 22
     Align = alTop
     TabOrder = 2
@@ -342,7 +345,7 @@ object frmYFFKList: TfrmYFFKList
       #20840#37096)
     OnChange = cxTabControl1Change
     ClientRectBottom = 22
-    ClientRectRight = 1118
+    ClientRectRight = 1126
     ClientRectTop = 19
   end
   object ADOQueryTemp: TADOQuery

应收应付/U_YFMXlist.dfm

@@ -21,7 +21,7 @@ object frmYFMXlist: TfrmYFMXlist
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1189
+    Width = 1197
     Height = 31
     ButtonHeight = 30
     ButtonWidth = 59
@@ -78,7 +78,7 @@ object frmYFMXlist: TfrmYFMXlist
   object Panel1: TPanel
     Left = 0
     Top = 31
-    Width = 1189
+    Width = 1197
     Height = 38
     Align = alTop
     BevelInner = bvRaised
@@ -195,8 +195,8 @@ object frmYFMXlist: TfrmYFMXlist
   object cxGrid2: TcxGrid
     Left = 0
     Top = 91
-    Width = 1189
+    Width = 1197
-    Height = 484
+    Height = 492
     Align = alClient
     TabOrder = 3
     object TV1: TcxGridDBBandedTableView
@@ -225,6 +225,40 @@ object frmYFMXlist: TfrmYFMXlist
         item
           Kind = skSum
           Column = V1Column13
+        end
+        item
+          Kind = skSum
+          Column = V1Column16
+        end
+        item
+          Kind = skSum
+          Column = V1Column8
+        end
+        item
+          Kind = skSum
+          Column = V1Column9
+        end
+        item
+          Kind = skSum
+          Column = V1Column12
+        end
+        item
+          Kind = skSum
+          Column = V1Column12
+        end
+        item
+          Kind = skSum
+          Column = TV1Column4
+        end
+        item
+          Kind = skSum
+          Column = TV1Column5
+        end
+        item
+          Kind = skSum
+          Column = V1Column15
+        end
+        item
         end>
       DataController.Summary.SummaryGroups = <>
       OptionsCustomize.ColumnFiltering = False
@@ -582,7 +616,7 @@ object frmYFMXlist: TfrmYFMXlist
   object cxTabControl1: TcxTabControl
     Left = 0
     Top = 69
-    Width = 1189
+    Width = 1197
     Height = 22
     Align = alTop
     TabOrder = 2
@@ -593,7 +627,7 @@ object frmYFMXlist: TfrmYFMXlist
       #24050#23457#26680
       #20840#37096)
     ClientRectBottom = 22
-    ClientRectRight = 1189
+    ClientRectRight = 1197
     ClientRectTop = 19
   end
   object ADOQueryTemp: TADOQuery

应收应付/U_YSCR.dfm

@@ -21,7 +21,7 @@ object frmYSCR: TfrmYSCR
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1233
+    Width = 1241
     Height = 31
     ButtonHeight = 30
     ButtonWidth = 83
@@ -110,7 +110,7 @@ object frmYSCR: TfrmYSCR
   object Panel1: TPanel
     Left = 0
     Top = 31
-    Width = 1233
+    Width = 1241
     Height = 70
     Align = alTop
     BevelInner = bvRaised
@@ -217,8 +217,8 @@ object frmYSCR: TfrmYSCR
   object cxGrid2: TcxGrid
     Left = 0
     Top = 123
-    Width = 1233
+    Width = 1241
-    Height = 289
+    Height = 297
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 3
@@ -244,9 +244,11 @@ object frmYSCR: TfrmYSCR
         end
         item
           Kind = skSum
+          Column = Tv2Column2
         end
         item
           Kind = skSum
+          Column = Tv2Column1
         end>
       DataController.Summary.SummaryGroups = <>
       OptionsCustomize.ColumnFiltering = False
@@ -430,7 +432,7 @@ object frmYSCR: TfrmYSCR
   object cxTabControl1: TcxTabControl
     Left = 0
     Top = 101
-    Width = 1233
+    Width = 1241
     Height = 22
     Align = alTop
     TabOrder = 2
@@ -443,13 +445,13 @@ object frmYSCR: TfrmYSCR
       #20840#37096)
     OnChange = cxTabControl1Change
     ClientRectBottom = 22
-    ClientRectRight = 1233
+    ClientRectRight = 1241
     ClientRectTop = 19
   end
   object cxGrid1: TcxGrid
     Left = 0
-    Top = 412
+    Top = 420
-    Width = 1233
+    Width = 1241
     Height = 237
     Align = alBottom
     TabOrder = 4

应收应付/U_YSMXlist.dfm

@@ -1,8 +1,8 @@
 object frmYSMXlist: TfrmYSMXlist
-  Left = 423
+  Left = 218
-  Top = 608
+  Top = 144
   Width = 1205
-  Height = 614
+  Height = 613
   Caption = #24212#25910#23545#36134#20449#24687#34920
   Color = clBtnFace
   Font.Charset = GB2312_CHARSET
@@ -22,7 +22,7 @@ object frmYSMXlist: TfrmYSMXlist
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1197
+    Width = 1189
     Height = 31
     ButtonHeight = 30
     ButtonWidth = 59
@@ -80,7 +80,7 @@ object frmYSMXlist: TfrmYSMXlist
   object Panel1: TPanel
     Left = 0
     Top = 31
-    Width = 1197
+    Width = 1189
     Height = 38
     Align = alTop
     BevelInner = bvRaised
@@ -222,8 +222,8 @@ object frmYSMXlist: TfrmYSMXlist
   object cxGrid2: TcxGrid
     Left = 0
     Top = 91
-    Width = 1197
+    Width = 1189
-    Height = 492
+    Height = 483
     Align = alClient
     TabOrder = 3
     object TV1: TcxGridDBBandedTableView
@@ -241,9 +241,7 @@ object frmYSMXlist: TfrmYSMXlist
         end
         item
           Kind = skSum
-        end
+          Column = TV1Column1
-        item
-          Kind = skSum
         end
         item
           Kind = skSum
@@ -256,6 +254,35 @@ object frmYSMXlist: TfrmYSMXlist
         item
           Kind = skSum
           Column = V1Column18
+        end
+        item
+          Kind = skSum
+          Column = V1Column8
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+        end
+        item
+        end
+        item
+        end
+        item
+          Kind = skSum
+          Column = V1Column12
         end>
       DataController.Summary.SummaryGroups = <>
       OptionsCustomize.ColumnFiltering = False
@@ -391,7 +418,7 @@ object frmYSMXlist: TfrmYSMXlist
       end
       object V1Column12: TcxGridDBBandedColumn
         Caption = #24635#37329#39069
-        DataBinding.FieldName = 'money'
+        DataBinding.FieldName = 'MxMoney'
         PropertiesClassName = 'TcxCurrencyEditProperties'
         Properties.DisplayFormat = '0.00'
         HeaderAlignmentHorz = taCenter
@@ -643,7 +670,7 @@ object frmYSMXlist: TfrmYSMXlist
   object cxTabControl1: TcxTabControl
     Left = 0
     Top = 69
-    Width = 1197
+    Width = 1189
     Height = 22
     Align = alTop
     TabOrder = 2
@@ -655,7 +682,7 @@ object frmYSMXlist: TfrmYSMXlist
       #20840#37096)
     OnChange = cxTabControl1Change
     ClientRectBottom = 22
-    ClientRectRight = 1197
+    ClientRectRight = 1189
     ClientRectTop = 19
   end
   object ADOQueryTemp: TADOQuery

应收应付/U_YSMXlist.pas

@@ -170,7 +170,7 @@ begin
       end;
       sql.Add(',@YFGSType='''' ');
       sql.Add(',@ISHS=' + quotedstr(Trim(ISHS.Text)));
-      //ShowMessage(sql.Text);
+      ShowMessage(sql.Text);
       Open;
     end;
     SCreateCDS20(ADOQueryMain, CDS_HZ);

应收应付/U_YSSKList.dfm

@@ -1,7 +1,7 @@
 object frmYSSKList: TfrmYSSKList
-  Left = 258
+  Left = 423
-  Top = 152
+  Top = 547
-  Width = 1196
+  Width = 1440
   Height = 618
   Caption = #24212#25910#24050#25910#27719#24635
   Color = clBtnFace
@@ -20,7 +20,7 @@ object frmYSSKList: TfrmYSSKList
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1188
+    Width = 1432
     Height = 31
     ButtonHeight = 30
     ButtonWidth = 83
@@ -85,7 +85,7 @@ object frmYSSKList: TfrmYSSKList
   object Panel1: TPanel
     Left = 0
     Top = 31
-    Width = 1188
+    Width = 1432
     Height = 74
     Align = alTop
     BevelInner = bvRaised
@@ -198,7 +198,7 @@ object frmYSSKList: TfrmYSSKList
   object cxGrid2: TcxGrid
     Left = 0
     Top = 127
-    Width = 1188
+    Width = 1432
     Height = 460
     Align = alClient
     TabOrder = 3
@@ -258,6 +258,7 @@ object frmYSSKList: TfrmYSSKList
         end
         item
           Kind = skSum
+          Column = Tv2Column6
         end
         item
           Kind = skSum
@@ -282,6 +283,7 @@ object frmYSSKList: TfrmYSSKList
         end
         item
           Kind = skSum
+          Column = Tv2Column2
         end
         item
           Kind = skSum
@@ -414,7 +416,7 @@ object frmYSSKList: TfrmYSSKList
   object cxTabControl1: TcxTabControl
     Left = 0
     Top = 105
-    Width = 1188
+    Width = 1432
     Height = 22
     Align = alTop
     TabOrder = 2
@@ -426,7 +428,7 @@ object frmYSSKList: TfrmYSSKList
       #20840#37096)
     OnChange = cxTabControl1Change
     ClientRectBottom = 22
-    ClientRectRight = 1188
+    ClientRectRight = 1432
     ClientRectTop = 19
   end
   object ADOQueryTemp: TADOQuery

应收应付/U_YSSKList.pas

@@ -14,7 +14,20 @@ uses
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, Clipbrd, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
   dxBarBuiltInMenu, DateUtils, dxSkinsCore, dxSkinsDefaultPainters,
-  dxSkinscxPCPainter;
+  dxSkinscxPCPainter, 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, dxSkinPumpkin,
+  dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus,
+  dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008,
+  dxSkinTheAsphaltWorld, dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint,
+  dxSkinXmas2008Blue;
 
 type
   TfrmYSSKList = class(TForm)

应收应付/U_testdll.dfm

@@ -1,6 +1,6 @@
 object Form1: TForm1
-  Left = 153
+  Left = 575
-  Top = 124
+  Top = 541
   Width = 791
   Height = 554
   Caption = 'Form1'
@@ -21,7 +21,7 @@ object Form1: TForm1
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 775
+    Width = 783
     Height = 25
     ButtonWidth = 57
     Caption = 'ToolBar1'

应收应付/YSYF.dof

@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\淃커덜쯤\D7szChenfeng\壇澗壇마\testDll.exe
+HostApplication=D:\Dp7Repo\淃커덜쯤\D7szChenfeng\壇澗壇마\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=

成品仓库(FinishedClothWarehouse.dll)/U_CPCKMdList.dfm

@@ -1,6 +1,6 @@
 object frmCPCKMdList: TfrmCPCKMdList
-  Left = 253
+  Left = 560
-  Top = 323
+  Top = 371
   Width = 1128
   Height = 516
   Caption = #30721#21333#25171#21360

成品仓库(FinishedClothWarehouse.dll)/U_CPFHSQInPut.dfm

@@ -1,6 +1,6 @@
 object frmPBFHSQInPut: TfrmPBFHSQInPut
-  Left = 466
+  Left = 524
-  Top = 165
+  Top = 378
   Width = 1075
   Height = 665
   Caption = #21457#36135#30003#35831#24405#20837
@@ -18,7 +18,7 @@ object frmPBFHSQInPut: TfrmPBFHSQInPut
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1059
+    Width = 1067
     Height = 29
     ButtonHeight = 30
     ButtonWidth = 59
@@ -58,7 +58,7 @@ object frmPBFHSQInPut: TfrmPBFHSQInPut
   object ScrollBox1: TScrollBox
     Left = 0
     Top = 29
-    Width = 1059
+    Width = 1067
     Height = 104
     Align = alTop
     BevelInner = bvNone
@@ -349,7 +349,7 @@ object frmPBFHSQInPut: TfrmPBFHSQInPut
   object ToolBar2: TToolBar
     Left = 0
     Top = 133
-    Width = 1059
+    Width = 1067
     Height = 29
     ButtonHeight = 30
     ButtonWidth = 59
@@ -389,8 +389,8 @@ object frmPBFHSQInPut: TfrmPBFHSQInPut
   object cxGrid1: TcxGrid
     Left = 0
     Top = 162
-    Width = 1059
+    Width = 1067
-    Height = 464
+    Height = 472
     Align = alClient
     TabOrder = 3
     object Tv1: TcxGridDBTableView

成品仓库(FinishedClothWarehouse.dll)/U_CPFHSQList.pas

@@ -26,7 +26,7 @@ uses
   dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus,
   dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008,
   dxSkinTheAsphaltWorld, dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint,
-  dxSkinXmas2008Blue;
+  dxSkinXmas2008Blue, ImgList;
 
 type
   TfrmCPFHSQList = class(TForm)
@@ -120,6 +120,7 @@ type
     cktype: TComboBox;
     Label6: TLabel;
     Tv2Column1: TcxGridDBColumn;
+    ThreeImgList: TImageList;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
     procedure TBFindClick(Sender: TObject);

成品仓库(FinishedClothWarehouse.dll)/U_DataLink.dfm

@@ -1,8 +1,8 @@
 object DataLink_FinishedClothWarehouse: TDataLink_FinishedClothWarehouse
   OldCreateOrder = False
   OnDestroy = DataModuleDestroy
-  Left = 459
+  Left = 460
-  Top = 278
+  Top = 279
   Height = 349
   Width = 482
   object AdoDataLink: TADOQuery

成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInList.dfm

@@ -1,6 +1,6 @@
 object frmFinishedClothInList: TfrmFinishedClothInList
-  Left = 119
+  Left = 105
-  Top = 159
+  Top = 65
   Width = 1249
   Height = 765
   Caption = #25104#21697#20837#24211#31649#29702
@@ -536,10 +536,10 @@ object frmFinishedClothInList: TfrmFinishedClothInList
         Width = 73
       end
       object Tv1Column11: TcxGridDBColumn
-        Caption = #25209#21495
+        Caption = #32463#36724#25209#21495
         DataBinding.FieldName = 'edZDFNo'
         HeaderAlignmentHorz = taCenter
-        Width = 83
+        Width = 92
       end
       object v2Column1: TcxGridDBColumn
         Caption = #21697#21517
@@ -716,7 +716,7 @@ object frmFinishedClothInList: TfrmFinishedClothInList
         TabOrder = 0
         Properties.CustomButtons.Buttons = <>
         Properties.Style = 3
-        Properties.TabIndex = 0
+        Properties.TabIndex = 1
         Properties.Tabs.Strings = (
           #35746#21333#27719#24635
           #26126#32454#25968#25454)

成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInspection.dfm

@@ -1,8 +1,8 @@
 object frmFinishedClothInspection: TfrmFinishedClothInspection
-  Left = 54
+  Left = 179
-  Top = 187
+  Top = 106
   Width = 1357
-  Height = 721
+  Height = 723
   Caption = #25104#21697#26816#39564#25253#21578
   Color = clBtnFace
   Font.Charset = GB2312_CHARSET
@@ -83,7 +83,7 @@ object frmFinishedClothInspection: TfrmFinishedClothInspection
     end
     object ComboBox1: TComboBox
       Left = 351
-      Top = 1
+      Top = 0
       Width = 98
       Height = 27
       Style = csDropDownList
@@ -429,7 +429,7 @@ object frmFinishedClothInspection: TfrmFinishedClothInspection
     Left = 0
     Top = 115
     Width = 1341
-    Height = 567
+    Height = 569
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
@@ -548,7 +548,7 @@ object frmFinishedClothInspection: TfrmFinishedClothInspection
         Width = 100
       end
       object Tv1Column12: TcxGridDBColumn
-        Caption = #25209#21495
+        Caption = #32463#36724#25209#21495
         DataBinding.FieldName = 'edZDFNo'
         HeaderAlignmentHorz = taCenter
         Width = 84
@@ -588,6 +588,12 @@ object frmFinishedClothInspection: TfrmFinishedClothInspection
         Options.Editing = False
         Width = 60
       end
+      object Tv1Column14: TcxGridDBColumn
+        Caption = #25209#21495
+        DataBinding.FieldName = 'BatchNo'
+        HeaderAlignmentHorz = taCenter
+        Width = 79
+      end
       object v1Column10: TcxGridDBColumn
         Caption = #24635#31859#25968
         DataBinding.FieldName = 'JYLen'
@@ -625,7 +631,8 @@ object frmFinishedClothInspection: TfrmFinishedClothInspection
       end
       object Tv1Column10: TcxGridDBColumn
         Caption = #25209#21495
-        DataBinding.FieldName = 'edZDFNo'
+        DataBinding.FieldName = 'BatchNo'
+        Visible = False
         HeaderAlignmentHorz = taCenter
         Width = 70
       end

成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothInspection.pas

@@ -135,6 +135,7 @@ type
     Tv1Column3: TcxGridDBColumn;
     Tv1Column10: TcxGridDBColumn;
     Tv1Column12: TcxGridDBColumn;
+    Tv1Column14: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);

成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothKCHZList.dfm

@@ -1,6 +1,6 @@
 object frmFinishedClothKCHZList: TfrmFinishedClothKCHZList
-  Left = 263
+  Left = 469
-  Top = 140
+  Top = 619
   Width = 1247
   Height = 531
   Caption = #22383#24067#24211#23384#31649#29702#34920

成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothKCHZList.pas

@@ -11,7 +11,20 @@ uses
   ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient,
   cxDropDownEdit, MovePanel, Menus, cxCheckBox, Clipbrd, cxPC, Math,
   cxLookAndFeels, cxLookAndFeelPainters, dxBarBuiltInMenu, cxNavigator,
-  dxSkinsCore, dxSkinsDefaultPainters, dxSkinscxPCPainter;
+  dxSkinsCore, dxSkinsDefaultPainters, dxSkinscxPCPainter, 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, dxSkinPumpkin,
+  dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus,
+  dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008,
+  dxSkinTheAsphaltWorld, dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint,
+  dxSkinXmas2008Blue;
 
 type
   TfrmFinishedClothKCHZList = class(TForm)

成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothKCList.dfm

@@ -1,7 +1,7 @@
 object frmFinishedClothKCList: TfrmFinishedClothKCList
-  Left = -6
+  Left = 508
-  Top = 33
+  Top = 419
-  Width = 1247
+  Width = 1086
   Height = 531
   Caption = #25104#21697#24211#23384#21015#34920
   Color = clBtnFace
@@ -18,7 +18,7 @@ object frmFinishedClothKCList: TfrmFinishedClothKCList
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1231
+    Width = 1078
     Height = 33
     ButtonHeight = 30
     ButtonWidth = 59
@@ -98,7 +98,7 @@ object frmFinishedClothKCList: TfrmFinishedClothKCList
   object Panel1: TPanel
     Left = 0
     Top = 33
-    Width = 1231
+    Width = 1078
     Height = 62
     Align = alTop
     BevelInner = bvRaised
@@ -283,7 +283,7 @@ object frmFinishedClothKCList: TfrmFinishedClothKCList
   object Panel2: TPanel
     Left = 0
     Top = 95
-    Width = 1231
+    Width = 1078
     Height = 30
     Align = alTop
     BevelOuter = bvNone
@@ -311,7 +311,7 @@ object frmFinishedClothKCList: TfrmFinishedClothKCList
         TabOrder = 0
         Properties.CustomButtons.Buttons = <>
         Properties.Style = 3
-        Properties.TabIndex = 0
+        Properties.TabIndex = 1
         Properties.Tabs.Strings = (
           #35746#21333#27719#24635
           #26126#32454#25968#25454)
@@ -324,7 +324,7 @@ object frmFinishedClothKCList: TfrmFinishedClothKCList
     object Panel6: TPanel
       Left = 205
       Top = 0
-      Width = 1026
+      Width = 873
       Height = 30
       Align = alClient
       AutoSize = True
@@ -332,7 +332,7 @@ object frmFinishedClothKCList: TfrmFinishedClothKCList
       BorderStyle = bsSingle
       TabOrder = 1
       DesignSize = (
-        1022
+        869
         26)
       object Label1: TLabel
         Left = 64
@@ -424,8 +424,8 @@ object frmFinishedClothKCList: TfrmFinishedClothKCList
   object cxGrid2: TcxGrid
     Left = 0
     Top = 125
-    Width = 1231
+    Width = 1078
-    Height = 367
+    Height = 375
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 4
@@ -571,11 +571,11 @@ object frmFinishedClothKCList: TfrmFinishedClothKCList
         Options.Editing = False
         Width = 73
       end
-      object Tv1Column14: TcxGridDBColumn
+      object Tv1Column15: TcxGridDBColumn
-        Caption = #25209#21495
+        Caption = #32463#36724#25209#21495
-        DataBinding.FieldName = 'edZDFNo'
+        DataBinding.FieldName = 'BatchNo'
         HeaderAlignmentHorz = taCenter
-        Width = 74
+        Width = 96
       end
       object v2Column1: TcxGridDBColumn
         Caption = #21697#21517
@@ -652,13 +652,6 @@ object frmFinishedClothKCList: TfrmFinishedClothKCList
         Options.Editing = False
         Width = 55
       end
-      object v1Column10: TcxGridDBColumn
-        Caption = #25209#21495
-        DataBinding.FieldName = 'BatchNo'
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 71
-      end
       object v1Column6: TcxGridDBColumn
         Caption = #26465#30721
         DataBinding.FieldName = 'JYID'
@@ -718,12 +711,6 @@ object frmFinishedClothKCList: TfrmFinishedClothKCList
         HeaderAlignmentHorz = taCenter
         Width = 100
       end
-      object Tv1Column5: TcxGridDBColumn
-        Caption = #32463#32447#25209#21495
-        DataBinding.FieldName = 'BatchNo'
-        HeaderAlignmentHorz = taCenter
-        Width = 100
-      end
       object Tv1Column6: TcxGridDBColumn
         Caption = #32428#32447#25209#21495
         DataBinding.FieldName = 'WXPH'

成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothKCList.pas

@@ -80,7 +80,6 @@ type
     v2Column1: TcxGridDBColumn;
     v2Column3: TcxGridDBColumn;
     cxgrdPS: TcxGridDBColumn;
-    v1Column10: TcxGridDBColumn;
     v1Column6: TcxGridDBColumn;
     v1Column5: TcxGridDBColumn;
     cxgrdMJLen: TcxGridDBColumn;
@@ -95,7 +94,6 @@ type
     Tv1Column2: TcxGridDBColumn;
     Tv1Column3: TcxGridDBColumn;
     Tv1Column4: TcxGridDBColumn;
-    Tv1Column5: TcxGridDBColumn;
     Tv1Column6: TcxGridDBColumn;
     Tv1Column7: TcxGridDBColumn;
     Tv1Column8: TcxGridDBColumn;
@@ -106,7 +104,7 @@ type
     Tv1Column11: TcxGridDBColumn;
     Tv1Column12: TcxGridDBColumn;
     Tv1Column13: TcxGridDBColumn;
-    Tv1Column14: TcxGridDBColumn;
+    Tv1Column15: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBRafreshClick(Sender: TObject);
     procedure ConNoMChange(Sender: TObject);
@@ -165,6 +163,7 @@ begin
         cxgrdCKPS.Visible := True;
         cxgrdConNoPS.Visible := True;
         cxgrdWFPS.Visible := True;
+        Tv1Column15.Visible := True;
         Tv1Column9.Visible := True;
         Tv1Column4.Visible := True;
         Tv1Column10.Visible := True;

成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothOutList.dfm

@@ -1,6 +1,6 @@
 object frmFinishedClothOutList: TfrmFinishedClothOutList
-  Left = 111
+  Left = 772
-  Top = 91
+  Top = 528
   Width = 1151
   Height = 515
   Caption = #25104#21697#20986#24211#31649#29702
@@ -20,7 +20,7 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1135
+    Width = 1143
     AutoSize = True
     ButtonHeight = 30
     ButtonWidth = 83
@@ -65,7 +65,7 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList
     end
     object ComboBox1: TComboBox
       Left = 189
-      Top = 3
+      Top = 0
       Width = 172
       Height = 24
       Style = csDropDownList
@@ -114,7 +114,7 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList
   object Panel1: TPanel
     Left = 0
     Top = 32
-    Width = 1135
+    Width = 1143
     Height = 62
     Align = alTop
     BevelInner = bvRaised
@@ -440,7 +440,7 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList
   object Panel2: TPanel
     Left = 0
     Top = 94
-    Width = 1135
+    Width = 1143
     Height = 30
     Align = alTop
     BevelOuter = bvNone
@@ -481,7 +481,7 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList
     object Panel6: TPanel
       Left = 205
       Top = 0
-      Width = 930
+      Width = 938
       Height = 30
       Align = alClient
       AutoSize = True
@@ -489,7 +489,7 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList
       BorderStyle = bsSingle
       TabOrder = 1
       DesignSize = (
-        926
+        934
         26)
       object Label7: TLabel
         Left = 64
@@ -581,8 +581,8 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList
   object cxGrid2: TcxGrid
     Left = 0
     Top = 124
-    Width = 1135
+    Width = 1143
-    Height = 352
+    Height = 360
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 4
@@ -716,12 +716,6 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList
         Options.Editing = False
         Width = 73
       end
-      object Tv1Column11: TcxGridDBColumn
-        Caption = #25209#21495
-        DataBinding.FieldName = 'edZDFNo'
-        HeaderAlignmentHorz = taCenter
-        Width = 78
-      end
       object v2Column1: TcxGridDBColumn
         Caption = #21697#21517
         DataBinding.FieldName = 'P_CodeName'
@@ -749,10 +743,10 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList
         Width = 55
       end
       object v1Column10: TcxGridDBColumn
-        Caption = #25209#21495
+        Caption = #32463#36724#25209#21495
         DataBinding.FieldName = 'BatchNo'
         HeaderAlignmentHorz = taCenter
-        Width = 71
+        Width = 93
       end
       object v1Column6: TcxGridDBColumn
         Caption = #26465#30721

成品仓库(FinishedClothWarehouse.dll)/U_FinishedClothOutList.pas

@@ -123,7 +123,6 @@ type
     carno: TEdit;
     Tv1Column4: TcxGridDBColumn;
     Tv1Column7: TcxGridDBColumn;
-    Tv1Column11: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBRafreshClick(Sender: TObject);
@@ -180,6 +179,7 @@ begin
         cxgrdMJLen.Visible := True;
         Tv1Column8.Visible := True;
         Tv1Column9.Visible := True;
+        v1Column10.Visible := True;
         Tv1Column3.Visible := True;
         ToolButton1.Visible := True;
       end;
@@ -236,6 +236,7 @@ begin
             sql.add('''' + Trim(FormatDateTime('yyyy-MM-dd', BegDate.DateTime)) + ''' ');
             sql.Add(',''' + Trim(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1)) + '''');
             sql.Add(',' + QuotedStr(fwhere) + ' ');
+            //ShowMessage(sql.text);
           end;
         1:      /////////////////////////Ã÷ϸ//////////////////////////////
           begin
@@ -249,6 +250,7 @@ begin
             sql.Add('@pageIndex=' + inttostr(CurrentPage));
             sql.Add(',@pageSize=' + inttostr(RecordsNumber));
             sql.Add(',@criteria= ' + quotedstr(fwhere));
+            //ShowMessage(sql.text);
           end;
       end;
       //ShowMessage(SQL.Text);

成品仓库(FinishedClothWarehouse.dll)/U_GetDllForm.pas

@@ -97,6 +97,14 @@ begin
     dtbase := 'chenfengdata';
     user := 'rtsa';
     pswd := 'rightsoft@5740';
+
+
+
+//    server := '127.0.0.1';
+////  server := '.';
+//    dtbase := 'delphichenfeng';
+//    user := 'sa';
+//    pswd := 'rightsoft';
     DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
 
   end

成品仓库(FinishedClothWarehouse.dll)/U_SQKCHZSelList2.dfm

@@ -1,7 +1,7 @@
 object frmSQKCHZSelList2: TfrmSQKCHZSelList2
-  Left = 254
+  Left = 474
-  Top = 222
+  Top = 467
-  Width = 1171
+  Width = 1086
   Height = 576
   Caption = #22383#24067#24211#23384#27719#24635'2'
   Color = clBtnFace
@@ -20,7 +20,7 @@ object frmSQKCHZSelList2: TfrmSQKCHZSelList2
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1163
+    Width = 1078
     Height = 33
     ButtonHeight = 30
     ButtonWidth = 59
@@ -73,7 +73,7 @@ object frmSQKCHZSelList2: TfrmSQKCHZSelList2
   object cxGrid2: TcxGrid
     Left = 0
     Top = 95
-    Width = 1163
+    Width = 1078
     Height = 450
     Align = alClient
     TabOrder = 1
@@ -191,7 +191,7 @@ object frmSQKCHZSelList2: TfrmSQKCHZSelList2
   object Panel1: TPanel
     Left = 0
     Top = 33
-    Width = 1163
+    Width = 1078
     Height = 62
     Align = alTop
     BevelInner = bvRaised

成品仓库(FinishedClothWarehouse.dll)/U_SQKCHZSelList2.pas

@@ -122,7 +122,7 @@ begin
       SQL.Add(' ,sum(case when JYType=''ÕýÆ·'' then 1 else 0 end )Zpps');
       SQL.Add(',sum(case when JYType=''´ÎÆ·'' then A.JSLen else 0 end )cpqty');
       SQL.Add(',sum(case when JYType=''ÕýÆ·'' then A.JSLen else 0 end )Zpqty');
-      sql.add(',BatchNo=(SELECT edZDFNo FROM PD_Plan_Card e WHERE e.pcid=a.pcid)');
+      //sql.add(',BatchNo=(SELECT edZDFNo FROM PD_Plan_Card e WHERE e.pcid=a.pcid)');
       SQL.Add('  from CK_Cloth_CR A');
       SQL.Add(' inner join CK_Cloth_KC B on A.JYID=B.JYID    inner join PD_Plan_Main c on A.mainid=c.mainid ');
       sql.Add('where B.Valid=''Y'' and A.CRFlag=''Èë¿â''');
@@ -133,7 +133,7 @@ begin
       sql.Add('and p_code in(select p_code from Contract_sub E INNER JOIN Contract_MAIN F ON E.CONMAINID=F.CONMAINID WHERE CONNO=' + QuotedStr(Trim(fconno)));
       SQL.Add(') ');
 
-      SQL.Add(' group by   a.p_code, a.p_codename, a.pcid ');
+      SQL.Add(' group by   a.p_code, a.p_codename ');
       //,khname,orderno,CONNO
 
       sql.Add(' ORDER BY a.p_code');

梭织计划单(ShuttleSchedule.dll)/U_GetDllForm.pas

@@ -74,8 +74,8 @@ begin
     dtbase := 'chenfengdata';
     user := 'rtsa';
     pswd := 'rightsoft@5740';
-//  server := '.';
+//    server := '127.0.0.1';
-//  dtbase := 'yiduidata';
+//    dtbase := 'delphichenfeng';
 //    user := 'sa';
 //    pswd := 'rightsoft';
     DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;

梭织计划单(ShuttleSchedule.dll)/U_PlanCardList.dfm

@@ -1,6 +1,6 @@
 object frmPlanCardList: TfrmPlanCardList
-  Left = 91
+  Left = 274
-  Top = 319
+  Top = 195
   Width = 1540
   Height = 764
   Caption = #32463#36724#35745#21010
@@ -1208,7 +1208,7 @@ object frmPlanCardList: TfrmPlanCardList
   object CDS_QZ: TClientDataSet
     Aggregates = <>
     Params = <>
-    Left = 816
+    Left = 808
     Top = 456
   end
   object RMDB_QZ: TRMDBDataSet

梭织计划单(ShuttleSchedule.dll)/U_PlanCardList.pas

@@ -12,7 +12,20 @@ uses
   RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, cxTextEdit, cxCheckBox, cxPC,
   Menus, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu,
   cxContainer, cxMaskEdit, Math, dxSkinsCore, dxSkinsDefaultPainters,
-  dxSkinscxPCPainter;
+  dxSkinscxPCPainter, 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, dxSkinPumpkin,
+  dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus,
+  dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008,
+  dxSkinTheAsphaltWorld, dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint,
+  dxSkinXmas2008Blue;
 
 type
   TfrmPlanCardList = class(TForm)

梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCInPut.dfm

@@ -1,6 +1,6 @@
 object frmClothSCInPut: TfrmClothSCInPut
-  Left = 193
+  Left = 363
-  Top = 149
+  Top = 107
   Width = 1464
   Height = 760
   Align = alClient

梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCInPut.pas

@@ -849,7 +849,7 @@ begin
 
     QDDate.Checked := True;
     DeliveryDate.Date := QDDate.DateTime;
-    kongjia.Text := '1';
+    kongjia.Text := '0.5';
     kongjiawei.Text := '0';
   end;
 

梭织计划单(ShuttleSchedule.dll)/U_ShuttleClothSCList.dfm

@@ -1,6 +1,6 @@
 object frmShuttleClothSCList: TfrmShuttleClothSCList
-  Left = 746
+  Left = 165
-  Top = 656
+  Top = 220
   Width = 1377
   Height = 579
   Caption = #26797#32455#32455#36896#21333

纱线仓库/U_ShaKCHZList.dfm

@@ -1,6 +1,6 @@
 object frmShaKCHZList: TfrmShaKCHZList
-  Left = 190
+  Left = 202
-  Top = 136
+  Top = 556
   Width = 1256
   Height = 630
   Caption = #32433#32447#24211#23384#27719#24635#21015#34920
@@ -148,11 +148,11 @@ object frmShaKCHZList: TfrmShaKCHZList
     Left = 0
     Top = 70
     Width = 1240
-    Height = 522
+    Height = 521
     Align = alClient
     TabOrder = 2
     object Tv1: TcxGridDBTableView
-      NavigatorButtons.ConfirmDelete = False
+      Navigator.Buttons.CustomButtons = <>
       OnCellDblClick = Tv1CellDblClick
       DataController.DataSource = DataSource1
       DataController.Summary.DefaultGroupSummaryItems = <>
@@ -224,8 +224,8 @@ object frmShaKCHZList: TfrmShaKCHZList
         DataBinding.FieldName = 'SPCode'
         Visible = False
         HeaderAlignmentHorz = taCenter
-        Hidden = True
         Options.Editing = False
+        VisibleForCustomization = False
         Width = 89
       end
       object v1Column8: TcxGridDBColumn

纱线仓库/U_ShaKCHZList.pas

@@ -10,7 +10,22 @@ uses
   cxControls, cxGridCustomView, cxGridDBTableView, cxGrid, StdCtrls, ComCtrls,
   ExtCtrls, ToolWin, cxGridCustomPopupMenu, cxGridPopupMenu, ADODB, DBClient,
   cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset,
-  RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit;
+  RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit,
+  cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, 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, dxSkinPumpkin,
+  dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus,
+  dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008,
+  dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine,
+  dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter,
+  cxNavigator;
 
 type
   TfrmShaKCHZList = class(TForm)

纱线仓库/U_ShaKCList.dfm

@@ -1,6 +1,6 @@
 object frmShaKCList: TfrmShaKCList
-  Left = 132
+  Left = 35
-  Top = 134
+  Top = 540
   Width = 1382
   Height = 611
   Caption = #32433#32447#24211#23384#21015#34920
@@ -20,7 +20,7 @@ object frmShaKCList: TfrmShaKCList
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1374
+    Width = 1366
     Height = 33
     ButtonHeight = 30
     ButtonWidth = 59
@@ -91,7 +91,7 @@ object frmShaKCList: TfrmShaKCList
   object Panel1: TPanel
     Left = 0
     Top = 33
-    Width = 1374
+    Width = 1366
     Height = 60
     Align = alTop
     BevelInner = bvRaised
@@ -198,8 +198,8 @@ object frmShaKCList: TfrmShaKCList
   object cxGrid2: TcxGrid
     Left = 0
     Top = 93
-    Width = 1374
+    Width = 1366
-    Height = 487
+    Height = 479
     Align = alClient
     TabOrder = 2
     object Tv1: TcxGridDBTableView
@@ -487,8 +487,8 @@ object frmShaKCList: TfrmShaKCList
   object CDS_Print: TClientDataSet
     Aggregates = <>
     Params = <>
-    Left = 348
+    Left = 180
-    Top = 332
+    Top = 284
   end
   object RMDBPrint: TRMDBDataSet
     Visible = True

纱线仓库/U_ShaKCList.pas

@@ -12,7 +12,20 @@ uses
   cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset,
   RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit,Math,
   MovePanel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator,
-  dxSkinsCore, dxSkinsDefaultPainters, dxSkinscxPCPainter;
+  dxSkinsCore, dxSkinsDefaultPainters, dxSkinscxPCPainter, 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, dxSkinPumpkin,
+  dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus,
+  dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008,
+  dxSkinTheAsphaltWorld, dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint,
+  dxSkinXmas2008Blue;
 
 type
   TfrmShaKCList = class(TForm)
@@ -258,7 +271,7 @@ begin
   TcxGridToExcel('É´Ïß¿â´æÁбí', cxGrid2);
 end;
 
-procedure TfrmShaKCList.ToolButton3Click(Sender: TObject);
+procedure TfrmShaKCList.ToolButton3Click(Sender: TObject);  //print
 var
   fPrintFile: string;
   Txt, fImagePath,CNSql,FNSql,BNSql,CTSql: string;

纱线仓库/U_ShaOutList.dfm

@@ -1,8 +1,8 @@
 object frmShaOutList: TfrmShaOutList
-  Left = 363
+  Left = 245
-  Top = 647
+  Top = 178
   Width = 1356
-  Height = 667
+  Height = 884
   Caption = #32433#32447#20986#24211#21015#34920
   Color = clBtnFace
   Font.Charset = GB2312_CHARSET
@@ -21,7 +21,7 @@ object frmShaOutList: TfrmShaOutList
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1348
+    Width = 1340
     Height = 33
     ButtonHeight = 30
     ButtonWidth = 59
@@ -107,7 +107,7 @@ object frmShaOutList: TfrmShaOutList
   object Panel1: TPanel
     Left = 0
     Top = 33
-    Width = 1348
+    Width = 1340
     Height = 61
     Align = alTop
     BevelInner = bvRaised
@@ -335,8 +335,8 @@ object frmShaOutList: TfrmShaOutList
   object cxGrid2: TcxGrid
     Left = 0
     Top = 116
-    Width = 1348
+    Width = 1340
-    Height = 520
+    Height = 729
     Align = alClient
     TabOrder = 2
     object Tv1: TcxGridDBTableView
@@ -363,11 +363,16 @@ object frmShaOutList: TfrmShaOutList
         end>
       DataController.Summary.SummaryGroups = <>
       OptionsCustomize.ColumnFiltering = False
-      OptionsSelection.CellSelect = False
       OptionsView.Footer = True
       OptionsView.GroupByBox = False
       Styles.Content = cxStyle1
       Styles.Header = cxStyle1
+      object Tv1Column2: TcxGridDBColumn
+        Caption = #36873#25321
+        DataBinding.FieldName = 'Ssel'
+        HeaderAlignmentHorz = taCenter
+        Width = 72
+      end
       object v1Column6: TcxGridDBColumn
         Caption = #20986#24211#21333#21495
         DataBinding.FieldName = 'Y_ID'
@@ -569,7 +574,7 @@ object frmShaOutList: TfrmShaOutList
   object cxTabControl1: TcxTabControl
     Left = 0
     Top = 94
-    Width = 1348
+    Width = 1340
     Height = 22
     Align = alTop
     TabOrder = 3
@@ -582,7 +587,7 @@ object frmShaOutList: TfrmShaOutList
       #24050#20316#24223#25968#25454)
     OnChange = cxTabControl1Change
     ClientRectBottom = 23
-    ClientRectRight = 1348
+    ClientRectRight = 1340
     ClientRectTop = 23
   end
   object ADOQueryCmd: TADOQuery
@@ -703,4 +708,10 @@ object frmShaOutList: TfrmShaOutList
       Font.Style = [fsBold]
     end
   end
+  object CDS_Print: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 208
+    Top = 264
+  end
 end

纱线仓库/U_ShaOutList.pas

@@ -105,6 +105,8 @@ type
     cxStyle1: TcxStyle;
     Note: TEdit;
     Label7: TLabel;
+    Tv1Column2: TcxGridDBColumn;
+    CDS_Print: TClientDataSet;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -229,7 +231,7 @@ begin
     TBEdit.Visible := False;
     cxTabControl1.Visible := False;
   end;
-  ReadCxGrid('纱线出库列表121', Tv1, '纱线仓库');
+  //ReadCxGrid('纱线出库列表121', Tv1, '纱线仓库');
   if Trim(FFY_ID) <> '' then
   begin
     TBAdd.Visible := False;
@@ -523,51 +525,237 @@ begin
   end;
 end;
 
+//procedure TfrmShaOutList.ToolButton1Click(Sender: TObject);
+//var
+//  filepath: string;
+//  mBegdate, mEnddate: string;
+//  FName, FNameSX, FNameJX: string;
+//  i: Integer;
+//begin
+//  for i := 0 to Tv1.ColumnCount - 1 do
+//  begin
+//    FName := Tv1.Columns[i].DataBinding.FilterFieldName;
+//    FNameSX := Trim(FName) + '-1';
+//    FNameJX := Trim(FName) + '-2';
+//    CDS_Main.AddIndex(FNameSX, FName, []);             { 正序 }
+//    CDS_Main.AddIndex(FNameJX, FName, [ixDescending]); { 倒序 }
+//    if Tv1.Columns[i].SortOrder = soDescending then
+//    begin
+//      CDS_Main.IndexName := FNameJX;
+//    end
+//    else if Tv1.Columns[i].SortOrder = soAscending then
+//    begin
+//      CDS_Main.IndexName := FNameSX;
+//    end;
+//  end;
+//  mBegdate := FormatDateTime('yyyy-MM-dd', begdate.Date);
+//  mEnddate := FormatDateTime('yyyy-MM-dd', enddate.Date);
+//  if CDS_Main.IsEmpty then
+//    exit;
+//
+//  ExportFtErpFile('纱线出库报表.rmf', ADOQueryTemp);
+//  try
+//    filepath := ExtractFilePath(Application.ExeName) + 'report\纱线出库报表.rmf';
+//    if not FileExists(Pchar(filepath)) then
+//    begin
+//      application.MessageBox(pchar('文件[' + filepath + ']不存在！'), '提示信息', MB_IConError);
+//      exit;
+//    end;
+//    RmVariables['begDate'] := FormatDateTime('yymmdd', begDate.Date) + '-' + FormatDateTime('yymmdd', enddate.Date);
+//    RM1.LoadFromFile(filepath);
+//    RM1.ShowReport;
+//  finally
+//
+//  end;
+//
+//end;
+
+//procedure TfrmShaOutList.ToolButton1Click(Sender: TObject);
+//var
+//  filepath: string;
+//  mBegdate, mEnddate: string;
+//  FName, FNameSX, FNameJX: string;
+//  i: Integer;
+//  SelectedRecords: TStringList;
+//  RecordID: string;
+//begin
+//  for i := 0 to Tv1.ColumnCount - 1 do
+//  begin
+//    FName := Tv1.Columns[i].DataBinding.FilterFieldName;
+//    FNameSX := Trim(FName) + '-1';
+//    FNameJX := Trim(FName) + '-2';
+//    CDS_Main.AddIndex(FNameSX, FName, []);             { 正序 }
+//    CDS_Main.AddIndex(FNameJX, FName, [ixDescending]); { 倒序 }
+//    if Tv1.Columns[i].SortOrder = soDescending then
+//    begin
+//      CDS_Main.IndexName := FNameJX;
+//    end
+//    else if Tv1.Columns[i].SortOrder = soAscending then
+//    begin
+//      CDS_Main.IndexName := FNameSX;
+//    end;
+//  end;
+//  
+//  mBegdate := FormatDateTime('yyyy-MM-dd', begdate.Date);
+//  mEnddate := FormatDateTime('yyyy-MM-dd', enddate.Date);
+//  
+//  if CDS_Main.IsEmpty then
+//    exit;
+//
+//  SelectedRecords := TStringList.Create;
+//  try
+//    CDS_Main.DisableControls;
+//    try
+//      CDS_Main.First;
+//
+//
+//       while CDS_Main.Locate('ssel', True, []) do
+//       begin
+//         RecordID := CDS_Main.FieldByName('Y_ID').AsString;
+//         SelectedRecords.Add(RecordID);
+//         CDS_Main.Edit;
+//         CDS_Main.FieldByName('ssel').AsBoolean := False;
+//         CDS_Main.Post;
+//       end;
+//    finally
+//      CDS_Main.EnableControls;
+//    end;
+//
+//    if SelectedRecords.Count = 0 then
+//    begin
+//      ShowMessage('请先选择要导出的记录！');
+//      Exit;
+//    end;
+//
+//    for i := 0 to SelectedRecords.Count - 1 do
+//    begin
+//      if CDS_Main.Locate('Y_ID', SelectedRecords[i], []) then
+//      begin
+//      end;
+//    end;
+//
+//    ExportFtErpFile('纱线出库报表.rmf', ADOQueryTemp);
+//
+//    try
+//      filepath := ExtractFilePath(Application.ExeName) + 'report\纱线出库报表.rmf';
+//      if not FileExists(Pchar(filepath)) then
+//      begin
+//        application.MessageBox(pchar('文件[' + filepath + ']不存在！'), '提示信息', MB_IConError);
+//        exit;
+//      end;
+//
+//      // 可以添加选中记录的信息到报表变量
+//      // 例如：选中的记录数量、选中的记录ID列表等
+//      RMVariables['SelectedCount'] := IntToStr(SelectedRecords.Count);
+//      RMVariables['begDate'] := FormatDateTime('yymmdd', begDate.Date) + '-' +
+//                               FormatDateTime('yymmdd', enddate.Date);
+//
+//      RM1.LoadFromFile(filepath);
+//      RM1.ShowReport;
+//    finally
+//      // 可以在这里添加清理代码
+//    end;
+//
+//  finally
+//    SelectedRecords.Free;
+//  end;
+//end;
+
 procedure TfrmShaOutList.ToolButton1Click(Sender: TObject);
 var
-  filepath: string;
+  fPrintFile, Txt, fImagePath, YIDSql: string;
-  mBegdate, mEnddate: string;
+  Moudle: THandle;
-  FName, FNameSX, FNameJX: string;
+  Makebar: TMakebar;
-  i: Integer;
+  Mixtext: TMixtext;
+  SelectedCount: Integer;
 begin
-  for i := 0 to Tv1.ColumnCount - 1 do
-  begin
-    FName := Tv1.Columns[i].DataBinding.FilterFieldName;
-    FNameSX := Trim(FName) + '-1';
-    FNameJX := Trim(FName) + '-2';
-    CDS_Main.AddIndex(FNameSX, FName, []);             { 正序 }
-    CDS_Main.AddIndex(FNameJX, FName, [ixDescending]); { 倒序 }
-    if Tv1.Columns[i].SortOrder = soDescending then
-    begin
-      CDS_Main.IndexName := FNameJX;
-    end
-    else if Tv1.Columns[i].SortOrder = soAscending then
-    begin
-      CDS_Main.IndexName := FNameSX;
-    end;
-  end;
-  mBegdate := FormatDateTime('yyyy-MM-dd', begdate.Date);
-  mEnddate := FormatDateTime('yyyy-MM-dd', enddate.Date);
   if CDS_Main.IsEmpty then
-    exit;
+    Exit;
 
-  ExportFtErpFile('纱线出库报表.rmf', ADOQueryTemp);
+  if CDS_Main.Locate('SSel', True, []) = False then
-  try
-    filepath := ExtractFilePath(Application.ExeName) + 'report\纱线出库报表.rmf';
-    if not FileExists(Pchar(filepath)) then
   begin
-      application.MessageBox(pchar('文件[' + filepath + ']不存在！'), '提示信息', MB_IConError);
+    Application.MessageBox('没有选择数据!', '提示', 0);
-      exit;
+    Exit;
+  end;
+
+  SelectedCount := 0;
+  YIDSql := '';
+  CDS_Main.DisableControls;
+
+  try
+    with CDS_Main do
+    begin
+      First;
+      while Locate('SSel', True, [loCaseInsensitive]) do
+      begin
+        // 构建Y_ID的IN条件
+        if YIDSql <> '' then
+          YIDSql := YIDSql + ',' + QuotedStr(Trim(FieldByName('Y_ID').AsString))
+        else
+          YIDSql := QuotedStr(Trim(FieldByName('Y_ID').AsString));
+        
+        Inc(SelectedCount);
+        
+        Edit;
+        FieldByName('SSel').Value := False;
+        Post;
+      end;
     end;
-    RmVariables['begDate'] := FormatDateTime('yymmdd', begDate.Date) + '-' + FormatDateTime('yymmdd', enddate.Date);
-    RM1.LoadFromFile(filepath);
-    RM1.ShowReport;
   finally
-
+    CDS_Main.EnableControls;
   end;
   
+  if YIDSql = '' then
+  begin
+    Application.MessageBox('未选择任何数据!', '提示', 0);
+    Exit;
+  end;
+
+  with ADOQueryCmd do
+  begin
+    Close;
+    SQL.Clear;
+
+    sql.Add(' select A.* ');
+    sql.Add(' from CK_Yarn_CR A');
+    sql.Add(' where isnull(CKName,'''')=''纱线''');
+    SQL.Add(' and CRFlag=''出库''');
+    
+    // 添加日期范围条件（根据您的需求可选）
+    // sql.Add(' and A.CRTime>=''' + FormatDateTime('yyyy-MM-dd', begdate.Date) + '''');
+    // sql.Add(' and A.CRTime<''' + FormatDateTime('yyyy-MM-dd', enddate.Date + 1) + '''');
+    
+    // 添加勾选数据条件
+    SQL.Add(' and A.Y_ID in (' + YIDSql + ')');
+
+    SQL.Add(' order by CRTime desc');
+    Open;
+  end;
+
+  if ADOQueryCmd.IsEmpty then
+  begin
+    Application.MessageBox('未找到对应的纱线出库数据！', '提示信息', MB_ICONINFORMATION);
+    Exit;
+  end;
+
+  SCreateCDS20(ADOQueryCmd, CDS_PRT);  // 使用CDS_PRT而不是CDS_Main
+  SInitCDSData20(ADOQueryCmd, CDS_PRT);
+
+  fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\纱线出库报表.rmf';
+  ExportFtErpFile('纱线出库报表.rmf', ADOQueryTemp);
+
+  if FileExists(fPrintFile) then
+  begin
+    RM1.LoadFromFile(fPrintFile);
+    RM1.ShowReport;
+  end
+  else
+  begin
+    Application.MessageBox(PChar('未找到报表文件：' + #13#10 + fPrintFile), '提示', MB_ICONWARNING);
+  end;
 end;
 
+
 procedure TfrmShaOutList.v1Column9CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
 var
   id: Integer;

纱线仓库/U_ShaOutPut.dfm

@@ -1,6 +1,6 @@
 object frmShaOutPut: TfrmShaOutPut
-  Left = 289
+  Left = 297
-  Top = 247
+  Top = 277
   Width = 1383
   Height = 644
   Align = alClient

纱线仓库/U_ShaRKInPut.dfm

@@ -1,6 +1,6 @@
 object frmShaRKInPut: TfrmShaRKInPut
-  Left = 186
+  Left = 407
-  Top = 133
+  Top = 186
   Width = 1288
   Height = 635
   Align = alClient
@@ -56,6 +56,7 @@ object frmShaRKInPut: TfrmShaRKInPut
       OptionsCustomize.ColumnFiltering = False
       OptionsView.Footer = True
       OptionsView.GroupByBox = False
+      Styles.Content = cxStyle1
       Styles.Inactive = DataLink_Yarn.SHuangSe
       Styles.IncSearch = DataLink_Yarn.SHuangSe
       Styles.Selection = DataLink_Yarn.SHuangSe
@@ -89,7 +90,7 @@ object frmShaRKInPut: TfrmShaRKInPut
           end>
         Properties.OnButtonClick = FactoryNameLPropertiesButtonClick
         HeaderAlignmentHorz = taCenter
-        Width = 118
+        Width = 170
       end
       object v1Column5: TcxGridDBColumn
         Tag = 2
@@ -452,4 +453,15 @@ object frmShaRKInPut: TfrmShaRKInPut
     Left = 599
     Top = 260
   end
+  object cxStyleRepository1: TcxStyleRepository
+    PixelsPerInch = 96
+    object cxStyle1: TcxStyle
+      AssignedValues = [svFont]
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -16
+      Font.Name = 'MS Sans Serif'
+      Font.Style = []
+    end
+  end
 end

纱线仓库/U_ShaRKInPut.pas

@@ -70,6 +70,8 @@ type
     v1Column10: TcxGridDBColumn;
     Tv1Column1: TcxGridDBColumn;
     Tv1Column2: TcxGridDBColumn;
+    cxStyleRepository1: TcxStyleRepository;
+    cxStyle1: TcxStyle;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);

纱线仓库/U_ShaRKList.dfm

@@ -1,6 +1,6 @@
 object frmShaRKList: TfrmShaRKList
-  Left = 198
+  Left = 646
-  Top = 147
+  Top = 283
   Width = 1396
   Height = 649
   Caption = #32433#32447#20837#24211#21015#34920

纱线仓库/U_YarnList.dfm

@@ -1,6 +1,6 @@
 object frmYarnList: TfrmYarnList
-  Left = 329
+  Left = 142
-  Top = 250
+  Top = 480
   Width = 1270
   Height = 700
   Caption = #32433#32447#36164#26009
@@ -178,13 +178,13 @@ object frmYarnList: TfrmYarnList
     Left = 0
     Top = 70
     Width = 1254
-    Height = 592
+    Height = 591
     Align = alClient
     TabOrder = 2
     object Tv2: TcxGridDBTableView
-      NavigatorButtons.ConfirmDelete = False
+      Navigator.Buttons.CustomButtons = <>
-      NavigatorButtons.Delete.Enabled = False
+      Navigator.Buttons.Delete.Enabled = False
-      NavigatorButtons.Delete.Visible = False
+      Navigator.Buttons.Delete.Visible = False
       OnFocusedRecordChanged = Tv2FocusedRecordChanged
       DataController.DataSource = DS_HZ
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -253,10 +253,10 @@ object frmYarnList: TfrmYarnList
         DataBinding.FieldName = 'Y_Spec'
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
-        Hidden = True
         Options.Editing = False
         Options.Focusing = False
         Options.Sorting = False
+        VisibleForCustomization = False
         Width = 72
       end
       object v2Column4: TcxGridDBColumn
@@ -264,10 +264,10 @@ object frmYarnList: TfrmYarnList
         DataBinding.FieldName = 'Y_CF'
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
-        Hidden = True
         Options.Editing = False
         Options.Focusing = False
         Options.Sorting = False
+        VisibleForCustomization = False
         Width = 74
       end
       object v2Column14: TcxGridDBColumn

纱线仓库/U_YarnList.pas

@@ -13,7 +13,21 @@ uses
   RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection,
   IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit,
   cxTextEdit, Menus, cxLookAndFeelPainters, cxButtons, cxContainer, cxImage,
-  cxDBEdit;
+  cxDBEdit, cxLookAndFeels, dxSkinsCore, 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, dxSkinPumpkin,
+  dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus,
+  dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008,
+  dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine,
+  dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter,
+  cxNavigator;
 
 type
   FdDy = record

纱线仓库/U_testdll.dfm

@@ -1,6 +1,6 @@
 object Form1: TForm1
-  Left = 203
+  Left = 479
-  Top = 121
+  Top = 407
   Width = 791
   Height = 554
   Caption = 'Form1'

纱线仓库/Yarn.dof

@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\Dp7Repo\ÏîÄ¿´úÂë\³Â·á\É´Ïß²Ö¿â\testDll.exe
+HostApplication=D:\Dp7Repo\ÏîÄ¿´úÂë\D7szChenfeng\É´Ïß²Ö¿â\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=

经轴仓库(Warehouse.dll)/U_EmptyRollerRklist.dfm

@@ -1,8 +1,8 @@
 object frmEmptyRollerRklist: TfrmEmptyRollerRklist
-  Left = 226
+  Left = 537
-  Top = 0
+  Top = 571
   Width = 1382
-  Height = 699
+  Height = 514
   Caption = #31354#36724#20837#24211#31649#29702
   Color = clBtnFace
   Font.Charset = GB2312_CHARSET
@@ -20,7 +20,7 @@ object frmEmptyRollerRklist: TfrmEmptyRollerRklist
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1374
+    Width = 1366
     AutoSize = True
     ButtonHeight = 30
     ButtonWidth = 59
@@ -99,7 +99,7 @@ object frmEmptyRollerRklist: TfrmEmptyRollerRklist
   object Panel1: TPanel
     Left = 0
     Top = 32
-    Width = 1374
+    Width = 1366
     Height = 77
     Align = alTop
     BevelInner = bvRaised
@@ -302,8 +302,8 @@ object frmEmptyRollerRklist: TfrmEmptyRollerRklist
   object cxGrid1: TcxGrid
     Left = 0
     Top = 109
-    Width = 1374
+    Width = 1366
-    Height = 559
+    Height = 366
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2

经轴仓库(Warehouse.dll)/U_EmptyRollerRklist.pas

@@ -12,7 +12,20 @@ uses
   cxTextEdit, cxCurrencyEdit, cxCheckBox, RM_System, RM_Dataset, RM_Common,
   RM_Class, RM_GridReport, cxPC, Menus, RM_e_Xls, cxLookAndFeels,
   cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters,
-  dxSkinscxPCPainter, cxNavigator;
+  dxSkinscxPCPainter, cxNavigator, 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, dxSkinPumpkin,
+  dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus,
+  dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008,
+  dxSkinTheAsphaltWorld, dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint,
+  dxSkinXmas2008Blue;
 
 type
   TfrmEmptyRollerRklist = class(TForm)

经轴仓库(Warehouse.dll)/U_EmptyRollerkCList.dfm

@@ -131,7 +131,7 @@ object frmEmptyRollerkCList: TfrmEmptyRollerkCList
     Left = 0
     Top = 85
     Width = 1282
-    Height = 520
+    Height = 519
     Align = alClient
     Font.Charset = GB2312_CHARSET
     Font.Color = clBtnShadow
@@ -142,7 +142,7 @@ object frmEmptyRollerkCList: TfrmEmptyRollerkCList
     PopupMenu = PopupMenu1
     TabOrder = 2
     object Tv1: TcxGridDBTableView
-      NavigatorButtons.ConfirmDelete = False
+      Navigator.Buttons.CustomButtons = <>
       DataController.DataSource = DataSource1
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
       DataController.Summary.DefaultGroupSummaryItems = <

经轴仓库(Warehouse.dll)/U_EmptyRollerkCList.pas

@@ -10,7 +10,21 @@ uses
   cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView,
   cxGrid, DBClient, ADODB, cxGridCustomPopupMenu, cxGridPopupMenu, cxCheckBox,
   RM_Common, RM_Class, RM_GridReport, RM_System, RM_Dataset, MMSystem, Menus,
-  BtnEdit;
+  BtnEdit, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, 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, dxSkinPumpkin,
+  dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus,
+  dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008,
+  dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine,
+  dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter,
+  cxNavigator;
 
 type
   TfrmEmptyRollerkCList = class(TForm)

经轴仓库(Warehouse.dll)/U_WarpRollerCklist.dfm

@@ -1,6 +1,6 @@
 object frmWarpRollerCklist: TfrmWarpRollerCklist
-  Left = 344
+  Left = 178
-  Top = 440
+  Top = 140
   Width = 1378
   Height = 615
   Caption = #32463#36724#20986#24211#31649#29702
@@ -80,9 +80,16 @@ object frmWarpRollerCklist: TfrmWarpRollerCklist
       ImageIndex = 68
       OnClick = TBExportClick
     end
-    object TBClose: TToolButton
+    object ToolButton1: TToolButton
       Left = 315
       Top = 0
+      Caption = #25171#21360
+      ImageIndex = 4
+      OnClick = ToolButton1Click
+    end
+    object TBClose: TToolButton
+      Left = 374
+      Top = 0
       AutoSize = True
       Caption = #20851#38381
       ImageIndex = 21
@@ -284,7 +291,7 @@ object frmWarpRollerCklist: TfrmWarpRollerCklist
     object edtKaNo: TEdit
       Tag = 2
       Left = 538
-      Top = 10
+      Top = 9
       Width = 80
       Height = 20
       TabOrder = 7
@@ -521,7 +528,7 @@ object frmWarpRollerCklist: TfrmWarpRollerCklist
   end
   object RMDB_Main: TRMDBDataSet
     Visible = True
-    DataSet = ADOPrint
+    DataSet = CDS_Print
     Left = 443
     Top = 262
   end
@@ -691,4 +698,10 @@ object frmWarpRollerCklist: TfrmWarpRollerCklist
       OnClick = N2Click
     end
   end
+  object CDS_Print: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    Left = 200
+    Top = 240
+  end
 end

经轴仓库(Warehouse.dll)/U_WarpRollerCklist.pas

@@ -102,6 +102,8 @@ type
     edtKaNo: TEdit;
     Tv1Column13: TcxGridDBColumn;
     Tv1Column14: TcxGridDBColumn;
+    ToolButton1: TToolButton;
+    CDS_Print: TClientDataSet;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormDestroy(Sender: TObject);
     procedure TBAddClick(Sender: TObject);
@@ -116,6 +118,7 @@ type
     procedure v1Column6CompareRowValuesForCellMerging(Sender: TcxGridColumn; ARow1: TcxGridDataRow; AProperties1: TcxCustomEditProperties; const AValue1: Variant; ARow2: TcxGridDataRow; AProperties2: TcxCustomEditProperties; const AValue2: Variant; var AAreEqual: Boolean);
     procedure N1Click(Sender: TObject);
     procedure N2Click(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
   private
     procedure InitGrid();
     procedure InitForm();
@@ -131,7 +134,7 @@ var
 implementation
 
 uses
-  U_DataLink, U_Fun10, U_ZDYHelp, U_WarpRollerCk;
+  U_DataLink, U_Fun10, U_ZDYHelp, U_WarpRollerCk, U_RTFun, U_Fun;
 {$R *.dfm}
 
 procedure TfrmWarpRollerCklist.InitForm();
@@ -347,5 +350,101 @@ begin
   SelOKNo(CDS_Main, False);
 end;
 
+procedure TfrmWarpRollerCklist.ToolButton1Click(Sender: TObject);
+var
+  fPrintFile, Txt, fImagePath, JYRKIDSql: string;
+  Moudle: THandle;
+  Makebar: TMakebar;
+  Mixtext: TMixtext;
+  SelectedCount: Integer;
+begin
+  if CDS_Main.IsEmpty then
+    Exit;
+
+  if CDS_Main.Locate('SSel', True, []) = False then
+  begin
+    Application.MessageBox('没有选择数据!', '提示', 0);
+    Exit;
+  end;
+  
+  SelectedCount := 0;
+  JYRKIDSql := '';
+  CDS_Main.DisableControls;
+  
+  try
+    with CDS_Main do
+    begin
+      First;
+      while Locate('SSel', True, [loCaseInsensitive]) do
+      begin
+        // 构建JZRKID的IN条件
+        if JYRKIDSql <> '' then
+          JYRKIDSql := JYRKIDSql + ',' + QuotedStr(Trim(FieldByName('JZRKID').AsString))
+        else
+          JYRKIDSql := ' and A.JZRKID in (' + QuotedStr(Trim(FieldByName('JZRKID').AsString));
+        
+        Inc(SelectedCount);
+        
+        Edit;
+        FieldByName('SSel').Value := False;
+        Post;
+      end;
+    end;
+  finally
+    CDS_Main.EnableControls;
+  end;
+  
+  if JYRKIDSql <> '' then
+    JYRKIDSql := JYRKIDSql + ')'
+  else
+  begin
+    Application.MessageBox('未选择任何数据!', '提示', 0);
+    Exit;
+  end;
+
+  // 执行查询
+  with ADOQueryCmd do
+  begin
+    Close;
+    SQL.Clear;
+    
+    SQL.Add(' select A.* ,edzdfNo,edtKaNo,C_TouWen,ZJPiLen,C_ShangPai,C_PiE,C_Len,APMachineNo ,edZDFNo ');
+    SQL.Add(',CarNo2=(SELECT MACHNO FROM BS_Machine k where k.machid= ');
+    SQL.Add('  (SELECT top 1 CARNO FROM CK_YgCl E WHERE E.MJID=A.PCID AND CLTYPE=''上轴''))');
+    SQL.Add(',P_CODE=(select TOP 1 P_CODE from PD_Plan_SUB e ');
+    SQL.Add('  where e.SUBID=(select TOP 1 SUBID from PD_Plan_Card_MS f where f.pcid=A.pcid))');
+    SQL.Add(',P_codeNAME=(select TOP 1 P_codeNAME from PD_Plan_SUB e ');
+    SQL.Add('  where e.SUBID=(select TOP 1 SUBID from PD_Plan_Card_MS f where f.pcid=A.pcid))');
+    SQL.Add(' from CK_WarpBeam_CR A LEFT JOIN PD_PLAN_cARD B ON A.PCID=B.PCID ');
+    SQL.Add(' where A.CRFlag=''出库'' ');
+    SQL.Add(JYRKIDSql);
+
+
+    Open;
+  end;
+
+  if ADOQueryCmd.IsEmpty then
+  begin
+    Application.MessageBox('未找到对应的整经轴数据！', '提示信息', MB_ICONINFORMATION);
+    Exit;
+  end;
+
+  SCreateCDS20(ADOQueryCmd, CDS_Print);
+  SInitCDSData20(ADOQueryCmd, CDS_Print);
+
+  fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\经轴出库清单.rmf';
+  ExportFtErpFile('经轴出库清单.rmf', ADOQueryTmp);
+
+  if FileExists(fPrintFile) then
+  begin
+    RM1.LoadFromFile(fPrintFile);
+    RM1.ShowReport;
+  end
+  else
+  begin
+    Application.MessageBox(PChar('未找到报表文件：' + #13#10 + fPrintFile), '提示', MB_ICONWARNING);
+  end;
+end;
+
 end.
 

经轴仓库(Warehouse.dll)/U_WarpRollerRklist.dfm

@@ -1,6 +1,6 @@
 object frmWarpRollerRklist: TfrmWarpRollerRklist
-  Left = -38
+  Left = 376
-  Top = 299
+  Top = 283
   Width = 1475
   Height = 686
   Caption = #32463#36724#20837#24211#31649#29702