111

B02基础纱线仓库/U_YarnOutEdit.pas

@@ -466,7 +466,6 @@ begin
           if Self.CDS_Sub.IsEmpty = False then
           begin
             CopyAddRowCDS(CDS_Sub);
-
           end
           else
           begin
@@ -474,6 +473,9 @@ begin
             begin
               Append;
               FieldByName('IOTime').Value := Trim(FormatDateTime('yyyy-MM-dd', Now));
+              FieldByName('IOType').Value := '车间领用';
+              FieldByName('ToCoNo').Value := frmYarnStkHZSel.CDS_Main.fieldbyname('StkCoNo').Value;     //出到单位
+              FieldByName('ToCoName').Value := frmYarnStkHZSel.CDS_Main.fieldbyname('StkCoName').Value;
               Post;
             end;
           end;
@@ -481,16 +483,13 @@ begin
           with Self.CDS_Sub do
           begin
             edit;
-
+           // FieldByName('IOType').Value := '车间领用';
-//              FieldByName('IOTime').Value := Trim(FormatDateTime('yyyy-MM-dd', Now))
-//              FieldByName('STKID').Value := frmYarnStkSel.CDS_Main.fieldbyname('BYIOID').Value;
-            FieldByName('IOType').Value := '车间领用';
             FieldByName('FromCoNo').Value := frmYarnStkHZSel.CDS_Main.fieldbyname('FromCoNo').Value;  //À´×Ôµ¥Î»
             FieldByName('FromCoName').Value := frmYarnStkHZSel.CDS_Main.fieldbyname('FromCoName').Value;
             FieldByName('StkCoNo').Value := frmYarnStkHZSel.CDS_Main.fieldbyname('StkCoNo').Value;    //´æ·Åµ¥Î»
             FieldByName('StkCoName').Value := frmYarnStkHZSel.CDS_Main.fieldbyname('StkCoName').Value;
-            FieldByName('ToCoNo').Value := frmYarnStkHZSel.CDS_Main.fieldbyname('StkCoNo').Value;     //出到单位
+          //  FieldByName('ToCoNo').Value := frmYarnStkHZSel.CDS_Main.fieldbyname('StkCoNo').Value;     //出到单位
-            FieldByName('ToCoName').Value := frmYarnStkHZSel.CDS_Main.fieldbyname('StkCoName').Value;
+          //  FieldByName('ToCoName').Value := frmYarnStkHZSel.CDS_Main.fieldbyname('StkCoName').Value;
 //
             FieldByName('Brand').Value := frmYarnStkHZSel.CDS_Main.fieldbyname('Brand').Value;
             FieldByName('Y_Name').Value := frmYarnStkHZSel.CDS_Main.fieldbyname('Y_Name').Value;

D01针织生产计划/U_KnitPlanInPut.dfm

@@ -3,13 +3,13 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
   Top = 14
   Caption = #36710#38388#29983#20135#35745#21010#21333#24405#20837
   ClientHeight = 580
-  ClientWidth = 1363
+  ClientWidth = 1464
   Color = clWhite
   Font.Charset = GB2312_CHARSET
   Font.Height = -12
   Font.Name = #23435#20307
   Position = poScreenCenter
-  ExplicitWidth = 1379
+  ExplicitWidth = 1480
   ExplicitHeight = 619
   PixelsPerInch = 96
   TextHeight = 12
@@ -17,7 +17,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
     Tag = 1
     Left = 0
     Top = 0
-    Width = 1363
+    Width = 1464
     Height = 38
     AutoSize = True
     ButtonHeight = 38
@@ -70,7 +70,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
   object ScrollBox1: TScrollBox [1]
     Left = 0
     Top = 38
-    Width = 1363
+    Width = 1464
     Height = 627
     Align = alTop
     BevelInner = bvNone
@@ -651,6 +651,19 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object lbl13: TLabel
+      Left = 1192
+      Top = 86
+      Width = 66
+      Height = 21
+      Caption = #21333#20215#65306
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clRed
+      Font.Height = -21
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
     object OrdDate: TDateTimePicker
       Left = 669
       Top = 4
@@ -659,7 +672,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
       BevelInner = bvNone
       Date = 40916.000000000000000000
       Format = 'yyyy-MM-dd'
-      Time = 0.670856296288548000
+      Time = 0.670856296288548100
       ShowCheckbox = True
       Font.Charset = GB2312_CHARSET
       Font.Color = clBlack
@@ -677,7 +690,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
       BevelInner = bvNone
       Date = 40916.000000000000000000
       Format = 'yyyy-MM-dd'
-      Time = 0.670856296288548000
+      Time = 0.670856296288548100
       ShowCheckbox = True
       Font.Charset = GB2312_CHARSET
       Font.Color = clBlack
@@ -1418,11 +1431,27 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
         #26159
         #21542)
     end
+    object Price: TEdit
+      Tag = 2
+      Left = 1253
+      Top = 82
+      Width = 82
+      Height = 27
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clBlack
+      Font.Height = -21
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 44
+      OnChange = OrdPieceWeightChange
+      OnKeyPress = ConNoKeyPress
+    end
   end
   object Panel2: TPanel [2]
     Left = 0
     Top = 665
-    Width = 1363
+    Width = 1464
     Height = 0
     Align = alClient
     TabOrder = 2
@@ -1430,7 +1459,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
     object cxPageControl1: TcxPageControl
       Left = 1
       Top = 1
-      Width = 1361
+      Width = 1462
       Height = 6
       Align = alClient
       Color = clWhite
@@ -1447,7 +1476,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
       Properties.CustomButtons.Buttons = <>
       Properties.Style = 6
       ClientRectBottom = 8
-      ClientRectRight = 1361
+      ClientRectRight = 1462
       ClientRectTop = 8
       object cxTabSheet1: TcxTabSheet
         Caption = '  '#37197'  '#27604'   '
@@ -1457,7 +1486,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
         object cxGrid2: TcxGrid
           Left = 0
           Top = 38
-          Width = 1361
+          Width = 1462
           Height = 4
           Align = alClient
           Font.Charset = GB2312_CHARSET
@@ -1657,7 +1686,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
           Tag = 1
           Left = 0
           Top = 0
-          Width = 1361
+          Width = 1462
           Height = 38
           AutoSize = True
           ButtonHeight = 38
@@ -1710,7 +1739,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
         object Panel1: TPanel
           Left = 0
           Top = 183
-          Width = 1361
+          Width = 1462
           Height = 25
           Align = alTop
           BevelInner = bvRaised
@@ -1728,7 +1757,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
         object Panel3: TPanel
           Left = 0
           Top = 0
-          Width = 1361
+          Width = 1462
           Height = 25
           Align = alTop
           BevelInner = bvRaised
@@ -1746,7 +1775,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
         object cxGrid5: TcxGrid
           Left = 0
           Top = 208
-          Width = 1361
+          Width = 1462
           Height = 1
           Align = alClient
           Font.Charset = GB2312_CHARSET
@@ -3028,7 +3057,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
         object cxGrid3: TcxGrid
           Left = 0
           Top = 25
-          Width = 1361
+          Width = 1462
           Height = 158
           Align = alTop
           Font.Charset = GB2312_CHARSET
@@ -4151,8 +4180,8 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut
   end
   inherited ADOQueryBaseCmd: TADOQuery
     Connection = DataLink_KnitPlan.ADOLink
-    Left = 1313
+    Left = 1403
-    Top = 88
+    Top = 36
   end
   inherited ADOQueryBaseTemp: TADOQuery
     Connection = DataLink_KnitPlan.ADOLink

D01针织生产计划/U_KnitPlanInPut.pas

@@ -404,6 +404,8 @@ type
     C_WidthUnit: TComboBox;
     lbl12: TLabel;
     ISShouJian: TComboBox;
+    lbl13: TLabel;
+    Price: TEdit;
     procedure TBCloseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure TBSaveClick(Sender: TObject);
@@ -523,7 +525,17 @@ begin
   begin
     Close;
     SQL.Clear;
-    sql.Add('select * from knit_Plan_Sub A where A.MainId=''' + Trim(FMainId) + '''');
+
+    sql.Add('select ');
+    if (trim(DName) = '陈鹏') or (trim(DName) = '俞碧涛') or (trim(DName) = '俞碧涵') or (trim(DName) = '朱庭辰') then
+        sql.Add('price,')
+      else if (trim(DName) = '韩宇佳') or (trim(DName) = '倪剑波') or (trim(DName) = '张明华') then
+      begin
+         sql.Add('Price = (select CASE WHEN Filler = '+quotedstr(DName)+' THEN Price ELSE ISNULL(Price, 0) * 0 END AS Price from knit_Plan_Sub BB inner join Knit_plan_main AA on AA.Mainid = BB.MainId where AA.Mainid = A.Mainid),');
+      end
+      else
+        sql.Add('price = isnull(price,0) * 0 ,');
+    sql.Add('* from knit_Plan_Sub A where A.MainId=''' + Trim(FMainId) + '''');
     Open;
   end;
   SCSHData(ADOQuery1, ScrollBox1, 2);
@@ -1079,6 +1091,11 @@ begin
     Application.MessageBox('克重不能为空!', '提示', 0);
     Exit;
   end;
+  if Trim(Price.Text) = '' then
+  begin
+    Application.MessageBox('单价不能为空!', '提示', 0);
+    Exit;
+  end;
   if Trim(OrdQty.Text) = '' then
   begin
     Application.MessageBox('总数量不能为空!', '提示', 0);
@@ -1135,6 +1152,11 @@ begin
     Application.MessageBox('总数量非法数字!', '提示', 0);
     Exit;
   end;
+  if TryStrToFloat(Price.Text, FReal) = False then
+  begin
+    Application.MessageBox('单价非法数字!', '提示', 0);
+    Exit;
+  end;
   if TryStrToFloat(OrdPiece.Text, FReal) = False then
   begin
     Application.MessageBox('匹数非法数字!', '提示', 0);

D01针织生产计划/U_KnitPlanList.dfm

@@ -334,6 +334,45 @@ inherited frmKnitPlanList: TfrmKnitPlanList
       Height = 12
       Caption = #34892#21495
     end
+    object lbl3: TLabel
+      Left = 1098
+      Top = 0
+      Width = 208
+      Height = 20
+      Caption = #23383#20307#39068#33394#20026#32418#65306#24050#32463#35745#21010#25490#21333
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clRed
+      Font.Height = -16
+      Font.Name = #24494#36719#38597#40657
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object lbl4: TLabel
+      Left = 1098
+      Top = 44
+      Width = 250
+      Height = 22
+      Caption = #32972#26223#39068#33394#20026#34013#65306#31163#20132#26399#24050#32463#19981#36275'4'#22825
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clRed
+      Font.Height = -16
+      Font.Name = #24494#36719#38597#40657
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object lbl5: TLabel
+      Left = 1098
+      Top = 22
+      Width = 330
+      Height = 22
+      Caption = #32972#26223#39068#33394#20026#28784#65306#19979#21333#24050#32463'5'#22825#24448#19978#36824#26410#24320#22987#29983#20135
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clRed
+      Font.Height = -16
+      Font.Name = #24494#36719#38597#40657
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
     object BegDate: TDateTimePicker
       Left = 100
       Top = 9
@@ -633,7 +672,6 @@ inherited frmKnitPlanList: TfrmKnitPlanList
         DataBinding.FieldName = 'C_Name'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Options.Editing = False
         Styles.Header = DataLink_KnitPlan.Default
         Width = 73
       end
@@ -852,8 +890,9 @@ inherited frmKnitPlanList: TfrmKnitPlanList
         Caption = #21097#20313#20132#26399
         DataBinding.FieldName = 'IFJQ'
         DataBinding.IsNullValueType = True
-        Visible = False
+        HeaderAlignmentHorz = taCenter
-        Width = 70
+        Options.Editing = False
+        Width = 60
       end
       object cxgrdbclmnTv1Column18: TcxGridDBColumn
         Caption = #33394#19997#27604#20363
@@ -920,6 +959,14 @@ inherited frmKnitPlanList: TfrmKnitPlanList
         Options.Editing = False
         Width = 90
       end
+      object cxgrdbclmnTv1Column24: TcxGridDBColumn
+        Caption = #21333#20215
+        DataBinding.FieldName = 'price'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 70
+      end
     end
     object cxGrid1Level1: TcxGridLevel
       GridView = Tv1

D01针织生产计划/U_KnitPlanList.pas

@@ -168,6 +168,10 @@ type
     cxgrdbclmnTv1Column22: TcxGridDBColumn;
     cxgrdbclmnTv1Column23: TcxGridDBColumn;
     SCPrint: TToolButton;
+    lbl3: TLabel;
+    lbl4: TLabel;
+    lbl5: TLabel;
+    cxgrdbclmnTv1Column24: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
     procedure TBFindClick(Sender: TObject);
@@ -317,8 +321,16 @@ begin
       Filtered := False;
       Close;
       sql.Clear;
-      sql.Add('select isnull(isred,'''') AS isred,IfJQ = DATEDIFF(day, CONVERT(date, GETDATE()), A.DlyDate),A.*,B.* ');
+      sql.Add('select isnull(isred,'''') AS isred,IfJQ = DATEDIFF(day, CONVERT(date, GETDATE()), A.DlyDate),');
-      sql.Add(',CarHZ=cast((SELECT  DISTINCT CarNO +'';'' from Knit_Plan_Card X where X.status <>''-1'' and X.MainID=A.MainID FOR XML PATH(''''))as VARCHAR(6000)  )  ');
+      if (trim(DName) = '陈鹏') or (trim(DName) = '俞碧涛') or (trim(DName) = '俞碧涵') or (trim(DName) = '朱庭辰') then
+        sql.Add('price,')
+      else if (trim(DName) = '韩宇佳') or (trim(DName) = '倪剑波') or (trim(DName) = '张明华') then
+      begin
+         sql.Add('Price = (select CASE WHEN Filler = '+quotedstr(DName)+' THEN Price ELSE ISNULL(Price, 0) * 0 END AS Price from knit_Plan_Sub BB inner join Knit_plan_main AA on AA.Mainid = BB.MainId where AA.Mainid = A.Mainid),');
+      end
+      else
+        sql.Add('price = isnull(B.price,0) * 0 ,');
+      sql.Add('A.*,B.*,CarHZ=cast((SELECT  DISTINCT CarNO +'';'' from Knit_Plan_Card X where X.status <>''-1'' and X.MainID=A.MainID FOR XML PATH(''''))as VARCHAR(6000)  )  ');
       sql.Add(',APPS=(select count (PCID) from Knit_Plan_Card X where X.MainID =A.MainID and X.Status <> ''-1'')  ');
       sql.Add(',JYPS=(select count (PCID) from Knit_Cloth_Inspect X where X.MainID =A.MainID  )  ');
       sql.Add(',XJPS=(select count (PCID) from Knit_Plan_Card X where X.MainID =A.MainID  and X.IsOffMachine = ''ÊÇ'')  ');
@@ -350,7 +362,7 @@ begin
 //        sql.Add('and EXISTS (select PCID from Knit_Plan_Card X where A.MainId =X.MainId and X.Status <> ''-1'') ');
       end;
       sql.add('order by A.FILLTIME DESC');
-   //   ShowMessage(sql.text);
+//      ShowMessage(sql.text);
       Open;
     end;
     SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));
@@ -1192,24 +1204,33 @@ end;
 
 procedure TfrmKnitPlanList.Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
 begin
+  if cxTabControl1.TabIndex = 0 then
+  begin
+    if AViewInfo.GridRecord.Values[Tv1Column8.Index] = '是' then
+    //设置字体颜色
+      ACanvas.Font.Color := $1C6BFF;
+    if (Date - AViewInfo.GridRecord.Values[tv1.GetColumnByFieldName('OrdDate').Index]) >= 5 then
+    begin
+      //设置背景颜色
+      ACanvas.Brush.Color := clLtGray;
+    end;
+
+  end;
+
   if cxTabControl1.TabIndex = 1 then
   begin
     if AViewInfo.GridRecord.Values[tv1.GetColumnByFieldName('IFJQ').Index] <= 3 then
       ACanvas.Brush.Color := clMenuHighlight;
-    if AViewInfo.GridRecord.Values[tv1.GetColumnByFieldName('OrdPiece').Index] > AViewInfo.GridRecord.Values[tv1.GetColumnByFieldName('APPS').Index] then
+//    if AViewInfo.GridRecord.Values[tv1.GetColumnByFieldName('OrdPiece').Index] > AViewInfo.GridRecord.Values[tv1.GetColumnByFieldName('APPS').Index] then
-    begin
+//    begin
-      if AViewInfo.Item.Index = 1 then
+//      if AViewInfo.Item.Index = 2 then
-      begin
+//      begin
-    // ÉèÖñ³¾°ÑÕÉ«
+//    // 设置背景颜色
-        ACanvas.Brush.Color := clYellow;
+//        ACanvas.Brush.Color := clYellow;
-
+//
+//      end;
+//    end;
   end;
-    end;
-
-  end;
-
-  if AViewInfo.GridRecord.Values[Tv1Column8.Index] = 'ÊÇ' then
-    ACanvas.Font.Color := $1C6BFF;
 end;
 
 procedure TfrmKnitPlanList.Tv1FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean);

D01针织生产计划/U_LCKQuery.dfm

@@ -44,12 +44,20 @@ inherited frmLCKQuery: TfrmLCKQuery
       Left = 71
       Top = 0
       AutoSize = True
-      Caption = #25171#21360
+      Caption = #25171#21360#27969#31243#21345
       ImageIndex = 21
       OnClick = ToolButton1Click
     end
+    object ToolButton3: TToolButton
+      Left = 178
+      Top = 0
+      AutoSize = True
+      Caption = #25171#21360#30721#21333
+      ImageIndex = 21
+      OnClick = ToolButton3Click
+    end
     object ToolButton2: TToolButton
-      Left = 142
+      Left = 273
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -57,7 +65,7 @@ inherited frmLCKQuery: TfrmLCKQuery
       OnClick = ToolButton2Click
     end
     object btn5: TToolButton
-      Left = 237
+      Left = 368
       Top = 0
       AutoSize = True
       Caption = #21024#38500#27969#31243#21345
@@ -65,21 +73,21 @@ inherited frmLCKQuery: TfrmLCKQuery
       OnClick = btn5Click
     end
     object btn3: TToolButton
-      Left = 344
+      Left = 475
       Top = 0
       Caption = #20462#25913#36710#21495
       ImageIndex = 3
       OnClick = btn3Click
     end
     object btn4: TToolButton
-      Left = 447
+      Left = 578
       Top = 0
       Caption = #36710#21495#26631#40644
       ImageIndex = 3
       OnClick = btn4Click
     end
     object TBClose: TToolButton
-      Left = 550
+      Left = 681
       Top = 0
       AutoSize = True
       Caption = #20851#38381

D01针织生产计划/U_LCKQuery.pas

@@ -85,6 +85,7 @@ type
     btn5: TToolButton;
     lbl4: TLabel;
     C_Name: TEdit;
+    ToolButton3: TToolButton;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure TBCloseClick(Sender: TObject);
     procedure TBRafreshClick(Sender: TObject);
@@ -245,6 +246,8 @@ begin
 end;
 
 procedure TfrmLCKQuery.ToolButton3Click(Sender: TObject);
+var
+  WSql: string;
 begin
   if CDS_1.IsEmpty then
     Exit;
@@ -253,45 +256,50 @@ begin
     Application.MessageBox('ûÓÐÑ¡ÔñÊý¾Ý!', 'Ìáʾ', 0);
     Exit;
   end;
-  if Application.MessageBox('确定要作废数据吗？', '提示', 32 + 4) <> IDYES then
+
-    Exit;
+  WSql := '';
-  try
-    ADOQueryCmd.Connection.BeginTrans;
   CDS_1.DisableControls;
+
   with CDS_1 do
   begin
     First;
-      while CDS_1.Locate('SSel', True, []) do
+    while not Eof do
     begin
-        while CDS_1.FieldByName('SSel').AsBoolean = True do
+      if CDS_1.fieldbyname('SSel').AsBoolean then
       begin
-          if Trim(CDS_1.fieldbyname('IsOffMachine').AsString) <> '是' then
+        if WSql <> '' then
+        begin
+          WSql := WSql + ',' + QuotedStr(Trim(CDS_1.fieldbyname('LCKID').AsString));
+        end
+        else
+        begin
+          WSql := QuotedStr(Trim(CDS_1.fieldbyname('LCKID').AsString));
+        end;
+      end;
+      Next;
+    end;
+  end;
+
+  CDS_1.Locate('SSel', True, []);
+  CDS_1.EnableControls;
+
+  try
+    frmLabelPrint := TfrmLabelPrint.Create(Application);
+    with frmLabelPrint do
+    begin
+      FPreviewPrint := False;
+      FLMType := 'PrintLCK';
+      FFiltration1 := WSql;
+      if ShowModal = 1 then
       begin
         with ADOQueryCmd do
         begin
-              Close;
-              sql.Clear;
-              sql.Add(' update knit_Plan_Card  set Status =''-1'' ');
-              sql.Add(' ,DelId =''' + trim(DCode) + '''');
-              sql.Add(' ,Deler =''' + trim(DName) + '''');
-              sql.Add(' ,Deltime =getdate() ');
-              sql.Add(' where PCID=''' + Trim(CDS_1.fieldbyname('PCID').AsString) + '''');
-              sql.Add(' and Status =''0'' ');
-              ExecSQL;
-            end;
-          end;
-          CDS_1.Delete;
-        end;
-      end;
-    end;
-    CDS_1.EnableControls;
 
-    ADOQueryCmd.Connection.CommitTrans;
+        end;
-  except
+      end;
-    ADOQueryCmd.Connection.RollbackTrans;
+    end;
-    CDS_1.EnableControls;
+  finally
-    Application.MessageBox('作废失败!', '提示', 0);
+    frmLabelPrint.Free;
-    Exit;
   end;
 end;
 

D02针织坯布检验/U_KnitMachInsp.pas

@@ -731,7 +731,6 @@ begin
       CarNo.Text := FCarNo;
       JuanHao.Text := Trim(ADOTmp.fieldbyname('PCNO').AsString);
       SetDdetails();
-      InputLen.SetFocus;
       CIFBegClick(GrossWeight);
     end;
 
@@ -744,6 +743,7 @@ begin
     ClearGlobal();
   end;
 
+  InputLen.SetFocus;
   InitJYGrid();
   InitCDGrid(FCIID);
   PlayWav('扫描成功');
@@ -1447,23 +1447,48 @@ var
 begin
   if CheckData('疵点') = False then
     exit;
+//
+//  FCIFName := Trim(TSpeedButton(Sender).Hint);
+//  MovePanel1.Visible := True;
+//  lblCIFName.Caption := Trim(FCIFName);
+//  CIFNumber.SetFocus;
+//  //ÏÔʾÊý×Ö¼üÅÌ
+////  CIFBeg.Text := InputLen.Text;
+//  with Panel3 do
+//  begin
+//    for i := 0 to ControlCount - 1 do
+//    begin
+//      if Controls[i] is TSpeedButton then
+//      begin
+//        TSpeedButton(Controls[i]).Hint := Trim(CIFNumber.Name);
+//      end;
+//    end;
+//  end;
 
-  FCIFName := Trim(TSpeedButton(Sender).Hint);
+  with CDS_2 do
-  MovePanel1.Visible := True;
-  lblCIFName.Caption := Trim(FCIFName);
-  CIFNumber.SetFocus;
-  //显示数字键盘
-//  CIFBeg.Text := InputLen.Text;
-  with Panel3 do
   begin
-    for i := 0 to ControlCount - 1 do
+    Append;
+    FieldByName('CIFName').Value := Trim(TSpeedButton(Sender).Hint);
+    FieldByName('CIFbeg').Value := Trim(InputLen.Text);
+    FieldByName('CIFEnd').Value := 0;
+    FieldByName('CIFNumber').Value := 1;
+    FieldByName('CIFPoints').Value := 0;
+    if RadioGroup1.ItemIndex > -1 then
     begin
-      if Controls[i] is TSpeedButton then
+      if RadioGroup1.ItemIndex < 3 then
       begin
-        TSpeedButton(Controls[i]).Hint := Trim(CIFNumber.Name);
+        FieldByName('CIFPoints').Value := RadioGroup1.ItemIndex + 1;
+      end
+      else
+      begin
+        FieldByName('CIFPoints').Value := 4;
       end;
     end;
+    FieldByName('CIFQty').Value := 0;
+
+    Post;
   end;
+  EDTSCAN.SetFocus();
 
 end;
 
@@ -1847,10 +1872,10 @@ end;
 
 procedure TfrmKnitMachInsp.NetWeightKeyPress(Sender: TObject; var Key: Char);
 begin
-  if Key = #13 then
+//  if Key = #13 then
-  begin
+//  begin
-    BTPrint.Click;
+//    BTPrint.Click;
-  end;
+//  end;
 end;
 
 procedure TfrmKnitMachInsp.FormCreate(Sender: TObject);

F04染色刷卡/DyeProcess.dpr

@@ -22,7 +22,8 @@ uses
   U_DataLink in 'U_DataLink.pas' {DataLink_DyeProcess: TDataModule},
   U_DyeOutputList in 'U_DyeOutputList.pas' {frmDyeOutputList},
   U_DyeOutput in 'U_DyeOutput.pas' {frmDyeOutput},
-  uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas';
+  uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas',
+  U_BaseDataLink in '..\..\..\public10\design\U_BaseDataLink.pas' {BaseDataLink: TDataModule};
 
 {$R *.res}
 

F04染色刷卡/DyeProcess.dproj

@@ -171,6 +171,11 @@
             <FormType>dfm</FormType>
         </DCCReference>
         <DCCReference Include="..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas"/>
+        <DCCReference Include="..\..\..\public10\design\U_BaseDataLink.pas">
+            <Form>BaseDataLink</Form>
+            <FormType>dfm</FormType>
+            <DesignClass>TDataModule</DesignClass>
+        </DCCReference>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

F04染色刷卡/DyeProcess.dproj.local

@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
+    <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.775,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.138,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutput.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.963,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutputList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.882,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.963,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutputList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.326,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\DyeProcess.dproj</Transaction>
     <Transaction>1899-12-30 00:00:00.000.998,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\Unit1.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.326,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\DyeProcess.dproj=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\InformationBase.dproj</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
   </Transactions>
@@ -57,6 +58,8 @@
     <File Path="D:\Dp10Repo"/>
     <File Path="..\..\..\public10"/>
     <File Path="..\..\..\public10\design"/>
+    <File Path="..\..\..\public10\design\U_BaseDataLink.pas"/>
+    <File Path="..\..\..\public10\design\U_BaseDataLink.dfm"/>
     <File Path="..\..\..\public10\design\U_BaseHelp.pas"/>
     <File Path="..\..\..\public10\design\U_BaseHelp.dfm"/>
     <File Path="..\..\..\public10\design\U_BaseInput.pas"/>

F04染色刷卡/DyeProcess.skincfg

@@ -0,0 +1,5 @@
+[ExpressSkins]
+Default=1
+ShowNotifications=1
+Enabled=1
+dxSkinsDefaultPainters=1

F04染色刷卡/InformationBase.dpr

@@ -20,7 +20,8 @@ uses
   U_RTFun in '..\..\..\public10\ThreeFun\Fun\U_RTFun.pas',
   U_ZDYHelp in '..\..\..\public10\ThreeFun\Form\U_ZDYHelp.pas' {frmZDYHelp},
   Unit1 in 'Unit1.pas' {Form1},
-  U_CompanySel in '..\A00通用窗体\U_CompanySel.pas' {frmCompanySel};
+  U_CompanySel in '..\A00通用窗体\U_CompanySel.pas' {frmCompanySel},
+  U_BaseDataLink in '..\..\..\public10\design\U_BaseDataLink.pas' {BaseDataLink: TDataModule};
 
 {$R *.res}
 

F04染色刷卡/InformationBase.dproj

@@ -124,7 +124,7 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
-        <Debugger_HostApplication>D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\testDll.exe</Debugger_HostApplication>
+        <Debugger_HostApplication>D:\Dp10Repo\项目代码\D10gmBitao\F04染色刷卡\testDll.exe</Debugger_HostApplication>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -165,6 +165,11 @@
             <Form>frmCompanySel</Form>
             <FormType>dfm</FormType>
         </DCCReference>
+        <DCCReference Include="..\..\..\public10\design\U_BaseDataLink.pas">
+            <Form>BaseDataLink</Form>
+            <FormType>dfm</FormType>
+            <DesignClass>TDataModule</DesignClass>
+        </DCCReference>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

F04染色刷卡/InformationBase.dproj.local

@@ -3,18 +3,19 @@
 	<Transactions>
     <Transaction>1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas=</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas</Transaction>
     <Transaction>1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas</Transaction>
-    <Transaction>1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas</Transaction>
+    <Transaction>1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas=</Transaction>
     <Transaction>1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas</Transaction>
+    <Transaction>2025-06-12 19:52:24.596,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="android-support-v4.dex.jar"/>
@@ -61,6 +62,8 @@
     <File Path="..\..\..\public10\design\U_cxGridCustomCss.pas"/>
     <File Path="..\..\..\public10\design\U_globalVar.pas"/>
     <File Path="..\..\..\public10\design\U_WindowFormdesign.pas"/>
+    <File Path="..\..\..\public10\design\U_BaseDataLink.pas"/>
+    <File Path="..\..\..\public10\design\U_BaseDataLink.dfm"/>
     <File Path="..\..\..\public10\ThreeFun"/>
     <File Path="..\..\..\public10\ThreeFun\Form"/>
     <File Path="..\..\..\public10\ThreeFun\Form\U_ZDYHelp.pas"/>

F04染色刷卡/U_DataLink.dfm

@@ -1,9 +1,10 @@
-object DataLink_DyeProcess: TDataLink_DyeProcess
+inherited DataLink_DyeProcess: TDataLink_DyeProcess
-  OldCreateOrder = False
-  OnCreate = DataModuleCreate
   OnDestroy = DataModuleDestroy
   Height = 349
   Width = 482
+  inherited cxImageList_bar: TcxImageList
+    FormatVersion = 1
+  end
   object AdoDataLink: TADOQuery
     Connection = ADOLink
     Parameters = <>
@@ -10426,6 +10427,8 @@ object DataLink_DyeProcess: TDataLink_DyeProcess
   object ThreeLookAndFeelCol: TcxLookAndFeelController
     Kind = lfStandard
     NativeStyle = False
+    ScrollbarMode = sbmHybrid
+    SkinName = 'WXI'
     Left = 253
     Top = 12
   end

F04染色刷卡/U_DataLink.pas

@@ -5,7 +5,8 @@ interface
 uses
   SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels,
   Windows, Messages, forms, OleCtnrs, DateUtils, ExtCtrls, SyncObjs, cxClasses,
-  dxSkinsCore, dxSkinsDefaultPainters, System.ImageList;
+  dxSkinsCore, dxSkinsDefaultPainters, System.ImageList, U_BaseDataLink, dxCore,
+  cxLocalization, cxImageList, cxGraphics, dxSkinsForm;
 
 type
   TMyThread = class(TThread)
@@ -37,7 +38,7 @@ var
   UserDataFlag: string;
 
 type
-  TDataLink_DyeProcess = class(TDataModule)
+  TDataLink_DyeProcess = class(TBaseDataLink)
     AdoDataLink: TADOQuery;
     ADOLink: TADOConnection;
     ThreeImgList: TImageList;
@@ -115,11 +116,13 @@ end;
 
 procedure TDataLink_DyeProcess.Timer_linkTimer(Sender: TObject);
 begin
+  inherited;
   TMyThread.Create(False);
 end;
 
 procedure TDataLink_DyeProcess.DataModuleCreate(Sender: TObject);
 begin
+  inherited;
   CriticalSection := TCriticalSection.Create;
 end;
 

F04染色刷卡/U_DyeOutputList.dfm

@@ -1,14 +1,15 @@
 inherited frmDyeOutputList: TfrmDyeOutputList
   Caption = #21047#21345#20449#24687
   ClientHeight = 584
-  ClientWidth = 1145
+  ClientWidth = 1534
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Height = -11
   Font.Name = 'Tahoma'
   OldCreateOrder = True
   WindowState = wsMaximized
-  ExplicitWidth = 1161
+  ExplicitLeft = -88
+  ExplicitWidth = 1550
   ExplicitHeight = 623
   PixelsPerInch = 96
   TextHeight = 13
@@ -16,14 +17,13 @@ inherited frmDyeOutputList: TfrmDyeOutputList
     Tag = 1
     Left = 0
     Top = 0
-    Width = 1145
+    Width = 1534
     Height = 38
     AutoSize = True
     ButtonHeight = 38
-    ButtonWidth = 97
+    ButtonWidth = 96
     Caption = 'ToolBar1'
     Color = clSkyBlue
-    DisabledImages = DataLink_DyeProcess.ImageList_new32
     Font.Charset = GB2312_CHARSET
     Font.Color = clWindowText
     Font.Height = -12
@@ -76,7 +76,7 @@ inherited frmDyeOutputList: TfrmDyeOutputList
       OnClick = TBExportClick
     end
     object ToolButton1: TToolButton
-      Left = 385
+      Left = 384
       Top = 0
       AutoSize = True
       Caption = #20445#23384#26684#24335
@@ -84,7 +84,7 @@ inherited frmDyeOutputList: TfrmDyeOutputList
       OnClick = ToolButton1Click
     end
     object ToolButton2: TToolButton
-      Left = 480
+      Left = 479
       Top = 0
       AutoSize = True
       Caption = #20462#25913#37325#37327
@@ -92,7 +92,7 @@ inherited frmDyeOutputList: TfrmDyeOutputList
       OnClick = ToolButton2Click
     end
     object TBClose: TToolButton
-      Left = 575
+      Left = 574
       Top = 0
       AutoSize = True
       Caption = #20851#38381
@@ -103,13 +103,14 @@ inherited frmDyeOutputList: TfrmDyeOutputList
   object Panel1: TPanel [1]
     Left = 0
     Top = 38
-    Width = 1145
+    Width = 1534
     Height = 64
     Align = alTop
     BevelInner = bvRaised
     BevelOuter = bvLowered
     Color = clSkyBlue
     TabOrder = 1
+    ExplicitTop = 18
     object Label3: TLabel
       Left = 252
       Top = 36
@@ -145,8 +146,8 @@ inherited frmDyeOutputList: TfrmDyeOutputList
       Height = 13
     end
     object Label16: TLabel
-      Left = 576
+      Left = 738
-      Top = 12
+      Top = 10
       Width = 24
       Height = 13
       Caption = #24037#24207
@@ -173,8 +174,8 @@ inherited frmDyeOutputList: TfrmDyeOutputList
       Caption = #39068#33394
     end
     object Label6: TLabel
-      Left = 428
+      Left = 880
-      Top = 36
+      Top = 8
       Width = 24
       Height = 13
       Caption = #33394#21495
@@ -187,12 +188,33 @@ inherited frmDyeOutputList: TfrmDyeOutputList
       Caption = #33457#22411#21495
     end
     object Label9: TLabel
-      Left = 576
+      Left = 738
-      Top = 36
+      Top = 34
       Width = 24
       Height = 13
       Caption = #29677#32452
     end
+    object lbl1: TLabel
+      Left = 403
+      Top = 35
+      Width = 48
+      Height = 13
+      Caption = #20135#21697#21517#31216
+    end
+    object lbl2: TLabel
+      Left = 578
+      Top = 10
+      Width = 24
+      Height = 13
+      Caption = #38376#24133
+    end
+    object lbl3: TLabel
+      Left = 578
+      Top = 36
+      Width = 24
+      Height = 13
+      Caption = #20811#37325
+    end
     object Lckid: TEdit
       Tag = 2
       Left = 302
@@ -258,8 +280,8 @@ inherited frmDyeOutputList: TfrmDyeOutputList
     end
     object C_ColorNo: TEdit
       Tag = 2
-      Left = 454
+      Left = 906
-      Top = 32
+      Top = 4
       Width = 80
       Height = 21
       TabOrder = 7
@@ -276,18 +298,22 @@ inherited frmDyeOutputList: TfrmDyeOutputList
     end
     object GlideName: TComboBox
       Tag = 2
-      Left = 602
+      Left = 764
-      Top = 8
+      Top = 6
       Width = 80
       Height = 21
       Style = csDropDownList
       TabOrder = 9
       OnChange = LckidChange
+      Items.Strings = (
+        ''
+        #32763#24067
+        #23450#22411)
     end
     object StaffName: TEdit
       Tag = 2
-      Left = 602
+      Left = 764
-      Top = 32
+      Top = 30
       Width = 80
       Height = 21
       TabOrder = 10
@@ -315,14 +341,43 @@ inherited frmDyeOutputList: TfrmDyeOutputList
       Kind = dtkTime
       TabOrder = 12
     end
+    object C_Name: TEdit
+      Tag = 2
+      Left = 454
+      Top = 32
+      Width = 80
+      Height = 21
+      TabOrder = 13
+      OnChange = LckidChange
+    end
+    object C_Width: TEdit
+      Tag = 2
+      Left = 604
+      Top = 6
+      Width = 80
+      Height = 21
+      TabOrder = 14
+      OnChange = LckidChange
+    end
+    object C_GramWeight: TEdit
+      Tag = 2
+      Left = 604
+      Top = 32
+      Width = 80
+      Height = 21
+      TabOrder = 15
+      OnChange = LckidChange
+    end
   end
   object cxGrid2: TcxGrid [2]
     Left = 0
     Top = 102
-    Width = 1145
+    Width = 1534
     Height = 482
     Align = alClient
     TabOrder = 2
+    ExplicitTop = 82
+    ExplicitHeight = 502
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
@@ -341,6 +396,10 @@ inherited frmDyeOutputList: TfrmDyeOutputList
         item
           Kind = skSum
           Column = Tv1Column8
+        end
+        item
+          Kind = skSum
+          Column = Tv1Column3
         end>
       DataController.Summary.SummaryGroups = <>
       OptionsCustomize.ColumnFiltering = False
@@ -348,10 +407,6 @@ inherited frmDyeOutputList: TfrmDyeOutputList
       OptionsView.Footer = True
       OptionsView.GroupByBox = False
       OptionsView.Indicator = True
-      Styles.IncSearch = DataLink_DyeProcess.SHuangSe
-      Styles.Header = DataLink_DyeProcess.Default
-      Styles.Inactive = DataLink_DyeProcess.SHuangSe
-      Styles.Selection = DataLink_DyeProcess.SHuangSe
       object Tv1Column12: TcxGridDBColumn
         Caption = #21047#21345#26085#26399
         DataBinding.FieldName = 'GOTime'
@@ -416,7 +471,7 @@ inherited frmDyeOutputList: TfrmDyeOutputList
         Width = 60
       end
       object Tv1Column4: TcxGridDBColumn
-        Caption = #22411#21495
+        Caption = #20869#37096#22411#21495
         DataBinding.FieldName = 'C_I_Name'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
@@ -552,8 +607,8 @@ inherited frmDyeOutputList: TfrmDyeOutputList
   end
   inherited ADOQueryBaseTemp: TADOQuery
     Connection = DataLink_DyeProcess.ADOLink
-    Left = 232
+    Left = 481
-    Top = 64
+    Top = 314
   end
   object ADOQueryCmd: TADOQuery
     Connection = DataLink_DyeProcess.ADOLink

F04染色刷卡/U_DyeOutputList.pas

@@ -86,6 +86,12 @@ type
     Button1: TButton;
     Button2: TButton;
     Edit1: TEdit;
+    lbl1: TLabel;
+    C_Name: TEdit;
+    lbl2: TLabel;
+    C_Width: TEdit;
+    lbl3: TLabel;
+    C_GramWeight: TEdit;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -141,7 +147,7 @@ begin
   BegDate.DateTime := EndDate.DateTime;
   fsyrName := trim(DdataBase);
   canshu1 := trim(DParameters1);
-  SInitComBoxBySql(ADOQueryTemp, GlideName, false, 'select PSName as Name from Dye_Process');
+  //SInitComBoxBySql(ADOQueryTemp, GlideName, false, 'select PSName as Name from Dye_Process');
 end;
 
 procedure TfrmDyeOutputList.InitGrid();

T00贸易通用窗体/U_TradePlanSel.dfm

@@ -114,7 +114,7 @@ inherited frmTradePlanSel: TfrmTradePlanSel
       Top = 37
       Width = 26
       Height = 12
-      Caption = #33394#21495
+      Caption = #23458#25143
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -12
@@ -127,7 +127,7 @@ inherited frmTradePlanSel: TfrmTradePlanSel
       Top = 10
       Width = 26
       Height = 12
-      Caption = #33457#22411
+      Caption = #38376#24133
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -12
@@ -151,9 +151,35 @@ inherited frmTradePlanSel: TfrmTradePlanSel
     object Label8: TLabel
       Left = 38
       Top = 37
-      Width = 53
+      Width = 39
       Height = 12
-      Caption = #21512' '#21516' '#21495
+      Caption = #35746#21333#21495
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object lbl1: TLabel
+      Left = 620
+      Top = 36
+      Width = 26
+      Height = 12
+      Caption = #20811#37325
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object lbl2: TLabel
+      Left = 800
+      Top = 10
+      Width = 39
+      Height = 12
+      Caption = #29289#26009#21495
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -12
@@ -188,7 +214,7 @@ inherited frmTradePlanSel: TfrmTradePlanSel
       TabOrder = 2
       OnChange = OrderNoChange
     end
-    object C_ColorNo: TEdit
+    object BuyName: TEdit
       Tag = 2
       Left = 476
       Top = 33
@@ -197,7 +223,7 @@ inherited frmTradePlanSel: TfrmTradePlanSel
       TabOrder = 3
       OnChange = OrderNoChange
     end
-    object C_Pattern: TEdit
+    object C_Width: TEdit
       Tag = 2
       Left = 649
       Top = 6
@@ -224,6 +250,24 @@ inherited frmTradePlanSel: TfrmTradePlanSel
       TabOrder = 6
       OnChange = OrderNoChange
     end
+    object C_GramWeight: TEdit
+      Tag = 2
+      Left = 649
+      Top = 33
+      Width = 120
+      Height = 20
+      TabOrder = 7
+      OnChange = OrderNoChange
+    end
+    object C_Material_Name: TEdit
+      Tag = 2
+      Left = 841
+      Top = 6
+      Width = 120
+      Height = 20
+      TabOrder = 8
+      OnChange = OrderNoChange
+    end
   end
   object cxGrid1: TcxGrid [2]
     Left = 0
@@ -235,6 +279,7 @@ inherited frmTradePlanSel: TfrmTradePlanSel
     object Tv1: TcxGridDBTableView
       OnDblClick = TV1DblClick
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DS_1
       DataController.Filter.AutoDataSetFilter = True
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -243,6 +288,22 @@ inherited frmTradePlanSel: TfrmTradePlanSel
         item
           Kind = skSum
           Column = v1PRTOrderQty
+        end
+        item
+          Kind = skSum
+          Column = v1Column3
+        end
+        item
+          Kind = skSum
+          Column = cxgrdbclmnTv1Column2
+        end
+        item
+          Kind = skSum
+          Column = v1Column4
+        end
+        item
+          Kind = skSum
+          Column = cxgrdbclmnTv1Column3
         end>
       DataController.Summary.SummaryGroups = <>
       OptionsView.Footer = True
@@ -250,6 +311,7 @@ inherited frmTradePlanSel: TfrmTradePlanSel
       object v1Column7: TcxGridDBColumn
         Caption = #36873#25321
         DataBinding.FieldName = 'Ssel'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxCheckBoxProperties'
         Properties.ImmediatePost = True
         HeaderAlignmentHorz = taCenter
@@ -257,58 +319,50 @@ inherited frmTradePlanSel: TfrmTradePlanSel
       end
       object Tv1Column11: TcxGridDBColumn
         Caption = #23458#25143
-        DataBinding.FieldName = 'CustName'
+        DataBinding.FieldName = 'BuyName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 80
       end
       object v1OrderNo: TcxGridDBColumn
         Caption = #35745#21010#21333#21495
-        DataBinding.FieldName = 'OrderNo'
+        DataBinding.FieldName = 'MainId'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
         Width = 72
       end
       object v1ConNo: TcxGridDBColumn
-        Caption = #21512#21516#21495
+        Caption = #35746#21333#21495
-        DataBinding.FieldName = 'ConNo'
+        DataBinding.FieldName = 'khconno'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
         Width = 68
       end
-      object v1DeliveryDate: TcxGridDBColumn
+      object cxgrdbclmnTv1Column1: TcxGridDBColumn
-        Caption = #20132#36135#26085#26399
+        Caption = #19994#21153#21592
-        DataBinding.FieldName = 'DlyDate'
+        DataBinding.FieldName = 'Saleser'
-        PropertiesClassName = 'TcxDateEditProperties'
+        DataBinding.IsNullValueType = True
-        Properties.ShowTime = False
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Options.Focusing = False
-        Width = 66
-      end
-      object Tv1Column4: TcxGridDBColumn
-        Caption = #23458#25143#21333#21495
-        DataBinding.FieldName = 'BuyConNo'
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Width = 80
       end
-      object Tv1Column5: TcxGridDBColumn
+      object cxgrdbclmnTv1Column4: TcxGridDBColumn
-        Caption = #24037#33402
+        Caption = #29289#26009#21495
-        DataBinding.FieldName = 'Technics'
+        DataBinding.FieldName = 'C_Material_Name'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-      end
+        Options.Editing = False
-      object Tv1Column2: TcxGridDBColumn
+        Width = 80
-        Caption = #21152#24037#21378
-        DataBinding.FieldName = 'FtyName'
-        HeaderAlignmentHorz = taCenter
-        Width = 138
       end
       object v1OrdDefStr1: TcxGridDBColumn
         Caption = #20135#21697#32534#21495
         DataBinding.FieldName = 'C_Code'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -317,29 +371,16 @@ inherited frmTradePlanSel: TfrmTradePlanSel
       object v1MPRTCodeName: TcxGridDBColumn
         Caption = #20135#21697#21517#31216
         DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
         Width = 70
       end
-      object v1MPRTSpec: TcxGridDBColumn
-        Caption = #35268#26684
-        DataBinding.FieldName = 'C_Spec'
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Options.Focusing = False
-        Width = 68
-      end
-      object Tv1Column1: TcxGridDBColumn
-        Caption = #25104#20998
-        DataBinding.FieldName = 'C_Composition'
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Width = 66
-      end
       object v1MPRTMF: TcxGridDBColumn
         Caption = #38376#24133
         DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -348,6 +389,7 @@ inherited frmTradePlanSel: TfrmTradePlanSel
       object v1MPRTKZ: TcxGridDBColumn
         Caption = #20811#37325
         DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
@@ -356,63 +398,60 @@ inherited frmTradePlanSel: TfrmTradePlanSel
       object v1PRTColor: TcxGridDBColumn
         Caption = #39068#33394
         DataBinding.FieldName = 'C_Color'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
         Width = 63
       end
-      object v1Column1: TcxGridDBColumn
-        Caption = #33394#21495
-        DataBinding.FieldName = 'C_ColorNo'
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Options.Focusing = False
-        Width = 56
-      end
-      object v1Column6: TcxGridDBColumn
-        Caption = #33457#22411
-        DataBinding.FieldName = 'C_Pattern'
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Options.Focusing = False
-        Width = 80
-      end
-      object v1Column4: TcxGridDBColumn
-        Caption = #21305#25968
-        DataBinding.FieldName = 'OrdPiece'
-        HeaderAlignmentHorz = taCenter
-        Width = 87
-      end
-      object v1PRTOrderQty: TcxGridDBColumn
-        Caption = #25968#37327
-        DataBinding.FieldName = 'OrdQty'
-        HeaderAlignmentHorz = taCenter
-        Options.Editing = False
-        Options.Focusing = False
-        Width = 57
-      end
       object v1Column5: TcxGridDBColumn
-        Caption = #25968#37327#21333#20301
+        Caption = #35746#21333#21333#20301
-        DataBinding.FieldName = 'OrdUnit'
+        DataBinding.FieldName = 'LenUnit'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
         Options.Focusing = False
         Width = 62
       end
-      object v1Column3: TcxGridDBColumn
+      object v1Column4: TcxGridDBColumn
-        Caption = #20844#26020#25968
+        Caption = #21305#25968
-        DataBinding.FieldName = 'PRTOrderKgQty'
+        DataBinding.FieldName = 'Piece'
-        Visible = False
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
-        Options.Editing = False
+        Width = 80
-        Width = 52
       end
-      object Tv1Column3: TcxGridDBColumn
+      object v1PRTOrderQty: TcxGridDBColumn
-        Caption = #22791#27880
+        Caption = #31859#25968
-        DataBinding.FieldName = 'OrdSNote'
+        DataBinding.FieldName = 'OrdQty'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
-        Width = 66
+        Options.Focusing = False
+        Width = 80
+      end
+      object cxgrdbclmnTv1Column2: TcxGridDBColumn
+        Caption = #30721#25968
+        DataBinding.FieldName = 'Yardage'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 80
+      end
+      object v1Column3: TcxGridDBColumn
+        Caption = #27611#37325
+        DataBinding.FieldName = 'GrossWeight'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 80
+      end
+      object cxgrdbclmnTv1Column3: TcxGridDBColumn
+        Caption = #20928#37325
+        DataBinding.FieldName = 'NetWeight'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 80
       end
     end
     object cxGrid1Level1: TcxGridLevel

T00贸易通用窗体/U_TradePlanSel.pas

@@ -11,7 +11,7 @@ uses
   cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels,
   cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator,
   dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, cxCheckBox,
-  cxCalendar;
+  cxCalendar, dxScrollbarAnnotations;
 
 type
   TfrmTradePlanSel = class(TfrmBaseHelp)
@@ -38,23 +38,14 @@ type
     Tv1Column11: TcxGridDBColumn;
     v1OrdDefStr1: TcxGridDBColumn;
     v1MPRTCodeName: TcxGridDBColumn;
-    v1MPRTSpec: TcxGridDBColumn;
-    Tv1Column1: TcxGridDBColumn;
     v1MPRTMF: TcxGridDBColumn;
     v1MPRTKZ: TcxGridDBColumn;
     v1PRTColor: TcxGridDBColumn;
-    v1Column1: TcxGridDBColumn;
-    v1Column6: TcxGridDBColumn;
     v1PRTOrderQty: TcxGridDBColumn;
     v1Column4: TcxGridDBColumn;
     v1Column5: TcxGridDBColumn;
-    v1DeliveryDate: TcxGridDBColumn;
     v1Column3: TcxGridDBColumn;
-    Tv1Column3: TcxGridDBColumn;
-    Tv1Column4: TcxGridDBColumn;
-    Tv1Column5: TcxGridDBColumn;
     cxGrid1Level1: TcxGridLevel;
-    Tv1Column2: TcxGridDBColumn;
     Label3: TLabel;
     Label2: TLabel;
     Label4: TLabel;
@@ -65,10 +56,18 @@ type
     OrderNo: TEdit;
     C_Name: TEdit;
     C_Color: TEdit;
-    C_ColorNo: TEdit;
+    BuyName: TEdit;
-    C_Pattern: TEdit;
+    C_Width: TEdit;
     C_Code: TEdit;
     ConNo: TEdit;
+    cxgrdbclmnTv1Column1: TcxGridDBColumn;
+    cxgrdbclmnTv1Column2: TcxGridDBColumn;
+    cxgrdbclmnTv1Column3: TcxGridDBColumn;
+    lbl1: TLabel;
+    C_GramWeight: TEdit;
+    cxgrdbclmnTv1Column4: TcxGridDBColumn;
+    lbl2: TLabel;
+    C_Material_Name: TEdit;
     procedure FormCreate(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormShow(Sender: TObject);
@@ -126,16 +125,21 @@ begin
 end;
 
 procedure TfrmTradePlanSel.InitGrid();
+var
+  WSql: string;
 begin
+  WSql := SGetFilters(Panel1, 1, 2);
+  if Trim(WSql) <> '' then
+    WSql := ' and ' + WSql;
   try
     ADOQueryMain.DisableControls;
     with ADOQueryMain do
     begin
       Close;
       sql.Clear;
-      sql.Add('select A.*  from V_Trade_Plan_Fty A ');
+      sql.Add('select MainId,khconno,BuyName,C_Material_Name,Saleser,C_Code,C_Name,C_Color,LenUnit,sum(Meter) AS Meter,sum(Yardage) AS Yardage,sum(GrossWeight) AS GrossWeight,sum(NetWeight) AS NetWeight,Count(*) AS Piece');
-      sql.add('where Status=''9'' ');
+      sql.Add(' from V_Trade_Cloth_Stk A where 1=1 ' + WSql);
-//      ShowMessage(sql.Text);
+      sql.Add(' GROUP BY MainId,khconno,C_Material_Name,BuyName,Saleser,C_Code,C_Name,C_Color,LenUnit');
       Open;
     end;
     SDofilter(ADOQueryMain, SGetFilters(Panel1, 1, 2));

T03贸易布匹检验/U_TradeClothInspList.dfm

@@ -536,6 +536,30 @@ inherited frmTradeClothInspList: TfrmTradeClothInspList
         Options.Editing = False
         Width = 80
       end
+      object cxgrdbclmnTv1Column17: TcxGridDBColumn
+        Caption = #25509#22836#25968
+        DataBinding.FieldName = 'JointNumber'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 80
+      end
+      object cxgrdbclmnTv1Column18: TcxGridDBColumn
+        Caption = #35746#21333#25968#37327
+        DataBinding.FieldName = 'OrdQty'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 98
+      end
+      object cxgrdbclmnTv1Column19: TcxGridDBColumn
+        Caption = #35746#21333#21333#20301
+        DataBinding.FieldName = 'OrdUnit'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 95
+      end
     end
     object cxGrid1Level1: TcxGridLevel
       GridView = Tv1

T03贸易布匹检验/U_TradeClothInspList.pas

@@ -120,6 +120,9 @@ type
     cxgrdbclmnTv1Column14: TcxGridDBColumn;
     cxgrdbclmnTv1Column15: TcxGridDBColumn;
     cxgrdbclmnTv1Column16: TcxGridDBColumn;
+    cxgrdbclmnTv1Column17: TcxGridDBColumn;
+    cxgrdbclmnTv1Column18: TcxGridDBColumn;
+    cxgrdbclmnTv1Column19: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBCloseClick(Sender: TObject);
@@ -433,19 +436,19 @@ begin
   if Order_Main.IsEmpty then
     exit;
 
-  with ADOQueryTemp do
+//  with ADOQueryTemp do
-  begin
+//  begin
-    Close;
+//    Close;
-    sql.Clear;
+//    sql.Clear;
-    sql.Add('select * from Trade_Cloth_IO where IOFlag=''入库'' and stkid=''' + Trim(Order_Main.fieldbyname('CIID').AsString) + '''');
+//    sql.Add('select * from Trade_Cloth_IO where IOFlag=''入库'' and stkid=''' + Trim(Order_Main.fieldbyname('CIID').AsString) + '''');
-    Open;
+//    Open;
-  end;
+//  end;
-  if ADOQueryTemp.IsEmpty = False then
+//  if ADOQueryTemp.IsEmpty = False then
-  begin
+//  begin
-    Order_Main.EnableControls;
+//    Order_Main.EnableControls;
-    Application.MessageBox('已产生入库数据不能编辑!', '提示', 0);
+//    Application.MessageBox('已产生入库数据不能编辑!', '提示', 0);
-    Exit;
+//    Exit;
-  end;
+//  end;
   try
     frmTradeInspEdit := TfrmTradeInspEdit.Create(Application);
     with frmTradeInspEdit do

T03贸易布匹检验/U_TradeInspEdit.dfm

@@ -268,6 +268,7 @@ object frmTradeInspEdit: TfrmTradeInspEdit
     TabOrder = 2
     object TV1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DataSource1
       DataController.Filter.AutoDataSetFilter = True
       DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
@@ -294,6 +295,7 @@ object frmTradeInspEdit: TfrmTradeInspEdit
       object TV1Column1: TcxGridDBColumn
         Caption = #30133#28857
         DataBinding.FieldName = 'CIFName'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxButtonEditProperties'
         Properties.Buttons = <
           item
@@ -307,6 +309,7 @@ object frmTradeInspEdit: TfrmTradeInspEdit
       object cxGridDBColumn2: TcxGridDBColumn
         Caption = #30133#28857#21517#31216
         DataBinding.FieldName = 'CIFName'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Focusing = False
         Options.Sorting = False
@@ -315,6 +318,7 @@ object frmTradeInspEdit: TfrmTradeInspEdit
       object cxGridDBColumn3: TcxGridDBColumn
         Caption = #20301#32622#36215
         DataBinding.FieldName = 'CIFbeg'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         Properties.OnEditValueChanged = cxGridDBColumn3PropertiesEditValueChanged
         HeaderAlignmentHorz = taCenter
@@ -325,6 +329,7 @@ object frmTradeInspEdit: TfrmTradeInspEdit
       object cxGridDBColumn4: TcxGridDBColumn
         Caption = #20301#32622#27490
         DataBinding.FieldName = 'CIFend'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         HeaderGlyphAlignmentHorz = taCenter
         Width = 79
@@ -332,6 +337,7 @@ object frmTradeInspEdit: TfrmTradeInspEdit
       object cxGridDBColumn5: TcxGridDBColumn
         Caption = #38271#24230
         DataBinding.FieldName = 'CIFQty'
+        DataBinding.IsNullValueType = True
         PropertiesClassName = 'TcxTextEditProperties'
         HeaderAlignmentHorz = taCenter
         Options.Sorting = False
@@ -340,6 +346,7 @@ object frmTradeInspEdit: TfrmTradeInspEdit
       object cxGridDBColumn6: TcxGridDBColumn
         Caption = #21407#22240
         DataBinding.FieldName = 'CDReason'
+        DataBinding.IsNullValueType = True
         Visible = False
         HeaderAlignmentHorz = taCenter
         Options.Sorting = False
@@ -347,18 +354,21 @@ object frmTradeInspEdit: TfrmTradeInspEdit
       end
       object cxGridDBColumn7: TcxGridDBColumn
         DataBinding.FieldName = 'CDQty'
+        DataBinding.IsNullValueType = True
         Visible = False
         Width = 60
       end
       object cxGridDBColumn8: TcxGridDBColumn
         Caption = #25187#20998
         DataBinding.FieldName = 'CIFPoints'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 73
       end
       object cxGridDBColumn9: TcxGridDBColumn
         Caption = #20010#25968
         DataBinding.FieldName = 'CIFNumber'
+        DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Width = 69
       end

T03贸易布匹检验/U_TradeInspEdit.pas

@@ -9,7 +9,7 @@ uses
   cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses,
   cxControls, cxGridCustomView, cxGrid, StdCtrls, ExtCtrls, ComCtrls, ToolWin,
   cxButtonEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore,
-  dxSkinsDefaultPainters, dxDateRanges;
+  dxSkinsDefaultPainters, dxDateRanges, dxScrollbarAnnotations;
 
 type
   TfrmTradeInspEdit = class(TForm)

T03贸易布匹检验/U_TradeMachInsp.pas

@@ -50,7 +50,7 @@ type
     AOrdDefNote1: TRichEdit;
     RM1: TRMGridReport;
     ADOTmp: TADOQuery;
-    ScrollBox1: TScrollBox;
+    ScrollBox111: TScrollBox;
     SpeedButton13: TSpeedButton;
     SpeedButton14: TSpeedButton;
     SpeedButton15: TSpeedButton;
@@ -170,7 +170,7 @@ type
     cxStyle4: TcxStyle;
     cxPageControl1: TcxPageControl;
     cxTabSheet1: TcxTabSheet;
-    ²é¿´: TcxTabSheet;
+    cxTabSheet2: TcxTabSheet;
     cxGrid2: TcxGrid;
     Tv2: TcxGridDBTableView;
     tv2CDType: TcxGridDBColumn;
@@ -313,6 +313,95 @@ type
     Edit8: TEdit;
     cxgrdbclmnTv3Column6: TcxGridDBColumn;
     lbl7: TLabel;
+    lbl8: TLabel;
+    JointNumber: TEdit;
+    cxgrdbclmnTv3Column7: TcxGridDBColumn;
+    ScrollBox1: TScrollBox;
+    btn2: TSpeedButton;
+    btn3: TSpeedButton;
+    btn4: TSpeedButton;
+    btn5: TSpeedButton;
+    btn6: TSpeedButton;
+    btn7: TSpeedButton;
+    btn8: TSpeedButton;
+    btn9: TSpeedButton;
+    btn10: TSpeedButton;
+    btn11: TSpeedButton;
+    btn12: TSpeedButton;
+    btn13: TSpeedButton;
+    btn14: TSpeedButton;
+    btn15: TSpeedButton;
+    btn16: TSpeedButton;
+    btn17: TSpeedButton;
+    btn18: TSpeedButton;
+    btn19: TSpeedButton;
+    btn20: TSpeedButton;
+    btn21: TSpeedButton;
+    btn22: TSpeedButton;
+    btn23: TSpeedButton;
+    btn24: TSpeedButton;
+    btn25: TSpeedButton;
+    btn26: TSpeedButton;
+    btn27: TSpeedButton;
+    btn28: TSpeedButton;
+    btn29: TSpeedButton;
+    btn30: TSpeedButton;
+    btn31: TSpeedButton;
+    btn32: TSpeedButton;
+    btn33: TSpeedButton;
+    btn34: TSpeedButton;
+    btn35: TSpeedButton;
+    btn36: TSpeedButton;
+    btn37: TSpeedButton;
+    btn38: TSpeedButton;
+    btn39: TSpeedButton;
+    btn40: TSpeedButton;
+    btn41: TSpeedButton;
+    btn42: TSpeedButton;
+    btn43: TSpeedButton;
+    btn44: TSpeedButton;
+    btn45: TSpeedButton;
+    btn46: TSpeedButton;
+    btn47: TSpeedButton;
+    btn48: TSpeedButton;
+    btn49: TSpeedButton;
+    btn50: TSpeedButton;
+    btn51: TSpeedButton;
+    btn52: TSpeedButton;
+    btn53: TSpeedButton;
+    btn54: TSpeedButton;
+    btn55: TSpeedButton;
+    btn56: TSpeedButton;
+    btn57: TSpeedButton;
+    btn58: TSpeedButton;
+    btn59: TSpeedButton;
+    btn60: TSpeedButton;
+    btn61: TSpeedButton;
+    btn62: TSpeedButton;
+    btn63: TSpeedButton;
+    btn64: TSpeedButton;
+    btn65: TSpeedButton;
+    btn66: TSpeedButton;
+    btn67: TSpeedButton;
+    btn68: TSpeedButton;
+    btn69: TSpeedButton;
+    btn70: TSpeedButton;
+    btn71: TSpeedButton;
+    MovePanel2: TMovePanel;
+    lbl9: TLabel;
+    lbl10: TLabel;
+    lbl11: TLabel;
+    lbl12: TLabel;
+    lbl13: TLabel;
+    lbl14: TLabel;
+    edt2: TEdit;
+    btn72: TButton;
+    btn73: TButton;
+    edt3: TEdit;
+    edt4: TEdit;
+    rg1: TRadioGroup;
+    btn74: TButton;
+    edt5: TEdit;
     procedure FormDestroy(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormShow(Sender: TObject);
@@ -373,7 +462,7 @@ type
     FCIID, FOperationStatus, FCIFName, FWorkshop: string;
     FBCIOID, FOrderNo, FMainId, FSubId, FPCId, FConNo, FConMId, FConSId, FDRMID, FDRSID, FLCKID: string;
     FBatchNO, FLenUnit, FC_Code, FC_Name, FC_Spec, FC_Width, FC_GramWeight, FC_KnitGramWeight, FDyeNo: string;
-    FC_Color, FC_ColorNo, FC_StyleNo, FC_Composition, FC_Pattern, FC_CustPattern, FC_ColorDepth, FLoom: string;
+    FC_Color, FC_ColorNo, FOffer, FC_StyleNo, FC_Composition, FC_Pattern, FC_CustPattern, FC_ColorDepth, FLoom: string;
     FFtyPCId, FCUSTNAME, FGangNo, FRulePieceNo, FRuleBeforeTare, FRuleLaterTare, FC_Figure, FC_Yarn, FYWY: string;
     FPieceNo: Integer;
     IsCommopen: boolean;
@@ -440,6 +529,7 @@ begin
   AOrdDefNote1.Text := AOrdDefNote1.Text + '成分:' + FC_Composition + #13;
   AOrdDefNote1.Text := AOrdDefNote1.Text + '上称毛重:' + FRuleBeforeTare + #13;
   AOrdDefNote1.Text := AOrdDefNote1.Text + '不上称皮重:' + FRuleLaterTare + #13;
+  AOrdDefNote1.Text := AOrdDefNote1.Text + 'Ï»úµ²³µ¹¤:' + FOffer + #13;
   AOrdDefNote1.Text := AOrdDefNote1.Text + '业务员:' + FYWY + #13;
   AOrdDefNote1.Text := AOrdDefNote1.Text + '客户:' + FCUSTNAME + #13;
 end;
@@ -646,7 +736,7 @@ begin
 //          exit;
 //        end;
 //      end;
-      if (StrToFloatDef(C_TradeGramWeight.Text, 0) <= 0) or (StrToFloatDef(GramWeight.Text, 0) <= 0) then
+      if (StrToFloatDef(C_TradeGramWeight.Text, 0) <= 0) or (StrToFloatDef(copy(GramWeight.Text, 1, 3), 0) <= 0) then
       begin
         raise Exception.Create('克重有问题，请检查克重!');
       end
@@ -1048,6 +1138,7 @@ begin
     FBatchNO := Trim(ADOTmp.fieldbyname('BatchNO').AsString);
     FC_Spec := Trim(ADOTmp.fieldbyname('C_Spec').AsString);
     FC_Color := Trim(ADOTmp.fieldbyname('C_Color').AsString);
+    FOffer := Trim(ADOTmp.fieldbyname('Offer').AsString);
     FC_KnitGramWeight := Trim(ADOTmp.fieldbyname('C_KnitGramWeight').AsString);
     FC_Figure := Trim(ADOTmp.fieldbyname('C_Figure').AsString);
     FC_Yarn := Trim(ADOTmp.fieldbyname('C_Yarn').AsString);
@@ -1654,6 +1745,7 @@ begin
       FieldByName('C_Yarn').value := FC_Yarn;
       FieldByName('C_GramWeight').value := FC_GramWeight;
       FieldByName('CIMachNo').Value := Trim(SCXFlag);
+      FieldByName('JointNumber').Value := StrToFloatDef(JointNumber.Text, 0);
       Post;
     end;
     MCIID := Trim(maxno);
@@ -1968,6 +2060,7 @@ begin
     InputLen.Text := '';
     InputWeight.Text := '';
     DelQty.Text := '';
+    JointNumber.Text := '';
 //    MaxQty.Caption := '';
     Edit3.Text := '√';
     Edit4.Text := '';

T04贸易明细仓库/U_GetDllForm.pas

@@ -187,17 +187,17 @@ begin
         end;
       end;
 
-//    311:  //成品扫描出库
+    311:  //成品扫描出库
-//      begin
+      begin
-//        with TfrmTradeClothOutEdit.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do       //
+        with TfrmTradeClothOutEdit.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do       //
-//        begin
+        begin
-//          fFormID := FormID;
+          fFormID := FormID;
-//          FormStyle := mstyle;
+          FormStyle := mstyle;
-//          WindowState := mstate;
+          WindowState := mstate;
-//          BorderStyle := mborderstyle;
+          BorderStyle := mborderstyle;
-//          mnewHandle := Handle;
+          mnewHandle := Handle;
-//        end;
+        end;
-//      end;
+      end;
 
     321:  //成品出库列表
       begin

T04贸易明细仓库/U_TradeClothDROutEdit.dfm

@@ -15,7 +15,7 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
     Left = 0
     Top = 0
     Width = 1175
-    Height = 185
+    Height = 231
     Align = alTop
     BevelInner = bvRaised
     BevelOuter = bvLowered
@@ -74,8 +74,8 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
       ParentFont = False
     end
     object Label10: TLabel
-      Left = 64
+      Left = 965
-      Top = 120
+      Top = 168
       Width = 196
       Height = 48
       Caption = #25195#25551#36864#22238
@@ -88,8 +88,8 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
       Visible = False
     end
     object Label1: TLabel
-      Left = 257
+      Left = 6
-      Top = 133
+      Top = 130
       Width = 80
       Height = 19
       Caption = #20986#24211#31867#22411
@@ -100,6 +100,58 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object lbl1: TLabel
+      Left = 258
+      Top = 129
+      Width = 80
+      Height = 19
+      Caption = #20135#21697#21517#31216
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clBlack
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object lbl2: TLabel
+      Left = 9
+      Top = 204
+      Width = 60
+      Height = 19
+      Caption = #22791#27880#65306
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object lbl3: TLabel
+      Left = 9
+      Top = 170
+      Width = 60
+      Height = 19
+      Caption = #35746#21333#21495
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clBlack
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+    object lbl4: TLabel
+      Left = 329
+      Top = 170
+      Width = 60
+      Height = 19
+      Caption = #29289#26009#21495
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clBlack
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
     object edtScan: TEdit
       Left = 589
       Top = 8
@@ -111,7 +163,7 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
       Font.Name = #23435#20307
       Font.Style = []
       ParentFont = False
-      TabOrder = 3
+      TabOrder = 1
       OnKeyPress = edtScanKeyPress
     end
     object CRTime: TDateTimePicker
@@ -121,7 +173,6 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
       Height = 28
       Date = 41337.000000000000000000
       Time = 0.663190821760508700
-      Enabled = False
       Font.Charset = GB2312_CHARSET
       Font.Color = clWindowText
       Font.Height = -20
@@ -130,23 +181,8 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
       ParentFont = False
       TabOrder = 0
     end
-    object ToCoName: TEdit
-      Tag = 2
-      Left = 344
-      Top = 86
-      Width = 154
-      Height = 28
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -20
-      Font.Name = #23435#20307
-      Font.Style = []
-      ParentFont = False
-      ReadOnly = True
-      TabOrder = 1
-    end
     object Button2: TButton
-      Left = 895
+      Left = 1006
       Top = 86
       Width = 100
       Height = 76
@@ -157,26 +193,11 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
-      TabOrder = 5
+      TabOrder = 3
       OnClick = Button2Click
     end
-    object CRType: TEdit
-      Tag = 2
-      Left = 344
-      Top = 128
-      Width = 154
-      Height = 28
-      Font.Charset = GB2312_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -20
-      Font.Name = #23435#20307
-      Font.Style = []
-      ParentFont = False
-      ReadOnly = True
-      TabOrder = 2
-    end
     object Button1: TButton
-      Left = 589
+      Left = 483
       Top = 86
       Width = 100
       Height = 76
@@ -187,12 +208,13 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
-      TabOrder = 4
+      TabOrder = 2
+      Visible = False
       OnClick = Button1Click
     end
     object edtIsSMTH: TEdit
-      Left = 23
+      Left = 924
-      Top = 125
+      Top = 173
       Width = 39
       Height = 37
       Font.Charset = GB2312_CHARSET
@@ -202,13 +224,13 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
       Font.Style = [fsBold]
       ParentFont = False
       ReadOnly = True
-      TabOrder = 6
+      TabOrder = 4
       Visible = False
       OnClick = edtIsSMTHClick
     end
     object btn1: TButton
-      Left = 746
+      Left = 719
-      Top = 88
+      Top = 86
       Width = 100
       Height = 76
       Caption = #24211#23384
@@ -218,7 +240,7 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
-      TabOrder = 7
+      TabOrder = 5
       OnClick = btn1Click
     end
     object OutNo: TEdit
@@ -233,11 +255,11 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
       Font.Style = [fsBold]
       ParentFont = False
       ReadOnly = True
-      TabOrder = 8
+      TabOrder = 6
     end
     object Button3: TButton
-      Left = 1025
+      Left = 852
-      Top = 87
+      Top = 86
       Width = 124
       Height = 76
       Caption = #30721#21333#25171#21360
@@ -247,23 +269,136 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
       Font.Name = #23435#20307
       Font.Style = [fsBold]
       ParentFont = False
-      TabOrder = 9
+      TabOrder = 7
       OnClick = Button3Click
     end
+    object btn2: TButton
+      Left = 589
+      Top = 86
+      Width = 100
+      Height = 76
+      Caption = #21462#21495
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -29
+      Font.Name = #23435#20307
+      Font.Style = [fsBold]
+      ParentFont = False
+      TabOrder = 8
+      OnClick = Button1Click
+    end
+    object ToCoName: TBtnEditC
+      Tag = 1
+      Left = 344
+      Top = 87
+      Width = 214
+      Height = 29
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = #23435#20307
+      Font.Style = []
+      ParentFont = False
+      TabOrder = 9
+      OnBtnUpClick = ToCoNameBtnUpClick
+      OnBtnDnClick = ToCoNameBtnDnClick
+    end
+    object CRType: TComboBox
+      Tag = 1
+      Left = 86
+      Top = 125
+      Width = 153
+      Height = 28
+      Style = csDropDownList
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = #23435#20307
+      Font.Style = []
+      ItemIndex = 0
+      ParentFont = False
+      TabOrder = 10
+      Text = #38144#21806#20986#24211
+      Items.Strings = (
+        #38144#21806#20986#24211
+        #25253#24223#20986#24211)
+    end
+    object CPName: TBtnEditC
+      Tag = 1
+      Left = 344
+      Top = 125
+      Width = 214
+      Height = 29
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = #23435#20307
+      Font.Style = []
+      ParentFont = False
+      TabOrder = 11
+      OnBtnUpClick = CPNameBtnUpClick
+      OnBtnDnClick = CPNameBtnDnClick
+    end
+    object Note: TEdit
+      Tag = 1
+      Left = 86
+      Top = 198
+      Width = 862
+      Height = 27
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -19
+      Font.Name = #23435#20307
+      Font.Style = []
+      ParentFont = False
+      TabOrder = 12
+    end
+    object KHConNo: TBtnEditC
+      Tag = 1
+      Left = 86
+      Top = 163
+      Width = 220
+      Height = 29
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = #23435#20307
+      Font.Style = []
+      ParentFont = False
+      TabOrder = 13
+      OnBtnUpClick = KHConNoBtnUpClick
+      OnBtnDnClick = KHConNoBtnDnClick
+    end
+    object C_Material_Name: TBtnEditC
+      Tag = 1
+      Left = 406
+      Top = 163
+      Width = 220
+      Height = 29
+      Font.Charset = GB2312_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -20
+      Font.Name = #23435#20307
+      Font.Style = []
+      ParentFont = False
+      TabOrder = 14
+      OnBtnUpClick = KHConNoBtnUpClick
+      OnBtnDnClick = C_Material_NameBtnDnClick
+    end
   end
   object Panel1: TPanel [1]
     Left = 0
-    Top = 185
+    Top = 231
     Width = 1175
-    Height = 508
+    Height = 462
     Align = alClient
     Caption = 'Panel1'
     TabOrder = 1
     object cxGrid3: TcxGrid
       Left = 1
-      Top = 214
+      Top = 224
       Width = 1173
-      Height = 293
+      Height = 237
       Align = alClient
       TabOrder = 0
       object Tv3: TcxGridDBTableView
@@ -370,6 +505,14 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
           Options.Editing = False
           Width = 79
         end
+        object cxgrdbclmnTv3Column5: TcxGridDBColumn
+          Caption = #20135#21697#21517#31216
+          DataBinding.FieldName = 'CPName'
+          DataBinding.IsNullValueType = True
+          HeaderAlignmentHorz = taCenter
+          Options.Editing = False
+          Width = 100
+        end
       end
       object cxGridLevel1: TcxGridLevel
         GridView = Tv3
@@ -379,9 +522,10 @@ inherited frmTradeClothDROutEdit: TfrmTradeClothDROutEdit
       Left = 1
       Top = 1
       Width = 1173
-      Height = 213
+      Height = 223
       Align = alTop
       TabOrder = 1
+      Visible = False
       object TV4: TcxGridDBTableView
         OnMouseDown = TV4MouseDown
         Navigator.Buttons.CustomButtons = <>

T04贸易明细仓库/U_TradeClothDROutEdit.pas

@@ -27,13 +27,11 @@ type
     Label9: TLabel;
     edtScan: TEdit;
     CRTime: TDateTimePicker;
-    ToCoName: TEdit;
     Button2: TButton;
     cxStyleRepository1: TcxStyleRepository;
     cxStyle1: TcxStyle;
     Label12: TLabel;
     CDS_Main: TClientDataSet;
-    CRType: TEdit;
     Button1: TButton;
     RMXLSExport1: TRMXLSExport;
     RMDBMX: TRMDBDataSet;
@@ -71,6 +69,18 @@ type
     Tv3Column3: TcxGridDBColumn;
     Label1: TLabel;
     Button3: TButton;
+    btn2: TButton;
+    ToCoName: TBtnEditC;
+    CRType: TComboBox;
+    lbl1: TLabel;
+    CPName: TBtnEditC;
+    cxgrdbclmnTv3Column5: TcxGridDBColumn;
+    lbl2: TLabel;
+    Note: TEdit;
+    lbl3: TLabel;
+    KHConNo: TBtnEditC;
+    lbl4: TLabel;
+    C_Material_Name: TBtnEditC;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -81,6 +91,13 @@ type
     procedure btn1Click(Sender: TObject);
     procedure TV4MouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
     procedure Button3Click(Sender: TObject);
+    procedure ToCoNameBtnDnClick(Sender: TObject);
+    procedure ToCoNameBtnUpClick(Sender: TObject);
+    procedure CPNameBtnUpClick(Sender: TObject);
+    procedure CPNameBtnDnClick(Sender: TObject);
+    procedure KHConNoBtnDnClick(Sender: TObject);
+    procedure KHConNoBtnUpClick(Sender: TObject);
+    procedure C_Material_NameBtnDnClick(Sender: TObject);
   private
     { Private declarations }
     FCKNO, FSMStr, JXFlag, CZZT, fcuowu: string;
@@ -88,7 +105,7 @@ type
     procedure InitSQGrid();
     procedure PlayWav(MWav: string);
     function JudgeSQD(): Boolean;
-    function SaveCKJTM(MStkIds: string): Boolean;//保存出库
+    function SaveCKJTM(MStkIds: string): Boolean; //保存出库
     procedure SaveCKJTMCX();   //撤销出库
   public
     { Public declarations }
@@ -101,7 +118,7 @@ implementation
 
 uses
   U_DataLink, U_RTFun, MMSystem, U_TradeDRSel, U_TradeClothStkList_Sel,
-  U_LabelPrint;
+  U_LabelPrint, U_CompanySel, U_ClothInfoSel, U_TradePlanSel;
 
 procedure TfrmTradeClothDROutEdit.PlayWav(MWav: string);
 begin
@@ -229,29 +246,28 @@ begin
       raise Exception.Create('已出库');
     end;
 
-    with ADOQueryTemp do
+//    with ADOQueryTemp do
-    begin
+//    begin
-      Close;
+//      Close;
-      sql.Clear;
+//      sql.Clear;
-      sql.Add(' select * from Trade_Cloth_DR_Sub A INNER JOIN Trade_Cloth_Stock B on  A.C_Code = B.C_Code and isnull(A.C_Color,'''')=isnull(B.C_Color,'''') and isnull(A.C_ColorNo,'''') = isnull(B.C_ColorNo,'''') ');
+//      sql.Add(' select * from Trade_Cloth_DR_Sub A INNER JOIN Trade_Cloth_Stock B on  A.C_Name = B.C_Name and isnull(A.C_Width,'''')=isnull(B.C_Width,'''') and isnull(A.C_GramWeight,'''') = isnull(B.C_GramWeight,'''') ');
-      sql.Add(' where B.StkExists=1 and B.CIID=''' + Trim(MStkIds) + '''');
+//      sql.Add(' where B.StkExists=1 and B.CIID=''' + Trim(MStkIds) + '''');
-      sql.Add(' and A.DRMID=''' + Trim(OutNo.Text) + '''');
+//      sql.Add(' and A.DRMID=''' + Trim(OutNo.Text) + '''');
-      Open;
+//      Open;
-    end;
+//    end;
-
+//
-    if ADOQueryTemp.IsEmpty then
+//    if ADOQueryTemp.IsEmpty then
-    begin
+//    begin
-      PlayWav('产品不一致');
+//      PlayWav('产品不一致');
-      edtScan.text := '';
+//      edtScan.text := '';
-      raise Exception.Create('产品不一致');
+//      raise Exception.Create('产品不一致');
-    end;
+//    end;
-
+//    if ADOQueryTemp.fieldbyname('DlyPiece').asfloat >= ADOQueryTemp.fieldbyname('Piece').asfloat then
-    if ADOQueryTemp.fieldbyname('DlyPiece').asfloat >= ADOQueryTemp.fieldbyname('Piece').asfloat then
+//    begin
-    begin
+//      PlayWav('超过发货上限');
-      PlayWav('超过发货上限');
+//      edtScan.text := '';
-      edtScan.text := '';
+//      raise Exception.Create('超过发货上限');
-      raise Exception.Create('超过发货上限');
+//    end;
-    end;
 
     try
       ADOQueryCmd.Connection.BeginTrans;
@@ -265,10 +281,16 @@ begin
         Sql.Add('exec P_Trade_Cloth_Out ');
         Sql.Add(' @StkIds=' + quotedstr(trim(MStkIds)));
         Sql.Add(',@IOTime=' + Quotedstr(FormatDateTime('yyyy-MM-dd', CRTime.DateTime)));
-        Sql.Add(',@IOType=' + Quotedstr(crtype.Text));
+        Sql.Add(',@IOType=' + Quotedstr(CRType.Text));
         Sql.Add(',@IONO=' + Quotedstr(OutNo.Text));
         Sql.Add(',@FillId=' + Quotedstr(DCode));
         Sql.Add(',@Filler=' + Quotedstr(DName));
+        Sql.Add(',@cpName=' + Quotedstr(trim(CPName.Text)));
+        Sql.Add(',@ToCoNo=' + Quotedstr(trim(ToCoName.TxtCode)));
+        Sql.Add(',@ToCoName=' + Quotedstr(trim(ToCoName.Text)));
+        Sql.Add(',@KHConNo=' + Quotedstr(trim(KHConNo.Text)));
+        Sql.Add(',@C_Material_Name=' + Quotedstr(trim(C_Material_Name.Text)));
+        Sql.Add(',@Note=' + Quotedstr(trim(Note.Text)));
         Open;
       end;
       if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
@@ -281,17 +303,17 @@ begin
       ADOQueryCmd.Connection.RollbackTrans;
       raise Exception.Create(PChar(Exception(ExceptObject).Message));
     end;
-    with ADOQueryCmd do
+//    with ADOQueryCmd do
-    begin
+//    begin
-      Close;
+//      Close;
-      sql.Clear;
+//      sql.Clear;
-      sql.Add('exec P_Trade_Cloth_DR @OutNo=' + Quotedstr(Trim(OutNo.Text)));
+//      sql.Add('exec P_Trade_Cloth_DR @OutNo=' + Quotedstr(Trim(OutNo.Text)));
-      Open;
+//      Open;
-    end;
+//    end;
-    if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
+//    if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then
-    begin
+//    begin
-      raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
+//      raise Exception.Create(pchar(trim(ADOQueryCmd.FieldByName('ShowMsg').AsString)));
-    end;
+//    end;
 
     PlayWav('正确');
     Result := True;
@@ -339,6 +361,34 @@ begin
   end;
 end;
 
+procedure TfrmTradeClothDROutEdit.KHConNoBtnDnClick(Sender: TObject);
+begin
+  KHConNo.Text := '';
+end;
+
+procedure TfrmTradeClothDROutEdit.KHConNoBtnUpClick(Sender: TObject);
+begin
+  try
+    frmTradePlanSel := TfrmTradePlanSel.Create(Application);
+    with frmTradePlanSel do
+    begin
+      if ShowModal = 1 then
+      begin
+        if KHConNo.Text = '' then
+        begin
+          Self.KHConNo.Text := frmTradePlanSel.CDS_1.fieldbyname('KHConNo').AsString;
+        end;
+        if C_Material_Name.Text = '' then
+        begin
+          Self.C_Material_Name.Text := frmTradePlanSel.CDS_1.fieldbyname('C_Material_Name').AsString;
+        end;
+      end;
+    end;
+  finally
+    frmTradePlanSel.Free;
+  end;
+end;
+
 procedure TfrmTradeClothDROutEdit.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   inherited;
@@ -453,26 +503,73 @@ begin
   end;
 end;
 
-procedure TfrmTradeClothDROutEdit.Button1Click(Sender: TObject);
+procedure TfrmTradeClothDROutEdit.CPNameBtnDnClick(Sender: TObject);
-var
+begin
-  MKey: Char;
+  CPName.Text := '';
+end;
+
+procedure TfrmTradeClothDROutEdit.CPNameBtnUpClick(Sender: TObject);
 begin
-  MKey := #13;
   try
-    frmTradeDRSel := TfrmTradeDRSel.Create(self);
+    frmClothInfoSel := TfrmClothInfoSel.Create(Application);
-    with frmTradeDRSel do
+    with frmClothInfoSel do
     begin
       if ShowModal = 1 then
       begin
-        edtScan.Text := Trim(Order_Main.fieldbyname('DRMID').AsString);
+        Self.CPName.Text := frmClothInfoSel.CDS_1.fieldbyname('C_Name').AsString;
-        edtScanKeyPress(edtScan, MKey);
       end;
     end;
   finally
-    frmTradeDRSel.Free;
+    frmClothInfoSel.Free;
   end;
 end;
 
+procedure TfrmTradeClothDROutEdit.C_Material_NameBtnDnClick(Sender: TObject);
+begin
+  C_Material_Name.Text := '';
+end;
+
+procedure TfrmTradeClothDROutEdit.ToCoNameBtnDnClick(Sender: TObject);
+begin
+  ToCoName.Text := '';
+end;
+
+procedure TfrmTradeClothDROutEdit.ToCoNameBtnUpClick(Sender: TObject);
+begin
+  try
+    frmCompanySel := TfrmCompanySel.Create(Application);
+    with frmCompanySel do
+    begin
+      FCoType := '客户';
+      if ShowModal = 1 then
+      begin
+        self.ToCoName.TxtCode := Trim(frmCompanySel.CDS_1.fieldbyname('CoCode').AsString);
+        self.ToCoName.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoAbbrName').AsString);
+      end;
+    end;
+
+  finally
+    frmCompanySel.Free;
+  end;
+end;
+
+procedure TfrmTradeClothDROutEdit.Button1Click(Sender: TObject);
+var
+  MKey: Char;
+  MaxMId: string;
+begin
+  MKey := #13;
+  if OutNo.Text <> '' then
+  begin
+    if Application.MessageBox('确定重新取号吗？', '提示', 32 + 4) <> IDYES then
+      Exit;
+
+  end;
+  if GetLSNo(ADOQueryTemp, MaxMId, 'DM', 'Trade_Cloth_DR_Main', 4, 2) = False then
+    raise Exception.Create('取最大号失败！');
+  OutNo.Text := MaxMId;
+end;
+
 procedure TfrmTradeClothDROutEdit.edtIsSMTHClick(Sender: TObject);
 begin
   if Trim(edtIsSMTH.Text) = '' then
@@ -484,10 +581,19 @@ end;
 procedure TfrmTradeClothDROutEdit.btn1Click(Sender: TObject);
 var
   MKey: Char;
+  i: Integer;
 begin
   MKey := #13;
   CZZT := '选择库存';
   fcuowu := '1';
+  if OutNo.Text = '' then
+    raise Exception.Create('请先取号！');
+  if ToCoName.Text = '' then
+    raise Exception.Create('请选择客户！');
+  if CRType.Text = '' then
+    raise Exception.Create('请选择出库类型！');
+  if CPName.Text = '' then
+    raise Exception.Create('请选择产品名称！');
   try
     frmTradeClothStkList_Sel := TfrmTradeClothStkList_Sel.Create(Application);
     with frmTradeClothStkList_Sel do
@@ -497,13 +603,9 @@ begin
       begin
         with frmTradeClothStkList_Sel.CDS_1 do
         begin
-          First;
+          for i := 0 to frmTradeClothStkList_Sel.MyStringList.Count - 1 do
-          while not Eof do
           begin
-            if Fieldbyname('ssel').AsBoolean then
+            Self.edtScan.Text := MyStringList[i];
-            begin
-
-              Self.edtScan.Text := Trim(Fieldbyname('CIID').AsString);
             edtScanKeyPress(Self.edtScan, MKey);
             if fcuowu = '错误' then
             begin
@@ -511,8 +613,6 @@ begin
             end;
             Sleep(200);
           end;
-            Next;
-          end;
         end;
       end;
     end;
@@ -537,8 +637,8 @@ begin
     end;
     SCreateCDS(ADOQueryTemp, DS1);
     SInitCDSData(ADOQueryTemp, DS1);
-    crtype.Text := Trim(ADOQueryTemp.FieldByName('OutType').AsString);
+    //crtype.Text := Trim(ADOQueryTemp.FieldByName('OutType').AsString);
-    ToCoName.Text := Trim(ADOQueryTemp.FieldByName('ToCoName').AsString);
+    //ToCoName.Text := Trim(ADOQueryTemp.FieldByName('ToCoName').AsString);
   end;
 end;
 

T04贸易明细仓库/U_TradeClothOutList.dfm

@@ -788,6 +788,30 @@ inherited frmTradeClothOutList: TfrmTradeClothOutList
         Options.Editing = False
         Width = 70
       end
+      object cxgrdbclmnTv1Column14: TcxGridDBColumn
+        Caption = #30133#28857#20010#25968
+        DataBinding.FieldName = 'CDQty'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 80
+      end
+      object cxgrdbclmnTv1Column15: TcxGridDBColumn
+        Caption = #20986#24211#21697#21517
+        DataBinding.FieldName = 'CPName'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 80
+      end
+      object cxgrdbclmnTv1Column17: TcxGridDBColumn
+        Caption = #22791#27880
+        DataBinding.FieldName = 'Note'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 80
+      end
     end
     object cxGrid1Level1: TcxGridLevel
       GridView = Tv1

T04贸易明细仓库/U_TradeClothOutList.pas

@@ -117,6 +117,9 @@ type
     btn3: TButton;
     btn4: TButton;
     edt1: TEdit;
+    cxgrdbclmnTv1Column14: TcxGridDBColumn;
+    cxgrdbclmnTv1Column15: TcxGridDBColumn;
+    cxgrdbclmnTv1Column17: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBRafreshClick(Sender: TObject);
@@ -352,8 +355,8 @@ begin
       Sql.Add(',@FillId=' + Quotedstr(DCode));
       Sql.Add(',@Filler=' + Quotedstr(DName));
 
-      Sql.Add('exec P_Trade_Cloth_DR ');
+//      Sql.Add('exec P_Trade_Cloth_DR ');
-      Sql.Add('@OutNo=' + quotedstr(trim(MOutNos)));
+//      Sql.Add('@OutNo=' + quotedstr(trim(MOutNos)));
 
       Open;
     end;
@@ -434,8 +437,8 @@ begin
             begin
               Close;
               sql.Clear;
-              sql.Add('Update Trade_Cloth_Inspect Set LabName=''' + frmLabSet.CDS_Label.fieldbyname('labelCaption').asstring + '''');
+              sql.Add('Update Trade_Cloth_Inspect_Rule Set LabPackage=''' + frmLabSet.CDS_Label.fieldbyname('labelCaption').asstring + '''');
-              sql.Add(' where CIID=''' + Trim(CDS_1.fieldbyname('CIID').AsString) + '''');
+              sql.Add(' where RuleID=''' + Trim(CDS_1.fieldbyname('MainId').AsString) + '''');
               ExecSQL;
             end;
           end;
@@ -497,7 +500,7 @@ begin
         end;
 
         if Trim(ADOQueryPrint.fieldbyname('Grade').AsString) = 'ÕýÆ·' then
-          FLabVolume := Trim(ADOQueryPrint.fieldbyname('LabVolume').AsString)
+          FLabVolume := Trim(ADOQueryPrint.fieldbyname('LabPackage').AsString)
         else
           FLabVolume := '´ÎÆ·±êÇ©';
 
@@ -507,7 +510,7 @@ begin
         if FileExists(fPrintFile) then
         begin
           RM1.LoadFromFile(fPrintFile);
-          if Trim(ADOQueryPrint.fieldbyname('LabVolume').AsString) <> '´ÎÆ·±êÇ©' then
+          if Trim(ADOQueryPrint.fieldbyname('LabPackage').AsString) <> '´ÎÆ·±êÇ©' then
             Rm1.DefaultCopies := strtointdef((edt1.Text), 1)
           else
             Rm1.DefaultCopies := strtointdef((edt1.Text), 1);

T04贸易明细仓库/U_TradeClothStkList.dfm

@@ -687,6 +687,22 @@ inherited frmTradeClothStkList: TfrmTradeClothStkList
         Options.Editing = False
         Width = 80
       end
+      object cxgrdbclmnTv1Column8: TcxGridDBColumn
+        Caption = #23458#25143#35746#21333#21495
+        DataBinding.FieldName = 'khconno'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 80
+      end
+      object cxgrdbclmnTv1Column9: TcxGridDBColumn
+        Caption = #30133#28857#20010#25968
+        DataBinding.FieldName = 'CDQty'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 80
+      end
     end
     object cxGrid1Level1: TcxGridLevel
       GridView = Tv1

T04贸易明细仓库/U_TradeClothStkList.pas

@@ -90,6 +90,8 @@ type
     Tv1Column2: TcxGridDBColumn;
     Tv1Column5: TcxGridDBColumn;
     Tv1Column7: TcxGridDBColumn;
+    cxgrdbclmnTv1Column8: TcxGridDBColumn;
+    cxgrdbclmnTv1Column9: TcxGridDBColumn;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBRafreshClick(Sender: TObject);

T04贸易明细仓库/U_TradeClothStkList_Sel.dfm

@@ -174,6 +174,30 @@ inherited frmTradeClothStkList_Sel: TfrmTradeClothStkList_Sel
       Font.Style = [fsBold]
       ParentFont = False
     end
+    object lbl4: TLabel
+      Left = 951
+      Top = 8
+      Width = 24
+      Height = 13
+      Hint = '0'
+      Caption = #38376#24133
+    end
+    object lbl5: TLabel
+      Left = 951
+      Top = 48
+      Width = 24
+      Height = 13
+      Hint = '0'
+      Caption = #20811#37325
+    end
+    object lbl6: TLabel
+      Left = 1163
+      Top = 6
+      Width = 24
+      Height = 13
+      Hint = '0'
+      Caption = #21367#21495
+    end
     object BegDate: TDateTimePicker
       Left = 154
       Top = 6
@@ -282,6 +306,36 @@ inherited frmTradeClothStkList_Sel: TfrmTradeClothStkList_Sel
       TabOrder = 10
       OnKeyPress = orderNoKeyPress
     end
+    object C_Width: TEdit
+      Tag = 2
+      Left = 1022
+      Top = 4
+      Width = 100
+      Height = 21
+      Hint = '0'
+      TabOrder = 11
+      OnKeyPress = orderNoKeyPress
+    end
+    object C_GramWeight: TEdit
+      Tag = 2
+      Left = 1022
+      Top = 44
+      Width = 100
+      Height = 21
+      Hint = '0'
+      TabOrder = 12
+      OnKeyPress = orderNoKeyPress
+    end
+    object PieceNo: TEdit
+      Tag = 1
+      Left = 1214
+      Top = 4
+      Width = 100
+      Height = 21
+      Hint = '0'
+      TabOrder = 13
+      OnKeyPress = orderNoKeyPress
+    end
   end
   object Panel6: TPanel [2]
     Left = 0
@@ -388,10 +442,9 @@ inherited frmTradeClothStkList_Sel: TfrmTradeClothStkList_Sel
   object cxGrid1: TcxGrid [3]
     Left = 0
     Top = 178
-    Width = 1540
+    Width = 942
     Height = 422
     Align = alClient
-    BorderStyle = cxcbsNone
     Font.Charset = GB2312_CHARSET
     Font.Color = clWindowText
     Font.Height = -12
@@ -400,12 +453,12 @@ inherited frmTradeClothStkList_Sel: TfrmTradeClothStkList_Sel
     ParentFont = False
     PopupMenu = PM_1
     TabOrder = 3
+    ExplicitTop = 179
     object Tv1: TcxGridDBTableView
       Navigator.Buttons.CustomButtons = <>
       ScrollbarAnnotations.CustomAnnotations = <>
       DataController.DataSource = DS_1
       DataController.Filter.AutoDataSetFilter = True
-      DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost]
       DataController.Summary.DefaultGroupSummaryItems = <>
       DataController.Summary.FooterSummaryItems = <
         item
@@ -677,6 +730,184 @@ inherited frmTradeClothStkList_Sel: TfrmTradeClothStkList_Sel
       GridView = Tv1
     end
   end
+  object cxGrid2: TcxGrid [4]
+    Left = 942
+    Top = 178
+    Width = 598
+    Height = 422
+    Align = alRight
+    Font.Charset = GB2312_CHARSET
+    Font.Color = clWindowText
+    Font.Height = -12
+    Font.Name = #23435#20307
+    Font.Style = []
+    ParentFont = False
+    PopupMenu = PM_1
+    TabOrder = 4
+    object TV2: TcxGridDBTableView
+      Navigator.Buttons.CustomButtons = <>
+      ScrollbarAnnotations.CustomAnnotations = <>
+      OnCellDblClick = TV2CellDblClick
+      DataController.DataSource = CD_2
+      DataController.Filter.AutoDataSetFilter = True
+      DataController.Summary.DefaultGroupSummaryItems = <>
+      DataController.Summary.FooterSummaryItems = <
+        item
+          Kind = skSum
+          Column = cxGridDBColumn17
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skCount
+          Column = cxGridDBColumn16
+        end
+        item
+          Kind = skSum
+          Column = cxGridDBColumn20
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+          Column = cxGridDBColumn18
+        end
+        item
+          Kind = skSum
+          Column = cxGridDBColumn19
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Format = #26816#39564#31995#25968'=#.##'
+          Kind = skAverage
+        end
+        item
+          Format = #25442#31639#31995#25968'=#.##'
+          Kind = skAverage
+        end
+        item
+          Kind = skCount
+          Column = cxGridDBColumn15
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end
+        item
+          Kind = skSum
+        end>
+      DataController.Summary.SummaryGroups = <>
+      OptionsCustomize.ColumnFiltering = False
+      OptionsView.Footer = True
+      OptionsView.GroupByBox = False
+      OptionsView.IndicatorWidth = 30
+      Styles.IncSearch = DataLink_TradeClothStk.SHuangSe
+      Styles.Footer = DataLink_TradeClothStk.Default
+      Styles.Header = DataLink_TradeClothStk.Default
+      Styles.Inactive = DataLink_TradeClothStk.SHuangSe
+      Styles.Selection = DataLink_TradeClothStk.SHuangSe
+      object cxGridDBColumn6: TcxGridDBColumn
+        Caption = #20135#21697#21517#31216
+        DataBinding.FieldName = 'C_Name'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
+      object cxGridDBColumn7: TcxGridDBColumn
+        Caption = #20811#37325
+        DataBinding.FieldName = 'C_GramWeight'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 48
+      end
+      object cxGridDBColumn8: TcxGridDBColumn
+        Caption = #26377#25928#38376#24133
+        DataBinding.FieldName = 'C_Width'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 67
+      end
+      object cxGridDBColumn15: TcxGridDBColumn
+        Caption = #21367#21495
+        DataBinding.FieldName = 'PieceNo'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 49
+      end
+      object cxGridDBColumn16: TcxGridDBColumn
+        Caption = #21367#26465#30721
+        DataBinding.FieldName = 'CIID'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
+      object cxGridDBColumn17: TcxGridDBColumn
+        Caption = #27611#37325
+        DataBinding.FieldName = 'GrossWeight'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
+      object cxGridDBColumn18: TcxGridDBColumn
+        Caption = #30382#37325
+        DataBinding.FieldName = 'Tare'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
+      object cxGridDBColumn19: TcxGridDBColumn
+        Caption = #20928#37325
+        DataBinding.FieldName = 'NetWeight'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
+      object cxGridDBColumn20: TcxGridDBColumn
+        Caption = #31859#25968
+        DataBinding.FieldName = 'Meter'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
+      object cxGridDBColumn21: TcxGridDBColumn
+        Caption = #30721#25968
+        DataBinding.FieldName = 'Yardage'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 66
+      end
+      object cxGridDBColumn25: TcxGridDBColumn
+        Caption = #23458#25143#35746#21333#21495
+        DataBinding.FieldName = 'khconno'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 100
+      end
+    end
+    object cxGridLevel1: TcxGridLevel
+      GridView = TV2
+    end
+  end
   inherited ADOQueryBaseCmd: TADOQuery
     Connection = DataLink_TradeClothStk.ADOLink
     Left = 553
@@ -739,4 +970,16 @@ inherited frmTradeClothStkList_Sel: TfrmTradeClothStkList_Sel
       OnClick = PM11Click
     end
   end
+  object CD_2: TDataSource
+    DataSet = CDS_2
+    Left = 1410
+    Top = 309
+  end
+  object CDS_2: TClientDataSet
+    Aggregates = <>
+    Params = <>
+    BeforeOpen = CDS_1BeforeOpen
+    Left = 1350
+    Top = 308
+  end
 end

T04贸易明细仓库/U_TradeClothStkList_Sel.pas

@@ -104,6 +104,28 @@ type
     lbl2: TLabel;
     lbl3: TLabel;
     cxgrdbclmnTv1Column3: TcxGridDBColumn;
+    lbl4: TLabel;
+    C_Width: TEdit;
+    lbl5: TLabel;
+    C_GramWeight: TEdit;
+    lbl6: TLabel;
+    PieceNo: TEdit;
+    cxGrid2: TcxGrid;
+    TV2: TcxGridDBTableView;
+    cxGridDBColumn6: TcxGridDBColumn;
+    cxGridDBColumn7: TcxGridDBColumn;
+    cxGridDBColumn8: TcxGridDBColumn;
+    cxGridDBColumn15: TcxGridDBColumn;
+    cxGridDBColumn16: TcxGridDBColumn;
+    cxGridDBColumn17: TcxGridDBColumn;
+    cxGridDBColumn18: TcxGridDBColumn;
+    cxGridDBColumn19: TcxGridDBColumn;
+    cxGridDBColumn20: TcxGridDBColumn;
+    cxGridDBColumn21: TcxGridDBColumn;
+    cxGridDBColumn25: TcxGridDBColumn;
+    cxGridLevel1: TcxGridLevel;
+    CD_2: TDataSource;
+    CDS_2: TClientDataSet;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBRafreshClick(Sender: TObject);
@@ -127,15 +149,18 @@ type
     procedure FormDestroy(Sender: TObject);
     procedure ToolButton1Click(Sender: TObject);
     procedure v1Column22PropertiesChange(Sender: TObject);
+    procedure TV2CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
   private
     CurrentPage, RecordsNumber: Integer;
     lstCust: TStringList;
+    sl: TStringList;
     procedure InitGrid();
     procedure SetStatus();
     { Private declarations }
   public
     canshu1: string;
     FilteredRecordCount: Integer;
+    property MyStringList: TStringList read sl;
     { Public declarations }
   end;
 
@@ -165,6 +190,7 @@ procedure TfrmTradeClothStkList_Sel.FormCreate(Sender: TObject);
 begin
   inherited;
   lstCust := TStringList.Create;
+  sl := TStringList.Create;
   EndDate.DateTime := SGetServerDateTime(ADOQueryTemp);
   BegDate.DateTime := EndDate.DateTime - 20;
 end;
@@ -179,7 +205,6 @@ procedure TfrmTradeClothStkList_Sel.InitGrid();
 var
   WSql: string;
 begin
-
   WSql := SGetFilters(Panel1, 1, 2);
   if Trim(WSql) <> '' then
     WSql := ' and ' + WSql;
@@ -191,7 +216,6 @@ begin
 
   try
     ADOQueryMain.DisableControls;
-
     with ADOQueryMain do
     begin
       Filtered := False;
@@ -256,6 +280,7 @@ begin
   inherited;
   FilteredRecordCount := 0;
   ReadCxGrid(trim(self.Caption) + 'Tv123', Tv1, '³ÉÆ·²Ö¿â');
+  ReadCxGrid(trim(self.Caption) + 'Tv2', Tv2, '´ý³ö¿â');
   CurrentPage := 1;
   RecordsNumber := 500;
   canshu1 := '¹ÜÀí';
@@ -281,10 +306,57 @@ begin
 end;
 
 procedure TfrmTradeClothStkList_Sel.PM11Click(Sender: TObject);
+var
+  i, index: Integer;
+  WSql: string;
 begin
   SelOKNo(CDS_1, false);
-  FilteredRecordCount := 0;
+  with CDS_1 do
-  lbl3.Caption:=FilteredRecordCount.ToString;
+  begin
+    First;
+    while not Eof do
+    begin
+      if CDS_1.fieldbyname('SSel').AsBoolean then
+      begin
+        if sl.IndexOf(CDS_1.fieldbyname('CIID').AsString) < 0 then
+          sl.Add(CDS_1.fieldbyname('CIID').AsString);
+      end
+      else
+      begin
+        index := sl.IndexOf(CDS_1.fieldbyname('CIID').AsString);
+        if index >= 0 then
+          sl.Delete(index);
+      end;
+      Next;
+    end;
+  end;
+  for i := 0 to sl.Count - 1 do
+  begin
+    if WSql <> '' then
+    begin
+      WSql := WSql + ',' + QuotedStr(sl[i]);
+    end
+    else
+    begin
+      WSql := QuotedStr(sl[i]);
+    end;
+  end;
+  with ADOQueryTemp do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('select * from V_Trade_Cloth_Stk AA where CIID in(');
+    if WSql = '' then
+      sql.Add(QuotedStr(WSql))
+    else
+      sql.Add(WSql);
+    sql.Add(')');
+//    showmessage(sql.Text);
+    Open;
+  end;
+  SCreateCDS(ADOQueryTemp, CDS_2);
+  SInitCDSData(ADOQueryTemp, CDS_2);
+  lbl3.Caption := IntToStr(sl.Count);
 end;
 
 procedure TfrmTradeClothStkList_Sel.Tv1DataControllerFilterBeforeChange(Sender: TcxDBDataFilterCriteria; ADataSet: TDataSet; const AFilterText: string);
@@ -298,17 +370,88 @@ begin
     AText := IntToStr(lstCust.Count);
 end;
 
-procedure TfrmTradeClothStkList_Sel.v1Column22PropertiesChange(Sender: TObject);
+procedure TfrmTradeClothStkList_Sel.TV2CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean);
+var
+  index, I: Integer;
+  WSql: string;
 begin
-  if CDS_1.fieldbyname('SSel').AsBoolean then
+  index := sl.IndexOf(CDS_2.fieldbyname('CIID').AsString);
+  if index >= 0 then
+    sl.Delete(index);
+  lbl3.Caption := IntToStr(sl.Count);
+  for I := 0 to sl.Count - 1 do
   begin
-    FilteredRecordCount := FilteredRecordCount + 1;
+    if WSql <> '' then
+    begin
+      WSql := WSql + ',' + QuotedStr(sl[I]);
     end
     else
     begin
-    FilteredRecordCount := FilteredRecordCount - 1;
+      WSql := QuotedStr(sl[I]);
     end;
-  lbl3.Caption := FilteredRecordCount.ToString;
+  end;
+
+  with ADOQueryTemp do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('select * from V_Trade_Cloth_Stk AA where CIID in(');
+    if WSql = '' then
+      sql.Add(QuotedStr(WSql))
+    else
+      sql.Add(WSql);
+    sql.Add(')');
+    Open;
+  end;
+  SCreateCDS(ADOQueryTemp, CDS_2);
+  SInitCDSData(ADOQueryTemp, CDS_2);
+end;
+
+procedure TfrmTradeClothStkList_Sel.v1Column22PropertiesChange(Sender: TObject);
+var
+  index: Integer;
+  I: Integer;
+  WSql: string;
+begin
+  if CDS_1.fieldbyname('SSel').AsBoolean then
+  begin
+    if sl.IndexOf(CDS_1.fieldbyname('CIID').AsString) < 0 then
+      sl.Add(CDS_1.fieldbyname('CIID').AsString);
+  end
+  else
+  begin
+    index := sl.IndexOf(CDS_1.fieldbyname('CIID').AsString);
+    if index >= 0 then
+      sl.Delete(index);
+  end;
+  lbl3.Caption := IntToStr(sl.Count);
+  for I := 0 to sl.Count - 1 do
+  begin
+    if WSql <> '' then
+    begin
+      WSql := WSql + ',' + QuotedStr(sl[I]);
+    end
+    else
+    begin
+      WSql := QuotedStr(sl[I]);
+    end;
+  end;
+
+  with ADOQueryTemp do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('select * from V_Trade_Cloth_Stk AA where CIID in(');
+    if WSql = '' then
+      sql.Add(QuotedStr(WSql))
+    else
+      sql.Add(WSql);
+    sql.Add(')');
+//    showmessage(sql.Text);
+    Open;
+  end;
+  SCreateCDS(ADOQueryTemp, CDS_2);
+  SInitCDSData(ADOQueryTemp, CDS_2);
 end;
 
 procedure TfrmTradeClothStkList_Sel.BTNPClick(Sender: TObject);
@@ -339,12 +482,57 @@ begin
 end;
 
 procedure TfrmTradeClothStkList_Sel.N1Click(Sender: TObject);
- var
+var
-  rowCount: Integer;
+  i, index: Integer;
+  WSql: string;
 begin
   SelOKNo(CDS_1, true);
-  FilteredRecordCount := TV1.DataController.RecordCount;
+  with CDS_1 do
-  lbl3.Caption := TV1.DataController.RecordCount.ToString;
+  begin
+    First;
+    while not Eof do
+    begin
+      if CDS_1.fieldbyname('SSel').AsBoolean then
+      begin
+        if sl.IndexOf(CDS_1.fieldbyname('CIID').AsString) < 0 then
+          sl.Add(CDS_1.fieldbyname('CIID').AsString);
+      end
+      else
+      begin
+        index := sl.IndexOf(CDS_1.fieldbyname('CIID').AsString);
+        if index >= 0 then
+          sl.Delete(index);
+      end;
+      Next;
+    end;
+  end;
+  for i := 0 to sl.Count - 1 do
+  begin
+    if WSql <> '' then
+    begin
+      WSql := WSql + ',' + QuotedStr(sl[i]);
+    end
+    else
+    begin
+      WSql := QuotedStr(sl[i]);
+    end;
+  end;
+  with ADOQueryTemp do
+  begin
+    Close;
+    sql.Clear;
+    sql.Add('select * from V_Trade_Cloth_Stk AA where CIID in(');
+    if WSql = '' then
+      sql.Add(QuotedStr(WSql))
+    else
+      sql.Add(WSql);
+    sql.Add(')');
+//    showmessage(sql.Text);
+    Open;
+  end;
+  SCreateCDS(ADOQueryTemp, CDS_2);
+  SInitCDSData(ADOQueryTemp, CDS_2);
+  lbl3.Caption := IntToStr(sl.Count);
 end;
 
 procedure TfrmTradeClothStkList_Sel.ToolButton1Click(Sender: TObject);
@@ -356,6 +544,7 @@ end;
 procedure TfrmTradeClothStkList_Sel.ToolButton2Click(Sender: TObject);
 var
   WSql: string;
+  i: Integer;
 begin
   if CDS_1.IsEmpty then
     Exit;
@@ -406,6 +595,7 @@ end;
 procedure TfrmTradeClothStkList_Sel.ToolButton4Click(Sender: TObject);
 begin
   WriteCxGrid(trim(self.Caption) + 'Tv123', Tv1, '³ÉÆ·²Ö¿â');
+  WriteCxGrid(trim(self.Caption) + 'Tv2', Tv2, '´ý³ö¿â');
 end;
 
 end.

T04贸易明细仓库/U_TradeClothTotalStkList.dfm

@@ -2,13 +2,13 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
   Left = 184
   Top = 138
   Caption = #25104#21697#24211#23384#27719#24635
-  ClientHeight = 600
+  ClientHeight = 613
   ClientWidth = 1540
   FormStyle = fsMDIChild
   Position = poScreenCenter
   Visible = True
   ExplicitWidth = 1556
-  ExplicitHeight = 639
+  ExplicitHeight = 652
   PixelsPerInch = 96
   TextHeight = 12
   object ToolBar1: TToolBar [0]
@@ -117,62 +117,54 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
       Hint = '0'
       Caption = #20135#21697#32534#21495
     end
-    object Label1: TLabel
-      Left = 531
-      Top = 44
-      Width = 36
-      Height = 12
-      Hint = '0'
-      Caption = #21512#21516#21495
-    end
     object Label3: TLabel
-      Left = 747
+      Left = 519
-      Top = 10
+      Top = 42
       Width = 48
       Height = 12
       Hint = '0'
       Caption = #35745#21010#21333#21495
     end
     object Label4: TLabel
-      Left = 747
+      Left = 734
-      Top = 44
+      Top = 10
       Width = 54
       Height = 12
       Hint = '0'
       Caption = #38376'    '#24133' '
     end
-    object Label6: TLabel
-      Left = 969
-      Top = 10
-      Width = 48
-      Height = 12
-      Hint = '0'
-      Caption = #22383#24067#20811#37325
-    end
     object Label8: TLabel
-      Left = 969
+      Left = 734
-      Top = 44
+      Top = 42
       Width = 48
       Height = 12
       Hint = '0'
       Caption = #25104#21697#20811#37325
     end
     object Label9: TLabel
-      Left = 1192
+      Left = 940
-      Top = 2
+      Top = 10
       Width = 36
       Height = 12
       Hint = '0'
       Caption = #24067#31080#21495
     end
     object Label10: TLabel
-      Left = 1192
+      Left = 940
-      Top = 36
+      Top = 42
       Width = 36
       Height = 12
       Hint = '0'
       Caption = #21367#26465#30721
     end
+    object lbl1: TLabel
+      Left = 1149
+      Top = 10
+      Width = 48
+      Height = 12
+      Hint = '0'
+      Caption = #23458#25143#21333#21495
+    end
     object BegDate: TDateTimePicker
       Left = 149
       Top = 6
@@ -251,19 +243,19 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
       TabOrder = 7
       OnKeyPress = C_CodeKeyPress
     end
-    object ConNo: TEdit
+    object MainId: TEdit
       Tag = 2
       Left = 593
-      Top = 40
+      Top = 38
       Width = 100
       Height = 20
       Hint = '0'
       TabOrder = 8
       OnKeyPress = C_CodeKeyPress
     end
-    object OrderNo: TEdit
+    object C_Width: TEdit
       Tag = 2
-      Left = 824
+      Left = 811
       Top = 6
       Width = 100
       Height = 20
@@ -271,19 +263,19 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
       TabOrder = 9
       OnKeyPress = C_CodeKeyPress
     end
-    object C_Width: TEdit
+    object C_GramWeight: TEdit
       Tag = 2
-      Left = 824
+      Left = 811
-      Top = 40
+      Top = 38
       Width = 100
       Height = 20
       Hint = '0'
       TabOrder = 10
       OnKeyPress = C_CodeKeyPress
     end
-    object C_KnitGramWeight: TEdit
+    object BCIOID: TEdit
       Tag = 2
-      Left = 1046
+      Left = 1017
       Top = 6
       Width = 100
       Height = 20
@@ -291,36 +283,26 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
       TabOrder = 11
       OnKeyPress = C_CodeKeyPress
     end
-    object C_GramWeight: TEdit
+    object CIID: TEdit
       Tag = 2
-      Left = 1046
+      Left = 1017
-      Top = 40
+      Top = 38
       Width = 100
       Height = 20
       Hint = '0'
       TabOrder = 12
       OnKeyPress = C_CodeKeyPress
     end
-    object BCIOID: TEdit
+    object khconno: TEdit
       Tag = 2
-      Left = 1269
+      Left = 1204
-      Top = -2
+      Top = 6
       Width = 100
       Height = 20
       Hint = '0'
       TabOrder = 13
       OnKeyPress = C_CodeKeyPress
     end
-    object CIID: TEdit
-      Tag = 2
-      Left = 1269
-      Top = 32
-      Width = 100
-      Height = 20
-      Hint = '0'
-      TabOrder = 14
-      OnKeyPress = C_CodeKeyPress
-    end
   end
   object Panel6: TPanel [2]
     Left = 0
@@ -428,7 +410,7 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
     Left = 0
     Top = 157
     Width = 1540
-    Height = 443
+    Height = 456
     Align = alClient
     BorderStyle = cxcbsNone
     Font.Charset = GB2312_CHARSET
@@ -439,7 +421,7 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
     ParentFont = False
     PopupMenu = PM_1
     TabOrder = 3
-    ExplicitTop = 158
+    ExplicitHeight = 443
     object Tv1: TcxGridDBTableView
       OnDblClick = Tv1DblClick
       Navigator.Buttons.CustomButtons = <>
@@ -622,7 +604,15 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
       end
       object Tv1Column7: TcxGridDBColumn
         Caption = #35745#21010#21333#21495
-        DataBinding.FieldName = 'OrderNo'
+        DataBinding.FieldName = 'MainId'
+        DataBinding.IsNullValueType = True
+        HeaderAlignmentHorz = taCenter
+        Options.Editing = False
+        Width = 80
+      end
+      object cxgrdbclmnTv1Column21: TcxGridDBColumn
+        Caption = #23458#25143#21333#21495
+        DataBinding.FieldName = 'khconno'
         DataBinding.IsNullValueType = True
         HeaderAlignmentHorz = taCenter
         Options.Editing = False
@@ -742,7 +732,6 @@ inherited frmTradeClothTotalStkList: TfrmTradeClothTotalStkList
       #24211#23384#27719#24635
       #24211#23384#26126#32454)
     OnChange = cxTabControl1Change
-    ExplicitLeft = -1
     ClientRectBottom = 22
     ClientRectRight = 1540
     ClientRectTop = 19

T04贸易明细仓库/U_TradeClothTotalStkList.pas

@@ -79,14 +79,10 @@ type
     Tv1Column18: TcxGridDBColumn;
     Tv1Column19: TcxGridDBColumn;
     cxTabControl1: TcxTabControl;
-    Label1: TLabel;
-    ConNo: TEdit;
     Label3: TLabel;
-    OrderNo: TEdit;
+    MainId: TEdit;
     Label4: TLabel;
     C_Width: TEdit;
-    Label6: TLabel;
-    C_KnitGramWeight: TEdit;
     Label8: TLabel;
     C_GramWeight: TEdit;
     Label9: TLabel;
@@ -94,6 +90,9 @@ type
     Label10: TLabel;
     CIID: TEdit;
     Tv1Column20: TcxGridDBColumn;
+    cxgrdbclmnTv1Column21: TcxGridDBColumn;
+    lbl1: TLabel;
+    khconno: TEdit;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure TBRafreshClick(Sender: TObject);
@@ -150,7 +149,6 @@ begin
       begin
         Tv1Column3.Visible := False;
         Tv1Column6.Visible := False;
-        Tv1Column7.Visible := False;
         Tv1Column8.Visible := False;
         Tv1Column9.Visible := False;
         Tv1Column11.Visible := False;
@@ -166,27 +164,20 @@ begin
         C_Code.text := '';
         C_Name.text := '';
         C_Color.text := '';
-
+        MainId.text := '';
-        ConNO.text := '';
-        OrderNO.text := '';
         C_Width.text := '';
-        C_KnitGramWeight.text := '';
         C_GramWeight.text := '';
         BCIOID.text := '';
         CIID.text := '';
 
-        label1.Visible := False;
         label3.Visible := False;
         label4.Visible := False;
-        label6.Visible := False;
         label8.Visible := False;
         label9.Visible := False;
         label10.Visible := False;
 
-        ConNO.Visible := False;
+        MainId.Visible := False;
-        OrderNO.Visible := False;
         C_Width.Visible := False;
-        C_KnitGramWeight.Visible := False;
         C_GramWeight.Visible := False;
         BCIOID.Visible := False;
         CIID.Visible := False;
@@ -197,18 +188,15 @@ begin
 
         Tv1Column1.Visible := False;
 
-        label1.Visible := true;
+        Tv1Column7.Visible := true;
         label3.Visible := true;
         label4.Visible := true;
-        label6.Visible := true;
         label8.Visible := true;
         label9.Visible := true;
         label10.Visible := true;
 
-        ConNO.Visible := true;
+        MainId.Visible := true;
-        OrderNO.Visible := true;
         C_Width.Visible := true;
-        C_KnitGramWeight.Visible := true;
         C_GramWeight.Visible := true;
         BCIOID.Visible := true;
         CIID.Visible := true;
@@ -262,12 +250,14 @@ begin
             sql.Add(' from  ');
             sql.Add('(select  rownumber=cast((row_number() over(order by AA.C_Code desc)) as int)');
             sql.Add(',COUNT(1) OVER() AS TotalCount');
-            sql.Add(',* from (select A.C_Code,A.C_Name,C_Color,A.LenUnit,sum(Meter) AS Meter,sum(Yardage) AS Yardage,sum(GrossWeight) AS GrossWeight,sum(NetWeight) AS NetWeight,Count(*) AS Piece');
+            sql.Add(',* from (select A.MainId,C.khconno,A.C_Code,A.C_Name,C_Color,A.LenUnit,sum(Meter) AS Meter,sum(Yardage) AS Yardage,sum(GrossWeight) AS GrossWeight,sum(NetWeight) AS NetWeight,Count(*) AS Piece');
-            sql.Add(' from  Trade_Cloth_Stock A inner join Trade_Cloth_IO B on B.StkId=A.StkId and A.StkCycles=B.IOCycles where A.StkExists=1 and B.IOFlag=''Èë¿â'' ');
+            sql.Add(' from Trade_Cloth_Stock A inner join Trade_Cloth_IO B on B.StkId=A.StkId and A.StkCycles=B.IOCycles ');
-            sql.Add(' GROUP BY 	A.C_Code,A.C_Name,C_Color,A.LenUnit) ');
+            sql.Add(' left join Knit_Plan_Main C on A.MainId = C.MainId  where A.StkExists=1 and B.IOFlag=''Èë¿â'' ');
+            sql.Add(' GROUP BY 	A.MainId,C.khconno,A.C_Code,A.C_Name,C_Color,A.LenUnit) ');
             sql.Add('  AA where 1=1 ' + WSql);
             sql.Add(') temp_row');
             sql.Add(' order by rownumber');
+           // showmessage(sql.Text);
           end;
         1:
           begin
@@ -394,6 +384,7 @@ begin
         C_Code.text := Trim(CDS_1.fieldbyname('C_Code').AsString);
         C_Name.text := Trim(CDS_1.fieldbyname('C_Name').AsString);
         C_Color.text := Trim(CDS_1.fieldbyname('C_Color').AsString);
+        MainId.Text := Trim(CDS_1.fieldbyname('MainId').AsString);
         cxTabControl1.TabIndex := 1;
       end;