From 1364704c679870036ac0f1eebc611dcda315a580 Mon Sep 17 00:00:00 2001
From: "DESKTOP-E401PHE\\Administrator" <rightsoft@163.com>
Date: Thu, 12 Feb 2026 10:37:58 +0800
Subject: [PATCH] 1234

---
 布匹仓库2/Repertory.dof    |  2 +-
 布匹仓库2/U_GetDllForm.pas |  7 +++----
 布匹仓库2/U_SPCKlist.dfm   | 16 ++++++++--------
 布匹仓库2/U_SPCKlist.pas   | 19 ++++++++++++++++---
 4 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/布匹仓库2/Repertory.dof b/布匹仓库2/Repertory.dof
index 9b0a7e5..da138f8 100644
--- a/布匹仓库2/Repertory.dof
+++ b/布匹仓库2/Repertory.dof
@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\Dp7Repo\ÏîÄ¿´úÂë\³ÊЭ\²¼Æ¥²Ö¿â2\testDll.exe
+HostApplication=D:\D7W\ÏîÄ¿´úÂë\D7myChengxie\²¼Æ¥²Ö¿â2\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=
diff --git a/布匹仓库2/U_GetDllForm.pas b/布匹仓库2/U_GetDllForm.pas
index 1310d3f..33142d1 100644
--- a/布匹仓库2/U_GetDllForm.pas
+++ b/布匹仓库2/U_GetDllForm.pas
@@ -63,11 +63,10 @@ begin
   SetLength(user, 255);
   SetLength(pswd, 255);
 
-  server := '121.40.233.100,7781';
- // server := '.';
+  server := '121.41.34.222,7781';
   dtbase := 'chengxiedata';
-  user := 'sa';
-  pswd := 'rightsoft@123';
+  user := 'chengxiesa';
+  pswd := 'right,.soft@5800';
 //  pswd := 'rightsoft';
   DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
   DConString := DataBaseStr;
diff --git a/布匹仓库2/U_SPCKlist.dfm b/布匹仓库2/U_SPCKlist.dfm
index ac7d5ff..f536024 100644
--- a/布匹仓库2/U_SPCKlist.dfm
+++ b/布匹仓库2/U_SPCKlist.dfm
@@ -21,7 +21,7 @@ object frmSPCKlist: TfrmSPCKlist
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1370
+    Width = 1362
     AutoSize = True
     ButtonHeight = 30
     ButtonWidth = 95
@@ -142,7 +142,7 @@ object frmSPCKlist: TfrmSPCKlist
   object Panel1: TPanel
     Left = 0
     Top = 32
-    Width = 1370
+    Width = 1362
     Height = 65
     Align = alTop
     BevelInner = bvRaised
@@ -385,8 +385,8 @@ object frmSPCKlist: TfrmSPCKlist
   object cxGrid1: TcxGrid
     Left = 0
     Top = 117
-    Width = 1153
-    Height = 467
+    Width = 1145
+    Height = 459
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
@@ -643,10 +643,10 @@ object frmSPCKlist: TfrmSPCKlist
     end
   end
   object Panel2: TPanel
-    Left = 1153
+    Left = 1145
     Top = 117
     Width = 217
-    Height = 467
+    Height = 459
     Align = alRight
     Caption = 'Panel2'
     TabOrder = 3
@@ -654,7 +654,7 @@ object frmSPCKlist: TfrmSPCKlist
       Left = 1
       Top = 1
       Width = 215
-      Height = 465
+      Height = 457
       Align = alClient
       TabOrder = 0
       object TvMX: TcxGridDBTableView
@@ -720,7 +720,7 @@ object frmSPCKlist: TfrmSPCKlist
   object cxTabControl1: TcxTabControl
     Left = 0
     Top = 97
-    Width = 1370
+    Width = 1362
     Height = 20
     Align = alTop
     Font.Charset = GB2312_CHARSET
diff --git a/布匹仓库2/U_SPCKlist.pas b/布匹仓库2/U_SPCKlist.pas
index 87f6478..f8aa199 100644
--- a/布匹仓库2/U_SPCKlist.pas
+++ b/布匹仓库2/U_SPCKlist.pas
@@ -11,7 +11,19 @@ uses
   cxGrid, DBClient, ADODB, cxGridCustomPopupMenu, cxGridPopupMenu, RM_Common,
   RM_Class, RM_e_Xls, RM_GridReport, RM_System, RM_Dataset, cxTextEdit, cxPC,
   cxCheckBox, Menus, Clipbrd, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore,
-  dxSkinsDefaultPainters, dxSkinscxPCPainter, cxNavigator, dxBarBuiltInMenu;
+  dxSkinsDefaultPainters, dxSkinscxPCPainter, cxNavigator, dxBarBuiltInMenu,
+  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
   TfrmSPCKlist = class(TForm)
@@ -457,8 +469,8 @@ begin
       close;
       sql.Clear;
       sql.Add(' select A.* ');
-      sql.Add(' ,RKQty=(select Qty from CK_ML_CR X where X.MJID=A.MJID and X.CRFLAG=''Èë¿â'') ');
-      sql.Add(' ,RKNO=(select X.INoutNo from CK_ML_CR X where X.MJID=A.MJID and CRFlag=''Èë¿â'') ');
+      sql.Add(' ,RKQty=(select sum(Qty) from CK_ML_CR X where X.MJID=A.MJID and X.CRFLAG=''Èë¿â'')  ');
+      sql.Add(' ,RKNO=STUFF(( SELECT '','' +convert(VARCHAR, INoutNo) FROM CK_ML_CR x where X.MJID=A.MJID FOR XML PATH('''')), 1, 1, '''') ');
       SQL.Add(' from CK_ML_CR A ');
       sql.Add(' where CRTime>=''' + formatdateTime('yyyy-MM-dd', begdate.Date) + ''' ');
       sql.Add(' and CRTime<''' + formatdateTime('yyyy-MM-dd', enddate.Date + 1) + ''' ');
@@ -470,6 +482,7 @@ begin
         else
           SQL.Add(' and  exists(select YFPZNO from YF_Money_CR_Sub X where X.YFPZNO=A.CRNO )');
       end;
+//      ShowMessage(SQL.Text);
       open;
     end;
     SCreateCDS20(ADOQueryMain, CDS_Main);