缸号保存方式修改

打卷检验管理/TradeManage.dof

@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=D:\陈亿项目代码\项目代码\小强\打卷检验管理\testDll.exe
+HostApplication=D:\Dp7Repo\项目代码\D7DJxiaoqiang\打卷检验管理\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=

打卷检验管理/U_JYOrderCDOne.dfm

@@ -22,7 +22,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
     Left = 0
     Top = 0
     Width = 1384
-    Height = 62
+    Height = 92
     AutoSize = True
     ButtonHeight = 30
     ButtonWidth = 119
@@ -110,34 +110,35 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       AutoSize = True
       Caption = #25764#38144#20986#24211
       ImageIndex = 86
+      Wrap = True
       OnClick = ToolButton7Click
     end
     object ToolButton11: TToolButton
-      Left = 639
+      Left = 0
-      Top = 0
+      Top = 30
       Caption = #25209#37327#20462#25913#32568#21495
       ImageIndex = 54
       OnClick = ToolButton11Click
     end
     object TBDW: TToolButton
-      Left = 758
+      Left = 119
-      Top = 0
+      Top = 30
       AutoSize = True
       Caption = #20462#25913#25968#37327#21333#20301
       ImageIndex = 54
       OnClick = TBDWClick
     end
     object ToolButton4: TToolButton
-      Left = 869
+      Left = 230
-      Top = 0
+      Top = 30
       AutoSize = True
       Caption = #25209#37327#35843#25972#31859#25968
       ImageIndex = 54
       OnClick = ToolButton4Click
     end
     object ToolButton13: TToolButton
-      Left = 980
+      Left = 341
-      Top = 0
+      Top = 30
       AutoSize = True
       Caption = #25209#37327#20928#37325#36716#38271#24230
       ImageIndex = 54
@@ -145,16 +146,15 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton13Click
     end
     object ToolButton8: TToolButton
-      Left = 1103
+      Left = 464
-      Top = 0
+      Top = 30
       AutoSize = True
       Caption = #25209#37327#20462#25913#30382#37325
       ImageIndex = 54
-      Wrap = True
       OnClick = ToolButton8Click
     end
     object ToolButton1: TToolButton
-      Left = 0
+      Left = 575
       Top = 30
       AutoSize = True
       Caption = #25171#21360#26631#31614
@@ -162,7 +162,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton1Click
     end
     object TCPDB: TToolButton
-      Left = 87
+      Left = 662
       Top = 30
       AutoSize = True
       Caption = #25104#21697#25171#21253
@@ -170,7 +170,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = TCPDBClick
     end
     object ToolButton3: TToolButton
-      Left = 174
+      Left = 749
       Top = 30
       AutoSize = True
       Caption = #25171#21360#21253#26631#31614
@@ -178,24 +178,25 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnClick = ToolButton3Click
     end
     object ToolButton2: TToolButton
-      Left = 273
+      Left = 848
       Top = 30
       AutoSize = True
       Caption = #25171#21360#26816#39564#25253#21578
       ImageIndex = 12
+      Wrap = True
       OnClick = ToolButton2Click
     end
     object ToolButton5: TToolButton
-      Left = 384
+      Left = 0
-      Top = 30
+      Top = 60
       AutoSize = True
       Caption = #25171#21360
       ImageIndex = 12
       OnClick = ToolButton5Click
     end
     object Edit3: TEdit
-      Left = 447
+      Left = 63
-      Top = 30
+      Top = 60
       Width = 68
       Height = 30
       Font.Charset = GB2312_CHARSET
@@ -209,8 +210,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       OnKeyPress = Edit3KeyPress
     end
     object ComboBox1: TComboBox
-      Left = 515
+      Left = 131
-      Top = 33
+      Top = 63
       Width = 149
       Height = 24
       Style = csDropDownList
@@ -234,8 +235,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
         #26816#39564#30721#21333)
     end
     object Edit4: TEdit
-      Left = 664
+      Left = 280
-      Top = 30
+      Top = 60
       Width = 121
       Height = 30
       Font.Charset = GB2312_CHARSET
@@ -248,32 +249,32 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
       Visible = False
     end
     object ToolButton12: TToolButton
-      Left = 785
+      Left = 401
-      Top = 30
+      Top = 60
       Caption = #20462#25913#30721#21333
       ImageIndex = 54
       Visible = False
       OnClick = ToolButton12Click
     end
     object ToolButton9: TToolButton
-      Left = 904
+      Left = 520
-      Top = 30
+      Top = 60
       AutoSize = True
       Caption = #24322#24120#25968#25454
       ImageIndex = 2
       OnClick = ToolButton9Click
     end
     object TBExport: TToolButton
-      Left = 991
+      Left = 607
-      Top = 30
+      Top = 60
       AutoSize = True
       Caption = #23548#20986
       ImageIndex = 75
       OnClick = TBExportClick
     end
     object TBClose: TToolButton
-      Left = 1054
+      Left = 670
-      Top = 30
+      Top = 60
       AutoSize = True
       Caption = #20851#38381
       ImageIndex = 55
@@ -282,7 +283,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   end
   object Panel1: TPanel
     Left = 0
-    Top = 62
+    Top = 92
     Width = 1384
     Height = 88
     Align = alTop
@@ -805,9 +806,9 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
   end
   object cxGrid1: TcxGrid
     Left = 0
-    Top = 150
+    Top = 180
     Width = 1384
-    Height = 568
+    Height = 538
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 3

打卷检验管理/U_JYOrderCDOne.pas

@@ -12,19 +12,19 @@ uses
   RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, MovePanel, cxTextEdit,
   cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxContainer, ShellAPI,
   cxCurrencyEdit, MMSystem, dxSkinsCore, dxSkinBlack, dxSkinBlue,
-  dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom,
+  dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom, dxSkinDarkSide,
-  dxSkinDarkSide, dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle,
+  dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy,
-  dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary,
+  dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian,
-  dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin,
+  dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis,
-  dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins,
+  dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black,
-  dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green,
+  dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink,
-  dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black,
+  dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue,
-  dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray,
+  dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
-  dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin,
+  dxSkinOffice2013White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic,
-  dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus,
+  dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringTime, dxSkinStardust,
-  dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008,
+  dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinsDefaultPainters,
-  dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine,
+  dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue,
-  dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter;
+  dxSkinscxPCPainter;
 
 type
   TfrmJYOrderCDOne = class(TForm)
@@ -441,8 +441,7 @@ begin
           sumP := sumP + 1;
           sumLen := RoundFloat(sumLen + Order_Main.fieldbyname('mjlen').AsFloat, 2);
           sumMZ := RoundFloat(sumMZ + Order_Main.fieldbyname('mjmaoz').AsFloat, 2);
-          sumJZ := RoundFloat(sumJZ + Order_Main.fieldbyname('mjqty4').AsFloat, 2)
+          sumJZ := RoundFloat(sumJZ + Order_Main.fieldbyname('mjqty4').AsFloat, 2)//          sumMZ := sumMZ + Order_Main.fieldbyname('mjmaoz').AsFloat;
-//          sumMZ := sumMZ + Order_Main.fieldbyname('mjmaoz').AsFloat;
 //          sumJZ := sumJZ + Order_Main.fieldbyname('mjqty4').AsFloat;
         end;
 
@@ -1157,6 +1156,8 @@ begin
     sql.Add('PRTColor=DBO.F_Get_Order_SubStr(BaoID,''BNColor''),SOrddefstr1=DBO.F_Get_Order_SubStr(BaoID,''BNSOrddefstr1''),');
     sql.Add('SOrddefstr4=DBO.F_Get_Order_SubStr(BaoID,''BNSOrddefstr4''),PRtHX=DBO.F_Get_Order_SubStr(BaoID,''BNPRtHX''), ');
     sql.Add('Mjstr4=DBO.F_Get_Order_SubStr(BaoID,''BNGangNo''), ');
+    sql.Add('MJFK=DBO.F_Get_Order_SubStr(BaoID,''BNMJFK''), ');
+    sql.Add('MJSJKZ=DBO.F_Get_Order_SubStr(BaoID,''BNMJSJKZ''), ');
     sql.Add('BNMJLENLIST=DBO.F_Get_Order_SubStr(BaoID,''BNMJLENLIST''), ');
     sql.Add('PRTkuanNo=DBO.F_Get_Order_SubStr(BaoID,''BNPrtkuanno''),');
     sql.Add('khConNo=(select top 1 khConNo from JYOrderCon_Main X where X.ConNO=D.conNO), ');
@@ -2280,7 +2281,7 @@ end;
 
 procedure TfrmJYOrderCDOne.ToolButton14Click(Sender: TObject);
 begin
- if Order_Main.IsEmpty then
+  if Order_Main.IsEmpty then
     Exit;
   if Order_Main.Locate('SSel', True, []) = False then
   begin
@@ -2324,7 +2325,7 @@ end;
 
 procedure TfrmJYOrderCDOne.ToolButton15Click(Sender: TObject);
 begin
- if Order_Main.IsEmpty then
+  if Order_Main.IsEmpty then
     Exit;
   if Order_Main.Locate('SSel', True, []) = False then
   begin

打卷检验管理/U_MJManageNewFDNew.dfm

@@ -973,11 +973,12 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnClick = SpeedButton13Click
     end
     object Panel1: TPanel
-      Left = 0
+      Left = 344
-      Top = 276
+      Top = 332
       Width = 369
       Height = 285
       TabOrder = 0
+      Visible = False
       object Button8: TButton
         Left = 5
         Top = 4
@@ -1249,6 +1250,143 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
         OnClick = Button26Click
       end
     end
+    object Panel4: TPanel
+      Left = 8
+      Top = 256
+      Width = 289
+      Height = 265
+      BevelInner = bvRaised
+      BevelOuter = bvLowered
+      Color = clSkyBlue
+      TabOrder = 1
+      Visible = False
+      object SpeedButton21: TSpeedButton
+        Left = 5
+        Top = 173
+        Width = 69
+        Height = 72
+        Caption = 'G'
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -37
+        Font.Name = #40657#20307
+        Font.Style = []
+        ParentFont = False
+        OnClick = SpeedButton1Click
+      end
+      object SpeedButton30: TSpeedButton
+        Left = 96
+        Top = 173
+        Width = 70
+        Height = 72
+        Caption = 'H'
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -37
+        Font.Name = #40657#20307
+        Font.Style = []
+        ParentFont = False
+        OnClick = SpeedButton1Click
+      end
+      object SpeedButton39: TSpeedButton
+        Left = 187
+        Top = 173
+        Width = 70
+        Height = 72
+        Caption = 'I'
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -37
+        Font.Name = #40657#20307
+        Font.Style = []
+        ParentFont = False
+        OnClick = SpeedButton1Click
+      end
+      object SpeedButton44: TSpeedButton
+        Left = 5
+        Top = 90
+        Width = 69
+        Height = 72
+        Caption = 'D'
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -37
+        Font.Name = #40657#20307
+        Font.Style = []
+        ParentFont = False
+        OnClick = SpeedButton1Click
+      end
+      object SpeedButton48: TSpeedButton
+        Left = 96
+        Top = 90
+        Width = 70
+        Height = 72
+        Caption = 'E'
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -37
+        Font.Name = #40657#20307
+        Font.Style = []
+        ParentFont = False
+        OnClick = SpeedButton1Click
+      end
+      object SpeedButton58: TSpeedButton
+        Left = 187
+        Top = 90
+        Width = 70
+        Height = 72
+        Caption = 'F'
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -37
+        Font.Name = #40657#20307
+        Font.Style = []
+        ParentFont = False
+        OnClick = SpeedButton1Click
+      end
+      object SpeedButton67: TSpeedButton
+        Left = 5
+        Top = 6
+        Width = 69
+        Height = 72
+        Caption = 'A'
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -37
+        Font.Name = #40657#20307
+        Font.Style = []
+        ParentFont = False
+        OnClick = SpeedButton1Click
+      end
+      object SpeedButton76: TSpeedButton
+        Left = 96
+        Top = 6
+        Width = 70
+        Height = 72
+        Caption = 'B'
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -37
+        Font.Name = #40657#20307
+        Font.Style = []
+        ParentFont = False
+        OnClick = SpeedButton1Click
+      end
+      object SpeedButton83: TSpeedButton
+        Left = 187
+        Top = 6
+        Width = 70
+        Height = 72
+        Caption = 'C'
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -37
+        Font.Name = #40657#20307
+        Font.Style = []
+        ParentFont = False
+        OnClick = SpeedButton1Click
+      end
+    end
   end
   object Panel2: TPanel
     Left = 428
@@ -2413,7 +2551,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   end
   object Panel3: TPanel
     Left = 638
-    Top = 328
+    Top = 326
     Width = 353
     Height = 334
     BevelInner = bvRaised
@@ -3251,8 +3389,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Enabled = False
     Interval = 5000
     OnTimer = Timer1Timer
-    Left = 960
+    Left = 1000
-    Top = 576
+    Top = 472
   end
   object ADOQueryPrint: TADOQuery
     Connection = DataLink_TradeManage.ADOLink

打卷检验管理/U_MJManageNewFDNew.pas

@@ -285,6 +285,16 @@ type
     CC: TEdit;
     Label54: TLabel;
     CZ: TEdit;
+    Panel4: TPanel;
+    SpeedButton21: TSpeedButton;
+    SpeedButton30: TSpeedButton;
+    SpeedButton39: TSpeedButton;
+    SpeedButton44: TSpeedButton;
+    SpeedButton48: TSpeedButton;
+    SpeedButton58: TSpeedButton;
+    SpeedButton67: TSpeedButton;
+    SpeedButton76: TSpeedButton;
+    SpeedButton83: TSpeedButton;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -12667,6 +12677,8 @@ begin
     sql.Add('KHORDERNO=DBO.F_Get_Order_SubStr(BaoID,''BNKHORDERNO''), ');
     sql.Add('PRTCODENAME=DBO.F_Get_Order_SubStr(BaoID,''BNPRTCODENAME''), ');
     sql.Add('MJXH=DBO.F_Get_Order_SubStr(BaoID,''BNMJXH''), ');
+    sql.Add('MJFK=DBO.F_Get_Order_SubStr(BaoID,''BNMJFK''), ');
+    sql.Add('MJSJKZ=DBO.F_Get_Order_SubStr(BaoID,''BNMJSJKZ''), ');
     sql.Add('BNMJLENLIST=DBO.F_Get_Order_SubStr(BaoID,''BNMJLENLIST''), ');
     sql.Add('PRTkuanNo=DBO.F_Get_Order_SubStr(BaoID,''BNPrtkuanno''),');
     sql.Add('khConNo=(select top 1 khConNo from JYOrderCon_Main X where X.ConNO=D.conNO), ');
@@ -14879,6 +14891,17 @@ begin
       end;
     end;
   end;
+  Panel4.Visible := True;
+  with Panel4 do
+  begin
+    for i := 0 to ControlCount - 1 do
+    begin
+      if Controls[i] is TSpeedButton then
+      begin
+        TSpeedButton(Controls[i]).Hint := Trim(TEdit(Sender).Name);
+      end;
+    end;
+  end;
 end;
 
 procedure TfrmMJManageNewFDNewSF.MJLenChange(Sender: TObject);
@@ -15117,6 +15140,8 @@ begin
     sql.Add('PRTColor=DBO.F_Get_Order_SubStr(BaoID,''BNColor''),SOrddefstr1=DBO.F_Get_Order_SubStr(BaoID,''BNSOrddefstr1''),');
     sql.Add('SOrddefstr4=DBO.F_Get_Order_SubStr(BaoID,''BNSOrddefstr4''),PRtHX=DBO.F_Get_Order_SubStr(BaoID,''BNPRtHX''), ');
     sql.Add('Mjstr4=DBO.F_Get_Order_SubStr(BaoID,''BNGangNo''), ');
+    sql.Add('MJFK=DBO.F_Get_Order_SubStr(BaoID,''BNMJFK''), ');
+    sql.Add('MJSJKZ=DBO.F_Get_Order_SubStr(BaoID,''BNMJSJKZ''), ');
     sql.Add('KHORDERNO=DBO.F_Get_Order_SubStr(BaoID,''BNKHORDERNO''), ');
     sql.Add('PRTCODENAME=DBO.F_Get_Order_SubStr(BaoID,''BNPRTCODENAME''), ');
     sql.Add('MJXH=DBO.F_Get_Order_SubStr(BaoID,''BNMJXH''), ');