1

2025-10-29 16:43:44 +08:00 · 2025-10-29 16:43:44 +08:00 · d3bc6ad260
commit d3bc6ad260
parent 36c796ce9a
7 changed files with 89 additions and 31 deletions
--- a/打卷检验管理/U_CKProductJYHZList.pas
+++ b/打卷检验管理/U_CKProductJYHZList.pas
@ -146,20 +146,21 @@ begin
      Close;
      sql.Clear;
      Filtered := False;
-      sql.Add('select convert(char(10),A.fillTime,120) as CRTime,A.MJType as CPType,A.MainId,A.MJTypeother as QtyUnit,A.Mjstr4,C.OrderNo,C.ConNO,D.PRTCodeName,D.PrtColor,D.PrtHX,D.SOrddefstr4, ');
+      sql.Add('select convert(char(10),A.fillTime,120) as CRTime,A.MJType as CPType,A.MainId,A.MJTypeother as QtyUnit,C.OrderNo,C.ConNO, ');
      sql.Add('count(A.MainId) as JQty,SUM(A.MJLen) as Qty,SUM(A.MJMaoZ) as KGQty,SUM(A.MJQty4) as MJQty4,');
-      sql.Add('JQty=(select count(*) from WFB_MJJY X where X.SubId=A.SubId),');
-      sql.Add('SCKROLL=(select sum(mjlen) from WFB_MJJY X where X.SubId=A.SubId and X.ckflag=''已出库''),');
-      sql.Add('SkcROLL=(select sum(mjlen) from WFB_MJJY X where X.SubId=A.SubId and X.ckflag=''未出库''),');
-      sql.Add('CKROLL=(select count(*) from WFB_MJJY X where X.SubId=A.SubId and X.ckflag=''已出库''),');
-      sql.Add('KCROLL=(select count(*) from WFB_MJJY X where X.SubId=A.SubId and X.ckflag=''未出库''),');
-      sql.Add('khconNO=(select top 1 khconNo from JYOrderCon_Main X where X.conNO=C.conNO)');
+      sql.Add('JQty=(select count(*) from WFB_MJJY X where X.MainId=A.MainId),');
+      sql.Add('SCKROLL=(select sum(mjlen) from WFB_MJJY X where X.MainId=A.MainId and X.ckflag=''已出库''),');
+      sql.Add('SkcROLL=(select sum(mjlen) from WFB_MJJY X where X.MainId=A.MainId and X.ckflag=''未出库''),');
+      sql.Add('CKROLL=(select count(*) from WFB_MJJY X where X.MainId=A.MainId and X.ckflag=''已出库''),');
+      sql.Add('KCROLL=(select count(*) from WFB_MJJY X where X.MainId=A.MainId and X.ckflag=''未出库''),');
+      sql.Add('khconNO=(select top 1 khconNo from JYOrderCon_Main X where X.conNO=C.conNO),');
+      sql.add('PRTCodeName=(select top 1 PRTCodeName from JYOrder_Sub d where d.MainId=A.MainId)');
      sql.Add('from WFB_MJJY A ');
      sql.Add('inner join JYOrder_Main C on C.MainId=A.MainId ');
-      sql.Add('inner join JYOrder_sub D on D.subID=A.subID ');
+
      Sql.add('where A.fillTime>=''' + formatdateTime('yyyy-MM-dd', begdate.Date) + ''' ');
      Sql.add('and A.fillTime<''' + formatdateTime('yyyy-MM-dd', enddate.Date + 1) + ''' ');
-      Sql.add('group by convert(char(10),A.fillTime,120),A.SubId,A.MJType,A.MainId,A.MJTypeother,A.Mjstr4,C.OrderNo,C.ConNO,D.PRTCodeName,D.PrtColor,D.PrtHX,D.SOrddefstr4');
+      Sql.add('group by convert(char(10),A.fillTime,120),A.MJType,A.MainId,A.MJTypeother,C.OrderNo,C.ConNO');
      Open;
      //ShowMessage(SQL.Text);
    end;
@ -292,15 +293,17 @@ begin
 end;

 procedure TfrmCKProductJYHZList.ToolButton1Click(Sender: TObject);
+
 begin
  if cds_main.IsEmpty then
    Exit;
  frmJYOrderCDOne := TfrmJYOrderCDOne.Create(Application);
  with frmJYOrderCDOne do
  begin
-    orderno.Text := trim(self.CDS_Main.fieldbyname('orderno').asstring);
-    gangno.Text := trim(self.CDS_Main.fieldbyname('MJStr4').asstring);
-    PRTColor.Text := trim(self.CDS_Main.fieldbyname('PRTColor').asstring);
+   Fmainid := trim(self.CDS_Main.fieldbyname('MAINID').asstring);
+   // orderno.Text := trim(self.CDS_Main.fieldbyname('orderno').asstring);
+    //gangno.Text := trim(self.CDS_Main.fieldbyname('MJStr4').asstring);
+    //PRTColor.Text := trim(self.CDS_Main.fieldbyname('PRTColor').asstring);
    if ShowModal = 1 then
    begin
    //     InitGrid();
--- a/打卷检验管理/U_ClothHCList.dfm
+++ b/打卷检验管理/U_ClothHCList.dfm
@ -1,6 +1,6 @@
 object frmClothHCList: TfrmClothHCList
-  Left = 377
-  Top = 240
+  Left = 471
+  Top = 443
  Width = 1179
  Height = 705
  Caption = #26816#39564#25351#31034#21333#26597#35810
@ -20,7 +20,7 @@ object frmClothHCList: TfrmClothHCList
  object ToolBar1: TToolBar
    Left = 0
    Top = 0
-    Width = 1163
+    Width = 1171
    AutoSize = True
    ButtonHeight = 30
    ButtonWidth = 59
@ -66,7 +66,7 @@ object frmClothHCList: TfrmClothHCList
  object Panel1: TPanel
    Left = 0
    Top = 32
-    Width = 1163
+    Width = 1171
    Height = 73
    Align = alTop
    BevelInner = bvRaised
@ -289,8 +289,8 @@ object frmClothHCList: TfrmClothHCList
  object cxGrid2: TcxGrid
    Left = 0
    Top = 105
-    Width = 1163
-    Height = 561
+    Width = 1171
+    Height = 569
    Align = alClient
    TabOrder = 2
    object TV2: TcxGridDBTableView
--- a/打卷检验管理/U_JYOrderCDOne.dfm
+++ b/打卷检验管理/U_JYOrderCDOne.dfm
@ -1,6 +1,6 @@
 object frmJYOrderCDOne: TfrmJYOrderCDOne
-  Left = 383
-  Top = 471
+  Left = 1020
+  Top = 275
  Width = 1400
  Height = 757
  Caption = #26816#39564#25253#21578
@ -1799,8 +1799,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne
    end
  end
  object Panel13: TPanel
-    Left = 120
-    Top = 376
+    Left = 248
+    Top = 480
    Width = 273
    Height = 129
    Color = clSkyBlue
--- a/打卷检验管理/U_JYOrderCDOne.pas
+++ b/打卷检验管理/U_JYOrderCDOne.pas
@ -299,6 +299,7 @@ type
    { Private declarations }
  public
    FFInt: Integer;
+    FMAINID: string;

    { Public declarations }
  end;
@ -375,7 +376,7 @@ end;
 procedure TfrmJYOrderCDOne.TBCloseClick(Sender: TObject);
 begin
  Close;
-  WriteCxGrid('检验报告JF', Tv1, '检验管理报告');
+  WriteCxGrid('检验管理报告JF', Tv1, '检验管理报告');
 end;

 procedure TfrmJYOrderCDOne.InitGrid();
@ -404,6 +405,10 @@ begin
      begin
        sql.add('and mjtype=''´ÎÆ·'' ');
      end;
+      if Trim(fmainid) <> '' then
+      begin
+        sql.add('and C.mainid=''' + fmainid + ''' ');
+      end;
      sql.add('order by A.mainid,B.prtcolor,gangno,A.mjxh');
      Open;
    end;
@ -466,7 +471,7 @@ procedure TfrmJYOrderCDOne.InitForm();
 var
  fsj, Strmd: string;
 begin
-  ReadCxGrid('检验报告JF', Tv1, '检验管理报告');
+  ReadCxGrid('检验管理报告JF', Tv1, '检验管理报告');
  fsj := 'select distinct(Filler) name from WFB_MJJY   ';
  Strmd := 'select distinct(text) name,index1 from A_MaDan order by index1  ';
  SInitComBoxBySql(ADOQueryCmd, Filler, False, fsj);
@ -555,7 +560,7 @@ begin
    TBManage.Visible := False;
    Toolbutton1.visible := False;
    Toolbutton3.visible := False;
-    v1Column22.visible := False;
+    //v1Column22.visible := False;
 //    TCPDB.Visible:=False;
  end;
 end;
@ -1674,6 +1679,31 @@ begin
    end;
  end;

+  if (trim(ComboBox1.Text) = '迦泽码单(实际米数)') then
+  begin
+    with ADOQueryTemp do
+    begin
+      Close;
+      sql.Clear;
+      sql.add('exec P_Print_CKMDYDL_M ');
+      sql.add('@DName=' + quotedstr(Trim(DCode)));
+      Open;
+    end;
+    SCreateCDS20(ADOQueryTemp, CDS_HZ);
+    SInitCDSData20(ADOQueryTemp, CDS_HZ);
+
+    with ADOQueryPrint do
+    begin
+      Close;
+      sql.Clear;
+      sql.add('exec P_Do_PrintMd_HZ ');
+      sql.add('@mainID=' + quotedstr(Trim('')));
+      sql.add(',@DName=' + quotedstr(Trim(DCode)));
+      sql.add(',@flag=''2'' ');
+      Open;
+    end;
+  end;
+
  if (trim(ComboBox1.Text) = '¼ìÑéÂëµ¥(È¾É«)') then
  begin
    with ADOQueryTemp do
--- a/打卷检验管理/U_MJManageNewFDNew.dfm
+++ b/打卷检验管理/U_MJManageNewFDNew.dfm
@ -1,6 +1,6 @@
 object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
-  Left = 369
-  Top = 423
+  Left = 451
+  Top = 597
  Width = 1366
  Height = 754
  Caption = #25104#21697#26816#39564
@ -2306,7 +2306,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
    Height = 30
    AutoSize = True
    ButtonHeight = 30
-    ButtonWidth = 105
+    ButtonWidth = 115
    Caption = 'ToolBar1'
    Color = clSkyBlue
    EdgeInner = esNone
@ -2486,6 +2486,14 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
      ImageIndex = 55
      OnClick = TBCloseClick
    end
+    object ToolButton1: TToolButton
+      Left = 1022
+      Top = 0
+      Caption = #21462#28040#20462#25913
+      ImageIndex = 56
+      Visible = False
+      OnClick = ToolButton1Click
+    end
  end
  object Panel6: TPanel
    Left = 0
@ -2717,6 +2725,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
      Top = 27
      Width = 28
      Height = 27
+      Enabled = False
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
      Font.Height = -19
@ -2734,6 +2743,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
      Top = 27
      Width = 28
      Height = 27
+      Enabled = False
      Font.Charset = GB2312_CHARSET
      Font.Color = clWindowText
      Font.Height = -19
--- a/打卷检验管理/U_MJManageNewFDNew.pas
+++ b/打卷检验管理/U_MJManageNewFDNew.pas
@ -264,6 +264,7 @@ type
    Label43: TLabel;
    Label53: TLabel;
    Consignee: TEdit;
+    ToolButton1: TToolButton;
    procedure FormDestroy(Sender: TObject);
    procedure FormClose(Sender: TObject; var Action: TCloseAction);
    procedure TBCloseClick(Sender: TObject);
@ -322,6 +323,7 @@ type
    procedure Timer1Timer(Sender: TObject);
    procedure TBCDClick(Sender: TObject);
    procedure Edit5Click(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
  private
    { Private declarations }
    FInt, PState, PrintInt, SCInitGrid, FState, FCK: Integer;
@ -1753,6 +1755,8 @@ begin
  MJLen.SetFocus;
 //  MJQty4.OnClick(MJQty4);
  MJLen.OnClick(Mjlen);
+  Edit7.text := '¡Ì';
+  Edit9.text := '¡Ì';

 end;

@ -2706,6 +2710,9 @@ end;

 procedure TfrmMJManageNewFDNewSF.ToolButton2Click(Sender: TObject);
 begin
+  Edit7.Text := '';
+  Edit9.Text := '';
+  ToolButton1.Visible := True;
  if CDS_MJID.IsEmpty then
    exit;
  if CDS_MJCD.IsEmpty = False then
@ -2997,5 +3004,13 @@ begin
  end;
 end;

+procedure TfrmMJManageNewFDNewSF.ToolButton1Click(Sender: TObject);
+begin
+  Edit7.text := '¡Ì';
+  Edit9.text := '¡Ì';
+  APID.Text := FAPID;
+  Button3.Click;
+end;
+
 end.

--- a/打卷检验管理/U_OrderInPut.dfm
+++ b/打卷检验管理/U_OrderInPut.dfm
@ -1,6 +1,6 @@
 object frmOrderInPut: TfrmOrderInPut
-  Left = 428
-  Top = 683
+  Left = 524
+  Top = 459
  Width = 1379
  Height = 761
  Caption = #25351#31034#21333#24405#20837