This commit is contained in:
libingpeng 2025-11-06 14:39:42 +08:00
parent ba25bf1423
commit 813586e31e
17 changed files with 107 additions and 105 deletions

View File

@ -1,50 +1,50 @@
[ExpressSkins] [ExpressSkins]
Default=1 Default=1
ShowNotifications=1 ShowNotifications=1
Enabled=0 Enabled=1
dxSkinBlack=1 dxSkinBlack=0
dxSkinBlue=1 dxSkinBlue=0
dxSkinBlueprint=1 dxSkinBlueprint=0
dxSkinCaramel=1 dxSkinCaramel=0
dxSkinCoffee=1 dxSkinCoffee=0
dxSkinDarkRoom=1 dxSkinDarkRoom=0
dxSkinDarkSide=1 dxSkinDarkSide=0
dxSkinDevExpressDarkStyle=1 dxSkinDevExpressDarkStyle=0
dxSkinDevExpressStyle=1 dxSkinDevExpressStyle=0
dxSkinFoggy=1 dxSkinFoggy=0
dxSkinGlassOceans=1 dxSkinGlassOceans=0
dxSkinHighContrast=1 dxSkinHighContrast=0
dxSkiniMaginary=1 dxSkiniMaginary=0
dxSkinLilian=1 dxSkinLilian=0
dxSkinLiquidSky=1 dxSkinLiquidSky=0
dxSkinLondonLiquidSky=1 dxSkinLondonLiquidSky=0
dxSkinMcSkin=1 dxSkinMcSkin=0
dxSkinMetropolis=1 dxSkinMetropolis=0
dxSkinMetropolisDark=1 dxSkinMetropolisDark=0
dxSkinMoneyTwins=1 dxSkinMoneyTwins=0
dxSkinOffice2007Black=1 dxSkinOffice2007Black=0
dxSkinOffice2007Blue=1 dxSkinOffice2007Blue=0
dxSkinOffice2007Green=1 dxSkinOffice2007Green=0
dxSkinOffice2007Pink=1 dxSkinOffice2007Pink=0
dxSkinOffice2007Silver=1 dxSkinOffice2007Silver=0
dxSkinOffice2010Black=1 dxSkinOffice2010Black=0
dxSkinOffice2010Blue=1 dxSkinOffice2010Blue=0
dxSkinOffice2010Silver=1 dxSkinOffice2010Silver=0
dxSkinOffice2013DarkGray=1 dxSkinOffice2013DarkGray=0
dxSkinOffice2013LightGray=1 dxSkinOffice2013LightGray=0
dxSkinOffice2013White=1 dxSkinOffice2013White=0
dxSkinPumpkin=1 dxSkinPumpkin=0
dxSkinSeven=1 dxSkinSeven=0
dxSkinSevenClassic=1 dxSkinSevenClassic=0
dxSkinSharp=1 dxSkinSharp=0
dxSkinSharpPlus=1 dxSkinSharpPlus=0
dxSkinSilver=1 dxSkinSilver=0
dxSkinSpringTime=1 dxSkinSpringTime=0
dxSkinStardust=1 dxSkinStardust=0
dxSkinSummer2008=1 dxSkinSummer2008=0
dxSkinTheAsphaltWorld=1 dxSkinTheAsphaltWorld=0
dxSkinsDefaultPainters=1 dxSkinsDefaultPainters=1
dxSkinValentine=1 dxSkinValentine=0
dxSkinVS2010=1 dxSkinVS2010=0
dxSkinWhiteprint=1 dxSkinWhiteprint=0
dxSkinXmas2008Blue=1 dxSkinXmas2008Blue=0

View File

@ -14,10 +14,10 @@ PROJECTS = TradeManage.dll testDll.exe
default: $(PROJECTS) default: $(PROJECTS)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
TradeManage.dll: ..\..\..\Dp7Repo\项目代码\D7DJqianjing\检验管理\TradeManage.dpr TradeManage.dll: ..\..\..\Dp7Repo\项目代码\D7DJfhshengxing\检验管理\TradeManage.dpr
$(DCC) $(DCC)
testDll.exe: ..\..\..\Dp7Repo\项目代码\D7DJqianjing\检验管理\testDll.dpr testDll.exe: ..\..\..\Dp7Repo\项目代码\D7DJfhshengxing\检验管理\testDll.dpr
$(DCC) $(DCC)

View File

@ -1,7 +1,7 @@
object frmClothSCDCGAnPai: TfrmClothSCDCGAnPai object frmClothSCDCGAnPai: TfrmClothSCDCGAnPai
Left = 447 Left = 327
Top = 334 Top = 374
Width = 1413 Width = 1462
Height = 719 Height = 719
Caption = #26631#31614#25171#21360 Caption = #26631#31614#25171#21360
Color = clBtnFace Color = clBtnFace
@ -19,7 +19,7 @@ object frmClothSCDCGAnPai: TfrmClothSCDCGAnPai
object ToolBar1: TToolBar object ToolBar1: TToolBar
Left = 0 Left = 0
Top = 0 Top = 0
Width = 1405 Width = 1454
AutoSize = True AutoSize = True
ButtonHeight = 30 ButtonHeight = 30
ButtonWidth = 59 ButtonWidth = 59
@ -57,7 +57,7 @@ object frmClothSCDCGAnPai: TfrmClothSCDCGAnPai
object Panel1: TPanel object Panel1: TPanel
Left = 0 Left = 0
Top = 32 Top = 32
Width = 1405 Width = 1454
Height = 58 Height = 58
Align = alTop Align = alTop
BevelInner = bvRaised BevelInner = bvRaised
@ -611,7 +611,7 @@ object frmClothSCDCGAnPai: TfrmClothSCDCGAnPai
object cxGrid2: TcxGrid object cxGrid2: TcxGrid
Left = 920 Left = 920
Top = 90 Top = 90
Width = 485 Width = 534
Height = 598 Height = 598
Align = alClient Align = alClient
TabOrder = 4 TabOrder = 4

View File

@ -1,6 +1,6 @@
object frmGreyInspection: TfrmGreyInspection object frmGreyInspection: TfrmGreyInspection
Left = 658 Left = 192
Top = 388 Top = 41
Width = 1316 Width = 1316
Height = 755 Height = 755
Caption = #26797#32455#22383#24067#26816#39564 Caption = #26797#32455#22383#24067#26816#39564

View File

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

View File

@ -1,6 +1,6 @@
object frmPBFHSQInPut: TfrmPBFHSQInPut object frmPBFHSQInPut: TfrmPBFHSQInPut
Left = 897 Left = 192
Top = 427 Top = 232
Width = 1075 Width = 1075
Height = 664 Height = 664
Caption = #21457#36135#30003#35831#24405#20837 Caption = #21457#36135#30003#35831#24405#20837

View File

@ -1,6 +1,6 @@
object frmCPFHSQList: TfrmCPFHSQList object frmCPFHSQList: TfrmCPFHSQList
Left = 613 Left = 74
Top = 386 Top = 188
Width = 1308 Width = 1308
Height = 679 Height = 679
Caption = #25104#21697#21457#36135#30003#35831 Caption = #25104#21697#21457#36135#30003#35831

View File

@ -1,8 +1,8 @@
object frmFinishedClothInList: TfrmFinishedClothInList object frmFinishedClothInList: TfrmFinishedClothInList
Left = 184 Left = 200
Top = 26 Top = 310
Width = 1249 Width = 1249
Height = 766 Height = 765
Caption = #25104#21697#20837#24211#31649#29702 Caption = #25104#21697#20837#24211#31649#29702
Color = clBtnFace Color = clBtnFace
Font.Charset = GB2312_CHARSET Font.Charset = GB2312_CHARSET
@ -20,7 +20,7 @@ object frmFinishedClothInList: TfrmFinishedClothInList
object ToolBar1: TToolBar object ToolBar1: TToolBar
Left = 0 Left = 0
Top = 0 Top = 0
Width = 1233 Width = 1241
AutoSize = True AutoSize = True
ButtonHeight = 30 ButtonHeight = 30
ButtonWidth = 83 ButtonWidth = 83
@ -82,7 +82,7 @@ object frmFinishedClothInList: TfrmFinishedClothInList
object Panel1: TPanel object Panel1: TPanel
Left = 0 Left = 0
Top = 32 Top = 32
Width = 1233 Width = 1241
Height = 62 Height = 62
Align = alTop Align = alTop
BevelInner = bvRaised BevelInner = bvRaised
@ -213,7 +213,7 @@ object frmFinishedClothInList: TfrmFinishedClothInList
Top = 12 Top = 12
Width = 24 Width = 24
Height = 12 Height = 12
Hint = '0' Hint = '1'
Caption = #21345#21495 Caption = #21345#21495
end end
object Label17: TLabel object Label17: TLabel
@ -222,7 +222,7 @@ object frmFinishedClothInList: TfrmFinishedClothInList
Top = 36 Top = 36
Width = 36 Width = 36
Height = 12 Height = 12
Hint = '0' Hint = '1'
Caption = #36724#21345#21495 Caption = #36724#21345#21495
end end
object BegDate: TDateTimePicker object BegDate: TDateTimePicker
@ -380,7 +380,7 @@ object frmFinishedClothInList: TfrmFinishedClothInList
Top = 8 Top = 8
Width = 85 Width = 85
Height = 20 Height = 20
Hint = '0' Hint = '1'
TabOrder = 14 TabOrder = 14
OnKeyPress = OrderNoKeyPress OnKeyPress = OrderNoKeyPress
end end
@ -390,7 +390,7 @@ object frmFinishedClothInList: TfrmFinishedClothInList
Top = 32 Top = 32
Width = 85 Width = 85
Height = 20 Height = 20
Hint = '0' Hint = '1'
TabOrder = 15 TabOrder = 15
OnKeyPress = OrderNoKeyPress OnKeyPress = OrderNoKeyPress
end end
@ -415,8 +415,8 @@ object frmFinishedClothInList: TfrmFinishedClothInList
object cxGrid2: TcxGrid object cxGrid2: TcxGrid
Left = 0 Left = 0
Top = 124 Top = 124
Width = 1233 Width = 1241
Height = 603 Height = 610
Align = alClient Align = alClient
PopupMenu = PopupMenu1 PopupMenu = PopupMenu1
TabOrder = 2 TabOrder = 2
@ -682,7 +682,7 @@ object frmFinishedClothInList: TfrmFinishedClothInList
object Panel2: TPanel object Panel2: TPanel
Left = 0 Left = 0
Top = 94 Top = 94
Width = 1233 Width = 1241
Height = 30 Height = 30
Align = alTop Align = alTop
BevelOuter = bvNone BevelOuter = bvNone
@ -723,7 +723,7 @@ object frmFinishedClothInList: TfrmFinishedClothInList
object Panel6: TPanel object Panel6: TPanel
Left = 205 Left = 205
Top = 0 Top = 0
Width = 1028 Width = 1036
Height = 30 Height = 30
Align = alClient Align = alClient
AutoSize = True AutoSize = True
@ -731,7 +731,7 @@ object frmFinishedClothInList: TfrmFinishedClothInList
BorderStyle = bsSingle BorderStyle = bsSingle
TabOrder = 1 TabOrder = 1
DesignSize = ( DesignSize = (
1024 1032
26) 26)
object Label7: TLabel object Label7: TLabel
Left = 64 Left = 64

View File

@ -1,6 +1,6 @@
object frmFinishedClothInspection: TfrmFinishedClothInspection object frmFinishedClothInspection: TfrmFinishedClothInspection
Left = 468 Left = 98
Top = 339 Top = 236
Width = 1357 Width = 1357
Height = 721 Height = 721
Caption = #25104#21697#26816#39564#25253#21578 Caption = #25104#21697#26816#39564#25253#21578

View File

@ -1,6 +1,6 @@
object frmFinishedClothKCList: TfrmFinishedClothKCList object frmFinishedClothKCList: TfrmFinishedClothKCList
Left = 391 Left = 186
Top = 296 Top = 367
Width = 1247 Width = 1247
Height = 531 Height = 531
Caption = #25104#21697#24211#23384#21015#34920 Caption = #25104#21697#24211#23384#21015#34920

View File

@ -1,6 +1,6 @@
object frmFinishedClothOutList: TfrmFinishedClothOutList object frmFinishedClothOutList: TfrmFinishedClothOutList
Left = 243 Left = 231
Top = 170 Top = 216
Width = 1151 Width = 1151
Height = 515 Height = 515
Caption = #25104#21697#20986#24211#31649#29702 Caption = #25104#21697#20986#24211#31649#29702
@ -20,7 +20,7 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList
object ToolBar1: TToolBar object ToolBar1: TToolBar
Left = 0 Left = 0
Top = 0 Top = 0
Width = 1135 Width = 1143
AutoSize = True AutoSize = True
ButtonHeight = 30 ButtonHeight = 30
ButtonWidth = 83 ButtonWidth = 83
@ -114,7 +114,7 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList
object Panel1: TPanel object Panel1: TPanel
Left = 0 Left = 0
Top = 32 Top = 32
Width = 1135 Width = 1143
Height = 62 Height = 62
Align = alTop Align = alTop
BevelInner = bvRaised BevelInner = bvRaised
@ -243,7 +243,7 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList
Top = 12 Top = 12
Width = 24 Width = 24
Height = 12 Height = 12
Hint = '0' Hint = '1'
Caption = #21345#21495 Caption = #21345#21495
end end
object Label17: TLabel object Label17: TLabel
@ -252,7 +252,7 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList
Top = 36 Top = 36
Width = 36 Width = 36
Height = 12 Height = 12
Hint = '0' Hint = '1'
Caption = #36724#21345#21495 Caption = #36724#21345#21495
end end
object BegDate: TDateTimePicker object BegDate: TDateTimePicker
@ -405,7 +405,7 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList
Top = 8 Top = 8
Width = 85 Width = 85
Height = 20 Height = 20
Hint = '0' Hint = '1'
TabOrder = 14 TabOrder = 14
OnKeyPress = OrderNoKeyPress OnKeyPress = OrderNoKeyPress
end end
@ -415,7 +415,7 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList
Top = 32 Top = 32
Width = 85 Width = 85
Height = 20 Height = 20
Hint = '0' Hint = '1'
TabOrder = 15 TabOrder = 15
OnKeyPress = OrderNoKeyPress OnKeyPress = OrderNoKeyPress
end end
@ -440,7 +440,7 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList
object Panel2: TPanel object Panel2: TPanel
Left = 0 Left = 0
Top = 94 Top = 94
Width = 1135 Width = 1143
Height = 30 Height = 30
Align = alTop Align = alTop
BevelOuter = bvNone BevelOuter = bvNone
@ -468,7 +468,7 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList
TabOrder = 0 TabOrder = 0
Properties.CustomButtons.Buttons = <> Properties.CustomButtons.Buttons = <>
Properties.Style = 3 Properties.Style = 3
Properties.TabIndex = 1 Properties.TabIndex = 0
Properties.Tabs.Strings = ( Properties.Tabs.Strings = (
#35746#21333#27719#24635 #35746#21333#27719#24635
#26126#32454#25968#25454) #26126#32454#25968#25454)
@ -481,7 +481,7 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList
object Panel6: TPanel object Panel6: TPanel
Left = 205 Left = 205
Top = 0 Top = 0
Width = 930 Width = 938
Height = 30 Height = 30
Align = alClient Align = alClient
AutoSize = True AutoSize = True
@ -489,7 +489,7 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList
BorderStyle = bsSingle BorderStyle = bsSingle
TabOrder = 1 TabOrder = 1
DesignSize = ( DesignSize = (
926 934
26) 26)
object Label7: TLabel object Label7: TLabel
Left = 64 Left = 64
@ -581,8 +581,8 @@ object frmFinishedClothOutList: TfrmFinishedClothOutList
object cxGrid2: TcxGrid object cxGrid2: TcxGrid
Left = 0 Left = 0
Top = 124 Top = 124
Width = 1135 Width = 1143
Height = 352 Height = 360
Align = alClient Align = alClient
PopupMenu = PopupMenu1 PopupMenu = PopupMenu1
TabOrder = 4 TabOrder = 4

View File

@ -1,6 +1,6 @@
object frmSQKCHZSelList2: TfrmSQKCHZSelList2 object frmSQKCHZSelList2: TfrmSQKCHZSelList2
Left = 692 Left = 254
Top = 374 Top = 222
Width = 1171 Width = 1171
Height = 576 Height = 576
Caption = #22383#24067#24211#23384#27719#24635'2' Caption = #22383#24067#24211#23384#27719#24635'2'

View File

@ -116,12 +116,13 @@ begin
Close; Close;
sql.Clear; sql.Clear;
//khname,orderno,CONNO //khname,orderno,CONNO
SQL.Add(' select a.p_code,a.p_codename,A.BatchNo'); SQL.Add(' select a.p_code,a.p_codename');
SQL.Add(' ,COUNT(A.JYID) PiQty ,SUM(A.JYGW) JYGW,SUM(A.JYNW) JYNW,SUM(A.JYTare) JYTare,SUM(A.JSLen) JYLen'); SQL.Add(' ,COUNT(A.JYID) PiQty ,SUM(A.JYGW) JYGW,SUM(A.JYNW) JYNW,SUM(A.JYTare) JYTare,SUM(A.JSLen) JYLen');
SQL.Add(',sum(case when JYType=''´ÎÆ·'' then 1 else 0 end )cpps'); SQL.Add(',sum(case when JYType=''´ÎÆ·'' then 1 else 0 end )cpps');
SQL.Add(' ,sum(case when JYType=''ÕýÆ·'' then 1 else 0 end )Zpps'); 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 )cpqty');
SQL.Add(',sum(case when JYType=''ÕýÆ·'' then A.JSLen else 0 end )Zpqty'); 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(' from CK_Cloth_CR A'); 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(' 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=''Èë¿â'''); sql.Add('where B.Valid=''Y'' and A.CRFlag=''Èë¿â''');
@ -132,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('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(') ');
SQL.Add(' group by a.p_code, a.p_codename, a.pcid ,A.BatchNo'); SQL.Add(' group by a.p_code, a.p_codename, a.pcid ');
//,khname,orderno,CONNO //,khname,orderno,CONNO
sql.Add(' ORDER BY a.p_code'); sql.Add(' ORDER BY a.p_code');

View File

@ -9,15 +9,15 @@ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
DCC = $(ROOT)\bin\dcc32.exe $** DCC = $(ROOT)\bin\dcc32.exe $**
BRCC = $(ROOT)\bin\brcc32.exe $** BRCC = $(ROOT)\bin\brcc32.exe $**
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
PROJECTS = ShuttleSchedule.dll testDll.exe PROJECTS = YSYF.dll testDll.exe
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
default: $(PROJECTS) default: $(PROJECTS)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
ShuttleSchedule.dll: ShuttleSchedule.dpr YSYF.dll: ..\..\..\Dp7Repo\淃커덜쯤\D7DJfhshengxing\壇澗壇마(YSYF.dll)\YSYF.dpr
$(DCC) $(DCC)
testDll.exe: testDll.dpr testDll.exe: ..\..\..\Dp7Repo\淃커덜쯤\D7DJfhshengxing\壇澗壇마(YSYF.dll)\testDll.dpr
$(DCC) $(DCC)

View File

@ -1,6 +1,6 @@
object frmPlanCardList: TfrmPlanCardList object frmPlanCardList: TfrmPlanCardList
Left = 375 Left = 91
Top = 358 Top = 319
Width = 1540 Width = 1540
Height = 764 Height = 764
Caption = #32463#36724#35745#21010 Caption = #32463#36724#35745#21010

View File

@ -11,7 +11,8 @@ uses
cxGrid, DBClient, cxCalendar, cxButtonEdit, cxSplitter, RM_Common, RM_Class, cxGrid, DBClient, cxCalendar, cxButtonEdit, cxSplitter, RM_Common, RM_Class,
RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, cxTextEdit, cxCheckBox, cxPC, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, cxTextEdit, cxCheckBox, cxPC,
Menus, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, Menus, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu,
cxContainer, cxMaskEdit, Math; cxContainer, cxMaskEdit, Math, dxSkinsCore, dxSkinsDefaultPainters,
dxSkinscxPCPainter;
type type
TfrmPlanCardList = class(TForm) TfrmPlanCardList = class(TForm)