From 77f799ea2a4d0ed85708d4bdbe02bf5b59b8d818 Mon Sep 17 00:00:00 2001
From: "DESKTOP-E401PHE\\Administrator" <rightsoft@163.com>
Date: Tue, 2 Dec 2025 17:18:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=8C=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 复合检验管理/U_DataLink.pas         |  15 ++-
 复合检验管理/U_MJManageNewFDNew.dfm | 163 +++++++++++++++++-----------
 复合检验管理/U_MJManageNewFDNew.pas |  40 +++++--
 3 files changed, 141 insertions(+), 77 deletions(-)

diff --git a/复合检验管理/U_DataLink.pas b/复合检验管理/U_DataLink.pas
index 2ea2d07..f49786e 100644
--- a/复合检验管理/U_DataLink.pas
+++ b/复合检验管理/U_DataLink.pas
@@ -5,7 +5,20 @@ interface
 uses
   SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels,
   Windows,Messages,forms,OleCtnrs,DateUtils, cxClasses, dxSkinsCore,
-  dxSkinsDefaultPainters;
+  dxSkinsDefaultPainters, 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;
 var
    DConString:String;   {ȫ�������ַ���}
    server, dtbase, user, pswd: String;  {���ݿ����Ӳ���}
diff --git a/复合检验管理/U_MJManageNewFDNew.dfm b/复合检验管理/U_MJManageNewFDNew.dfm
index 3c2646c..56b9afe 100644
--- a/复合检验管理/U_MJManageNewFDNew.dfm
+++ b/复合检验管理/U_MJManageNewFDNew.dfm
@@ -1,6 +1,6 @@
 object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
-  Left = 124
-  Top = 39
+  Left = 256
+  Top = 174
   Width = 1556
   Height = 754
   Caption = #25104#21697#26816#39564
@@ -47,7 +47,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Left = 0
     Top = 87
     Width = 425
-    Height = 636
+    Height = 628
     Align = alLeft
     TabOrder = 0
     object Tv3: TcxGridDBTableView
@@ -191,8 +191,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object ScrollBox1: TScrollBox
     Left = 1151
     Top = 87
-    Width = 397
-    Height = 636
+    Width = 389
+    Height = 628
     Align = alClient
     Color = clWhite
     ParentColor = False
@@ -1043,7 +1043,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Left = 425
     Top = 87
     Width = 512
-    Height = 636
+    Height = 628
     Align = alLeft
     BevelInner = bvRaised
     BevelOuter = bvLowered
@@ -1155,8 +1155,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       ParentFont = False
     end
     object Label13: TLabel
-      Left = 458
-      Top = 338
+      Left = 426
+      Top = 506
       Width = 15
       Height = 22
       Caption = 'M'
@@ -1169,8 +1169,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Visible = False
     end
     object Label14: TLabel
-      Left = 283
-      Top = 338
+      Left = 251
+      Top = 506
       Width = 60
       Height = 23
       Caption = #21407#25968#37327
@@ -1248,8 +1248,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       ParentFont = False
     end
     object Label29: TLabel
-      Left = 284
-      Top = 294
+      Left = 252
+      Top = 462
       Width = 58
       Height = 23
       Caption = #26588'   '#21495
@@ -1366,8 +1366,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       ParentFont = False
     end
     object Label40: TLabel
-      Left = 208
-      Top = 399
+      Left = 248
+      Top = 559
       Width = 80
       Height = 22
       Caption = #26579#21378#32568#21495
@@ -1379,20 +1379,6 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       ParentFont = False
       Visible = False
     end
-    object Label45: TLabel
-      Left = 223
-      Top = 298
-      Width = 40
-      Height = 23
-      Caption = #21253#21495
-      Font.Charset = ANSI_CHARSET
-      Font.Color = clRed
-      Font.Height = -20
-      Font.Name = 'Arial'
-      Font.Style = []
-      ParentFont = False
-      Visible = False
-    end
     object Label28: TLabel
       Left = 256
       Top = 604
@@ -1409,7 +1395,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label53: TLabel
       Left = 208
-      Top = 5
+      Top = 86
       Width = 42
       Height = 20
       Caption = #23458#25143
@@ -1422,7 +1408,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label55: TLabel
       Left = 208
-      Top = 141
+      Top = 138
       Width = 42
       Height = 20
       Caption = #39068#33394
@@ -1434,8 +1420,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       ParentFont = False
     end
     object Label57: TLabel
-      Left = 208
-      Top = 49
+      Left = 333
+      Top = 289
       Width = 42
       Height = 20
       Caption = #21697#21517
@@ -1448,8 +1434,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Visible = False
     end
     object Label58: TLabel
-      Left = 208
-      Top = 97
+      Left = 333
+      Top = 337
       Width = 42
       Height = 20
       Caption = #33457#22411
@@ -1463,7 +1449,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label59: TLabel
       Left = 208
-      Top = 229
+      Top = 226
       Width = 42
       Height = 20
       Caption = #26631#31614
@@ -1476,7 +1462,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Label60: TLabel
       Left = 208
-      Top = 189
+      Top = 186
       Width = 42
       Height = 20
       Caption = #33394#21495
@@ -1500,6 +1486,19 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object Label45: TLabel
+      Left = 168
+      Top = 27
+      Width = 84
+      Height = 20
+      Caption = #25340#21305#38271#24230
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clBlue
+      Font.Height = -20
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
     object MJFK: TEdit
       Left = 53
       Top = 377
@@ -1597,8 +1596,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnKeyPress = MJstr3KeyPress
     end
     object MJQty1: TEdit
-      Left = 353
-      Top = 329
+      Left = 321
+      Top = 497
       Width = 90
       Height = 41
       Font.Charset = GB2312_CHARSET
@@ -1663,8 +1662,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnKeyPress = MJstr3KeyPress
     end
     object MJstr3: TEdit
-      Left = 353
-      Top = 289
+      Left = 321
+      Top = 457
       Width = 90
       Height = 41
       Font.Charset = GB2312_CHARSET
@@ -1785,8 +1784,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnKeyPress = MJstr3KeyPress
     end
     object MJstr5: TEdit
-      Left = 293
-      Top = 390
+      Left = 333
+      Top = 550
       Width = 90
       Height = 41
       Font.Charset = GB2312_CHARSET
@@ -1818,8 +1817,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnKeyPress = MJstr3KeyPress
     end
     object BaoID: TEdit
-      Left = 259
-      Top = 264
+      Left = 427
+      Top = 568
       Width = 121
       Height = 20
       TabOrder = 10
@@ -1842,7 +1841,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object KH: TBtnEditA
       Left = 256
-      Top = 0
+      Top = 81
       Width = 145
       Height = 37
       AutoSize = False
@@ -1856,8 +1855,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnBtnClick = KHBtnClick
     end
     object PM: TBtnEditA
-      Left = 256
-      Top = 44
+      Left = 381
+      Top = 284
       Width = 145
       Height = 37
       AutoSize = False
@@ -1874,7 +1873,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object YS: TBtnEditA
       Left = 256
-      Top = 132
+      Top = 129
       Width = 145
       Height = 37
       AutoSize = False
@@ -1889,8 +1888,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnBtnClick = YSBtnClick
     end
     object HX: TBtnEditA
-      Left = 256
-      Top = 88
+      Left = 381
+      Top = 328
       Width = 145
       Height = 37
       AutoSize = False
@@ -1907,7 +1906,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object SH: TBtnEditA
       Left = 256
-      Top = 176
+      Top = 173
       Width = 145
       Height = 37
       AutoSize = False
@@ -1923,7 +1922,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object SLbName: TFTComboBox
       Left = 256
-      Top = 220
+      Top = 217
       Width = 185
       Height = 32
       Font.Charset = GB2312_CHARSET
@@ -1944,7 +1943,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Button9: TButton
       Left = 384
-      Top = 0
+      Top = 81
       Width = 65
       Height = 38
       Caption = #36873#25321#23458#25143
@@ -1958,8 +1957,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnClick = Button9Click
     end
     object Button10: TButton
-      Left = 384
-      Top = 40
+      Left = 509
+      Top = 280
       Width = 65
       Height = 38
       Caption = #36873#25321#21697#21517
@@ -1975,7 +1974,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Button11: TButton
       Left = 384
-      Top = 128
+      Top = 125
       Width = 65
       Height = 38
       Caption = #36873#25321#39068#33394
@@ -1990,7 +1989,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Button12: TButton
       Left = 384
-      Top = 176
+      Top = 173
       Width = 65
       Height = 38
       Caption = #36873#25321#33394#21495
@@ -2004,8 +2003,8 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnClick = Button12Click
     end
     object Button13: TButton
-      Left = 384
-      Top = 88
+      Left = 509
+      Top = 328
       Width = 65
       Height = 38
       Caption = #36873#25321#33457#22411
@@ -2059,6 +2058,38 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       TabOrder = 34
       Visible = False
     end
+    object Prelen: TEdit
+      Left = 257
+      Top = 19
+      Width = 93
+      Height = 36
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -28
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 35
+      OnChange = MJLenChange
+      OnClick = Edit1Click
+      OnKeyDown = MJQty4KeyDown
+      OnKeyPress = MJstr3KeyPress
+    end
+    object BPinpi: TButton
+      Left = 354
+      Top = 8
+      Width = 111
+      Height = 65
+      Caption = #25340#21305
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 36
+      OnClick = BPinpiClick
+    end
   end
   object MovePanel1: TMovePanel
     Left = 1158
@@ -2314,7 +2345,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     Left = 937
     Top = 87
     Width = 214
-    Height = 636
+    Height = 628
     Align = alLeft
     BevelInner = bvRaised
     BevelOuter = bvLowered
@@ -2323,7 +2354,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Left = 2
       Top = 2
       Width = 210
-      Height = 311
+      Height = 303
       Align = alClient
       TabOrder = 0
       object Tv2: TcxGridDBTableView
@@ -2431,7 +2462,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object Panel8: TPanel
       Left = 2
-      Top = 313
+      Top = 305
       Width = 210
       Height = 28
       Align = alBottom
@@ -2446,7 +2477,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     end
     object AOrdDefNote1: TRichEdit
       Left = 2
-      Top = 341
+      Top = 333
       Width = 210
       Height = 293
       Align = alBottom
@@ -2463,7 +2494,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   end
   object Panel3: TPanel
     Left = 610
-    Top = 348
+    Top = 332
     Width = 353
     Height = 334
     BevelInner = bvRaised
@@ -2659,7 +2690,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 1548
+    Width = 1540
     Height = 30
     AutoSize = True
     ButtonHeight = 30
@@ -2832,7 +2863,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
   object Panel6: TPanel
     Left = 0
     Top = 30
-    Width = 1548
+    Width = 1540
     Height = 57
     Align = alTop
     BevelInner = bvRaised
diff --git a/复合检验管理/U_MJManageNewFDNew.pas b/复合检验管理/U_MJManageNewFDNew.pas
index 5f90a56..335d8bc 100644
--- a/复合检验管理/U_MJManageNewFDNew.pas
+++ b/复合检验管理/U_MJManageNewFDNew.pas
@@ -1,7 +1,7 @@
 unit U_MJManageNewFDNew;
 
-interface
-
+interface                                            
+                   
 uses
   Windows, Messages, SysUtils, Variants, math, Classes, Graphics, Controls,
   Forms, Dialogs, StdCtrls, cxStyles, cxCustomData, cxGraphics, cxFilter, cxData,
@@ -216,7 +216,6 @@ type
     Label42: TLabel;
     v2Column4: TcxGridDBColumn;
     baoNo: TEdit;
-    Label45: TLabel;
     BaoID: TEdit;
     Button7: TButton;
     v3Column6: TcxGridDBColumn;
@@ -320,6 +319,9 @@ type
     Label63: TLabel;
     Banno: TEdit;
     banid: TEdit;
+    Prelen: TEdit;
+    BPinpi: TButton;
+    Label45: TLabel;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -396,6 +398,7 @@ type
     procedure Edit14Click(Sender: TObject);
     procedure Button5Click(Sender: TObject);
     procedure BannoChange(Sender: TObject);
+    procedure BPinpiClick(Sender: TObject);
   private
     { Private declarations }
     FInt, PState, PrintInt, SCInitGrid, FState, FCK: Integer;
@@ -570,12 +573,12 @@ begin
         MJLen.Text := format('%.' + trim(fxsws) + 'f', [fdata * 1.09361]);
         Label9.Caption := 'Y'; // ��ʾΪ��
       end
-      else
+      else             
       begin
         MJLen.Text := format('%.' + trim(fxsws) + 'f', [fdata]);
         if i2 = 0 then
           Label9.Caption := 'M'
-        else
+        else                                          
           Label9.Caption := 'Y';
       end;
 
@@ -1164,9 +1167,20 @@ begin
       end
       else
       begin
-        FieldByName('MJLen').Value := StrToFloatdef(trim(MJLen.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc;
+        if StrToFloatdef(trim(Prelen.Text), 0) > 0 then
+        begin
+          FieldByName('MJLen').Value := StrToFloatdef(trim(MJLen.Text), 0) + StrToFloatdef(trim(Prelen.Text), 0) + fjc;
+        end
+        else
+        begin
+          FieldByName('MJLen').Value := StrToFloatdef(trim(MJLen.Text), 0) - StrToFloatdef(trim(MJQty2.Text), 0) + fjc;
+        end;
+
       end;
 
+      FieldByName('Prelen').Value := StrToFloatdef(trim(Prelen.Text), 0);
+      FieldByName('Curlen').Value := StrToFloatdef(trim(MJLen.Text), 0);
+
       FieldByName('MJQty1').Value := StrToFloatdef(trim(MJQty1.Text), 0);
       FieldByName('MJQty2').Value := StrToFloatdef(trim(MJQty2.Text), 0);
       FieldByName('MJQty3').Value := StrToFloatdef(trim(MJQty3.Text), 0);
@@ -1216,9 +1230,8 @@ begin
         FieldByName('baoID').Value := Trim(baoID.Text);
       end;
 
-        FieldByName('banNO').Value := Trim(banno.text);
-        FieldByName('banID').Value := Trim(banID.Text);
-
+      FieldByName('banNO').Value := Trim(banno.text);
+      FieldByName('banID').Value := Trim(banID.Text);
 
       Post;
     end;
@@ -1791,6 +1804,7 @@ begin
     MJQty2.Text := '';
     Label15.Caption := '';
     MJQty4.Text := '';
+    Prelen.Text := '';
 
     if edit10.Text = '��' then
     begin
@@ -3470,7 +3484,7 @@ begin
 
   if ADOTmp.IsEmpty then
     //SHOWMESSage('11111111');
-  Exit;
+    Exit;
 
   with ADOCmd do
   begin
@@ -3594,5 +3608,11 @@ begin
   banid.Text := ADOQueryMain.fieldbyname('banid').AsString
 end;
 
+procedure TfrmMJManageNewFDNewSF.BPinpiClick(Sender: TObject);
+begin
+  Prelen.Text := MJLen.Text;
+
+end;
+
 end.