10.29cxz

云翔OA(WTOA.dll)/WTOA.dof

@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=E:\项目资料\00_重点客户\云翔\D7myYunxiang\云翔OA(WTOA.dll)\testDll.exe
+HostApplication=D:\Project\D7myYunxiang\ÔÆÏèOA(WTOA.dll)\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=

云翔一码通/U_GetDllForm.pas

@@ -16,6 +16,8 @@ uses
   U_DataLink, U_YMTRKList, U_YMTFHSQList, U_YMTFHDataList, U_YMTJGWCList,
   U_YMTStockList;
 
+var
+  frmYMTFHSQListJG, frmYMTFHSQListXS: TfrmYMTFHSQList;
        /////////////////////////////////////////////////////////////////
       //         功能说明:取Dll中得窗体                              //
      //        参数说明：App>>调用应用程序；                        //
@@ -186,15 +188,15 @@ begin
         begin
           if App.MainForm.MDIChildren[i].Caption = '销售发货申请' then
           begin
-            BringWindowToTop(frmYMTFHSQList.Handle);
+            BringWindowToTop(frmYMTFHSQListXS.Handle);
             bFound := TRUE;
             Break;
           end;
         end;
         if not bFound then
         begin
-          frmYMTFHSQList := TfrmYMTFHSQList.Create(application.MainForm);
-          with frmYMTFHSQList do
+          frmYMTFHSQListXS := TfrmYMTFHSQList.Create(application.MainForm);
+          with frmYMTFHSQListXS do
           begin
             Title := '销售发货申请';
             caption := Trim(Title);
@@ -205,9 +207,9 @@ begin
           end;
         end
         else
-          frmYMTFHSQList.BringToFront;
+          frmYMTFHSQListXS.BringToFront;
        //句柄
-        mnewHandle := frmYMTFHSQList.Handle;
+        mnewHandle := frmYMTFHSQListXS.Handle;
       end;
     212:  //发货数据
       begin
@@ -235,15 +237,15 @@ begin
         begin
           if App.MainForm.MDIChildren[i].Caption = '加工发货登记' then
           begin
-            BringWindowToTop(frmYMTFHSQList.Handle);
+            BringWindowToTop(frmYMTFHSQListJG.Handle);
             bFound := TRUE;
             Break;
           end;
         end;
         if not bFound then
         begin
-          frmYMTFHSQList := TfrmYMTFHSQList.Create(application.MainForm);
-          with frmYMTFHSQList do
+          frmYMTFHSQListJG := TfrmYMTFHSQList.Create(application.MainForm);
+          with frmYMTFHSQListJG do
           begin
             Title := '加工发货登记';
             caption := Trim(Title);
@@ -254,9 +256,9 @@ begin
           end;
         end
         else
-          frmYMTFHSQList.BringToFront;
+          frmYMTFHSQListJG.BringToFront;
        //句柄
-        mnewHandle := frmYMTFHSQList.Handle;
+        mnewHandle := frmYMTFHSQListJG.Handle;
       end;
   end;
 

云翔一码通/U_YMTFHSQInPut.dfm

@@ -1,6 +1,6 @@
 object frmFHSQInPut: TfrmFHSQInPut
-  Left = 677
-  Top = 428
+  Left = 444
+  Top = 375
   Width = 1499
   Height = 664
   Caption = #21457#36135#30003#35831#24405#20837
@@ -178,7 +178,7 @@ object frmFHSQInPut: TfrmFHSQInPut
       Left = 123
       Top = 75
       Width = 714
-      Height = 28
+      Height = 25
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -19
@@ -193,7 +193,7 @@ object frmFHSQInPut: TfrmFHSQInPut
       Left = 469
       Top = 7
       Width = 373
-      Height = 31
+      Height = 28
       Hint = 'KHNo'
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
@@ -231,7 +231,7 @@ object frmFHSQInPut: TfrmFHSQInPut
       Left = 123
       Top = 38
       Width = 135
-      Height = 31
+      Height = 28
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -19
@@ -248,7 +248,7 @@ object frmFHSQInPut: TfrmFHSQInPut
       Left = 936
       Top = 8
       Width = 120
-      Height = 28
+      Height = 25
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -19

云翔一码通/U_YMTFHSQInPut.pas

@@ -327,6 +327,7 @@ begin
   if SaveData() then
   begin
     Application.MessageBox('保存成功！', '提示', 0);
+    TBClose.Click;
   end;
 end;
 
@@ -487,7 +488,7 @@ begin
 
       FKHNo := Trim(SHDanWei.TxtCode);
 //      FTT := Trim(FHTaiTou.text);
-
+      v1Column2.Visible := true;
       if ShowModal = 1 then
       begin
         while frmOrderSel.CDS_Main.Locate('SSel', true, []) do

云翔一码通/U_YMTFHSQInPut2.dfm

@@ -1,6 +1,6 @@
 object frmFHSQInPut2: TfrmFHSQInPut2
-  Left = 357
-  Top = 336
+  Left = 766
+  Top = 507
   Width = 1499
   Height = 664
   Caption = #21457#36135#30003#35831#24405#20837
@@ -98,8 +98,8 @@ object frmFHSQInPut2: TfrmFHSQInPut2
     end
     object Label11: TLabel
       Tag = 1
-      Left = 380
-      Top = 12
+      Left = 301
+      Top = 44
       Width = 100
       Height = 19
       Caption = #25910#36135#21333#20301#65306
@@ -112,8 +112,8 @@ object frmFHSQInPut2: TfrmFHSQInPut2
     end
     object Label2: TLabel
       Tag = 1
-      Left = 380
-      Top = 43
+      Left = 300
+      Top = 12
       Width = 100
       Height = 19
       Caption = #30003#35831#26085#26399#65306
@@ -127,7 +127,7 @@ object frmFHSQInPut2: TfrmFHSQInPut2
     object Label5: TLabel
       Tag = 1
       Left = 53
-      Top = 43
+      Top = 44
       Width = 80
       Height = 19
       Caption = #19994#21153#21592#65306
@@ -140,8 +140,8 @@ object frmFHSQInPut2: TfrmFHSQInPut2
     end
     object Label3: TLabel
       Tag = 1
-      Left = 849
-      Top = 12
+      Left = 848
+      Top = 11
       Width = 80
       Height = 19
       Caption = #21152#24037#31867#22411
@@ -152,11 +152,39 @@ object frmFHSQInPut2: TfrmFHSQInPut2
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object Label4: TLabel
+      Tag = 1
+      Left = 847
+      Top = 42
+      Width = 80
+      Height = 19
+      Caption = #21152#24037#24037#33402
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object Label6: TLabel
+      Tag = 1
+      Left = 558
+      Top = 11
+      Width = 120
+      Height = 19
+      Caption = #25910#36135#21333#20301#31867#22411
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
     object CRType: TComboBox
       Tag = 1
-      Left = 121
+      Left = 122
       Top = 8
-      Width = 250
+      Width = 150
       Height = 27
       Style = csDropDownList
       Font.Charset = GB2312_CHARSET
@@ -168,11 +196,10 @@ object frmFHSQInPut2: TfrmFHSQInPut2
       ItemHeight = 19
       ParentFont = False
       TabOrder = 0
+      OnChange = CRTypeChange
       Items.Strings = (
-        #21152#24037#20869#38144
-        #21152#24037#22806#38144
-        #21152#24037#20986#24211
-        '')
+        #22806#21457#21152#24037
+        #26412#21378#21152#24037)
     end
     object Note: TEdit
       Tag = 1
@@ -191,9 +218,9 @@ object frmFHSQInPut2: TfrmFHSQInPut2
     end
     object SHDanWei: TBtnEditC
       Tag = 1
-      Left = 470
-      Top = 7
-      Width = 373
+      Left = 391
+      Top = 39
+      Width = 418
       Height = 28
       Hint = 'KHNo'
       Font.Charset = GB2312_CHARSET
@@ -209,9 +236,9 @@ object frmFHSQInPut2: TfrmFHSQInPut2
     end
     object SQDate: TDateTimePicker
       Tag = 1
-      Left = 470
-      Top = 39
-      Width = 130
+      Left = 390
+      Top = 8
+      Width = 141
       Height = 27
       BevelInner = bvNone
       Date = 43473.670856296290000000
@@ -230,8 +257,8 @@ object frmFHSQInPut2: TfrmFHSQInPut2
     object Salesman: TBtnEditC
       Tag = 1
       Left = 121
-      Top = 38
-      Width = 135
+      Top = 39
+      Width = 150
       Height = 28
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
@@ -244,20 +271,67 @@ object frmFHSQInPut2: TfrmFHSQInPut2
       OnBtnUpClick = SalesmanBtnUpClick
       OnBtnDnClick = SalesmanBtnDnClick
     end
-    object JGType: TEdit
+    object JGType: TComboBox
       Tag = 1
-      Left = 931
-      Top = 8
+      Left = 936
+      Top = 7
       Width = 120
-      Height = 25
+      Height = 27
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -19
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      ItemHeight = 19
       ParentFont = False
       TabOrder = 5
+      Items.Strings = (
+        #38754#24067
+        #24213#24067)
+    end
+    object JGCraft: TComboBox
+      Tag = 1
+      Left = 936
+      Top = 38
+      Width = 120
+      Height = 27
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      ItemHeight = 19
+      ParentFont = False
+      TabOrder = 6
+      Items.Strings = (
+        #26579#33394
+        #32483#33457
+        #22797#21512)
+    end
+    object SHDanWeiType: TComboBox
+      Tag = 1
+      Left = 690
+      Top = 7
+      Width = 120
+      Height = 27
+      Style = csDropDownList
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
+      ItemHeight = 19
+      ItemIndex = 0
+      ParentFont = False
+      TabOrder = 7
+      Text = #20379#24212#21830
+      Items.Strings = (
+        #20379#24212#21830
+        #23458#25143
+        #26412#21378)
     end
   end
   object ToolBar2: TToolBar
@@ -266,7 +340,7 @@ object frmFHSQInPut2: TfrmFHSQInPut2
     Width = 1491
     Height = 29
     ButtonHeight = 30
-    ButtonWidth = 95
+    ButtonWidth = 135
     Caption = 'ToolBar1'
     Color = clBtnFace
     EdgeInner = esNone
@@ -283,17 +357,8 @@ object frmFHSQInPut2: TfrmFHSQInPut2
     ParentFont = False
     ShowCaptions = True
     TabOrder = 2
-    object ToolButton3: TToolButton
-      Left = 0
-      Top = 0
-      AutoSize = True
-      Caption = #35745#21010#21333
-      ImageIndex = 57
-      Visible = False
-      OnClick = ToolButton3Click
-    end
     object ToolButton1: TToolButton
-      Left = 99
+      Left = 0
       Top = 0
       AutoSize = True
       Caption = #24211#23384
@@ -301,13 +366,21 @@ object frmFHSQInPut2: TfrmFHSQInPut2
       OnClick = ToolButton1Click
     end
     object ToolButton2: TToolButton
-      Left = 178
+      Left = 79
       Top = 0
       AutoSize = True
       Caption = #21024#34892
       ImageIndex = 113
       OnClick = ToolButton2Click
     end
+    object ToolButton3: TToolButton
+      Left = 158
+      Top = 0
+      AutoSize = True
+      Caption = #32465#23450#35745#21010#21333
+      ImageIndex = 53
+      OnClick = ToolButton3Click
+    end
   end
   object cxGrid1: TcxGrid
     Left = 0
@@ -317,6 +390,7 @@ object frmFHSQInPut2: TfrmFHSQInPut2
     Align = alClient
     TabOrder = 3
     object Tv1: TcxGridDBTableView
+      PopupMenu = pm1
       Navigator.Buttons.CustomButtons = <>
       DataController.DataSource = DataSource1
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -335,13 +409,16 @@ object frmFHSQInPut2: TfrmFHSQInPut2
         end>
       DataController.Summary.FooterSummaryItems = <
         item
-          Kind = skSum
+          Kind = skCount
+          Column = TV1MXID
         end
         item
           Kind = skSum
+          Column = TV1MQty
         end
         item
           Kind = skSum
+          Column = Tv1KgQty
         end
         item
           Kind = skSum
@@ -362,7 +439,15 @@ object frmFHSQInPut2: TfrmFHSQInPut2
       Styles.IncSearch = DataLink_YXYMT.SHuangSe
       Styles.Selection = DataLink_YXYMT.SHuangSe
       Styles.Header = DataLink_YXYMT.Default
-      object v1Column14: TcxGridDBColumn
+      object Tv1Column4: TcxGridDBColumn
+        Tag = 1
+        Caption = #36873#25321
+        DataBinding.FieldName = 'SSel'
+        PropertiesClassName = 'TcxCheckBoxProperties'
+        HeaderAlignmentHorz = taCenter
+        Width = 40
+      end
+      object TV1MXID: TcxGridDBColumn
         Caption = #32534#21495
         DataBinding.FieldName = 'MXID'
         HeaderAlignmentHorz = taCenter
@@ -388,14 +473,14 @@ object frmFHSQInPut2: TfrmFHSQInPut2
         HeaderAlignmentHorz = taCenter
         Width = 81
       end
-      object v1Column4: TcxGridDBColumn
+      object TV1MQty: TcxGridDBColumn
         Caption = #38271#24230
         DataBinding.FieldName = 'MQty'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 70
       end
-      object Tv1Column1: TcxGridDBColumn
+      object Tv1KgQty: TcxGridDBColumn
         Caption = #37325#37327
         DataBinding.FieldName = 'KgQty'
         HeaderAlignmentHorz = taCenter
@@ -436,6 +521,19 @@ object frmFHSQInPut2: TfrmFHSQInPut2
         HeaderAlignmentHorz = taCenter
         Width = 106
       end
+      object Tv1Column3: TcxGridDBColumn
+        Caption = #35745#21010#21333#21495
+        DataBinding.FieldName = 'SCConNo'
+        PropertiesClassName = 'TcxButtonEditProperties'
+        Properties.Buttons = <
+          item
+            Default = True
+            Kind = bkEllipsis
+          end>
+        Properties.OnButtonClick = Tv1Column3PropertiesButtonClick
+        HeaderAlignmentHorz = taCenter
+        Width = 100
+      end
     end
     object cxGrid1Level1: TcxGridLevel
       GridView = Tv1
@@ -477,4 +575,16 @@ object frmFHSQInPut2: TfrmFHSQInPut2
     Left = 688
     Top = 392
   end
+  object pm1: TPopupMenu
+    Left = 646
+    Top = 394
+    object N2: TMenuItem
+      Caption = #20840#36873
+      OnClick = N2Click
+    end
+    object N1: TMenuItem
+      Caption = #20840#24323
+      OnClick = N1Click
+    end
+  end
 end

云翔一码通/U_YMTFHSQInPut2.pas

@@ -23,7 +23,7 @@ uses
   dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray,
   dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSilver,
   dxSkinStardust, dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinValentine,
-  dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue;
+  dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, cxCheckBox, Menus;
 
 type
   TfrmFHSQInPut2 = class(TForm)
@@ -41,7 +41,7 @@ type
     DataSource1: TDataSource;
     Order_Sub: TClientDataSet;
     ADOQuery1: TADOQuery;
-    v1Column14: TcxGridDBColumn;
+    TV1MXID: TcxGridDBColumn;
     cxGridPopupMenu2: TcxGridPopupMenu;
     Label1: TLabel;
     CRType: TComboBox;
@@ -57,15 +57,24 @@ type
     v1Column1: TcxGridDBColumn;
     v1Column2: TcxGridDBColumn;
     v1Column3: TcxGridDBColumn;
-    v1Column4: TcxGridDBColumn;
+    TV1MQty: TcxGridDBColumn;
     v1Column5: TcxGridDBColumn;
     v1Column10: TcxGridDBColumn;
     ToolButton3: TToolButton;
     Label3: TLabel;
-    JGType: TEdit;
     ToolButton1: TToolButton;
-    Tv1Column1: TcxGridDBColumn;
+    Tv1KgQty: TcxGridDBColumn;
     Tv1Column2: TcxGridDBColumn;
+    Tv1Column3: TcxGridDBColumn;
+    Tv1Column4: TcxGridDBColumn;
+    Label4: TLabel;
+    JGType: TComboBox;
+    JGCraft: TComboBox;
+    Label6: TLabel;
+    SHDanWeiType: TComboBox;
+    pm1: TPopupMenu;
+    N2: TMenuItem;
+    N1: TMenuItem;
     procedure TBCloseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure TBSaveClick(Sender: TObject);
@@ -78,6 +87,10 @@ type
     procedure v1Column10PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
     procedure ToolButton3Click(Sender: TObject);
     procedure ToolButton1Click(Sender: TObject);
+    procedure CRTypeChange(Sender: TObject);
+    procedure Tv1Column3PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+    procedure N2Click(Sender: TObject);
+    procedure N1Click(Sender: TObject);
   private
     fuserName: string;
     procedure InitData();
@@ -107,7 +120,7 @@ uses
 procedure TfrmFHSQInPut2.TBCloseClick(Sender: TObject);
 begin
   Close;
-  WriteCxGrid('发货申请录入1', Tv1, '发货管理');
+  WriteCxGrid('发货申请录入2', Tv1, '发货申请');
 end;
 
 procedure TfrmFHSQInPut2.InitData();
@@ -157,7 +170,7 @@ end;
 
 procedure TfrmFHSQInPut2.FormShow(Sender: TObject);
 begin
-  readCxGrid('发货申请录入1', Tv1, '发货管理');
+  readCxGrid('发货申请录入2', Tv1, '发货申请');
   InitData();
 end;
 
@@ -165,6 +178,7 @@ function TfrmFHSQInPut2.SaveData(): Boolean;
 var
   maxno, maxmnno, FSSId: string;
   fconNO, fmxType: string;
+  MXCount, TotalSum: string;
 begin
   try
     ADOCmd.Connection.BeginTrans;
@@ -201,6 +215,7 @@ begin
       end;
       FieldByName('SQType').Value := '³ÉÆ·';
       FieldByName('FSID').Value := Trim(maxno);
+
       RTSetsavedata(ADOCmd, 'YMT_FHSQ_Main', ScrollBox1, 1);
 
       if Trim(FMainId) = '' then
@@ -270,6 +285,7 @@ begin
           end;
           FieldByName('FSID').Value := Trim(FMainId);
           FieldByName('SSID').Value := Trim(maxno);
+
           RTSetSaveDataCDS(ADOCmd, Tv1, Order_Sub, 'YMT_FHSQ_Sub', 0);
           FieldByName('MainId').Value := Order_Sub.fieldbyname('MainId').Value;
           FieldByName('SubId').Value := Order_Sub.fieldbyname('SubId').Value;
@@ -290,8 +306,9 @@ begin
       Close;
       sql.Clear;
       sql.Add('Update YMT_FHSQ_Main Set ');
-      sql.Add('SQPSHZ=(select Sum(SQPS) from YMT_FHSQ_Sub A where A.FSID=YMT_FHSQ_Main.FSID)');
-      sql.Add(',SQQtyHZM=(select Sum(SQQtyM) from YMT_FHSQ_Sub A where A.FSID=YMT_FHSQ_Main.FSID)');
+      sql.Add('SQPSHZ=(select count(MXID) from YMT_FHSQ_Sub A where A.FSID=YMT_FHSQ_Main.FSID)');
+      sql.Add(',SQQtyHZM=(select Sum(MQty) from YMT_FHSQ_Sub A where A.FSID=YMT_FHSQ_Main.FSID)');
+      sql.Add(',SQQtyHZ=(select Sum(KgQty) from YMT_FHSQ_Sub A where A.FSID=YMT_FHSQ_Main.FSID)');
       sql.Add('where FSID=''' + Trim(FMainId) + '''');
       ExecSQL;
     end;
@@ -325,6 +342,7 @@ begin
   if SaveData() then
   begin
     Application.MessageBox('±£´æ³É¹¦£¡', 'Ìáʾ', 0);
+    TBClose.Click;
   end;
 end;
 
@@ -372,7 +390,7 @@ end;
 procedure TfrmFHSQInPut2.SHDanWeiBtnUpClick(Sender: TObject);
 begin
 
-  if CRType.Text = '加工出库' then
+  if SHDanWeiType.Text = '供应商' then
   begin
     try
       frmZdyAttachGYS := TfrmZdyAttachGYS.Create(Application);
@@ -389,7 +407,7 @@ begin
       frmZdyAttachGYS.Free;
     end;
   end
-  else
+  else if SHDanWeiType.Text = '客户' then
   begin
     try
       frmZdyAttachkh := TfrmZdyAttachkh.Create(Application);
@@ -482,59 +500,85 @@ begin
     frmOrderSel := TfrmOrderSel.Create(Application);
     with frmOrderSel do
     begin
-
       FKHNo := Trim(SHDanWei.TxtCode);
-//      FTT := Trim(FHTaiTou.text);
+      ToolButton1.Visible := False;
+      v1Column2.Visible := False;
 
       if ShowModal = 1 then
       begin
-        while frmOrderSel.CDS_Main.Locate('SSel', true, []) do
+
+        if Self.Order_Sub.IsEmpty then
+          exit;
+        if Self.Order_Sub.Locate('SSel', True, []) = False then
         begin
-          if Trim(Self.SHDanWei.Text) = '' then
-          begin
-            SHDanWei.TxtCode := Trim(frmOrderSel.CDS_Main.fieldbyname('KHNO').AsString);
-            with ADOQueryTemp do
-            begin
-              Close;
-              sql.Clear;
-              sql.Add('select * from KH_Main where KHNO=''' + Trim(SHDanWei.TxtCode) + '''');
-              open;
-            end;
-            SHDanWei.Text := Trim(ADOQueryTemp.fieldbyname('KHNameJC').AsString);
+          application.MessageBox('请选择需要绑定计划单的数据！', '提示信息');
+          exit;
         end;
 
-//          if Trim(Self.FHTaiTou.Text) = '' then
-//          begin
-//            FHTaiTou.Text := Trim(frmOrderSel.CDS_Main.fieldbyname('SYRName').AsString);
-//          end;
-
-          if Self.Order_Sub.Locate('SubId;CPType', VarArrayOf([Trim(frmOrderSel.CDS_Main.fieldbyname('SubId').AsString), Trim(frmOrderSel.CDS_Main.fieldbyname('CPType').AsString)]), []) = False then
+        try
+          while Self.Order_Sub.Locate('SSel', True, []) do
           begin
             with Self.Order_Sub do
             begin
-              Append;
+              Edit;
+              FieldByName('SSel').Value := False;
               FieldByName('MainId').Value := frmOrderSel.CDS_Main.fieldbyname('MainId').Value;
               FieldByName('SubId').Value := frmOrderSel.CDS_Main.fieldbyname('SubId').Value;
-              FieldByName('MXPrtName').Value := Trim(frmOrderSel.CDS_Main.fieldbyname('MLCodeName').AsString);
-              FieldByName('MXPrtColor').Value := Trim(frmOrderSel.CDS_Main.fieldbyname('MLColor').AsString);
-              FieldByName('MXPrtHX').Value := Trim(frmOrderSel.CDS_Main.fieldbyname('MLHX').AsString);
               FieldByName('SCConNo').Value := Trim(frmOrderSel.CDS_Main.fieldbyname('MLOrderNo').AsString);
-//              CRType.Text := Trim(frmOrderSel.CDS_Main.fieldbyname('CRType').AsString);
-
-              CRType.ItemIndex := CRType.Items.IndexOf(trim(frmOrderSel.CDS_Main.fieldbyname('CRType').AsString));
-              FieldByName('CPType').Value := '成品';
-              FieldByName('SQPS').Value := 0;
-              FieldByName('SQQtyM').Value := 0;
-              FieldByName('BZType').Value := frmOrderSel.CDS_Main.fieldbyname('BZType').Value;
-              FieldByName('FHPrice').Value := frmOrderSel.CDS_Main.fieldbyname('MLPrice').Value;
-              FieldByName('FeeName').Value := frmOrderSel.CDS_Main.fieldbyname('FeeName').Value;
-              FieldByName('FeeMoney').Value := frmOrderSel.CDS_Main.fieldbyname('FeeMoney').Value;
               Post;
             end;
           end;
-          frmOrderSel.CDS_Main.Delete;
+
+          application.MessageBox('绑定计划单成功！', '提示信息');
+        except
+          application.MessageBox('绑定计划单失败！', '提示信息', 0);
         end;
+
       end;
+
+//      if ShowModal = 1 then
+//      begin
+//        while frmOrderSel.CDS_Main.Locate('SSel', true, []) do
+//        begin
+//          if Trim(Self.SHDanWei.Text) = '' then
+//          begin
+//            SHDanWei.TxtCode := Trim(frmOrderSel.CDS_Main.fieldbyname('KHNO').AsString);
+//            with ADOQueryTemp do
+//            begin
+//              Close;
+//              sql.Clear;
+//              sql.Add('select * from KH_Main where KHNO=''' + Trim(SHDanWei.TxtCode) + '''');
+//              open;
+//            end;
+//            SHDanWei.Text := Trim(ADOQueryTemp.fieldbyname('KHNameJC').AsString);
+//          end;
+//
+//          if Self.Order_Sub.Locate('SubId;CPType', VarArrayOf([Trim(frmOrderSel.CDS_Main.fieldbyname('SubId').AsString), Trim(frmOrderSel.CDS_Main.fieldbyname('CPType').AsString)]), []) = False then
+//          begin
+//            with Self.Order_Sub do
+//            begin
+//              Append;
+//              FieldByName('MainId').Value := frmOrderSel.CDS_Main.fieldbyname('MainId').Value;
+//              FieldByName('SubId').Value := frmOrderSel.CDS_Main.fieldbyname('SubId').Value;
+//              FieldByName('MXPrtName').Value := Trim(frmOrderSel.CDS_Main.fieldbyname('MLCodeName').AsString);
+//              FieldByName('MXPrtColor').Value := Trim(frmOrderSel.CDS_Main.fieldbyname('MLColor').AsString);
+//              FieldByName('MXPrtHX').Value := Trim(frmOrderSel.CDS_Main.fieldbyname('MLHX').AsString);
+//              FieldByName('SCConNo').Value := Trim(frmOrderSel.CDS_Main.fieldbyname('MLOrderNo').AsString);
+//
+//              CRType.ItemIndex := CRType.Items.IndexOf(trim(frmOrderSel.CDS_Main.fieldbyname('CRType').AsString));
+//              FieldByName('CPType').Value := '成品';
+//              FieldByName('SQPS').Value := 0;
+//              FieldByName('SQQtyM').Value := 0;
+//              FieldByName('BZType').Value := frmOrderSel.CDS_Main.fieldbyname('BZType').Value;
+//              FieldByName('FHPrice').Value := frmOrderSel.CDS_Main.fieldbyname('MLPrice').Value;
+//              FieldByName('FeeName').Value := frmOrderSel.CDS_Main.fieldbyname('FeeName').Value;
+//              FieldByName('FeeMoney').Value := frmOrderSel.CDS_Main.fieldbyname('FeeMoney').Value;
+//              Post;
+//            end;
+//          end;
+//          frmOrderSel.CDS_Main.Delete;
+//        end;
+//      end;
     end;
   finally
     frmOrderSel.Free;
@@ -582,5 +626,59 @@ begin
   end;
 end;
 
+procedure TfrmFHSQInPut2.CRTypeChange(Sender: TObject);
+begin
+  if CRType.Text = '本厂加工' then
+  begin
+    SHDanWei.Text := '宇昊';
+    SHDanWei.TxtCode := 'GS02';
+    SHDanWeiType.ItemIndex := 2;
+  end
+  else
+  begin
+    SHDanWeiType.ItemIndex := 0;
+  end;
+end;
+
+procedure TfrmFHSQInPut2.Tv1Column3PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
+begin
+  try
+    frmOrderSel := TfrmOrderSel.Create(Application);
+    with frmOrderSel do
+    begin
+      FKHNo := Trim(SHDanWei.TxtCode);
+      ToolButton1.Visible := False;
+      v1Column2.Visible := False;
+
+      if ShowModal = 1 then
+      begin
+
+        with Self.Order_Sub do
+        begin
+          Edit;
+          FieldByName('SSel').Value := False;
+          FieldByName('MainId').Value := frmOrderSel.CDS_Main.fieldbyname('MainId').Value;
+          FieldByName('SubId').Value := frmOrderSel.CDS_Main.fieldbyname('SubId').Value;
+          FieldByName('SCConNo').Value := Trim(frmOrderSel.CDS_Main.fieldbyname('MLOrderNo').AsString);
+        end;
+
+      end;
+
+    end;
+  finally
+    frmOrderSel.Free;
+  end;
+end;
+
+procedure TfrmFHSQInPut2.N2Click(Sender: TObject);
+begin
+  SelOKNo(Order_Sub, True);
+end;
+
+procedure TfrmFHSQInPut2.N1Click(Sender: TObject);
+begin
+  SelOKNo(Order_Sub, false);
+end;
+
 end.
 

云翔一码通/U_YMTFHSQList.dfm

@@ -1,6 +1,6 @@
 object frmYMTFHSQList: TfrmYMTFHSQList
-  Left = 521
-  Top = 198
+  Left = 1213
+  Top = 589
   Width = 1308
   Height = 679
   Caption = #21457#36135#30003#35831

云翔一码通/U_YMTFHSQList.pas

@@ -261,7 +261,7 @@ begin
       Close;
       sql.Clear;
       Sql.Add(' select A.*  from YMT_FHSQ_Main A');
-      sql.Add(' where 1=1 ');
+      sql.Add(' where Valid = ''Y'' ');
 
       sql.Add(' and filltime>=''' + Trim(FormatDateTime('yyyy-MM-dd', BegDate.Date)) + '''');
       sql.Add(' and filltime<''' + Trim(FormatDateTime('yyyy-MM-dd', EndDate.Date + 1)) + '''');
@@ -476,8 +476,15 @@ begin
   if Order_Main.IsEmpty then
     Exit;
    msql := ' select A.*,B.*  from YMT_FHSQ_Main A inner join YMT_FHSQ_Sub B on A.FSId=B.FSId where A.FSId=''' + Trim(Order_Main.fieldbyname('FSId').AsString) + '''';
+  if Trim(Self.Caption) = '销售发货申请' then
+  begin
+    MPrintJson := '{ "LBName": "销售发货申请单","QrCodeField": "fsid","DConString": "' + DConString + '","DCode": "' + DCode + '","DName": "' + DName + '","IsPreview": true,"printerIndex": 0,"ExportFileType": "", "PrtArgs": [ {"SqlStr": "' + msql + '" }] }';
+  end
+  else if Trim(Self.Caption) = '加工发货登记' then
+  begin
+     MPrintJson := '{ "LBName": "加工发货申请单","QrCodeField": "fsid","DConString": "' + DConString + '","DCode": "' + DCode + '","DName": "' + DName + '","IsPreview": true,"printerIndex": 0,"ExportFileType": "", "PrtArgs": [ {"SqlStr": "' + msql + '" }] }';
+  end;
 
-  MPrintJson := '{ "LBName": "坯布发货申请单","QrCodeField": "ssid","DConString": "' + DConString + '","DCode": "' + DCode + '","DName": "' + DName + '","IsPreview": true,"printerIndex": 0,"ExportFileType": "", "PrtArgs": [ {"SqlStr": "' + msql + '" }] }';
   FunPrint(Application, PChar(MPrintJson));
 
 end;

云翔一码通/U_YMTOrderSel.dfm

@@ -7,7 +7,7 @@ object frmOrderSel: TfrmOrderSel
   Color = clBtnFace
   Font.Charset = GB2312_CHARSET
   Font.Color = clWindowText
-  Font.Height = -15
+  Font.Height = -12
   Font.Name = #23435#20307
   Font.Style = []
   OldCreateOrder = False
@@ -16,8 +16,8 @@ object frmOrderSel: TfrmOrderSel
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   OnShow = FormShow
-  PixelsPerInch = 120
-  TextHeight = 15
+  PixelsPerInch = 96
+  TextHeight = 12
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
@@ -68,131 +68,131 @@ object frmOrderSel: TfrmOrderSel
     Left = 0
     Top = 32
     Width = 1320
-    Height = 88
+    Height = 70
     Align = alTop
     BevelInner = bvRaised
     BevelOuter = bvLowered
     Color = clSkyBlue
     TabOrder = 1
     object Label1: TLabel
-      Left = 31
-      Top = 18
-      Width = 92
-      Height = 22
+      Left = 25
+      Top = 14
+      Width = 80
+      Height = 19
       Caption = #19979#21333#26085#26399
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -19
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
     end
     object Label3: TLabel
-      Left = 591
-      Top = 51
-      Width = 92
-      Height = 22
+      Left = 473
+      Top = 41
+      Width = 80
+      Height = 19
       Caption = #25351#31034#21333#21495
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -19
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
     end
     object Label4: TLabel
-      Left = 299
-      Top = 18
-      Width = 94
-      Height = 22
+      Left = 239
+      Top = 14
+      Width = 84
+      Height = 19
       Caption = #23458'    '#25143
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -19
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
     end
     object Label9: TLabel
-      Left = 591
-      Top = 18
-      Width = 93
-      Height = 22
+      Left = 473
+      Top = 14
+      Width = 82
+      Height = 19
       Caption = #21512' '#21516' '#21495
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -19
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
     end
     object Label12: TLabel
-      Left = 766
-      Top = 149
-      Width = 32
-      Height = 15
+      Left = 613
+      Top = 119
+      Width = 26
+      Height = 12
       Caption = #20811#37325
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
-      Font.Height = -15
+      Font.Height = -12
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
     end
     object Label5: TLabel
-      Left = 299
-      Top = 51
-      Width = 92
-      Height = 22
+      Left = 239
+      Top = 41
+      Width = 80
+      Height = 19
       Caption = #20135#21697#21517#31216
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -19
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
     end
     object Label7: TLabel
-      Left = 656
-      Top = 110
-      Width = 64
-      Height = 15
+      Left = 525
+      Top = 88
+      Width = 52
+      Height = 12
       Caption = #23457#26680#29366#24577
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
-      Font.Height = -15
+      Font.Height = -12
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
       Visible = False
     end
     object BegDate: TDateTimePicker
-      Left = 125
-      Top = 13
-      Width = 154
-      Height = 30
+      Left = 100
+      Top = 10
+      Width = 123
+      Height = 27
       Date = 40675.464742650460000000
       Format = 'yyyy-MM-dd'
       Time = 40675.464742650460000000
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -19
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
       TabOrder = 0
     end
     object EndDate: TDateTimePicker
-      Left = 125
-      Top = 46
-      Width = 154
-      Height = 30
+      Left = 100
+      Top = 37
+      Width = 123
+      Height = 27
       Date = 40675.464761099540000000
       Format = 'yyyy-MM-dd'
       Time = 40675.464761099540000000
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -19
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
@@ -200,13 +200,13 @@ object frmOrderSel: TfrmOrderSel
     end
     object MLOrderNo: TEdit
       Tag = 2
-      Left = 690
-      Top = 46
-      Width = 150
-      Height = 25
+      Left = 552
+      Top = 37
+      Width = 120
+      Height = 30
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -19
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
@@ -216,13 +216,13 @@ object frmOrderSel: TfrmOrderSel
     end
     object KHNameHZ: TEdit
       Tag = 2
-      Left = 396
-      Top = 13
-      Width = 175
-      Height = 25
+      Left = 317
+      Top = 10
+      Width = 140
+      Height = 30
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -19
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
@@ -231,13 +231,13 @@ object frmOrderSel: TfrmOrderSel
     end
     object MLConNo: TEdit
       Tag = 2
-      Left = 690
-      Top = 13
-      Width = 150
-      Height = 25
+      Left = 552
+      Top = 10
+      Width = 120
+      Height = 30
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -19
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
@@ -247,21 +247,21 @@ object frmOrderSel: TfrmOrderSel
     end
     object MPRTKZ: TEdit
       Tag = 2
-      Left = 818
-      Top = 124
-      Width = 70
-      Height = 20
+      Left = 654
+      Top = 99
+      Width = 56
+      Height = 23
       TabOrder = 5
     end
     object MLCodeName: TEdit
       Tag = 2
-      Left = 396
-      Top = 46
-      Width = 174
-      Height = 25
+      Left = 317
+      Top = 37
+      Width = 139
+      Height = 30
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
-      Font.Height = -22
+      Font.Height = -19
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
@@ -271,11 +271,11 @@ object frmOrderSel: TfrmOrderSel
     end
     object status: TComboBox
       Tag = 2
-      Left = 726
-      Top = 109
-      Width = 129
-      Height = 23
-      ItemHeight = 15
+      Left = 581
+      Top = 87
+      Width = 103
+      Height = 20
+      ItemHeight = 12
       TabOrder = 7
       Visible = False
       Items.Strings = (
@@ -287,7 +287,7 @@ object frmOrderSel: TfrmOrderSel
   end
   object cxSplitter1: TcxSplitter
     Left = 0
-    Top = 642
+    Top = 648
     Width = 1320
     Height = 8
     HotZoneClassName = 'TcxMediaPlayer9Style'
@@ -296,12 +296,13 @@ object frmOrderSel: TfrmOrderSel
   end
   object cxGrid2: TcxGrid
     Left = 0
-    Top = 120
+    Top = 102
     Width = 1320
-    Height = 522
+    Height = 546
     Align = alClient
     TabOrder = 3
     object Tv1: TcxGridDBTableView
+      OnDblClick = Tv1DblClick
       Navigator.Buttons.CustomButtons = <>
       DataController.DataSource = DataSource1
       DataController.Summary.DefaultGroupSummaryItems = <>
@@ -454,8 +455,5 @@ object frmOrderSel: TfrmOrderSel
       Caption = #20840#24323
       OnClick = N1Click
     end
-    object N3: TMenuItem
-      Caption = #25490#21333
-    end
   end
 end

云翔一码通/U_YMTOrderSel.pas

@@ -59,7 +59,6 @@ type
     N1: TMenuItem;
     Label7: TLabel;
     status: TComboBox;
-    N3: TMenuItem;
     ToolButton1: TToolButton;
     cxGrid2: TcxGrid;
     Tv1: TcxGridDBTableView;
@@ -90,6 +89,7 @@ type
     procedure MLOrderNoKeyPress(Sender: TObject; var Key: Char);
     procedure KHNameHZChange(Sender: TObject);
     procedure ToolButton1Click(Sender: TObject);
+    procedure Tv1DblClick(Sender: TObject);
   private
     DQdate: TDateTime;
     procedure InitGrid();
@@ -310,5 +310,12 @@ begin
   ModalResult := 1;
 end;
 
+procedure TfrmOrderSel.Tv1DblClick(Sender: TObject);
+begin
+if CDS_Main.IsEmpty then
+    exit;
+  ModalResult := 1;
+end;
+
 end.
 

云翔一码通/U_YMTRKInPut.dfm

@@ -1,6 +1,6 @@
 object frmYMTRKInPut: TfrmYMTRKInPut
-  Left = 258
-  Top = 163
+  Left = 465
+  Top = 477
   Width = 1876
   Height = 623
   Align = alClient
@@ -47,7 +47,7 @@ object frmYMTRKInPut: TfrmYMTRKInPut
         end
         item
           Kind = skSum
-          Column = v1Column9
+          Column = Tv1PiQty
         end
         item
           Kind = skCount
@@ -95,6 +95,13 @@ object frmYMTRKInPut: TfrmYMTRKInPut
         HeaderAlignmentHorz = taCenter
         Width = 83
       end
+      object Tv1CustomerNo: TcxGridDBColumn
+        Caption = #23458#25143#32534#21495
+        DataBinding.FieldName = 'CustomerNo'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 90
+      end
       object v1Column21: TcxGridDBColumn
         Tag = 2
         Caption = #23458#25143
@@ -112,7 +119,7 @@ object frmYMTRKInPut: TfrmYMTRKInPut
       end
       object v1Column20: TcxGridDBColumn
         Tag = 2
-        Caption = #32534#21495
+        Caption = #20135#21697#32534#21495
         DataBinding.FieldName = 'spcode'
         HeaderAlignmentHorz = taCenter
       end
@@ -152,6 +159,13 @@ object frmYMTRKInPut: TfrmYMTRKInPut
         HeaderAlignmentHorz = taCenter
         Width = 70
       end
+      object Tv1FactoryNo: TcxGridDBColumn
+        Caption = #20379#24212#21830#32534#21495
+        DataBinding.FieldName = 'FactoryNo'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 90
+      end
       object v1Column14: TcxGridDBColumn
         Tag = 2
         Caption = #20379#24212#21830
@@ -168,10 +182,10 @@ object frmYMTRKInPut: TfrmYMTRKInPut
         HeaderAlignmentHorz = taCenter
         Width = 101
       end
-      object v1Column19: TcxGridDBColumn
+      object Tv1GangNo: TcxGridDBColumn
         Tag = 2
         Caption = #32568#21495
-        DataBinding.FieldName = 'RCGangNo'
+        DataBinding.FieldName = 'GangNo'
         HeaderAlignmentHorz = taCenter
         Width = 74
       end
@@ -234,13 +248,14 @@ object frmYMTRKInPut: TfrmYMTRKInPut
         HeaderAlignmentHorz = taCenter
         Width = 77
       end
-      object v1Column9: TcxGridDBColumn
+      object Tv1PiQty: TcxGridDBColumn
         Tag = 2
         Caption = #21305#25968
         DataBinding.FieldName = 'PiQty'
         PropertiesClassName = 'TcxCurrencyEditProperties'
         Properties.DecimalPlaces = 0
         Properties.DisplayFormat = '0;'
+        Properties.OnEditValueChanged = Tv1PiQtyPropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
         Width = 67
       end
@@ -254,14 +269,22 @@ object frmYMTRKInPut: TfrmYMTRKInPut
         HeaderAlignmentHorz = taCenter
         Width = 85
       end
-      object Tv1Column3: TcxGridDBColumn
+      object Tv1Column2: TcxGridDBColumn
         Tag = 2
-        Caption = #37325#37327
-        DataBinding.FieldName = 'KGQty'
+        Caption = #30721#23610
+        DataBinding.FieldName = 'Yardwand'
         PropertiesClassName = 'TcxCurrencyEditProperties'
-        Properties.DisplayFormat = '0.00;'
+        Properties.DecimalPlaces = 0
+        Properties.DisplayFormat = '0'
         Properties.OnEditValueChanged = Tv1PricePropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
+        Width = 60
+      end
+      object Tv1Column4: TcxGridDBColumn
+        Caption = #23454#38469#31859#25968
+        DataBinding.FieldName = 'FactMQty'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
         Width = 80
       end
       object v1Column3: TcxGridDBColumn
@@ -277,6 +300,16 @@ object frmYMTRKInPut: TfrmYMTRKInPut
         HeaderAlignmentHorz = taCenter
         Width = 77
       end
+      object Tv1Column3: TcxGridDBColumn
+        Tag = 2
+        Caption = #37325#37327
+        DataBinding.FieldName = 'KGQty'
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.DisplayFormat = '0.00;'
+        Properties.OnEditValueChanged = Tv1PricePropertiesEditValueChanged
+        HeaderAlignmentHorz = taCenter
+        Width = 80
+      end
       object v1Column12: TcxGridDBColumn
         Tag = 2
         Caption = #22791#27880
@@ -586,9 +619,11 @@ object frmYMTRKInPut: TfrmYMTRKInPut
       Align = alClient
       TabOrder = 0
       object TvMX: TcxGridDBTableView
+        OnKeyDown = TvMXKeyDown
         Navigator.Buttons.CustomButtons = <>
         Navigator.Buttons.Delete.Enabled = False
         Navigator.Buttons.Delete.Visible = False
+        OnEditKeyDown = TvMXEditKeyDown
         DataController.DataSource = DS_MX
         DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
         DataController.Summary.DefaultGroupSummaryItems = <
@@ -621,6 +656,7 @@ object frmYMTRKInPut: TfrmYMTRKInPut
             Column = TvMXColumn1
           end>
         DataController.Summary.SummaryGroups = <>
+        OptionsBehavior.AlwaysShowEditor = True
         OptionsBehavior.GoToNextCellOnEnter = True
         OptionsCustomize.ColumnFiltering = False
         OptionsView.Footer = True
@@ -646,6 +682,7 @@ object frmYMTRKInPut: TfrmYMTRKInPut
         object TvMXColumn1: TcxGridDBColumn
           Caption = #37325#37327
           DataBinding.FieldName = 'KGQty'
+          PropertiesClassName = 'TcxTextEditProperties'
           HeaderAlignmentHorz = taCenter
           Width = 60
         end

云翔一码通/U_YMTRKInPut.pas

@@ -31,7 +31,7 @@ type
     Tv1: TcxGridDBTableView;
     v1Column2: TcxGridDBColumn;
     v2Column1: TcxGridDBColumn;
-    v1Column9: TcxGridDBColumn;
+    Tv1PiQty: TcxGridDBColumn;
     v2Column6: TcxGridDBColumn;
     cxGrid2Level1: TcxGridLevel;
     ToolBar1: TToolBar;
@@ -58,7 +58,7 @@ type
     v1Column15: TcxGridDBColumn;
     v1Column17: TcxGridDBColumn;
     v1Column18: TcxGridDBColumn;
-    v1Column19: TcxGridDBColumn;
+    Tv1GangNo: TcxGridDBColumn;
     v1Column20: TcxGridDBColumn;
     v1Column21: TcxGridDBColumn;
     ToolButton2: TToolButton;
@@ -101,6 +101,10 @@ type
     TbAddRow: TToolButton;
     TbDeleteRow: TToolButton;
     http: TIdHTTP;
+    Tv1Column2: TcxGridDBColumn;
+    Tv1Column4: TcxGridDBColumn;
+    Tv1CustomerNo: TcxGridDBColumn;
+    Tv1FactoryNo: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBAddClick(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);
@@ -131,6 +135,8 @@ type
     procedure AddNumKeyPress(Sender: TObject; var Key: Char);
     procedure FormDestroy(Sender: TObject);
     procedure FormCreate(Sender: TObject);
+    procedure TvMXEditKeyDown(Sender: TcxCustomGridTableView; AItem: TcxCustomGridTableItem; AEdit: TcxCustomEdit; var Key: Word; Shift: TShiftState);
+    procedure Tv1PiQtyPropertiesEditValueChanged(Sender: TObject);
   private
     { Private declarations }
     function SaveCKData(): Boolean;
@@ -409,6 +415,8 @@ var
 begin
   if not Assigned(CDS_MX) then
     Exit;
+  if SPID = '' then
+    SPID := ' ';
 
   try
     CDS_MX.DisableControls;
@@ -454,6 +462,7 @@ begin
   PiQty := CDS_Sub.fieldbyname('PiQty').AsInteger;
 
   try
+    ADOQueryCmd.Connection.BeginTrans;
     for i := 1 to PiQty do
     begin
       if GetLSNo(ADOQueryTemp, MaxNo, 'MCM', 'YMT_CK_MX', 3, 1) = False then
@@ -461,22 +470,20 @@ begin
         Application.MessageBox('取最大号失败!', '提示', 0);
         Exit;
       end;
-
       MMXID := Trim(MaxNo);
-      with ADOQueryCmd do
+      with CDS_MX do
       begin
-        Close;
-        SQL.Clear;
-        sql.Add('insert into  YMT_CK_MX (MXID,SPID,MXQty)');
-        sql.Add('values(' + quotedstr(MMXID));
-        sql.Add(',' + quotedstr(Trim(SPID)));
-        sql.Add(',0');
-        sql.Add(')');
-        ExecSQL;
+        Append;
+        FieldByName('MXID').Value := MMXID;
+        FieldByName('SPID').Value := SPID;
+        FieldByName('MQty').Value := '0';
+        FieldByName('KGQty').Value := '0';
+        Post;
       end;
     end;
-    InitMXGrid(SPID);
+    ADOQueryCmd.Connection.CommitTrans;
   except
+    ADOQueryCmd.Connection.RollbackTrans;
     Application.MessageBox('添加失败!', '提示', 0);
   end;
 end;
@@ -502,7 +509,7 @@ begin
       Close;
       sql.Clear;
       sql.Add(' select A.* ');
-      sql.Add(',OrderNO=(select OrderNO from JYOrder_Main JM where JM.MainId=A.ORDMainIdRK)');
+
       sql.Add(' from YMT_CK_CR A');
       sql.Add(' where SPID IN (' + SPIDList + ')');
       Open;
@@ -516,24 +523,20 @@ begin
       Close;
       sql.Clear;
       sql.Add(' select A.* ');
-      sql.Add(',OrderNO=(select OrderNO from JYOrder_Main JM where JM.MainId=A.ORDMainIdRK)');
+
       sql.Add(' from YMT_CK_CR A');
       sql.Add(' where SPID=''' + Trim(FBCId) + '''');
       Open;
     end;
   end;
 
-  // 其余代码保持不变
   SCreateCDS20(ADOQueryTemp, CDS_Sub);
   SInitCDSData20(ADOQueryTemp, CDS_Sub);
   if CDS_Sub.IsEmpty then
     Exit;
 
-  // 注意：这里可能需要修改，因为现在有多个SPID
-  // 您需要决定如何处理多个SPID的情况
   InitMXGrid(CDS_Sub.fieldbyname('SPID').AsString);
 
-  // 其余代码保持不变
   with ADOQueryTemp do
   begin
     Close;
@@ -640,6 +643,11 @@ begin
     with CDS_Sub do
     begin
       Edit;
+      FieldByName('PiQty').Value := '0';
+      FieldByName('Qty').Value := '0';
+      FieldByName('KGQty').Value := '0';
+      FieldByName('FactMQty').Value := '0';
+      FieldByName('Money').Value := '0';
       FieldByName('SPID').Value := Trim(MMaxno);
       post;
     end;
@@ -658,6 +666,7 @@ begin
       FieldByName('Price').Value := '0';
       FieldByName('Qty').Value := '0';
       FieldByName('KGQty').Value := '0';
+      FieldByName('Yardwand').Value := '100';
       Post;
     end;
   end;
@@ -718,14 +727,12 @@ begin
           ////////////////////////////////////////////////////////////////////////////////////////////
           //////////保存主表数据
           FieldByName('SPID').Value := Trim(Maxno);
-          FieldByName('FZSPID').Value := Trim(Maxno);
+//          FieldByName('FZSPID').Value := Trim(Maxno);
           FieldByName('CKName').Value := '待检布';
           FieldByName('CustomerNo').Value := Trim(CDS_Sub.fieldbyname('CustomerNo').AsString);
           FieldByName('FactoryNo').Value := Trim(CDS_Sub.fieldbyname('FactoryNo').AsString);
           FieldByName('FromFactoryNo').Value := Trim(CDS_Sub.fieldbyname('FromFactoryNo').AsString);
           FieldByName('ToFactoryNo').Value := Trim(CDS_Sub.fieldbyname('ToFactoryNo').AsString);
-          FieldByName('ORDMainIdRK').Value := Trim(CDS_Sub.fieldbyname('ORDMainIdRK').AsString);
-          FieldByName('ORDSubIdRK').Value := Trim(CDS_Sub.fieldbyname('ORDSubIdRK').AsString);
           FieldByName('CRFlag').Value := '入库';
           FieldByName('CRQtyFlag').Value := 1;
 
@@ -833,7 +840,7 @@ begin
               end;
 
               // 检查MQty是否大于0，如果是则收集MXID
-              if CDS_MX.FieldByName('MQty').AsFloat > 0 then
+              if (CDS_MX.FieldByName('MQty').AsFloat > 0) or (CDS_MX.FieldByName('KgQty').AsFloat > 0) then
               begin
                 if MXIDs <> '' then
                   MXIDs := MXIDs + ',' + Trim(MaxMXno)
@@ -905,6 +912,7 @@ begin
     InitMXGrid(' ')
   else
     InitMXGrid(Trim(CDS_Sub.fieldbyname('SPID').AsString));
+
 end;
 
 procedure TfrmYMTRKInPut.TBDelClick(Sender: TObject);
@@ -1017,7 +1025,7 @@ begin
   if SaveCKData() then
   begin
     Application.MessageBox('保存成功!', '提示', 0);
-    ModalResult:=1;
+    ModalResult := 1;
     Exit;
   end;
 end;
@@ -1325,6 +1333,7 @@ begin
   if Key = 13 then
     Key := 40;
   TvMX.OptionsData.Editing := True;
+
 end;
 
 procedure TfrmYMTRKInPut.v1Column21PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer);
@@ -1368,9 +1377,14 @@ begin
   begin
     Edit;
     if FieldByName('PriceType').Value = '米' then
-      FieldByName('Money').Value := FieldByName('Price').Asfloat * FieldByName('Qty').Asfloat
+    begin
+      FieldByName('Money').Value := FieldByName('Price').Asfloat * FieldByName('Qty').Asfloat * FieldByName('Yardwand').Asfloat / 100;
+      FieldByName('FactMQty').Value := FieldByName('Qty').Asfloat * FieldByName('Yardwand').Asfloat / 100;
+    end
     else
+    begin
       FieldByName('Money').Value := FieldByName('Price').Asfloat * FieldByName('KGQty').Asfloat;
+    end;
     Post;
   end;
 end;
@@ -1392,9 +1406,14 @@ begin
   begin
     Edit;
     if FieldByName('PriceType').Value = '米' then
-      FieldByName('Money').Value := FieldByName('Price').Asfloat * FieldByName('Qty').Asfloat
+    begin
+      FieldByName('Money').Value := FieldByName('Price').Asfloat * FieldByName('Qty').Asfloat * FieldByName('Yardwand').Asfloat / 100;
+      FieldByName('FactMQty').Value := FieldByName('Qty').Asfloat * FieldByName('Yardwand').Asfloat / 100;
+    end
     else
+    begin
       FieldByName('Money').Value := FieldByName('Price').Asfloat * FieldByName('KGQty').Asfloat;
+    end;
     Post;
   end;
 end;
@@ -1542,7 +1561,44 @@ end;
 
 procedure TfrmYMTRKInPut.FormCreate(Sender: TObject);
 begin
-FSelectedSPIDs := TStringList.Create;
+  FSelectedSPIDs := TStringList.Create;
+end;
+
+procedure TfrmYMTRKInPut.TvMXEditKeyDown(Sender: TcxCustomGridTableView; AItem: TcxCustomGridTableItem; AEdit: TcxCustomEdit; var Key: Word; Shift: TShiftState);
+var
+  CurrentColIndex: Integer;
+  CurrentRowIndex: Integer;
+  LastRowIndex: Integer;
+begin
+  if Key = VK_RETURN then
+  begin
+    // 获取当前列索引
+    if Sender.Controller.FocusedItem <> nil then
+      CurrentColIndex := Sender.Controller.FocusedItem.Index
+    else
+      CurrentColIndex := -1;
+    
+    // 获取当前行索引
+    CurrentRowIndex := Sender.DataController.FocusedRecordIndex;
+    LastRowIndex := Sender.DataController.RecordCount - 1;
+    
+    // 如果当前在第三列（索引2）按Enter且不是最后一行
+    if (CurrentColIndex = 2) and (CurrentRowIndex < LastRowIndex) then
+    begin
+      // 移动到下一行的第二列（索引1）
+      Sender.DataController.FocusedRecordIndex := CurrentRowIndex + 1;
+      Sender.Controller.FocusedItem := Sender.Items[1]; // 设置到第二列
+      Key := 0; // 阻止默认行为
+    end;
+  end
+  else
+    inherited;
+end;
+
+procedure TfrmYMTRKInPut.Tv1PiQtyPropertiesEditValueChanged(Sender: TObject);
+begin
+  AddNum.SetFocus;
+  AddNum.Text := Trim(CDS_Sub.fieldbyname('PiQty').AsString);
 end;
 
 end.

云翔一码通/U_YMTRKList.dfm

@@ -1,6 +1,6 @@
 object frmYMTRKList: TfrmYMTRKList
-  Left = 206
-  Top = 367
+  Left = 386
+  Top = 545
   Width = 1470
   Height = 823
   Caption = #38754#26009#22238#20179#30331#35760
@@ -492,7 +492,7 @@ object frmYMTRKList: TfrmYMTRKList
       end
       object v1Column21: TcxGridDBColumn
         Tag = 2
-        Caption = #32534#21495
+        Caption = #20135#21697#32534#21495
         DataBinding.FieldName = 'spcode'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -568,9 +568,9 @@ object frmYMTRKList: TfrmYMTRKList
         Options.Editing = False
         Width = 86
       end
-      object v1Column19: TcxGridDBColumn
+      object Tv1GangNo: TcxGridDBColumn
         Caption = #32568#21495
-        DataBinding.FieldName = 'RCGangNo'
+        DataBinding.FieldName = 'GangNo'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 75
@@ -602,6 +602,20 @@ object frmYMTRKList: TfrmYMTRKList
         Options.Editing = False
         Width = 62
       end
+      object Tv1Yardwand: TcxGridDBColumn
+        Caption = #30721#23610
+        DataBinding.FieldName = 'Yardwand'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 60
+      end
+      object Tv1FactMQty: TcxGridDBColumn
+        Caption = #23454#38469#31859#37327
+        DataBinding.FieldName = 'FactMQty'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 60
+      end
       object Tv1Column4: TcxGridDBColumn
         Caption = #37325#37327
         DataBinding.FieldName = 'KgQty'
@@ -654,6 +668,20 @@ object frmYMTRKList: TfrmYMTRKList
         Options.Editing = False
         Width = 79
       end
+      object Tv1CustomerNo: TcxGridDBColumn
+        Caption = #23458#25143#32534#21495
+        DataBinding.FieldName = 'CustomerNo'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 90
+      end
+      object Tv1FactoryNo: TcxGridDBColumn
+        Caption = #20379#24212#21830#32534#21495
+        DataBinding.FieldName = 'FactoryNo'
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 90
+      end
     end
     object cxGrid2Level1: TcxGridLevel
       GridView = Tv1
@@ -669,13 +697,13 @@ object frmYMTRKList: TfrmYMTRKList
     TabOrder = 3
     object cxGrid1: TcxGrid
       Left = 1
-      Top = 71
+      Top = 112
       Width = 282
-      Height = 615
+      Height = 574
       Align = alClient
+      PopupMenu = pm1
       TabOrder = 0
       object TvMX: TcxGridDBTableView
-        PopupMenu = pm1
         Navigator.Buttons.CustomButtons = <>
         Navigator.Buttons.Delete.Enabled = False
         Navigator.Buttons.Delete.Visible = False
@@ -755,7 +783,7 @@ object frmYMTRKList: TfrmYMTRKList
     end
     object ToolBar2: TToolBar
       Left = 1
-      Top = 42
+      Top = 83
       Width = 282
       Height = 29
       ButtonHeight = 30
@@ -785,7 +813,7 @@ object frmYMTRKList: TfrmYMTRKList
     end
     object Panel3: TPanel
       Left = 1
-      Top = 1
+      Top = 42
       Width = 282
       Height = 41
       Align = alTop
@@ -816,6 +844,31 @@ object frmYMTRKList: TfrmYMTRKList
         OnClick = Button1Click
       end
     end
+    object Panel6: TPanel
+      Left = 1
+      Top = 1
+      Width = 282
+      Height = 41
+      Align = alTop
+      TabOrder = 3
+      object Label16: TLabel
+        Left = 6
+        Top = 12
+        Width = 24
+        Height = 12
+        Caption = #32534#21495
+        Layout = tlCenter
+      end
+      object MXID: TEdit
+        Tag = 1
+        Left = 39
+        Top = 10
+        Width = 120
+        Height = 20
+        TabOrder = 0
+        OnKeyPress = MXIDKeyPress
+      end
+    end
   end
   object Panel4: TPanel
     Left = 547
@@ -930,39 +983,39 @@ object frmYMTRKList: TfrmYMTRKList
   object ADOQueryCmd: TADOQuery
     Connection = DataLink_YXYMT.ADOLink
     Parameters = <>
-    Left = 504
-    Top = 254
+    Left = 649
+    Top = 246
   end
   object ADOQueryMain: TADOQuery
     Connection = DataLink_YXYMT.ADOLink
     LockType = ltReadOnly
     Parameters = <>
-    Left = 668
-    Top = 254
+    Left = 785
+    Top = 246
   end
   object ADOQueryTemp: TADOQuery
     Connection = DataLink_YXYMT.ADOLink
     LockType = ltReadOnly
     Parameters = <>
-    Left = 750
-    Top = 254
+    Left = 853
+    Top = 246
   end
   object DataSource1: TDataSource
     DataSet = CDS_Main
-    Left = 504
-    Top = 378
+    Left = 649
+    Top = 382
   end
   object cxGridPopupMenu1: TcxGridPopupMenu
     Grid = cxGrid2
     PopupMenus = <>
-    Left = 750
-    Top = 316
+    Left = 853
+    Top = 314
   end
   object CDS_Main: TClientDataSet
     Aggregates = <>
     Params = <>
-    Left = 504
-    Top = 316
+    Left = 649
+    Top = 314
   end
   object RM1: TRMGridReport
     ThreadPrepareReport = True
@@ -980,15 +1033,15 @@ object frmYMTRKList: TfrmYMTRKList
     CompressThread = False
     LaterBuildEvents = True
     OnlyOwnerDataSet = False
-    Left = 504
-    Top = 440
+    Left = 785
+    Top = 450
     ReportData = {}
   end
   object RMDBMain: TRMDBDataSet
     Visible = True
     DataSet = CDS_PRT
-    Left = 832
-    Top = 378
+    Left = 717
+    Top = 450
   end
   object RMXLSExport1: TRMXLSExport
     ShowAfterExport = True
@@ -1001,30 +1054,30 @@ object frmYMTRKList: TfrmYMTRKList
     ScaleX = 1.000000000000000000
     ScaleY = 1.000000000000000000
     CompressFile = False
-    Left = 586
-    Top = 440
+    Left = 853
+    Top = 450
   end
   object RMDBHZ: TRMDBDataSet
     Visible = True
     DataSet = CDS_HZ
-    Left = 750
-    Top = 378
+    Left = 649
+    Top = 450
   end
   object CDS_HZ: TClientDataSet
     Aggregates = <>
     Params = <>
-    Left = 832
-    Top = 254
+    Left = 581
+    Top = 314
   end
   object CDS_PRT: TClientDataSet
     Aggregates = <>
     Params = <>
-    Left = 668
-    Top = 316
+    Left = 785
+    Top = 314
   end
   object PopupMenu1: TPopupMenu
-    Left = 668
-    Top = 378
+    Left = 581
+    Top = 450
     object N1: TMenuItem
       Caption = #20840#36873
       OnClick = N1Click
@@ -1037,29 +1090,29 @@ object frmYMTRKList: TfrmYMTRKList
   object ADOQueryImage: TADOQuery
     Connection = DataLink_YXYMT.ADOLink
     Parameters = <>
-    Left = 586
-    Top = 254
+    Left = 717
+    Top = 246
   end
   object CDS_MX: TClientDataSet
     Aggregates = <>
     Params = <>
-    Left = 586
-    Top = 316
+    Left = 717
+    Top = 314
   end
   object DS_MX: TDataSource
     DataSet = CDS_MX
-    Left = 586
-    Top = 378
+    Left = 717
+    Top = 382
   end
   object cxGridPopupMenu2: TcxGridPopupMenu
     Grid = cxGrid1
     PopupMenus = <>
-    Left = 832
-    Top = 316
+    Left = 581
+    Top = 382
   end
   object pm1: TPopupMenu
-    Left = 676
-    Top = 442
+    Left = 853
+    Top = 382
     object MenuItem1: TMenuItem
       Caption = #25286#25209
       OnClick = MenuItem1Click
@@ -1079,7 +1132,14 @@ object frmYMTRKList: TfrmYMTRKList
     Request.BasicAuthentication = False
     Request.UserAgent = 'Mozilla/3.0 (compatible; Indy Library)'
     HTTPOptions = [hoForceEncodeParams]
-    Left = 532
-    Top = 320
+    Left = 785
+    Top = 382
+  end
+  object ADOQueryMX: TADOQuery
+    Connection = DataLink_YXYMT.ADOLink
+    LockType = ltReadOnly
+    Parameters = <>
+    Left = 581
+    Top = 246
   end
 end

云翔一码通/U_YMTRKList.pas

@@ -95,7 +95,7 @@ type
     Label12: TLabel;
     CRType: TComboBox;
     v1Column18: TcxGridDBColumn;
-    v1Column19: TcxGridDBColumn;
+    Tv1GangNo: TcxGridDBColumn;
     Label11: TLabel;
     RCGangNo: TEdit;
     Label13: TLabel;
@@ -145,6 +145,14 @@ type
     MQty: TEdit;
     KgQty: TEdit;
     http: TIdHTTP;
+    Tv1Yardwand: TcxGridDBColumn;
+    Tv1FactMQty: TcxGridDBColumn;
+    Tv1CustomerNo: TcxGridDBColumn;
+    Tv1FactoryNo: TcxGridDBColumn;
+    Panel6: TPanel;
+    Label16: TLabel;
+    MXID: TEdit;
+    ADOQueryMX: TADOQuery;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -176,6 +184,7 @@ type
     procedure MenuItem1Click(Sender: TObject);
     procedure SureClick(Sender: TObject);
     procedure QuitClick(Sender: TObject);
+    procedure MXIDKeyPress(Sender: TObject; var Key: Char);
   private
     canshu1, canshu2: string;
     procedure InitGrid();
@@ -274,7 +283,7 @@ end;
 
 procedure TfrmYMTRKList.InitMXGrid(SPID: string);
 begin
-  with ADOQueryTemp do
+  with ADOQueryMX do
   begin
     Close;
     sql.Clear;
@@ -282,8 +291,9 @@ begin
     sql.Add(' order by MXID');
     Open;
   end;
-  SCreateCDS20(ADOQueryTemp, CDS_MX);
-  SInitCDSData20(ADOQueryTemp, CDS_MX);
+
+  SCreateCDS20(ADOQueryMX, CDS_MX);
+  SInitCDSData20(ADOQueryMX, CDS_MX);
 end;
 
 procedure TfrmYMTRKList.InitImage(fsubID: string);
@@ -382,8 +392,8 @@ begin
     TBDel.Visible := True;
     TBEdit.Visible := True;
   end;
-//  ReadCxGrid('´ý¼ì²¼Èë¿âÁбí', Tv1, '´ý¼ì²¼²Ö¿â');
-//  ReadCxGrid('´ý¼ì²¼Èë¿âÁбí2', TvMX, '´ý¼ì²¼²Ö¿â');
+  ReadCxGrid('待检布入库列表', Tv1, '待检布仓库');
+  ReadCxGrid('待检布入库列表2', TvMX, '待检布仓库');
   InitGrid();
 end;
 
@@ -443,6 +453,17 @@ begin
       Exit;
     try
       ADOQueryCmd.Connection.BeginTrans;
+      while not CDS_MX.Eof do
+      begin
+        with ADOQueryCmd do
+        begin
+          Close;
+          SQL.Clear;
+          sql.Add('delete YMT_CK_CR  where FromMXID=' + quotedstr(Trim(CDS_MX.FieldByName('MXID').AsString)));
+          ExecSQL;
+        end;
+        CDS_MX.Next;
+      end;
 
       with ADOQueryCmd do
       begin
@@ -451,6 +472,14 @@ begin
         sql.Add(' delete YMT_CK_CR where SPID=''' + Trim(CDS_Main.fieldbyname('SPID').AsString) + '''');
         ExecSQL;
       end;
+
+      with ADOQueryCmd do
+      begin
+        Close;
+        sql.Clear;
+        sql.Add(' delete YMT_CK_MX where SPID=''' + Trim(CDS_Main.fieldbyname('SPID').AsString) + '''');
+        ExecSQL;
+      end;
       ADOQueryCmd.Connection.CommitTrans;
       CDS_Main.Delete;
     except
@@ -583,7 +612,8 @@ begin
         FSelectedSPIDs.Assign(SelectedSPIDs);
 
         TBDel.Visible := False;
-        TBAdd.Visible := False;
+//        TBAdd.Visible := False;
+
         if ShowModal = 1 then
         begin
           // ´¦Àí·µ»Ø½á¹û
@@ -656,6 +686,7 @@ var
 begin
   if CDS_Main.IsEmpty then
     Exit;
+
   if CDS_MX.Locate('SSel', True, []) then
   begin
     RTValues := SelCDSKey(CDS_MX, ['MXID']);
@@ -665,7 +696,7 @@ begin
   begin
     MFiltration := Trim(CDS_Main.fieldbyname('SPID').AsString);
   end;
-  FPrintJson := '{ "LMType": "LMType","QrCodeField": "MXID","PreviewPrint": true,"DConString": "' + DConString + '","DCode": "' + DCode + '","DName": "' + DName + '", "PrtArgs": [ { "IsSql": true, "Filtration": " ' + MFiltration + '" }] }';
+  FPrintJson := '{ "LMType": "LMType","QrCodeField": "MXID","PreviewPrint": true,"DConString": "' + DConString + '","DCode": "' + DCode + '","DName": "' + DName + '", "PrtArgs": [ { "IsSql": false, "Filtration": " ' + MFiltration + '" }] }';
 
   FormPrint(Application, PChar(FPrintJson));
 end;
@@ -677,7 +708,7 @@ begin
   if CDS_Main.IsEmpty then
     Exit;
   MFiltration := Trim(CDS_Main.fieldbyname('SPID').AsString);
-  MPrintJson := '{ "LBName": "±êÇ©´òÓ¡","QrCodeField": "MXID","DConString": "' + DConString + '","DCode": "' + DCode + '","DName": "' + DName + '","IsPreview": true,"printerIndex": 0,"ExportFileType": "", "PrtArgs": [ {"SqlStr": "EXEC P_YMT_CK_MX_Prt1 ''' + MFiltration + ''' " }] }';
+  MPrintJson := '{ "LBName": "一码通坯布标签","QrCodeField": "MXID","DConString": "' + DConString + '","DCode": "' + DCode + '","DName": "' + DName + '","IsPreview": true,"printerIndex": 0,"ExportFileType": "", "PrtArgs": [ {"SqlStr": "EXEC P_YMT_CK_MX_Prt1 ''' + MFiltration + ''' " }] }';
   FunPrint(Application, PChar(MPrintJson));
 
 end;
@@ -825,6 +856,7 @@ begin
         sql.Add('where SPID=' + quotedstr(trim(CDS_Main.fieldbyname('SPID').AsString)));
         execsql;
       end;
+
       with CDS_Main do
       begin
         Edit;
@@ -943,5 +975,19 @@ begin
   Panel5.Visible := False;
 end;
 
+procedure TfrmYMTRKList.MXIDKeyPress(Sender: TObject; var Key: Char);
+begin
+  if Key = #13 then
+  begin
+    if ADOQueryMX.Active then
+    begin
+      SDofilter(ADOQueryMX, SGetFilters(Panel6, 1, 2));
+      SCreateCDS20(ADOQueryMX, CDS_MX);
+      SInitCDSData20(ADOQueryMX, CDS_MX);
+    end;
+  end;
+
+end;
+
 end.
 

云翔一码通/U_YMTStockList.dfm

@@ -1,6 +1,6 @@
 object frmStockList: TfrmStockList
-  Left = -1
-  Top = 580
+  Left = 892
+  Top = 817
   Width = 1470
   Height = 823
   Caption = #24211#23384#26597#35810
@@ -390,8 +390,9 @@ object frmStockList: TfrmStockList
       object Tv1Column5: TcxGridDBColumn
         Caption = #32534#21495
         DataBinding.FieldName = 'FromMXID'
+        PropertiesClassName = 'TcxTextEditProperties'
+        Properties.ReadOnly = True
         HeaderAlignmentHorz = taCenter
-        Options.Editing = False
       end
       object v1Column2: TcxGridDBColumn
         Tag = 2

云翔一码通/U_YMTStockList.pas

@@ -187,6 +187,7 @@ begin
       sql.Add(' and A.CRTime<=''' + Trim(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1)) + '''');
       sql.Add(' and isnull(CKName,'''')=''ÃæÁÏ''');
       SQL.Add(' and CRFlag=''Èë¿â''  ');
+      SQL.Add(' and Valid=''Y''  ');
       Open;
       //ShowMessage(SQL.Text);
     end;
@@ -213,14 +214,14 @@ end;
 
 procedure TfrmStockList.TBCloseClick(Sender: TObject);
 begin
-  WriteCxGrid('´ý¼ì²¼Èë¿âÁбí', Tv1, 'ÃæÁϲֿâ');
+  WriteCxGrid('¿â´æÁбí', Tv1, 'ÃæÁϲֿâ');
   Close;
 end;
 
 procedure TfrmStockList.FormShow(Sender: TObject);
 begin
 
-  ReadCxGrid('´ý¼ì²¼Èë¿âÁбí', Tv1, 'ÃæÁϲֿâ');
+  ReadCxGrid('¿â´æÁбí', Tv1, 'ÃæÁϲֿâ');
 
   InitGrid();
 end;

云翔一码通/U_YMTStockSel.dfm

@@ -1,6 +1,6 @@
 object frmStockSel: TfrmStockSel
-  Left = 237
-  Top = 581
+  Left = 787
+  Top = 973
   Width = 1328
   Height = 687
   Caption = #24211#23384#36873#25321
@@ -79,7 +79,7 @@ object frmStockSel: TfrmStockSel
       Top = 14
       Width = 80
       Height = 19
-      Caption = #19979#21333#26085#26399
+      Caption = #20837#24211#26102#38388
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -19
@@ -88,11 +88,11 @@ object frmStockSel: TfrmStockSel
       ParentFont = False
     end
     object Label4: TLabel
-      Left = 241
-      Top = 14
-      Width = 73
+      Left = 406
+      Top = 15
+      Width = 40
       Height = 19
-      Caption = #23458'   '#25143
+      Caption = #23458#25143
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -19
@@ -114,11 +114,11 @@ object frmStockSel: TfrmStockSel
       ParentFont = False
     end
     object Label5: TLabel
-      Left = 489
+      Left = 601
       Top = 14
-      Width = 73
+      Width = 40
       Height = 19
-      Caption = #21697'   '#21517
+      Caption = #21697#21517
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -19
@@ -141,7 +141,7 @@ object frmStockSel: TfrmStockSel
       Visible = False
     end
     object Label2: TLabel
-      Left = 746
+      Left = 794
       Top = 14
       Width = 80
       Height = 19
@@ -153,8 +153,21 @@ object frmStockSel: TfrmStockSel
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object Label3: TLabel
+      Left = 233
+      Top = 14
+      Width = 20
+      Height = 19
+      Caption = #33267
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
     object BegDate: TDateTimePicker
-      Left = 100
+      Left = 108
       Top = 10
       Width = 123
       Height = 27
@@ -170,8 +183,8 @@ object frmStockSel: TfrmStockSel
       TabOrder = 0
     end
     object EndDate: TDateTimePicker
-      Left = 100
-      Top = 37
+      Left = 256
+      Top = 10
       Width = 123
       Height = 27
       Date = 40675.464761099540000000
@@ -187,8 +200,8 @@ object frmStockSel: TfrmStockSel
     end
     object CustomerNoName: TEdit
       Tag = 2
-      Left = 328
-      Top = 9
+      Left = 453
+      Top = 10
       Width = 140
       Height = 27
       Font.Charset = GB2312_CHARSET
@@ -210,7 +223,7 @@ object frmStockSel: TfrmStockSel
     end
     object SPName: TEdit
       Tag = 2
-      Left = 576
+      Left = 648
       Top = 9
       Width = 139
       Height = 27
@@ -241,7 +254,7 @@ object frmStockSel: TfrmStockSel
     end
     object CRType: TComboBox
       Tag = 2
-      Left = 844
+      Left = 884
       Top = 10
       Width = 139
       Height = 27
@@ -255,8 +268,10 @@ object frmStockSel: TfrmStockSel
       ItemHeight = 19
       ParentFont = False
       TabOrder = 6
+      OnChange = CustomerNoNameChange
       Items.Strings = (
         ''
+        #26816#39564#20837#24211
         #21152#24037#23436#25104
         #22238#20462#23436#25104
         #26816#39564#36864#22238

云翔一码通/U_YMTStockSel.pas

@@ -87,6 +87,7 @@ type
     cxGrid2Level1: TcxGridLevel;
     Label2: TLabel;
     CRType: TComboBox;
+    Label3: TLabel;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -167,6 +168,7 @@ begin
       sql.Add(' and A.CRTime<=''' + Trim(FormatDateTime('yyyy-MM-dd', enddate.DateTime + 1)) + '''');
       sql.Add(' and isnull(CKName,'''')=''ÃæÁÏ''');
       SQL.Add(' and CRFlag=''Èë¿â''  ');
+      SQL.Add(' and valid=''Y''  ');
       Open;
       //ShowMessage(SQL.Text);
     end;
@@ -226,7 +228,13 @@ end;
 procedure TfrmStockSel.SPNameKeyPress(Sender: TObject; var Key: Char);
 begin
   if Key = #13 then
-    InitGrid();
+  begin
+    if ADOQueryMain.Active = False then
+      Exit;
+    SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
+    SCreateCDS20(ADOQueryMain, CDS_Main);
+    SInitCDSData20(ADOQueryMain, CDS_Main);
+  end;
 end;
 
 procedure TfrmStockSel.MLConNoKeyPress(Sender: TObject; var Key: Char);

云翔一码通/U_ZdyAttachGYS.dfm

@@ -1,28 +1,28 @@
 object frmZdyAttachGYS: TfrmZdyAttachGYS
-  Left = 512
-  Top = 376
+  Left = 431
+  Top = 800
   Width = 1038
   Height = 618
   Caption = #20379#24212#21830#36164#26009#31649#29702
   Color = clBtnFace
   Font.Charset = GB2312_CHARSET
   Font.Color = clWindowText
-  Font.Height = -15
+  Font.Height = -12
   Font.Name = #23435#20307
   Font.Style = []
   OldCreateOrder = False
   OnClose = FormClose
   OnDestroy = FormDestroy
   OnShow = FormShow
-  PixelsPerInch = 120
-  TextHeight = 15
+  PixelsPerInch = 96
+  TextHeight = 12
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
     Width = 1030
     Height = 31
     ButtonHeight = 30
-    ButtonWidth = 65
+    ButtonWidth = 59
     Caption = 'ToolBar1'
     Color = clSkyBlue
     DisabledImages = DataLink_YXYMT.ThreeImgList
@@ -41,7 +41,7 @@ object frmZdyAttachGYS: TfrmZdyAttachGYS
       OnClick = TBRafreshClick
     end
     object ToolButton2: TToolButton
-      Left = 69
+      Left = 63
       Top = 0
       AutoSize = True
       Caption = #36807#28388
@@ -49,7 +49,7 @@ object frmZdyAttachGYS: TfrmZdyAttachGYS
       OnClick = ToolButton2Click
     end
     object TBClose: TToolButton
-      Left = 138
+      Left = 126
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -61,31 +61,31 @@ object frmZdyAttachGYS: TfrmZdyAttachGYS
     Left = 0
     Top = 31
     Width = 1030
-    Height = 49
+    Height = 39
     Align = alTop
     BevelInner = bvRaised
     BevelOuter = bvLowered
     Color = clSkyBlue
     TabOrder = 1
     object Label3: TLabel
-      Left = 254
-      Top = 16
-      Width = 75
-      Height = 15
+      Left = 203
+      Top = 13
+      Width = 60
+      Height = 12
       Caption = #20379#24212#21830#31616#31216
     end
     object Label1: TLabel
-      Left = 28
-      Top = 16
-      Width = 75
-      Height = 15
+      Left = 22
+      Top = 13
+      Width = 60
+      Height = 12
       Caption = #20379#24212#21830#32534#21495
     end
     object KHNameJC: TEdit
       Tag = 2
-      Left = 334
-      Top = 11
-      Width = 112
+      Left = 267
+      Top = 9
+      Width = 90
       Height = 23
       ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
       TabOrder = 1
@@ -93,9 +93,9 @@ object frmZdyAttachGYS: TfrmZdyAttachGYS
     end
     object KHNo: TEdit
       Tag = 2
-      Left = 104
-      Top = 11
-      Width = 112
+      Left = 83
+      Top = 9
+      Width = 90
       Height = 23
       ImeName = #20013#25991' - QQ'#25340#38899#36755#20837#27861
       TabOrder = 0
@@ -104,9 +104,9 @@ object frmZdyAttachGYS: TfrmZdyAttachGYS
   end
   object cxGrid1: TcxGrid
     Left = 0
-    Top = 80
+    Top = 70
     Width = 1030
-    Height = 501
+    Height = 517
     Align = alClient
     TabOrder = 2
     object Tv1: TcxGridDBTableView

云翔一码通/YXYMT.dof

@@ -101,7 +101,7 @@ DebugSourceDirs=
 UsePackages=0
 [Parameters]
 RunParams=
-HostApplication=E:\项目资料\00_重点客户\云翔\D7myYunxiang\云翔一码通\testDll.exe
+HostApplication=D:\Project\D7myYunxiang\云翔一码通\testDll.exe
 Launcher=
 UseLauncher=0
 DebugCWD=

云翔生产管理(MYSC.dll)/U_GetDllForm.pas

@@ -90,10 +90,12 @@ begin
   user := 'sa';
   pswd := 'rightsoft@123';
   DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server;
-//  DConString := DataBaseStr;
+//  DParameters1 := '高权限';
+//  DName := 'ADMIN';
+//  DCode := 'ADMIN';
   if trim(DataBaseStr) <> '' then
     DConString := DataBaseStr;
-  DParameters1 := '高权限';
+
 //  DParameters3:='1';
   if not ConnData() then
   begin

云翔生产管理(MYSC.dll)/U_LLRKInPutMH_MCG.dfm

@@ -1,6 +1,6 @@
 object frmLLRKInPutMH_MCG: TfrmLLRKInPutMH_MCG
-  Left = 421
-  Top = 228
+  Left = 512
+  Top = 644
   Width = 1261
   Height = 492
   Caption = #36741#26009#37319#36141#20837#24211#24405#20837
@@ -285,7 +285,7 @@ object frmLLRKInPutMH_MCG: TfrmLLRKInPutMH_MCG
       Top = 245
       Width = 42
       Height = 20
-      Caption = #21305#25968
+      Caption = #20214#25968
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -20
@@ -324,7 +324,7 @@ object frmLLRKInPutMH_MCG: TfrmLLRKInPutMH_MCG
       Top = 284
       Width = 42
       Height = 20
-      Caption = #21305#38271
+      Caption = #20214#38271
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -20

云翔生产管理(MYSC.dll)/U_LLRKInPutMH_MCG.pas

@@ -315,6 +315,7 @@ begin
     sql.Add(' from CK_MYSC_CR   ');
     sql.Add(' where RKNo=''' + Trim(FMainId) + '''');
     sql.Add(' and MYID=''' + Trim(FSubid) + '''');
+//    ShowMessage(SQL.Text);
     Open;
   end;
   if ADOQuery1.IsEmpty = false then
@@ -330,6 +331,7 @@ begin
   begin
     initBtnColor(Panel4, clMenu);
   end;
+
   if PState = 2 then
   begin
     FSubid := '';
@@ -341,6 +343,7 @@ begin
     MYMDMoney.Text := '';
     MYMDPrice.Text := '';
   end;
+
   if RKNo.Text = '' then
   begin
     if GetLSNo(ADOCmd, maxmxno, 'RN', 'CK_MYSC_CR', 3, 1) = False then
@@ -404,6 +407,7 @@ begin
     begin
       maxno := Trim(FSubid);
     end;
+
     with ADOCmd do
     begin
       Close;
@@ -411,6 +415,7 @@ begin
       SQL.Add('select * from CK_MYSC_CR where MYId=''' + Trim(maxno) + '''');
       Open;
     end;
+
     with ADOCmd do
     begin
       if IsEmpty then
@@ -426,7 +431,9 @@ begin
         FieldByName('EditerCode').Value := Trim(DCode);
         FieldByName('EditTime').Value := SGetServerDateTime(ADOTemp);
       end;
+
       RTSetsavedata(ADOCmd, 'CK_MYSC_CR', Panel4, 2);
+
       FieldByName('MYId').Value := Trim(maxno);
       FieldByName('CRType').Value := '²É¹ºÈë¿â';
       if Trim(FCGSID) <> '' then
@@ -444,6 +451,7 @@ begin
       Post;
     end;
     FMainId := Trim(maxno);
+
     with ADOCmd do
     begin
       close;
@@ -753,7 +761,7 @@ end;
 
 procedure TfrmLLRKInPutMH_MCG.MDJChangChange(Sender: TObject);
 begin
-  KgQty.Text := FormatFloat('0.00', strtofloatdef(MYKZ.text, 0) * strtofloatdef(MYMF.text, 0) * strtofloatdef(MDJChang.text, 0) * strtofloatdef(PS.text, 0) / 100000);
+  KgQty.Text := FormatFloat('0.00', strtofloatdef(MYKZ.text, 0) * strtofloatdef(MYMF.text, 0) * (strtofloatdef(MDJChang.text, 0) * strtofloatdef(PS.text, 0) + strtofloatdef(AddQty.text, 0)) / 100000 ) ;
   Qty.Text := FloatToStr(strtofloatdef(MDJChang.text, 0) * strtofloatdef(PS.text, 0) + strtofloatdef(AddQty.text, 0));
 end;
 

云翔生产管理(MYSC.dll)/U_MCGRKList.dfm

@@ -1,6 +1,6 @@
 object frmMCGRKList: TfrmMCGRKList
-  Left = 508
-  Top = 193
+  Left = 607
+  Top = 522
   Width = 1149
   Height = 676
   Caption = #26825#37319#36141#20837#24211#30331#35760
@@ -21,7 +21,6 @@ object frmMCGRKList: TfrmMCGRKList
     Left = 0
     Top = 0
     Width = 1141
-    Height = 62
     AutoSize = True
     ButtonHeight = 30
     ButtonWidth = 95
@@ -87,12 +86,11 @@ object frmMCGRKList: TfrmMCGRKList
       AutoSize = True
       Caption = #21367#25968#31995#25968
       ImageIndex = 25
-      Wrap = True
       OnClick = ToolButton3Click
     end
     object labMYType: TLabel
-      Left = 0
-      Top = 30
+      Left = 474
+      Top = 0
       Width = 292
       Height = 30
       Caption = '     '#36741#26009#37319#36141#20837#24211'  '
@@ -104,8 +102,8 @@ object frmMCGRKList: TfrmMCGRKList
       ParentFont = False
     end
     object ToolButton4: TToolButton
-      Left = 292
-      Top = 30
+      Left = 766
+      Top = 0
       AutoSize = True
       Caption = #25171#21360
       ImageIndex = 4
@@ -113,16 +111,16 @@ object frmMCGRKList: TfrmMCGRKList
       OnClick = ToolButton4Click
     end
     object TBExport: TToolButton
-      Left = 361
-      Top = 30
+      Left = 835
+      Top = 0
       AutoSize = True
       Caption = #23548#20986
       ImageIndex = 97
       OnClick = TBExportClick
     end
     object TBClose: TToolButton
-      Left = 430
-      Top = 30
+      Left = 904
+      Top = 0
       AutoSize = True
       Caption = #20851#38381
       ImageIndex = 21
@@ -131,9 +129,9 @@ object frmMCGRKList: TfrmMCGRKList
   end
   object cxGrid1: TcxGrid
     Left = 0
-    Top = 139
+    Top = 109
     Width = 1141
-    Height = 506
+    Height = 536
     Align = alClient
     PopupMenu = PopupMenu1
     TabOrder = 2
@@ -330,7 +328,7 @@ object frmMCGRKList: TfrmMCGRKList
   end
   object Panel1: TPanel
     Left = 0
-    Top = 62
+    Top = 32
     Width = 1141
     Height = 77
     Align = alTop