~

打卷检验管理/U_JYOrderCDOne.pas

@@ -699,9 +699,9 @@ begin
   Order_Main.DisableControls;
   with Order_Main do
   begin                               
-    First;
+//    First;
-    while not Eof do
+//    while not Eof do
-    begin
+//    begin
     if Order_Main.FieldByName('SSel').AsBoolean = True then
     begin
       with ADOQueryTemp do
@@ -741,10 +741,10 @@ begin
          // end;
       end;
       Order_Main.Delete;
-      end
-      else
-        Next;
     end;
+//      else
+//        Next;
+//    end;
   end;
   Order_Main.EnableControls;
 

打卷检验管理/U_MJManageNewFDNew.dfm

@@ -2774,7 +2774,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Visible = False
     end
     object Label44: TLabel
-      Left = 147
+      Left = 134
       Top = 30
       Width = 60
       Height = 19
@@ -2816,11 +2816,11 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Visible = False
     end
     object Label48: TLabel
-      Left = 243
+      Left = 331
       Top = 30
-      Width = 100
+      Width = 60
       Height = 19
-      Caption = #27611#37325#36716#38271#24230
+      Caption = #27611#36716#38271
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -19
@@ -2829,7 +2829,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       ParentFont = False
     end
     object Label51: TLabel
-      Left = 617
+      Left = 625
       Top = 30
       Width = 40
       Height = 19
@@ -2856,11 +2856,11 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       ParentFont = False
     end
     object Label43: TLabel
-      Left = 373
+      Left = 432
       Top = 30
-      Width = 120
+      Width = 80
       Height = 19
-      Caption = #20013#25991#23383#27573#26631#31614
+      Caption = #20013#25991#26631#31614
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -19
@@ -2895,7 +2895,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       ParentFont = False
     end
     object Label66: TLabel
-      Left = 528
+      Left = 544
       Top = 32
       Width = 40
       Height = 19
@@ -2907,6 +2907,19 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object Label67: TLabel
+      Left = 238
+      Top = 26
+      Width = 30
+      Height = 28
+      Caption = #37325#37327#13#10#38480#21046
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -14
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
     object BTAdd: TButton
       Left = 1070
       Top = 8
@@ -2967,7 +2980,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnClick = Edit7Click
     end
     object Edit9: TEdit
-      Left = 115
+      Left = 102
       Top = 27
       Width = 28
       Height = 27
@@ -3001,7 +3014,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnClick = Edit10Click
     end
     object Edit11: TEdit
-      Left = 214
+      Left = 302
       Top = 27
       Width = 28
       Height = 27
@@ -3017,7 +3030,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnClick = Edit11Click
     end
     object Edit12: TEdit
-      Left = 586
+      Left = 594
       Top = 27
       Width = 28
       Height = 27
@@ -3054,7 +3067,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
         #25163#36755)
     end
     object Edit5: TEdit
-      Left = 341
+      Left = 403
       Top = 26
       Width = 28
       Height = 27
@@ -3070,7 +3083,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       OnClick = Edit5Click
     end
     object Edit13: TEdit
-      Left = 500
+      Left = 516
       Top = 26
       Width = 28
       Height = 27
@@ -3085,6 +3098,22 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
       TabOrder = 10
       OnClick = Edit13Click
     end
+    object Edit14: TEdit
+      Left = 206
+      Top = 27
+      Width = 28
+      Height = 27
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      ReadOnly = True
+      TabOrder = 11
+      Text = #8730
+      OnClick = Edit14Click
+    end
   end
   object Panel1: TPanel
     Left = 168

打卷检验管理/U_MJManageNewFDNew.pas

@@ -290,6 +290,8 @@ type
     ADOQuery1: TADOQuery;
     Label66: TLabel;
     Edit13: TEdit;
+    Label67: TLabel;
+    Edit14: TEdit;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -356,6 +358,7 @@ type
     procedure Button10Click(Sender: TObject);
     procedure Button5Click(Sender: TObject);
     procedure Edit13Click(Sender: TObject);
+    procedure Edit14Click(Sender: TObject);
   private
     { Private declarations }
     FInt, PState, PrintInt, SCInitGrid, FState, FCK, FPSXZ: Integer;
@@ -1719,14 +1722,27 @@ begin
   end;
   if (strtofloatdef(trim(MJLen.Text), 0) < 20) or (strtofloatdef(trim(MJLen1.Text), 0) < 20) then
   begin
-    application.MessageBox('长度不足20', '提示');
+//    application.MessageBox('长度不足20', '提示');
     exit;
   end;
   if (strtofloatdef(trim(MJLen.Text), 0) > 200) or (strtofloatdef(trim(MJLen1.Text), 0) > 200) then
   begin
-    application.MessageBox('长度超出200不能提交', '提示');
+//    application.MessageBox('长度超出200不能提交', '提示');
     exit;
   end;
+  if Trim(Edit14.Text) = '' then
+  begin                                    
+
+  end
+  else                        
+  begin
+    if (strtofloatdef(trim(MJMaoZ.Text), 0) < 5) or (strtofloatdef(trim(MJQty4.Text), 0) < 5) then
+    begin
+//    application.MessageBox('重量不能提交', '提示');
+      exit;
+    end;
+  end;
+
   if Trim(FAPID) = '' then
     Exit;
 
@@ -3874,5 +3890,17 @@ begin
   end;
 end;
 
+procedure TfrmMJManageNewFDNewSF.Edit14Click(Sender: TObject);
+begin
+  if Trim(Edit14.Text) = '' then
+  begin
+    Edit14.Text := '√';
+  end
+  else
+  begin
+    Edit14.Text := '';
+  end;
+end;
+
 end.
 

打卷检验管理/U_ProductOrderLBNameSet.pas

@@ -840,7 +840,7 @@ begin
     sql.Add(' ' + quotedstr(trim(DName)));
     sql.Add(',getdate() ');
      sql.Add(',' + quotedstr(trim(self.Caption)));
-    sql.Add(',' + quotedstr(trim('卷号规则')));
+    sql.Add(',' + quotedstr(trim('寧刻데얩뵀방橙')));
     sql.Add(',' + quotedstr(trim('指示单号:' + trim(Order_Main.FieldByName('orderno').AsString) + ' 子表:' + trim(Order_Main.FieldByName('subID').AsString) + '原本规则:' + trim(Order_Main.FieldByName('Orddefstr15').AsString) + '更改之后:' + trim(mvalues))));
     sql.Add(',' + quotedstr(trim('成功')));
     sql.Add(')');