检验指示单管理页面，新增 “出库码数”列，显示数据为已出库的码数

“出库长度”改为“出库米数” ，显示数据为已出库的米数
2025-10-14 14:38:20 +08:00 · 2025-10-14 14:38:20 +08:00 · f428e1f257
commit f428e1f257
parent 1e6d7b6edc
6 changed files with 57 additions and 22 deletions
--- 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)
-

--- a/打卷检验管理/ProjectGroup1.~bpg
+++ 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)
+
+
--- 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;
--- 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
--- 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)));
--- 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