From 066cf5b40e1b598da34ae2174a47d6fbccd5d9bf Mon Sep 17 00:00:00 2001
From: "DESKTOP-E401PHE\\Administrator" <rightsoft@163.com>
Date: Thu, 5 Feb 2026 17:15:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 复合检验管理/U_MJManageNewFDNew.dfm | 30 ++++++++++++++++++++++++++++-
 复合检验管理/U_MJManageNewFDNew.pas | 16 ++++++++++++---
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/复合检验管理/U_MJManageNewFDNew.dfm b/复合检验管理/U_MJManageNewFDNew.dfm
index 54110c5..5cffc9a 100644
--- a/复合检验管理/U_MJManageNewFDNew.dfm
+++ b/复合检验管理/U_MJManageNewFDNew.dfm
@@ -1551,6 +1551,19 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object Label68: TLabel
+      Left = 352
+      Top = 388
+      Width = 84
+      Height = 20
+      Caption = #37325#37327#20301#25968
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clBlue
+      Font.Height = -20
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
     object MJFK: TEdit
       Left = 51
       Top = 341
@@ -2164,7 +2177,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
     object MJCWS: TEdit
       Left = 293
       Top = 381
-      Width = 90
+      Width = 52
       Height = 36
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
@@ -2185,6 +2198,21 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       TabOrder = 39
       OnClick = GHWCClick
     end
+    object MJZWS: TEdit
+      Left = 437
+      Top = 381
+      Width = 52
+      Height = 36
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -28
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 40
+      OnClick = Edit1Click
+      OnKeyPress = MJstr3KeyPress
+    end
   end
   object MovePanel1: TMovePanel
     Left = 1158
diff --git a/复合检验管理/U_MJManageNewFDNew.pas b/复合检验管理/U_MJManageNewFDNew.pas
index 7d794cf..f816c84 100644
--- a/复合检验管理/U_MJManageNewFDNew.pas
+++ b/复合检验管理/U_MJManageNewFDNew.pas
@@ -332,6 +332,8 @@ type
     ToolButton1: TToolButton;
     ToolButton5: TToolButton;
     QryCheckNet: TADOQuery;
+    Label68: TLabel;
+    MJZWS: TEdit;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -652,7 +654,8 @@ begin
   begin
     if trim(Edit9.Text) = '��' then
     begin
-      MJMaoZ.Text := format('%.' + trim(fxsws1) + 'f', [i1 / 100000]);
+//      MJMaoZ.Text := format('%.' + trim(fxsws1) + 'f', [i1 / 100000]);
+      MJMaoZ.Text := format('%.' + trim(MJZWS.text) + 'f', [i1 / 100000]);
     end;
   end;
 end;
@@ -1285,7 +1288,8 @@ begin
         FieldByName('baoNO').Value := Trim(baono.text);
         FieldByName('baoID').Value := Trim(baoID.Text);
       end;
-
+      FieldByName('MJCWS').Value := Trim(MJCWS.text);
+      FieldByName('MJZWS').Value := Trim(MJZWS.Text);       
       Post;
     end;
     if PState = 1 then
@@ -1784,6 +1788,10 @@ begin
   begin
     MJCWS.text := '1';
   end;
+  if trim(MJZWS.text) = '' then
+  begin
+    MJZWS.text := '1';
+  end;
   if trim(MJXH.text) = '0' then
   begin
     application.MessageBox('���Ų���Ϊ0', '��ʾ');
@@ -2548,7 +2556,8 @@ begin
     if TryStrToFloat(MJQty3.Text, FReal) = False then
       Exit;
     jz := StrToFloat(MJMaoZ.Text) - StrToFloat(MJQty3.Text);
-    MJQty4.Text := format('%.' + trim(fxsws1) + 'f', [jz]);
+//    MJQty4.Text := format('%.' + trim(fxsws1) + 'f', [jz]);
+    MJQty4.Text := format('%.' + trim(MJZWS.text) + 'f', [jz]);
   end
   else
   begin
@@ -2675,6 +2684,7 @@ begin
     end;
     fxsws := Trim(ADOTmp.fieldbyname('xsws').AsString);
     MJCWS.Text := Trim(ADOTmp.fieldbyname('xsws').AsString);
+    MJZWS.Text := Trim(ADOTmp.fieldbyname('xsws1').AsString);
     fxsws1 := Trim(ADOTmp.fieldbyname('xsws1').AsString);
     baoNO.Text := Trim(ADOTmp.fieldbyname('maxBaoNO').AsString);
     if GetLSNo(ADOCmd, FBaoID, 'BI', 'WFB_MJJY', 3, 1) = False then