diff --git a/A02基础产品管理/U_ClothInfo.dfm b/A02基础产品管理/U_ClothInfo.dfm index 9d2cf9b..bc6e29a 100644 --- a/A02基础产品管理/U_ClothInfo.dfm +++ b/A02基础产品管理/U_ClothInfo.dfm @@ -10,7 +10,7 @@ inherited frmClothInfo: TfrmClothInfo FormStyle = fsMDIChild Position = poScreenCenter Visible = True - ExplicitTop = -87 + ExplicitLeft = -349 ExplicitWidth = 1556 ExplicitHeight = 884 PixelsPerInch = 96 @@ -194,7 +194,7 @@ inherited frmClothInfo: TfrmClothInfo Top = 11 Width = 64 Height = 21 - Caption = #20135#21697#21517#31216 + Caption = #33394#24067#21517#31216 end object Label9: TLabel Left = 794 @@ -532,8 +532,6 @@ inherited frmClothInfo: TfrmClothInfo Align = alClient Caption = #26679#21697#32553#30053#22270#65288#21452#20987#22270#29255#26597#30475#21407#22270#65289 TabOrder = 0 - ExplicitLeft = 606 - ExplicitWidth = 699 object ScrollBox1: TScrollBox Left = 2 Top = 23 @@ -543,7 +541,6 @@ inherited frmClothInfo: TfrmClothInfo BevelInner = bvLowered BorderStyle = bsNone TabOrder = 0 - ExplicitWidth = 695 end end end @@ -556,9 +553,6 @@ inherited frmClothInfo: TfrmClothInfo Align = alClient PopupMenu = PM_1 TabOrder = 2 - ExplicitLeft = 2 - ExplicitTop = 43 - ExplicitWidth = 1104 object Tv1: TcxGridDBTableView OnMouseDown = Tv1MouseDown Navigator.Buttons.CustomButtons = <> @@ -601,7 +595,7 @@ inherited frmClothInfo: TfrmClothInfo Width = 130 end object v1Column9: TcxGridDBColumn - Caption = #20013#25991#21697#21517 + Caption = #33394#24067#21517#31216 DataBinding.FieldName = 'C_Name' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter @@ -610,7 +604,7 @@ inherited frmClothInfo: TfrmClothInfo end object Tv1Column24: TcxGridDBColumn AlternateCaption = 'qtyunit' - Caption = #21333#20301 + Caption = #35745#20215#21333#20301 DataBinding.FieldName = 'qtyunit' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter @@ -800,8 +794,6 @@ inherited frmClothInfo: TfrmClothInfo Height = 451 Align = alRight TabOrder = 3 - ExplicitLeft = 1107 - ExplicitTop = 43 object Tv2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -858,9 +850,6 @@ inherited frmClothInfo: TfrmClothInfo Height = 451 AlignSplitter = salRight Control = cxGrid2 - ExplicitLeft = 588 - ExplicitTop = 380 - ExplicitHeight = 100 end end inherited loadProcess: TPanel diff --git a/A02基础产品管理/U_ClothInfo.pas b/A02基础产品管理/U_ClothInfo.pas index 145798a..b8ff1e2 100644 --- a/A02基础产品管理/U_ClothInfo.pas +++ b/A02基础产品管理/U_ClothInfo.pas @@ -224,7 +224,8 @@ begin SqlStr := 'select * from BS_Cloth_Info_Sub A where BCIID =' + quotedstr((CDS_1.fieldbyname('BCIID').AsString)); - SqlStr := SqlStr + 'order by dbo.getNum( C_ColorNo) '; + SqlStr := SqlStr + 'ORDER BY CASE WHEN C_COLORNO NOT LIKE ''%[^0-9]%'' THEN dbo.getNum(C_Colorno) ELSE 9999999999 '; + SqlStr := SqlStr + ' END ,C_ColorNo'; InitAdoData(ADO_2, Tv1, SqlStr, '', ''); @@ -441,6 +442,7 @@ begin inherited; ReadCxGrid(self.Caption + 'TV1', Tv1, 'Ʒ'); + ReadCxGrid(self.Caption + 'TV2', Tv2, 'Ʒ'); application.ProcessMessages; @@ -866,6 +868,7 @@ end; procedure TfrmClothInfo.ToolButton2Click(Sender: TObject); begin WriteCxGrid(self.Caption + 'TV1', Tv1, 'Ʒ'); + WriteCxGrid(self.Caption + 'TV2', Tv2, 'Ʒ'); end; procedure TfrmClothInfo.ToolButton3Click(Sender: TObject); diff --git a/A02基础产品管理/U_ClothInfoInput.dfm b/A02基础产品管理/U_ClothInfoInput.dfm index ba1447c..b9c4be6 100644 --- a/A02基础产品管理/U_ClothInfoInput.dfm +++ b/A02基础产品管理/U_ClothInfoInput.dfm @@ -75,7 +75,6 @@ object frmClothInfoInput: TfrmClothInfoInput Ctl3D = False ParentCtl3D = False TabOrder = 1 - ExplicitTop = 31 object Label1: TLabel Left = 37 Top = 18 @@ -88,7 +87,7 @@ object frmClothInfoInput: TfrmClothInfoInput Top = 18 Width = 64 Height = 21 - Caption = #20013#25991#21697#21517 + Caption = #33394#24067#21517#31216 end object Label15: TLabel Left = 37 @@ -255,9 +254,9 @@ object frmClothInfoInput: TfrmClothInfoInput object Label25: TLabel Left = 39 Top = 281 - Width = 32 + Width = 64 Height = 21 - Caption = #21333#20301 + Caption = #35745#20215#21333#20301 end object C_Code: TcxTextEdit Tag = 2 @@ -596,8 +595,6 @@ object frmClothInfoInput: TfrmClothInfoInput Height = 461 Align = alClient TabOrder = 1 - ExplicitLeft = 2 - ExplicitTop = 32 object TV1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/A02基础产品管理/U_ClothInfoInput.pas b/A02基础产品管理/U_ClothInfoInput.pas index 23274e2..c364b76 100644 --- a/A02基础产品管理/U_ClothInfoInput.pas +++ b/A02基础产品管理/U_ClothInfoInput.pas @@ -165,7 +165,8 @@ begin sql.Clear; sql.Add('select A.* from BS_Cloth_Info_Sub A '); sql.Add(' where A.BCIID=''' + Trim(FBCIID) + ''''); - sql.Add('order by dbo.getNum( C_ColorNo)'); + sql.Add('ORDER BY CASE WHEN C_COLORNO NOT LIKE ''%[^0-9]%'' THEN dbo.getNum(C_Colorno) ELSE 9999999999 '); + sql.Add(' END ,C_ColorNo'); Open; end; SCreateCDS(ADOQueryTemp, CDS_1); @@ -185,7 +186,7 @@ begin SCSHData(ADOQueryTemp, ScrollBox1, 2); StkPosition.Text := ADOQueryTemp.FieldByName('StkPosition').AsString; - qtyunit.Text := ADOQueryTemp.FieldByName('qtyunit').AsString; + qtyunit.Text := ADOQueryTemp.FieldByName('qtyunit').AsString; // SCSHData(ADOQueryTemp, ScrollBox1, 0); C_FromName.Properties.LookupItems.Text := Trim(ADOQueryTemp.fieldbyname('FromBCIID').AsString); // C_FromName.Text := Trim(ADOQueryTemp.fieldbyname('C_FromName').AsString); // @@ -413,7 +414,7 @@ begin FieldByName('BCIID').Value := Trim(MaxBCIID); FieldByName('StkPosition').Value := Trim(StkPosition.text); - FieldByName('QTYUNIT').Value := Trim(QTYUNIT.text); + FieldByName('QTYUNIT').Value := Trim(QTYUNIT.text); if trim(C_Code.Text) = '' then C_Code.Text := Trim(MaxBCIID);