From f428e1f257075095a18e118121f273c4ad3bb114 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Tue, 14 Oct 2025 14:38:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=8C=87=E7=A4=BA=E5=8D=95?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=20=20=20=E2=80=9C=E5=87=BA=E5=BA=93=E7=A0=81=E6=95=B0=E2=80=9D?= =?UTF-8?q?=E5=88=97=20=EF=BC=8C=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=B8=BA=E5=B7=B2=E5=87=BA=E5=BA=93=E7=9A=84=E7=A0=81=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit “出库长度”改为“出库米数” ，显示数据为已出库的米数 --- 打卷检验管理/ProjectGroup1.bpg | 8 +++--- 打卷检验管理/ProjectGroup1.~bpg | 23 ++++++++++++++++ 打卷检验管理/TradeManage.dof | 3 -- 打卷检验管理/U_ProductOrderNewList.dfm | 38 +++++++++++++++++--------- 打卷检验管理/U_ProductOrderNewList.pas | 3 ++ 打卷检验管理/testDll.cfg | 4 +-- 6 files changed, 57 insertions(+), 22 deletions(-) create mode 100644 打卷检验管理/ProjectGroup1.~bpg diff --git a/打卷检验管理/ProjectGroup1.bpg b/打卷检验管理/ProjectGroup1.bpg index 7c050f6..091c62d 100644 --- a/打卷检验管理/ProjectGroup1.bpg +++ b/打卷检验管理/ProjectGroup1.bpg @@ -9,15 +9,15 @@ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$** DCC = $(ROOT)\bin\dcc32.exe $** BRCC = $(ROOT)\bin\brcc32.exe $** #------------------------------------------------------------------------------ -PROJECTS = testDll.exe ProductPrice.dll +PROJECTS = TradeManage.dll testDll.exe #------------------------------------------------------------------------------ default: $(PROJECTS) #------------------------------------------------------------------------------ +TradeManage.dll: TradeManage.dpr + $(DCC) + testDll.exe: testDll.dpr $(DCC) -ProductPrice.dll: ProductPrice.dpr - $(DCC) - diff --git a/打卷检验管理/ProjectGroup1.~bpg b/打卷检验管理/ProjectGroup1.~bpg new file mode 100644 index 0000000..484d8e5 --- /dev/null +++ b/打卷检验管理/ProjectGroup1.~bpg @@ -0,0 +1,23 @@ +#------------------------------------------------------------------------------ +VERSION = BWS.01 +#------------------------------------------------------------------------------ +!ifndef ROOT +ROOT = $(MAKEDIR)\.. +!endif +#------------------------------------------------------------------------------ +MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$** +DCC = $(ROOT)\bin\dcc32.exe $** +BRCC = $(ROOT)\bin\brcc32.exe $** +#------------------------------------------------------------------------------ +PROJECTS = TradeManage.dll testDll.exe +#------------------------------------------------------------------------------ +default: $(PROJECTS) +#------------------------------------------------------------------------------ + +TradeManage.dll: ..\..\D7DJjinchao\ϼ\TradeManage.dpr + $(DCC) + +testDll.exe: ..\..\D7DJjinchao\ϼ\testDll.dpr + $(DCC) + + diff --git a/打卷检验管理/TradeManage.dof b/打卷检验管理/TradeManage.dof index 56e8ddf..9b51856 100644 --- a/打卷检验管理/TradeManage.dof +++ b/打卷检验管理/TradeManage.dof @@ -136,6 +136,3 @@ ProductVersion=1.0.0.0 Comments= [Excluded Packages] c:\program files\borland\delphi7\Bin\DBWEBXPRT.BPL=Borland Web Wizard Package -[HistoryLists\hlUnitAliases] -Count=1 -Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; diff --git a/打卷检验管理/U_ProductOrderNewList.dfm b/打卷检验管理/U_ProductOrderNewList.dfm index 24dcf73..8700eed 100644 --- a/打卷检验管理/U_ProductOrderNewList.dfm +++ b/打卷检验管理/U_ProductOrderNewList.dfm @@ -20,7 +20,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1366 + Width = 1374 AutoSize = True ButtonHeight = 30 ButtonWidth = 95 @@ -187,7 +187,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList object Panel1: TPanel Left = 0 Top = 32 - Width = 1366 + Width = 1374 Height = 40 Align = alTop BevelInner = bvRaised @@ -416,7 +416,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList object cxGrid1: TcxGrid Left = 0 Top = 95 - Width = 1366 + Width = 1374 Height = 333 Align = alTop TabOrder = 3 @@ -630,7 +630,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList Width = 65 end object Tv1Column2: TcxGridDBColumn - Caption = #20986#24211#38271#24230 + Caption = #20986#24211#31859#25968 DataBinding.FieldName = 'CKQty' HeaderAlignmentHorz = taCenter Width = 65 @@ -661,6 +661,12 @@ object frmProductOrderNewList: TfrmProductOrderNewList HeaderAlignmentHorz = taCenter Width = 60 end + object Tv1Column6: TcxGridDBColumn + Caption = #20986#24211#30721#25968 + DataBinding.FieldName = 'CKMS' + HeaderAlignmentHorz = taCenter + Width = 70 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 @@ -770,8 +776,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object cxSplitter1: TcxSplitter Left = 0 - Top = 451 - Width = 1366 + Top = 459 + Width = 1374 Height = 8 HotZoneClassName = 'TcxMediaPlayer9Style' AlignSplitter = salBottom @@ -779,8 +785,8 @@ object frmProductOrderNewList: TfrmProductOrderNewList end object Panel2: TPanel Left = 0 - Top = 459 - Width = 1366 + Top = 467 + Width = 1374 Height = 256 Align = alBottom Caption = 'Panel2' @@ -788,7 +794,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList object cxGrid2: TcxGrid Left = 1 Top = 1 - Width = 987 + Width = 995 Height = 254 Align = alClient TabOrder = 0 @@ -1080,7 +1086,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList Width = 65 end object TV2Column4: TcxGridDBColumn - Caption = #20986#24211#38271#24230 + Caption = #20986#24211#31859#25968 DataBinding.FieldName = 'CKQty' HeaderAlignmentHorz = taCenter Width = 65 @@ -1103,13 +1109,19 @@ object frmProductOrderNewList: TfrmProductOrderNewList HeaderAlignmentHorz = taCenter Width = 60 end + object TV2Column9: TcxGridDBColumn + Caption = #20986#24211#30721#25968 + DataBinding.FieldName = 'CKMS' + HeaderAlignmentHorz = taCenter + Width = 70 + end end object cxGridLevel1: TcxGridLevel GridView = TV2 end end object GroupBox1: TGroupBox - Left = 988 + Left = 996 Top = 1 Width = 377 Height = 254 @@ -1139,7 +1151,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList object cxTabControl1: TcxTabControl Left = 0 Top = 72 - Width = 1366 + Width = 1374 Height = 23 Align = alTop TabOrder = 2 @@ -1152,7 +1164,7 @@ object frmProductOrderNewList: TfrmProductOrderNewList #20840#37096) OnChange = cxTabControl1Change ClientRectBottom = 23 - ClientRectRight = 1366 + ClientRectRight = 1374 ClientRectTop = 19 end object cxGridPopupMenu1: TcxGridPopupMenu diff --git a/打卷检验管理/U_ProductOrderNewList.pas b/打卷检验管理/U_ProductOrderNewList.pas index 2deb77d..401e1c6 100644 --- a/打卷检验管理/U_ProductOrderNewList.pas +++ b/打卷检验管理/U_ProductOrderNewList.pas @@ -164,6 +164,8 @@ type QryCheckNet: TADOQuery; Tv1Column5: TcxGridDBColumn; TV2Column8: TcxGridDBColumn; + Tv1Column6: TcxGridDBColumn; + TV2Column9: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -326,6 +328,7 @@ begin sql.Add('CKQty=(select sum(MJLen) from WFB_MJJY X where X.MainID=A.mainID and X.subID=A.subID and ckflag=''ѳ''), '); sql.Add('CKJZ=(select sum(MJQty4) from WFB_MJJY X where X.MainID=A.mainID and X.subID=A.subID and ckflag=''ѳ''),'); sql.Add('CKMZ=(select sum(MJMaoZ) from WFB_MJJY X where X.MainID=A.mainID and X.subID=A.subID and ckflag=''ѳ''),'); + sql.Add('CKMS=(select sum(MJMa) from WFB_MJJY X where X.MainID=A.mainID and X.subID=A.subID and ckflag=''ѳ''),'); SQL.Add('MaxRoll=(select isnull(sum(maxroll),0) from (select Subid,mjstr4,max(mjxh) as maxroll from wfb_mjjy X group by mjstr4,Subid) XX where XX.subid=A.subid)'); sql.Add('from JYOrder_sub A '); sql.Add('where A.mainID =' + quotedstr((Order_Main.fieldbyname('mainID').AsString))); diff --git a/打卷检验管理/testDll.cfg b/打卷检验管理/testDll.cfg index 6c57635..e9c1cc1 100644 --- a/打卷检验管理/testDll.cfg +++ b/打卷检验管理/testDll.cfg @@ -31,8 +31,8 @@ -M -$M16384,1048576 -K$00400000 --LE"c:\program files\borland\delphi7\Projects\Bpl" --LN"c:\program files\borland\delphi7\Projects\Bpl" +-LE"c:\program files (x86)\borland\delphi7\Projects\Bpl" +-LN"c:\program files (x86)\borland\delphi7\Projects\Bpl" -w-UNSAFE_TYPE -w-UNSAFE_CODE -w-UNSAFE_CAST