码单修改

染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.dfm

@@ -1,7 +1,7 @@
 object frmMarkingInspection: TfrmMarkingInspection
-  Left = 382
-  Top = 111
-  Width = 1036
+  Left = 404
+  Top = 40
+  Width = 1153
   Height = 733
   Caption = #25104#21697#26816#39564
   Color = clBtnFace
@@ -21,7 +21,7 @@ object frmMarkingInspection: TfrmMarkingInspection
     Left = 794
     Top = 85
     Width = 241
-    Height = 592
+    Height = 609
     Align = alLeft
     TabOrder = 1
     object SpeedButton13: TSpeedButton
@@ -478,14 +478,14 @@ object frmMarkingInspection: TfrmMarkingInspection
     Left = 0
     Top = 85
     Width = 369
-    Height = 592
+    Height = 609
     Align = alLeft
     BevelInner = bvRaised
     BevelOuter = bvLowered
     TabOrder = 2
     object Label9: TLabel
       Left = 164
-      Top = 283
+      Top = 274
       Width = 15
       Height = 22
       Caption = 'M'
@@ -500,7 +500,7 @@ object frmMarkingInspection: TfrmMarkingInspection
     end
     object Label4: TLabel
       Left = 164
-      Top = 188
+      Top = 179
       Width = 28
       Height = 22
       Caption = 'KG'
@@ -512,8 +512,8 @@ object frmMarkingInspection: TfrmMarkingInspection
       ParentFont = False
     end
     object Label5: TLabel
-      Left = 13
-      Top = 282
+      Left = 77
+      Top = 585
       Width = 40
       Height = 23
       Caption = #38271#24230
@@ -527,7 +527,7 @@ object frmMarkingInspection: TfrmMarkingInspection
     end
     object Label11: TLabel
       Left = 13
-      Top = 188
+      Top = 179
       Width = 40
       Height = 23
       Caption = #27611#37325
@@ -579,7 +579,7 @@ object frmMarkingInspection: TfrmMarkingInspection
     end
     object Label30: TLabel
       Left = 13
-      Top = 94
+      Top = 85
       Width = 40
       Height = 23
       Caption = #30382#37325
@@ -592,7 +592,7 @@ object frmMarkingInspection: TfrmMarkingInspection
     end
     object Label31: TLabel
       Left = 164
-      Top = 141
+      Top = 132
       Width = 28
       Height = 22
       Caption = 'KG'
@@ -605,7 +605,7 @@ object frmMarkingInspection: TfrmMarkingInspection
     end
     object Label32: TLabel
       Left = 13
-      Top = 141
+      Top = 132
       Width = 40
       Height = 23
       Caption = #20928#37325
@@ -618,7 +618,7 @@ object frmMarkingInspection: TfrmMarkingInspection
     end
     object Label33: TLabel
       Left = 164
-      Top = 94
+      Top = 85
       Width = 28
       Height = 22
       Caption = 'KG'
@@ -644,7 +644,7 @@ object frmMarkingInspection: TfrmMarkingInspection
     end
     object Label36: TLabel
       Left = 13
-      Top = 45
+      Top = 36
       Width = 40
       Height = 23
       Caption = #21367#21495
@@ -657,7 +657,7 @@ object frmMarkingInspection: TfrmMarkingInspection
     end
     object Label37: TLabel
       Left = 203
-      Top = 282
+      Top = 273
       Width = 40
       Height = 23
       Caption = #32568#21495
@@ -670,7 +670,7 @@ object frmMarkingInspection: TfrmMarkingInspection
     end
     object Label38: TLabel
       Left = 11
-      Top = 234
+      Top = 225
       Width = 40
       Height = 23
       Caption = #31995#25968
@@ -683,7 +683,7 @@ object frmMarkingInspection: TfrmMarkingInspection
     end
     object Label3: TLabel
       Left = 205
-      Top = 141
+      Top = 132
       Width = 40
       Height = 23
       Caption = #29677#21035
@@ -696,7 +696,7 @@ object frmMarkingInspection: TfrmMarkingInspection
     end
     object Label6: TLabel
       Left = 205
-      Top = 234
+      Top = 225
       Width = 40
       Height = 23
       Caption = #26694#21495
@@ -709,7 +709,7 @@ object frmMarkingInspection: TfrmMarkingInspection
     end
     object Label13: TLabel
       Left = 205
-      Top = 94
+      Top = 85
       Width = 40
       Height = 23
       Caption = #20811#37325
@@ -722,7 +722,7 @@ object frmMarkingInspection: TfrmMarkingInspection
     end
     object Label15: TLabel
       Left = 205
-      Top = 46
+      Top = 37
       Width = 40
       Height = 23
       Caption = #38376#24133
@@ -733,9 +733,48 @@ object frmMarkingInspection: TfrmMarkingInspection
       Font.Style = []
       ParentFont = False
     end
-    object MJLen: TEdit
-      Left = 57
+    object Label14: TLabel
+      Left = 13
+      Top = 324
+      Width = 40
+      Height = 23
+      Caption = #26631#31614
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clBlack
+      Font.Height = -20
+      Font.Name = 'Arial'
+      Font.Style = []
+      ParentFont = False
+    end
+    object Label16: TLabel
+      Left = 10
       Top = 273
+      Width = 40
+      Height = 23
+      Caption = #27454#21495
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clBlack
+      Font.Height = -20
+      Font.Name = 'Arial'
+      Font.Style = []
+      ParentFont = False
+    end
+    object Label22: TLabel
+      Left = 192
+      Top = 177
+      Width = 60
+      Height = 23
+      Caption = #35746#21333#21495
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clBlack
+      Font.Height = -20
+      Font.Name = 'Arial'
+      Font.Style = []
+      ParentFont = False
+    end
+    object MJLen: TEdit
+      Left = 121
+      Top = 576
       Width = 102
       Height = 41
       Font.Charset = GB2312_CHARSET
@@ -751,7 +790,7 @@ object frmMarkingInspection: TfrmMarkingInspection
     end
     object MJMaoZ: TEdit
       Left = 57
-      Top = 179
+      Top = 170
       Width = 102
       Height = 41
       Font.Charset = GB2312_CHARSET
@@ -848,7 +887,7 @@ object frmMarkingInspection: TfrmMarkingInspection
     end
     object MJQty3: TEdit
       Left = 57
-      Top = 85
+      Top = 76
       Width = 102
       Height = 41
       Font.Charset = GB2312_CHARSET
@@ -863,7 +902,7 @@ object frmMarkingInspection: TfrmMarkingInspection
     end
     object MJQty4: TEdit
       Left = 57
-      Top = 132
+      Top = 123
       Width = 102
       Height = 41
       Font.Charset = GB2312_CHARSET
@@ -902,7 +941,7 @@ object frmMarkingInspection: TfrmMarkingInspection
     end
     object MJStr4: TEdit
       Left = 247
-      Top = 273
+      Top = 264
       Width = 102
       Height = 41
       Font.Charset = GB2312_CHARSET
@@ -917,7 +956,7 @@ object frmMarkingInspection: TfrmMarkingInspection
     end
     object mjxh: TEdit
       Left = 57
-      Top = 36
+      Top = 27
       Width = 101
       Height = 41
       Font.Charset = GB2312_CHARSET
@@ -931,7 +970,7 @@ object frmMarkingInspection: TfrmMarkingInspection
     end
     object MKXS: TEdit
       Left = 55
-      Top = 225
+      Top = 216
       Width = 102
       Height = 41
       Font.Charset = GB2312_CHARSET
@@ -946,7 +985,7 @@ object frmMarkingInspection: TfrmMarkingInspection
     end
     object MJBanZu: TComboBox
       Left = 249
-      Top = 132
+      Top = 123
       Width = 102
       Height = 40
       Style = csDropDownList
@@ -966,7 +1005,7 @@ object frmMarkingInspection: TfrmMarkingInspection
     end
     object KuangHao: TEdit
       Left = 249
-      Top = 225
+      Top = 216
       Width = 102
       Height = 41
       Font.Charset = GB2312_CHARSET
@@ -980,8 +1019,8 @@ object frmMarkingInspection: TfrmMarkingInspection
       OnKeyPress = MJstr3KeyPress
     end
     object KuWei: TEdit
-      Left = 249
-      Top = 179
+      Left = 297
+      Top = 562
       Width = 102
       Height = 41
       Font.Charset = GB2312_CHARSET
@@ -991,12 +1030,13 @@ object frmMarkingInspection: TfrmMarkingInspection
       Font.Style = [fsBold]
       ParentFont = False
       TabOrder = 15
+      Visible = False
       OnClick = Edit1Click
       OnKeyPress = MJstr3KeyPress
     end
     object Button3: TButton
-      Left = 199
-      Top = 179
+      Left = 247
+      Top = 562
       Width = 46
       Height = 41
       Caption = #24211#20301
@@ -1007,11 +1047,12 @@ object frmMarkingInspection: TfrmMarkingInspection
       Font.Style = [fsBold]
       ParentFont = False
       TabOrder = 16
+      Visible = False
       OnClick = Button3Click
     end
     object MJKZ: TEdit
       Left = 249
-      Top = 85
+      Top = 76
       Width = 102
       Height = 41
       Font.Charset = GB2312_CHARSET
@@ -1027,7 +1068,7 @@ object frmMarkingInspection: TfrmMarkingInspection
     end
     object MJMF: TEdit
       Left = 249
-      Top = 37
+      Top = 28
       Width = 102
       Height = 41
       Font.Charset = GB2312_CHARSET
@@ -1042,12 +1083,57 @@ object frmMarkingInspection: TfrmMarkingInspection
       OnExit = MJQty4Exit
       OnKeyPress = MJQty4KeyPress
     end
+    object LBName: TComboBox
+      Left = 57
+      Top = 315
+      Width = 296
+      Height = 40
+      Style = csDropDownList
+      Font.Charset = ANSI_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -29
+      Font.Name = 'Times New Roman'
+      Font.Style = [fsBold]
+      ItemHeight = 32
+      ParentFont = False
+      TabOrder = 19
+    end
+    object KuanNo: TEdit
+      Left = 54
+      Top = 264
+      Width = 102
+      Height = 41
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -32
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 20
+      OnClick = Edit1Click
+      OnKeyPress = MJstr3KeyPress
+    end
+    object KHConNo: TEdit
+      Left = 249
+      Top = 168
+      Width = 102
+      Height = 41
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -32
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 21
+      OnClick = Edit1Click
+      OnKeyPress = MJstr3KeyPress
+    end
   end
   object Panel7: TPanel
     Left = 1035
     Top = 85
-    Width = 0
-    Height = 592
+    Width = 102
+    Height = 609
     Align = alClient
     BevelInner = bvRaised
     BevelOuter = bvLowered
@@ -1055,8 +1141,8 @@ object frmMarkingInspection: TfrmMarkingInspection
     object cxGrid2: TcxGrid
       Left = 2
       Top = 2
-      Width = 524
-      Height = 263
+      Width = 98
+      Height = 280
       Align = alClient
       TabOrder = 0
       object Tv2: TcxGridDBTableView
@@ -1148,8 +1234,8 @@ object frmMarkingInspection: TfrmMarkingInspection
     end
     object Panel8: TPanel
       Left = 2
-      Top = 265
-      Width = 524
+      Top = 282
+      Width = 98
       Height = 41
       Align = alBottom
       Caption = 'A<=25     25<B<=33    C>33'
@@ -1164,8 +1250,8 @@ object frmMarkingInspection: TfrmMarkingInspection
     end
     object AOrdDefNote1: TRichEdit
       Left = 2
-      Top = 306
-      Width = 524
+      Top = 323
+      Width = 98
       Height = 284
       Align = alBottom
       Font.Charset = GB2312_CHARSET
@@ -1181,14 +1267,14 @@ object frmMarkingInspection: TfrmMarkingInspection
   object Panel5: TPanel
     Left = 0
     Top = 0
-    Width = 1035
+    Width = 1137
     Height = 85
     Align = alTop
     TabOrder = 0
     object Panel6: TPanel
       Left = 1
       Top = 31
-      Width = 1033
+      Width = 1135
       Height = 53
       Align = alClient
       BevelInner = bvRaised
@@ -1300,6 +1386,19 @@ object frmMarkingInspection: TfrmMarkingInspection
         Font.Style = [fsBold]
         ParentFont = False
       end
+      object Label23: TLabel
+        Left = 979
+        Top = 15
+        Width = 80
+        Height = 19
+        Caption = #25163#21160#21367#21495
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -19
+        Font.Name = #23435#20307
+        Font.Style = [fsBold]
+        ParentFont = False
+      end
       object APID: TEdit
         Left = 87
         Top = 11
@@ -1362,11 +1461,26 @@ object frmMarkingInspection: TfrmMarkingInspection
         TabOrder = 3
         OnClick = edtDelClick
       end
+      object Edit5: TEdit
+        Left = 950
+        Top = 11
+        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 = 4
+        OnClick = Edit5Click
+      end
     end
     object ToolBar1: TToolBar
       Left = 1
       Top = 1
-      Width = 1033
+      Width = 1135
       Height = 30
       ButtonHeight = 30
       ButtonWidth = 119
@@ -1426,10 +1540,18 @@ object frmMarkingInspection: TfrmMarkingInspection
         ImageIndex = 22
         OnClick = ToolButton2Click
       end
-      object TBClose: TToolButton
+      object ToolButton5: TToolButton
         Left = 447
         Top = 0
         AutoSize = True
+        Caption = #21024#38500
+        ImageIndex = 3
+        OnClick = ToolButton5Click
+      end
+      object TBClose: TToolButton
+        Left = 510
+        Top = 0
+        AutoSize = True
         Caption = #20851#38381
         ImageIndex = 21
         OnClick = TBCloseClick
@@ -1440,7 +1562,7 @@ object frmMarkingInspection: TfrmMarkingInspection
     Left = 786
     Top = 85
     Width = 8
-    Height = 592
+    Height = 609
     HotZoneClassName = 'TcxMediaPlayer9Style'
     Control = Panel1
   end
@@ -1448,7 +1570,7 @@ object frmMarkingInspection: TfrmMarkingInspection
     Left = 369
     Top = 85
     Width = 417
-    Height = 592
+    Height = 609
     Align = alLeft
     Caption = 'Panel1'
     TabOrder = 7
@@ -1456,7 +1578,7 @@ object frmMarkingInspection: TfrmMarkingInspection
       Left = 1
       Top = 1
       Width = 415
-      Height = 590
+      Height = 607
       Align = alClient
       TabOrder = 0
       object Tv3: TcxGridDBTableView
@@ -1553,7 +1675,7 @@ object frmMarkingInspection: TfrmMarkingInspection
   end
   object Panel3: TPanel
     Left = 398
-    Top = 443
+    Top = 435
     Width = 383
     Height = 231
     BevelInner = bvRaised
@@ -2133,4 +2255,11 @@ object frmMarkingInspection: TfrmMarkingInspection
     Left = 872
     Top = 4
   end
+  object ADOQuery1: TADOQuery
+    Connection = DataLink_DyeingFinishingPlan.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 744
+    Top = 192
+  end
 end

染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.pas

@@ -28,7 +28,7 @@ uses
 type
   TfrmMarkingInspection = class(TForm)
     cxStyleRepository1: TcxStyleRepository;
-    cxStyle1: TcxStyle;                               
+    cxStyle1: TcxStyle;
     cxStyle2: TcxStyle;
     cxGridPopupMenu1: TcxGridPopupMenu;
     DataSource1: TDataSource;
@@ -195,6 +195,16 @@ type
     v3Column3: TcxGridDBColumn;
     cxGridLevel2: TcxGridLevel;
     QryCheckNet: TADOQuery;
+    ToolButton5: TToolButton;
+    Label14: TLabel;
+    LBName: TComboBox;
+    ADOQuery1: TADOQuery;
+    Label16: TLabel;
+    KuanNo: TEdit;
+    Label22: TLabel;
+    KHConNo: TEdit;
+    Edit5: TEdit;
+    Label23: TLabel;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
@@ -234,6 +244,8 @@ type
     procedure Button3Click(Sender: TObject);
     procedure ToolButton4Click(Sender: TObject);
     procedure edtDelClick(Sender: TObject);
+    procedure ToolButton5Click(Sender: TObject);
+    procedure Edit5Click(Sender: TObject);
   private
     { Private declarations }
     FColumn, FAPID, FMainId, FSubId, FFFMJID, FOperationStatus: string;
@@ -435,17 +447,17 @@ begin
   MJQty3.Text := '';
   MJQty4.Text := '';
   KuangHao.Text := '';
-
+  KuanNo.Text := '';
 end;
 
 procedure TfrmMarkingInspection.PrintCKMDG(MRKOrdID: string);
 var
   fPrintFile: string;
   Txt, fImagePath: string;
-  Moudle: THandle;
+  Moudle: THandle;                                   
   Makebar: TMakebar;
   Mixtext: TMixtext;
-begin
+begin                                       
 
   with ADOQueryPrint do
   begin
@@ -529,6 +541,8 @@ begin
     MJMaoZ.Text := Trim(ADOTmp.fieldbyname('MJMaoZ').AsString);
     KuWei.Text := Trim(ADOTmp.fieldbyname('KuWei').AsString);
     KuangHao.Text := Trim(ADOTmp.fieldbyname('KuangHao').AsString);
+    KuanNo.Text := Trim(ADOTmp.fieldbyname('PRTKuanNo').AsString);
+    KHConNo.Text := Trim(ADOTmp.fieldbyname('KHConNo').AsString);
     MKXS.Text := Trim(ADOTmp.fieldbyname('Xs').AsString);
     MJBanZu.ItemIndex := MJBanZu.Items.IndexOf(trim(ADOTmp.fieldbyname('MJBanZu').AsString));
 
@@ -605,6 +619,9 @@ begin
 
     MJMF.Text := Trim(ADOTmp.fieldbyname('KKMF').AsString);
     MJKZ.Text := Trim(ADOTmp.fieldbyname('KKKZ').AsString);
+    KuanNo.Text := Trim(ADOTmp.fieldbyname('PRTKuanNo').AsString);
+    KHConNo.Text := Trim(ADOTmp.fieldbyname('KHConNo').AsString);
+
 
     MJstr4.Text := '';
     lblCode.Caption := Trim(ADOTmp.fieldbyname('MPRTCode').AsString);
@@ -822,10 +839,18 @@ begin
 end;
 
 procedure TfrmMarkingInspection.FormShow(Sender: TObject);
+var
+  MSQL: string;
 begin
   InitJP();
   InitCDGrid();
 
+  MSQL := ' select LabelCaption Name from P_Label';
+  SInitComBoxBySql(ADOQuery1, LBName, false, MSQL);
+//
+// fsj := 'select distinct(Filler) name from WFB_MJJY   ';
+//  SInitComBoxBySql(ADOQueryCmd, Filler, False, fsj);
+
   if trim(Edit7.Text) = '√' then
     IsJsMessage := true;
 
@@ -980,6 +1005,8 @@ begin
 
       FieldByName('MJBanZu').Value := MJBanZu.Text;
       FieldByName('KuangHao').Value := KuangHao.Text;
+      FieldByName('KuanNo').Value := KuanNo.Text;
+      FieldByName('KHConNo').Value := KHConNo.Text;
       FieldByName('KuWei').Value := KuWei.Text;
       FieldByName('baoNO').Value := '';
       FieldByName('baoID').Value := '';
@@ -1210,7 +1237,12 @@ begin
     SQL.Add(' @MJID=''' + Trim(FMJID) + '''');
     Open;
   end;
-  if ADOQueryPrint.IsEmpty then
+//  if ADOQueryPrint.IsEmpty then
+//  begin
+//    application.MessageBox('标签内容未找到！', '提示信息', MB_ICONERROR);
+//    exit;
+//  end;
+  if LBName.text = '' then
   begin
     application.MessageBox('标签内容未找到！', '提示信息', MB_ICONERROR);
     exit;
@@ -1246,10 +1278,13 @@ begin
     application.MessageBox('条形码生成失败！', '提示信息', MB_ICONERROR);
     exit;
   end;
-  ExportFtErpFile(Trim(ADOQueryPrint.fieldbyname('LBName').AsString) + '.rmf', ADOTmp);
-  if Trim(ADOQueryPrint.fieldbyname('LBName').AsString) <> '' then
+//  ExportFtErpFile(Trim(ADOQueryPrint.fieldbyname('LBName').AsString) + '.rmf', ADOTmp);
+  ExportFtErpFile(Trim(LBName.Text) + '.rmf', ADOTmp);
+//  if Trim(ADOQueryPrint.fieldbyname('LBName').AsString) <> '' then
+  if Trim(LBName.Text)<>'' then
   begin
-    fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + Trim(ADOQueryPrint.fieldbyname('LBName').AsString) + '.rmf'
+//    fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + Trim(ADOQueryPrint.fieldbyname('LBName').AsString) + '.rmf'
+      fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + Trim(LBName.Text) + '.rmf'
   end
   else
   begin
@@ -1860,5 +1895,24 @@ begin
   end;
 end;
 
+procedure TfrmMarkingInspection.ToolButton5Click(Sender: TObject);
+begin
+  DelData(Trim(CDS_MJID.fieldbyname('MJID').AsString));
+end;
+
+procedure TfrmMarkingInspection.Edit5Click(Sender: TObject);
+begin
+   if Trim(TEdit(Sender).Text) = '' then
+  begin
+    TEdit(Sender).Text := '√';
+    MJXH.Readonly:=False;
+  end
+  else
+  begin
+    TEdit(Sender).Text := '';
+    MJXH.Readonly:=True;
+  end;
+end;
+
 end.