diff --git a/A02基础产品管理/U_TatClothInfoInput.dfm b/A02基础产品管理/U_TatClothInfoInput.dfm index 6a5faa6..7460648 100644 --- a/A02基础产品管理/U_TatClothInfoInput.dfm +++ b/A02基础产品管理/U_TatClothInfoInput.dfm @@ -1201,7 +1201,6 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput object cxTabSheet2: TcxTabSheet Caption = ' '#32441#29256#22270' ' ImageIndex = 1 - TabVisible = False object Panel7: TPanel Left = 0 Top = 0 @@ -2394,6 +2393,7 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput object cxTabSheet4: TcxTabSheet Caption = #31359#31576#27861 ImageIndex = 3 + TabVisible = False object reed_weave_method: TMemo Left = 0 Top = 0 @@ -2449,7 +2449,7 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput end end object cxTabSheet7: TcxTabSheet - Caption = ' '#31359#32508#27861'/'#36215#32508#27861' ' + Caption = ' '#31359#32508#27861 ImageIndex = 6 object Splitter1: TSplitter Left = 762 @@ -2505,6 +2505,7 @@ object frmTatClothInfoInput: TfrmTatClothInfoInput Align = alClient BevelOuter = bvNone TabOrder = 1 + Visible = False object Label27: TLabel Left = 0 Top = 0 diff --git a/E03梭织坯布检验/U_TatClothInspList.dfm b/E03梭织坯布检验/U_TatClothInspList.dfm index 68ba687..0db0ee5 100644 --- a/E03梭织坯布检验/U_TatClothInspList.dfm +++ b/E03梭织坯布检验/U_TatClothInspList.dfm @@ -127,6 +127,7 @@ inherited frmTatClothInspList: TfrmTatClothInspList ParentFont = False PopupMenu = PM_1 TabOrder = 2 + ExplicitTop = 133 object Tv1: TcxGridDBTableView OnMouseUp = Tv1MouseUp Navigator.Buttons.CustomButtons = <> @@ -546,6 +547,14 @@ inherited frmTatClothInspList: TfrmTatClothInspList Options.Editing = False Width = 66 end + object Tv1add_weight: TcxGridDBColumn + Caption = #21152#37325 + DataBinding.FieldName = 'add_weight' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 66 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/E03梭织坯布检验/U_TatClothInspList.pas b/E03梭织坯布检验/U_TatClothInspList.pas index dc06d80..9933160 100644 --- a/E03梭织坯布检验/U_TatClothInspList.pas +++ b/E03梭织坯布检验/U_TatClothInspList.pas @@ -82,6 +82,7 @@ type Tv1Column10: TcxGridDBColumn; Tv1Column1: TcxGridDBColumn; Tv1Column2: TcxGridDBColumn; + Tv1add_weight: TcxGridDBColumn; Panel1: TPanel; Label3: TLabel; Label7: TLabel; @@ -243,6 +244,7 @@ var MLen: string; MAddLen: Double; MCIIDS: string; + MCKJS: Integer; begin if Order_Main.IsEmpty then Exit; @@ -284,6 +286,23 @@ begin if MCIIDS = '' then Exit; + //ѳľ޸ļӳ + with ADOQueryCmd do + begin + Close; + SQL.Clear; + SQL.Add('select count(*) as CKJS from Tat_Cloth_IO'); + SQL.Add(' where IOFlag='''' and StkId in (' + MCIIDS + ')'); + Open; + MCKJS := FieldByName('CKJS').AsInteger; + Close; + end; + if MCKJS > 0 then + begin + Application.MessageBox('ѡдѳݣ޸ļӳ!', 'ʾ', 0); + Exit; + end; + try ADOQueryCmd.Connection.BeginTrans; with ADOQueryCmd do @@ -294,6 +313,27 @@ begin SQL.Add(' where CIID in (' + MCIIDS + ')'); ExecSQL; end; + //ͬ: +ӳ + with ADOQueryCmd do + begin + Close; + SQL.Clear; + SQL.Add('update S set StkMeter=ROUND(ISNULL(TRY_CAST(E.Meter AS decimal(18,4)),0)+ISNULL(TRY_CAST(E.add_length AS decimal(18,4)),0),2)'); + SQL.Add(' from Tat_Cloth_Stock S join Tat_Cloth_Inspect E on E.CIID=S.CIID'); + SQL.Add(' where S.StkId in (' + MCIIDS + ')'); + ExecSQL; + end; + //ͬǰˮ + with ADOQueryCmd do + begin + Close; + SQL.Clear; + SQL.Add('update B set Meter=ROUND(ISNULL(TRY_CAST(E.Meter AS decimal(18,4)),0)+ISNULL(TRY_CAST(E.add_length AS decimal(18,4)),0),2)'); + SQL.Add(' from Tat_Cloth_IO B join Tat_Cloth_Stock S on B.StkId=S.StkId and B.IOCycles=S.StkCycles'); + SQL.Add(' join Tat_Cloth_Inspect E on E.CIID=S.CIID'); + SQL.Add(' where B.IOFlag='''' and B.StkId in (' + MCIIDS + ')'); + ExecSQL; + end; with ADOQueryCmd do begin Close; diff --git a/E03梭织坯布检验/U_TatMachInsp.dfm b/E03梭织坯布检验/U_TatMachInsp.dfm index 39331ff..9cb2078 100644 --- a/E03梭织坯布检验/U_TatMachInsp.dfm +++ b/E03梭织坯布检验/U_TatMachInsp.dfm @@ -2656,7 +2656,7 @@ end object Tv3Column1: TcxGridDBColumn Caption = #31859#25968 - DataBinding.FieldName = 'Meter' + DataBinding.FieldName = 'MeterWithAddLength' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False @@ -2737,6 +2737,14 @@ Options.Editing = False Width = 80 end + object Tv3add_weight: TcxGridDBColumn + Caption = #21152#37325 + DataBinding.FieldName = 'add_weight' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 50 + end end object cxGridLevel2: TcxGridLevel GridView = Tv3 @@ -3330,6 +3338,19 @@ Font.Style = [fsBold] ParentFont = False end + object Label60: TLabel + Left = 6 + Top = 353 + Width = 42 + Height = 23 + Caption = #21152#37325 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -20 + Font.Name = 'Times New Roman' + Font.Style = [fsBold] + ParentFont = False + end object edtChen: TEdit Left = 54 Top = 52 @@ -3546,6 +3567,21 @@ OnClick = edtMaxClick OnKeyPress = MJstr3KeyPress end + object add_weight: TEdit + Left = 54 + Top = 349 + Width = 63 + Height = 28 + Font.Charset = ANSI_CHARSET + Font.Color = clWindowText + Font.Height = -20 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + TabOrder = 13 + OnClick = CIFBegClick + OnKeyPress = MJstr3KeyPress + end end object Panel3: TPanel [4] Left = 8 diff --git a/E03梭织坯布检验/U_TatMachInsp.pas b/E03梭织坯布检验/U_TatMachInsp.pas index 239145f..96e7b1c 100644 --- a/E03梭织坯布检验/U_TatMachInsp.pas +++ b/E03梭织坯布检验/U_TatMachInsp.pas @@ -339,6 +339,7 @@ type Tv3CalcMeter: TcxGridDBColumn; Tv3EstimatedDiff: TcxGridDBColumn; Tv3ActualDiff: TcxGridDBColumn; + Tv3add_weight: TcxGridDBColumn; Label57: TLabel; edtMax: TEdit; C_LongitudeBatchNo: TEdit; @@ -346,6 +347,8 @@ type Label58: TLabel; Label59: TLabel; BtnCon: TButton; + add_weight: TEdit; + Label60: TLabel; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormShow(Sender: TObject); @@ -693,6 +696,12 @@ begin raise Exception.Create('ܴ' + MaxWeight.Text + '!'); end; + if Trim(add_weight.Text) <> '' then + begin + if TryStrToFloat(add_weight.Text, mvalue) = False then + raise Exception.Create('¼!'); + end; + if Trim(InputLen.Text) <> '' then begin if TryStrToFloat(InputLen.Text, mvalue) = False then @@ -744,6 +753,7 @@ begin Tare.Text := ''; InputWeight.Text := ''; code_table_length.Text := ''; + add_weight.Text := ''; FLenUnit := ''; FLoom := ''; C_LongitudeBatchNo.Text := ''; @@ -1423,10 +1433,16 @@ begin if FMainId <> '' then begin sql.Add('select A.*,'); - sql.Add(' ROUND(ISNULL(TRY_CAST(A.GrossWeight AS decimal(18,4)) / NULLIF(TRY_CAST(A.C_GramWeight AS decimal(18,4)), 0), 0), 1) AS CalcMeter,'); + sql.Add(' CM2.CalcMeter AS CalcMeter,'); sql.Add(' ISNULL((select top 1 TRY_CAST(B.estimated_diff AS decimal(18,4)) from Bs_Cloth_Info B where B.c_code = A.c_code), 0) AS EstimatedDiff,'); - sql.Add(' ROUND(ABS(ISNULL(TRY_CAST(A.GrossWeight AS decimal(18,4)) / NULLIF(TRY_CAST(A.C_GramWeight AS decimal(18,4)), 0), 0) - ISNULL(TRY_CAST(A.code_table_length AS decimal(18,4)), 0)), 1) AS ActualDiff'); + sql.Add(' ROUND(ABS(CM2.CalcMeter - ISNULL(TRY_CAST(A.code_table_length AS decimal(18,4)), 0)), 1) AS ActualDiff'); + sql.Add(' ,ROUND(ISNULL(TRY_CAST(A.Meter AS decimal(18,4)), 0) + ISNULL(TRY_CAST(A.add_length AS decimal(18,4)), 0), 2) AS MeterWithAddLength'); sql.Add('from Tat_Cloth_Inspect A '); + sql.Add('outer apply (select ROUND(ISNULL(TRY_CAST(A.GrossWeight AS decimal(18,4)) / NULLIF(TRY_CAST(A.C_GramWeight AS decimal(18,4)), 0), 0), 1) as CalcMeterRaw) CM'); + sql.Add('outer apply (select CASE WHEN CM.CalcMeterRaw <= 0 THEN CM.CalcMeterRaw'); + sql.Add(' WHEN CM.CalcMeterRaw - FLOOR(CM.CalcMeterRaw) < 0.05 THEN FLOOR(CM.CalcMeterRaw)'); + sql.Add(' WHEN CM.CalcMeterRaw - FLOOR(CM.CalcMeterRaw) <= 0.5 THEN FLOOR(CM.CalcMeterRaw) + 0.5'); + sql.Add(' ELSE CEILING(CM.CalcMeterRaw) END as CalcMeter) CM2'); sql.Add('where mainid=' + quotedstr(fmainid)); sql.Add('and filler=' + quotedstr(dname)); sql.Add('order by filltime desc'); @@ -1434,10 +1450,16 @@ begin else begin sql.Add('select A.*,'); - sql.Add(' ROUND(ISNULL(TRY_CAST(A.GrossWeight AS decimal(18,4)) / NULLIF(TRY_CAST(A.C_GramWeight AS decimal(18,4)), 0), 0), 1) AS CalcMeter,'); + sql.Add(' CM2.CalcMeter AS CalcMeter,'); sql.Add(' ISNULL((select top 1 TRY_CAST(B.estimated_diff AS decimal(18,4)) from Bs_Cloth_Info B where B.c_code = A.c_code), 0) AS EstimatedDiff,'); - sql.Add(' ROUND(ABS(ISNULL(TRY_CAST(A.GrossWeight AS decimal(18,4)) / NULLIF(TRY_CAST(A.C_GramWeight AS decimal(18,4)), 0), 0) - ISNULL(TRY_CAST(A.code_table_length AS decimal(18,4)), 0)), 1) AS ActualDiff'); + sql.Add(' ROUND(ABS(CM2.CalcMeter - ISNULL(TRY_CAST(A.code_table_length AS decimal(18,4)), 0)), 1) AS ActualDiff'); + sql.Add(' ,ROUND(ISNULL(TRY_CAST(A.Meter AS decimal(18,4)), 0) + ISNULL(TRY_CAST(A.add_length AS decimal(18,4)), 0), 2) AS MeterWithAddLength'); sql.Add('from Tat_Cloth_Inspect A '); + sql.Add('outer apply (select ROUND(ISNULL(TRY_CAST(A.GrossWeight AS decimal(18,4)) / NULLIF(TRY_CAST(A.C_GramWeight AS decimal(18,4)), 0), 0), 1) as CalcMeterRaw) CM'); + sql.Add('outer apply (select CASE WHEN CM.CalcMeterRaw <= 0 THEN CM.CalcMeterRaw'); + sql.Add(' WHEN CM.CalcMeterRaw - FLOOR(CM.CalcMeterRaw) < 0.05 THEN FLOOR(CM.CalcMeterRaw)'); + sql.Add(' WHEN CM.CalcMeterRaw - FLOOR(CM.CalcMeterRaw) <= 0.5 THEN FLOOR(CM.CalcMeterRaw) + 0.5'); + sql.Add(' ELSE CEILING(CM.CalcMeterRaw) END as CalcMeter) CM2'); sql.Add('where convert(varchar(10),filltime,120)=convert(varchar(10),getdate(),120)'); sql.Add('and filler=' + quotedstr(dname)); sql.Add('and mainid=''޶'''); @@ -1449,31 +1471,11 @@ begin SCreateCDS(ADOQueryMain, CDS_3); SInitCDSData(ADOQueryMain, CDS_3); - //TV3 Meter/CalcMeter: decimal 0.1-0.4 -> 0.5, 0.6-0.9 -> next integer - with CDS_3 do - begin - DisableControls; - try - First; - while not Eof do - begin - Edit; - FieldByName('Meter').Value := RoundUpToHalf(FieldByName('Meter').AsFloat); - FieldByName('CalcMeter').Value := RoundUpToHalf(FieldByName('CalcMeter').AsFloat); - Post; - Next; - end; - First; - finally - EnableControls; - end; - end; - with ADOTmp do begin Close; SQL.Clear; - sql.Add('select COUNT(*)JS,SUM(METER)METER'); + sql.Add('select COUNT(*)JS,ROUND(SUM(ISNULL(METER,0)+ISNULL(add_length,0)),2)METER'); sql.Add('from Tat_Cloth_Inspect A '); sql.Add('where convert(varchar(10),filltime,120)=convert(varchar(10),getdate(),120)'); sql.Add('and filler=' + quotedstr(dname)); @@ -1699,6 +1701,7 @@ begin FieldByName('GrossWeight').Value := MGrossWeight; FieldByName('NetWeight').Value := MNetWeight; FieldByName('Tare').Value := MTare; + FieldByName('add_weight').Value := StrToFloatdef(Trim(add_weight.Text), 0); ///////////////////////// ///////////////////////// /// ///////////////////////// 泤 ///////////////////////// @@ -1727,7 +1730,7 @@ begin end; FieldByName('InputLen').Value := RoundFloat(StrToFloatdef(trim(InputLen.Text), 0), 1); - FieldByName('Meter').Value := MMeter; + FieldByName('Meter').Value := RoundUpToHalf(MMeter); FieldByName('Yardage').Value := MYardage; FieldByName('LenUnit').Value := TRIM(lblLenUnit.Caption); diff --git a/E04梭织坯布仓库/U_TatClothInEdit.dfm b/E04梭织坯布仓库/U_TatClothInEdit.dfm index 15839ea..1e93729 100644 --- a/E04梭织坯布仓库/U_TatClothInEdit.dfm +++ b/E04梭织坯布仓库/U_TatClothInEdit.dfm @@ -23,6 +23,7 @@ inherited frmTatClothInEdit: TfrmTatClothInEdit TabOrder = 0 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_1 DataController.Filter.AutoDataSetFilter = True DataController.Summary.DefaultGroupSummaryItems = <> @@ -57,6 +58,7 @@ inherited frmTatClothInEdit: TfrmTatClothInEdit object v1Column6: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.NullStyle = nssUnchecked HeaderAlignmentHorz = taCenter @@ -67,12 +69,14 @@ inherited frmTatClothInEdit: TfrmTatClothInEdit object v1Column11: TcxGridDBColumn Caption = #21367#26465#30721 DataBinding.FieldName = 'StkId' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 75 end object v1Column5: TcxGridDBColumn Caption = #21367#21495 DataBinding.FieldName = 'PieceNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Filtering = False @@ -81,6 +85,7 @@ inherited frmTatClothInEdit: TfrmTatClothInEdit object v1Column3: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Filtering = False @@ -89,12 +94,14 @@ inherited frmTatClothInEdit: TfrmTatClothInEdit object Tv1Column1: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 62 end object v1Column4: TcxGridDBColumn Caption = #21345#21495 DataBinding.FieldName = 'PCID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 41 @@ -102,6 +109,7 @@ inherited frmTatClothInEdit: TfrmTatClothInEdit object v2Column6: TcxGridDBColumn Caption = #31859#25968 DataBinding.FieldName = 'StkMeter' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Filtering = False @@ -110,6 +118,7 @@ inherited frmTatClothInEdit: TfrmTatClothInEdit object v2Column5: TcxGridDBColumn Caption = #27611#37325 DataBinding.FieldName = 'StkGrossWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Filtering = False @@ -202,6 +211,7 @@ inherited frmTatClothInEdit: TfrmTatClothInEdit TabOrder = 0 object Tv2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> OnCellDblClick = Tv2CellDblClick DataController.DataSource = DS_2 DataController.Filter.AutoDataSetFilter = True @@ -218,6 +228,7 @@ inherited frmTatClothInEdit: TfrmTatClothInEdit object v1OrderNo: TcxGridDBColumn Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'OrderNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Options.Sorting = False @@ -226,6 +237,7 @@ inherited frmTatClothInEdit: TfrmTatClothInEdit object v2Column2: TcxGridDBColumn Caption = #23458#25143 DataBinding.FieldName = 'CustomerNoName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Width = 123 @@ -233,6 +245,7 @@ inherited frmTatClothInEdit: TfrmTatClothInEdit object cxGridDBColumn2: TcxGridDBColumn Caption = #20135#21697#21517#31216 DataBinding.FieldName = 'MPRTCodeName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Options.Sorting = False @@ -241,6 +254,7 @@ inherited frmTatClothInEdit: TfrmTatClothInEdit object cxGridDBColumn3: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Options.Sorting = False @@ -249,12 +263,14 @@ inherited frmTatClothInEdit: TfrmTatClothInEdit object Tv2Column2: TcxGridDBColumn Caption = #21305#25968 DataBinding.FieldName = 'PCPiece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 48 end object v1Column10: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'PCQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Width = 51 @@ -262,6 +278,7 @@ inherited frmTatClothInEdit: TfrmTatClothInEdit object v1Column14: TcxGridDBColumn Caption = #21333#20301 DataBinding.FieldName = 'PCUnit' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Width = 42 @@ -269,6 +286,7 @@ inherited frmTatClothInEdit: TfrmTatClothInEdit object v1PRTMF: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Options.Sorting = False @@ -277,6 +295,7 @@ inherited frmTatClothInEdit: TfrmTatClothInEdit object v1PRTKZ: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Focusing = False Options.Sorting = False @@ -446,6 +465,7 @@ inherited frmTatClothInEdit: TfrmTatClothInEdit TabOrder = 0 object Tv3: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_3 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -473,6 +493,7 @@ inherited frmTatClothInEdit: TfrmTatClothInEdit object v3Column5: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True Properties.NullStyle = nssUnchecked @@ -483,6 +504,7 @@ inherited frmTatClothInEdit: TfrmTatClothInEdit object cxGridDBColumn4: TcxGridDBColumn Caption = #21367#21495 DataBinding.FieldName = 'PieceNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 52 @@ -490,6 +512,7 @@ inherited frmTatClothInEdit: TfrmTatClothInEdit object v3MJID: TcxGridDBColumn Caption = #21367#26465#30721 DataBinding.FieldName = 'StkId' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 60 @@ -497,6 +520,7 @@ inherited frmTatClothInEdit: TfrmTatClothInEdit object v3Column3: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -504,12 +528,14 @@ inherited frmTatClothInEdit: TfrmTatClothInEdit object Tv3Column1: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 67 end object v3Column4: TcxGridDBColumn Caption = #21345#21495 DataBinding.FieldName = 'PCID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 65 @@ -517,6 +543,7 @@ inherited frmTatClothInEdit: TfrmTatClothInEdit object cxGridDBColumn6: TcxGridDBColumn Caption = #31859#25968 DataBinding.FieldName = 'StkMeter' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Focusing = False @@ -525,6 +552,7 @@ inherited frmTatClothInEdit: TfrmTatClothInEdit object v3Column1: TcxGridDBColumn Caption = #27611#37325 DataBinding.FieldName = 'StkGrossWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 59 diff --git a/E04梭织坯布仓库/U_TatClothInEdit.pas b/E04梭织坯布仓库/U_TatClothInEdit.pas index 89f4241..3510e6e 100644 --- a/E04梭织坯布仓库/U_TatClothInEdit.pas +++ b/E04梭织坯布仓库/U_TatClothInEdit.pas @@ -11,7 +11,7 @@ uses cxControls, cxGridCustomView, cxGrid, MovePanel, cxCheckBox, Menus, ComCtrls, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, U_BaseList, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, RM_Common, RM_Class, - RM_GridReport, RM_Dataset, Vcl.ToolWin; + RM_GridReport, RM_Dataset, Vcl.ToolWin, dxSkinWXI, dxScrollbarAnnotations; type TfrmTatClothInEdit = class(TfrmBaseList) diff --git a/E04梭织坯布仓库/U_TatClothInList.dfm b/E04梭织坯布仓库/U_TatClothInList.dfm index 175a9d7..5fd72b6 100644 --- a/E04梭织坯布仓库/U_TatClothInList.dfm +++ b/E04梭织坯布仓库/U_TatClothInList.dfm @@ -7,7 +7,6 @@ inherited frmTatClothInList: TfrmTatClothInList FormStyle = fsMDIChild Position = poScreenCenter Visible = True - ExplicitLeft = -115 ExplicitWidth = 1556 ExplicitHeight = 639 PixelsPerInch = 96 @@ -502,6 +501,7 @@ inherited frmTatClothInList: TfrmTatClothInList TabOrder = 3 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_1 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -573,6 +573,7 @@ inherited frmTatClothInList: TfrmTatClothInList object v1Column22: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True Properties.NullStyle = nssUnchecked @@ -583,6 +584,7 @@ inherited frmTatClothInList: TfrmTatClothInList object v1Column21: TcxGridDBColumn Caption = #20837#24211#21333#21495 DataBinding.FieldName = 'IONO' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 103 @@ -590,16 +592,19 @@ inherited frmTatClothInList: TfrmTatClothInList object Tv1Column9: TcxGridDBColumn Caption = #20837#24211#26102#38388 DataBinding.FieldName = 'IOTime' + DataBinding.IsNullValueType = True Options.Editing = False end object Tv1Column11: TcxGridDBColumn Caption = #20837#24211#31867#22411 DataBinding.FieldName = 'IOType' + DataBinding.IsNullValueType = True Options.Editing = False end object v1Column32: TcxGridDBColumn Caption = #21512#21516#21495 DataBinding.FieldName = 'conNO' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 76 @@ -607,6 +612,7 @@ inherited frmTatClothInList: TfrmTatClothInList object v1Column1: TcxGridDBColumn Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'OrderNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 78 @@ -614,6 +620,7 @@ inherited frmTatClothInList: TfrmTatClothInList object Tv1Column4: TcxGridDBColumn Caption = #20135#21697#32534#21495 DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 74 @@ -621,6 +628,7 @@ inherited frmTatClothInList: TfrmTatClothInList object v1Column13: TcxGridDBColumn Caption = #20135#21697#21517#31216 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -628,6 +636,7 @@ inherited frmTatClothInList: TfrmTatClothInList object v1Column4: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -635,6 +644,7 @@ inherited frmTatClothInList: TfrmTatClothInList object v1Column18: TcxGridDBColumn Caption = #21345#21495 DataBinding.FieldName = 'PCId' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -642,6 +652,7 @@ inherited frmTatClothInList: TfrmTatClothInList object v1Column23: TcxGridDBColumn Caption = #21367#21495 DataBinding.FieldName = 'PieceNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -649,6 +660,7 @@ inherited frmTatClothInList: TfrmTatClothInList object v1Column8: TcxGridDBColumn Caption = #27611#37325 DataBinding.FieldName = 'GrossWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -656,6 +668,7 @@ inherited frmTatClothInList: TfrmTatClothInList object v1Column27: TcxGridDBColumn Caption = #30382#37325 DataBinding.FieldName = 'Tare' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -663,6 +676,7 @@ inherited frmTatClothInList: TfrmTatClothInList object v1Column28: TcxGridDBColumn Caption = #20928#37325 DataBinding.FieldName = 'NetWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -670,6 +684,7 @@ inherited frmTatClothInList: TfrmTatClothInList object v1Column10: TcxGridDBColumn Caption = #31859#25968 DataBinding.FieldName = 'Meter' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -677,6 +692,7 @@ inherited frmTatClothInList: TfrmTatClothInList object Tv1Column12: TcxGridDBColumn Caption = #24211#20301 DataBinding.FieldName = 'IOPosition' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 71 @@ -684,6 +700,7 @@ inherited frmTatClothInList: TfrmTatClothInList object Tv1Column10: TcxGridDBColumn Caption = #30721#25968 DataBinding.FieldName = 'Yardage' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -691,6 +708,7 @@ inherited frmTatClothInList: TfrmTatClothInList object v1Column12: TcxGridDBColumn Caption = #21697#36136 DataBinding.FieldName = 'Grade' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -698,6 +716,7 @@ inherited frmTatClothInList: TfrmTatClothInList object v1Column42: TcxGridDBColumn Caption = #24635#35760#24405#25968 DataBinding.FieldName = 'TotalCount' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -705,6 +724,7 @@ inherited frmTatClothInList: TfrmTatClothInList object v1Column6: TcxGridDBColumn Caption = #21367#26465#30721 DataBinding.FieldName = 'CIID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -712,6 +732,7 @@ inherited frmTatClothInList: TfrmTatClothInList object Tv1Column7: TcxGridDBColumn Caption = #23458#25143#33457#22411 DataBinding.FieldName = 'C_CustPattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -719,6 +740,7 @@ inherited frmTatClothInList: TfrmTatClothInList object v1Column3: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -726,6 +748,7 @@ inherited frmTatClothInList: TfrmTatClothInList object v1Column5: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -733,6 +756,7 @@ inherited frmTatClothInList: TfrmTatClothInList object v1Column34: TcxGridDBColumn Caption = #32568#26465#30721 DataBinding.FieldName = 'BCIOID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -740,6 +764,7 @@ inherited frmTatClothInList: TfrmTatClothInList object v1Column40: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -747,6 +772,7 @@ inherited frmTatClothInList: TfrmTatClothInList object v1Column46: TcxGridDBColumn Caption = #26816#39564#26426#21488 DataBinding.FieldName = 'CIMachNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -754,6 +780,7 @@ inherited frmTatClothInList: TfrmTatClothInList object Tv1Column5: TcxGridDBColumn Caption = #26816#39564#24037 DataBinding.FieldName = 'jyg' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -761,12 +788,14 @@ inherited frmTatClothInList: TfrmTatClothInList object VC_BaoID: TcxGridDBColumn Caption = #21253#26465#30721 DataBinding.FieldName = 'PacketId' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object Tv1Column8: TcxGridDBColumn Caption = #23458#25143#21333#21495 DataBinding.FieldName = 'BuyConNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -774,6 +803,7 @@ inherited frmTatClothInList: TfrmTatClothInList object Tv1Column3: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -781,6 +811,7 @@ inherited frmTatClothInList: TfrmTatClothInList object Tv1Column1: TcxGridDBColumn Caption = #26426#21488#21495 DataBinding.FieldName = 'carno' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -788,6 +819,7 @@ inherited frmTatClothInList: TfrmTatClothInList object Tv1Column2: TcxGridDBColumn Caption = #33521#25991#39068#33394 DataBinding.FieldName = 'C_EColor' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -795,60 +827,70 @@ inherited frmTatClothInList: TfrmTatClothInList object Tv1Column15: TcxGridDBColumn Caption = #25377#36710#24037'1' DataBinding.FieldName = 'SCPerson' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 end object Tv1Column6: TcxGridDBColumn Caption = #25377#36710#24037#20135#37327'1' DataBinding.FieldName = 'OutPutQty1' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 93 end object Tv1Column13: TcxGridDBColumn Caption = #25377#36710#24037'2' DataBinding.FieldName = 'jbSCPerson' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 71 end object Tv1Column14: TcxGridDBColumn Caption = #25377#36710#24037#20135#37327'2' DataBinding.FieldName = 'OutPutQty2' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 67 end object Tv1Column16: TcxGridDBColumn Caption = #25377#36710#24037'3' DataBinding.FieldName = 'JBSCPerson3' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 70 end object Tv1Column17: TcxGridDBColumn Caption = #25377#36710#24037#20135#37327'3' DataBinding.FieldName = 'OutPutQty3' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 98 end object Tv1Column18: TcxGridDBColumn Caption = #25377#36710#24037'4' DataBinding.FieldName = 'jbSCPerson4' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 70 end object Tv1Column19: TcxGridDBColumn Caption = #25377#36710#24037#20135#37327'4' DataBinding.FieldName = 'OutPutQty4' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 103 end object Tv1Column20: TcxGridDBColumn Caption = #25377#36710#24037'5' DataBinding.FieldName = 'JBSCPerson5' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 70 end object Tv1Column21: TcxGridDBColumn Caption = #25377#36710#24037#20135#37327'5' DataBinding.FieldName = 'OutPutQty5' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 80 end diff --git a/E04梭织坯布仓库/U_TatClothInList.pas b/E04梭织坯布仓库/U_TatClothInList.pas index d8a3009..349b4e4 100644 --- a/E04梭织坯布仓库/U_TatClothInList.pas +++ b/E04梭织坯布仓库/U_TatClothInList.pas @@ -13,7 +13,7 @@ uses RM_System, RM_GridReport, Menus, cxCalendar, MovePanel, Math, Clipbrd, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxTextEdit, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseList, cxPC, - System.StrUtils; + System.StrUtils, dxSkinWXI, dxScrollbarAnnotations; type TfrmTatClothInList = class(TfrmBaseList) diff --git a/E04梭织坯布仓库/U_TatClothOutList.dfm b/E04梭织坯布仓库/U_TatClothOutList.dfm index e47624e..c312c02 100644 --- a/E04梭织坯布仓库/U_TatClothOutList.dfm +++ b/E04梭织坯布仓库/U_TatClothOutList.dfm @@ -7,7 +7,6 @@ inherited frmTatClothOutList: TfrmTatClothOutList FormStyle = fsMDIChild Position = poScreenCenter Visible = True - ExplicitLeft = -689 ExplicitWidth = 1556 ExplicitHeight = 639 PixelsPerInch = 96 @@ -494,6 +493,7 @@ inherited frmTatClothOutList: TfrmTatClothOutList TabOrder = 3 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> OnCellDblClick = Tv1CellDblClick DataController.DataSource = DS_1 DataController.Filter.AutoDataSetFilter = True @@ -566,6 +566,7 @@ inherited frmTatClothOutList: TfrmTatClothOutList object v1Column22: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True Properties.NullStyle = nssUnchecked @@ -576,6 +577,7 @@ inherited frmTatClothOutList: TfrmTatClothOutList object v1Column21: TcxGridDBColumn Caption = #20986#24211#26102#38388 DataBinding.FieldName = 'IOTime' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 103 @@ -583,10 +585,12 @@ inherited frmTatClothOutList: TfrmTatClothOutList object Tv1Column11: TcxGridDBColumn Caption = #20986#24211#31867#22411 DataBinding.FieldName = 'IOType' + DataBinding.IsNullValueType = True end object Tv1Column9: TcxGridDBColumn Caption = #20986#24211#21333#21495 DataBinding.FieldName = 'IONO' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 82 @@ -594,6 +598,7 @@ inherited frmTatClothOutList: TfrmTatClothOutList object v1Column32: TcxGridDBColumn Caption = #21512#21516#21495 DataBinding.FieldName = 'ConNO' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 76 @@ -601,6 +606,7 @@ inherited frmTatClothOutList: TfrmTatClothOutList object v1Column1: TcxGridDBColumn Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'OrderNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 92 @@ -608,6 +614,7 @@ inherited frmTatClothOutList: TfrmTatClothOutList object Tv1Column4: TcxGridDBColumn Caption = #20135#21697#32534#21495 DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 74 @@ -615,6 +622,7 @@ inherited frmTatClothOutList: TfrmTatClothOutList object v1Column13: TcxGridDBColumn Caption = #20135#21697#21517#31216 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -622,6 +630,7 @@ inherited frmTatClothOutList: TfrmTatClothOutList object v1Column4: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -629,6 +638,7 @@ inherited frmTatClothOutList: TfrmTatClothOutList object v1Column18: TcxGridDBColumn Caption = #21345#21495 DataBinding.FieldName = 'PCId' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -636,6 +646,7 @@ inherited frmTatClothOutList: TfrmTatClothOutList object v1Column23: TcxGridDBColumn Caption = #21367#21495 DataBinding.FieldName = 'PieceNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -643,6 +654,7 @@ inherited frmTatClothOutList: TfrmTatClothOutList object v1Column8: TcxGridDBColumn Caption = #27611#37325 DataBinding.FieldName = 'GrossWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -650,6 +662,7 @@ inherited frmTatClothOutList: TfrmTatClothOutList object v1Column27: TcxGridDBColumn Caption = #30382#37325 DataBinding.FieldName = 'Tare' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -657,6 +670,7 @@ inherited frmTatClothOutList: TfrmTatClothOutList object v1Column28: TcxGridDBColumn Caption = #20928#37325 DataBinding.FieldName = 'NetWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -664,6 +678,7 @@ inherited frmTatClothOutList: TfrmTatClothOutList object v1Column10: TcxGridDBColumn Caption = #31859#25968 DataBinding.FieldName = 'Meter' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -671,12 +686,14 @@ inherited frmTatClothOutList: TfrmTatClothOutList object Tv1Column12: TcxGridDBColumn Caption = #24211#20301 DataBinding.FieldName = 'IOPosition' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 71 end object Tv1Column10: TcxGridDBColumn Caption = #30721#25968 DataBinding.FieldName = 'Yardage' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -684,6 +701,7 @@ inherited frmTatClothOutList: TfrmTatClothOutList object v1Column12: TcxGridDBColumn Caption = #21697#36136 DataBinding.FieldName = 'Grade' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -691,6 +709,7 @@ inherited frmTatClothOutList: TfrmTatClothOutList object v1Column42: TcxGridDBColumn Caption = #24635#35760#24405#25968 DataBinding.FieldName = 'TotalCount' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -698,6 +717,7 @@ inherited frmTatClothOutList: TfrmTatClothOutList object v1Column6: TcxGridDBColumn Caption = #21367#26465#30721 DataBinding.FieldName = 'CIID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -705,6 +725,7 @@ inherited frmTatClothOutList: TfrmTatClothOutList object Tv1Column7: TcxGridDBColumn Caption = #23458#25143#33457#22411 DataBinding.FieldName = 'C_CustPattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -712,6 +733,7 @@ inherited frmTatClothOutList: TfrmTatClothOutList object v1Column3: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -719,6 +741,7 @@ inherited frmTatClothOutList: TfrmTatClothOutList object v1Column5: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -726,6 +749,7 @@ inherited frmTatClothOutList: TfrmTatClothOutList object v1Column40: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -733,6 +757,7 @@ inherited frmTatClothOutList: TfrmTatClothOutList object Tv1Column5: TcxGridDBColumn Caption = #21253#21495 DataBinding.FieldName = 'BAONO' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -740,11 +765,13 @@ inherited frmTatClothOutList: TfrmTatClothOutList object VC_BaoID: TcxGridDBColumn Caption = #21253#26465#30721 DataBinding.FieldName = 'PacketId' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter end object Tv1Column8: TcxGridDBColumn Caption = #23458#25143#21333#21495 DataBinding.FieldName = 'BuyConNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -752,6 +779,7 @@ inherited frmTatClothOutList: TfrmTatClothOutList object Tv1Column3: TcxGridDBColumn Caption = #26816#39564#24037 DataBinding.FieldName = 'jyg' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -759,6 +787,7 @@ inherited frmTatClothOutList: TfrmTatClothOutList object Tv1Column1: TcxGridDBColumn Caption = #27454#21495 DataBinding.FieldName = 'C_StyleNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -766,6 +795,7 @@ inherited frmTatClothOutList: TfrmTatClothOutList object Tv1Column2: TcxGridDBColumn Caption = #33521#25991#39068#33394 DataBinding.FieldName = 'C_EColor' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -773,66 +803,77 @@ inherited frmTatClothOutList: TfrmTatClothOutList object Tv1Column22: TcxGridDBColumn Caption = #26426#21488#21495 DataBinding.FieldName = 'carno' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 70 end object Tv1Column6: TcxGridDBColumn Caption = #25377#36710#24037'1' DataBinding.FieldName = 'SCPerson' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 72 end object Tv1Column13: TcxGridDBColumn Caption = #25377#36710#24037#20135#37327'1' DataBinding.FieldName = 'OutPutQty1' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 92 end object Tv1Column14: TcxGridDBColumn Caption = #25377#36710#24037'2' DataBinding.FieldName = 'jbSCPerson' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 72 end object Tv1Column15: TcxGridDBColumn Caption = #25377#36710#24037#20135#37327'2' DataBinding.FieldName = 'OutPutQty2' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 88 end object Tv1Column16: TcxGridDBColumn Caption = #25377#36710#24037'3' DataBinding.FieldName = 'JBSCPerson3' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 72 end object Tv1Column17: TcxGridDBColumn Caption = #25377#36710#24037#20135#37327'3' DataBinding.FieldName = 'OutPutQty3' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 87 end object Tv1Column18: TcxGridDBColumn Caption = #25377#36710#24037'4' DataBinding.FieldName = 'JBSCPerson4' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 72 end object Tv1Column19: TcxGridDBColumn Caption = #25377#36710#24037#20135#37327'4' DataBinding.FieldName = 'OutPutQty4' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 92 end object Tv1Column20: TcxGridDBColumn Caption = #25377#36710#24037'5' DataBinding.FieldName = 'JBSCPerson5' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 72 end object Tv1Column21: TcxGridDBColumn Caption = #25377#36710#24037#20135#37327'5' DataBinding.FieldName = 'OutPutQty5' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 91 end diff --git a/E04梭织坯布仓库/U_TatClothOutList.pas b/E04梭织坯布仓库/U_TatClothOutList.pas index 3228b46..8463934 100644 --- a/E04梭织坯布仓库/U_TatClothOutList.pas +++ b/E04梭织坯布仓库/U_TatClothOutList.pas @@ -13,7 +13,7 @@ uses RM_System, RM_GridReport, Menus, cxCalendar, MovePanel, Math, Clipbrd, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxTextEdit, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, U_BaseList, cxPC, - System.StrUtils; + System.StrUtils, dxSkinWXI, dxScrollbarAnnotations; type TfrmTatClothOutList = class(TfrmBaseList) diff --git a/E04梭织坯布仓库/U_TatClothWaitStorage.dfm b/E04梭织坯布仓库/U_TatClothWaitStorage.dfm index 0040629..faef435 100644 --- a/E04梭织坯布仓库/U_TatClothWaitStorage.dfm +++ b/E04梭织坯布仓库/U_TatClothWaitStorage.dfm @@ -90,6 +90,7 @@ object frmTatClothWaitStorage: TfrmTatClothWaitStorage TabOrder = 1 object Tv2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -127,6 +128,7 @@ object frmTatClothWaitStorage: TfrmTatClothWaitStorage object v2Column3: TcxGridDBColumn Caption = #36873#20013 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True Properties.NullStyle = nssUnchecked @@ -136,6 +138,7 @@ object frmTatClothWaitStorage: TfrmTatClothWaitStorage object v2Column2: TcxGridDBColumn Caption = #23458#25143 DataBinding.FieldName = 'CustName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -143,6 +146,7 @@ object frmTatClothWaitStorage: TfrmTatClothWaitStorage object cxGridDBColumn2: TcxGridDBColumn Caption = #20135#21697#21517#31216 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -150,6 +154,7 @@ object frmTatClothWaitStorage: TfrmTatClothWaitStorage object v2Column8: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'SOrddefstr1' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -157,6 +162,7 @@ object frmTatClothWaitStorage: TfrmTatClothWaitStorage object cxGridDBColumn3: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -164,6 +170,7 @@ object frmTatClothWaitStorage: TfrmTatClothWaitStorage object Tv2Column1: TcxGridDBColumn Caption = #21305#25968 DataBinding.FieldName = 'OrdPiece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -171,6 +178,7 @@ object frmTatClothWaitStorage: TfrmTatClothWaitStorage object v1Column10: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'OrdQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -178,6 +186,7 @@ object frmTatClothWaitStorage: TfrmTatClothWaitStorage object v1Column14: TcxGridDBColumn Caption = #21333#20301 DataBinding.FieldName = 'OrdUnit' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -185,6 +194,7 @@ object frmTatClothWaitStorage: TfrmTatClothWaitStorage object v1PRTMF: TcxGridDBColumn Caption = #26410#20837#24211#21305#25968 DataBinding.FieldName = 'ZPPS' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 97 @@ -192,6 +202,7 @@ object frmTatClothWaitStorage: TfrmTatClothWaitStorage object v1PRTKZ: TcxGridDBColumn Caption = #26410#20837#24211#25968#37327 DataBinding.FieldName = 'ZPQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 117 diff --git a/E04梭织坯布仓库/U_TatClothWaitStorage.pas b/E04梭织坯布仓库/U_TatClothWaitStorage.pas index b4d92cb..e485637 100644 --- a/E04梭织坯布仓库/U_TatClothWaitStorage.pas +++ b/E04梭织坯布仓库/U_TatClothWaitStorage.pas @@ -10,7 +10,7 @@ uses cxClasses, cxControls, cxGridCustomView, cxGrid, cxGridCustomPopupMenu, cxGridPopupMenu, cxCheckBox, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator, dxDateRanges, - dxBarBuiltInMenu, Vcl.ToolWin; + dxBarBuiltInMenu, Vcl.ToolWin, dxSkinWXI, dxScrollbarAnnotations; type TfrmTatClothWaitStorage = class(TForm) diff --git a/E04梭织坯布仓库/U_TatDRList.dfm b/E04梭织坯布仓库/U_TatDRList.dfm index 2d9cf3b..debdcbe 100644 --- a/E04梭织坯布仓库/U_TatDRList.dfm +++ b/E04梭织坯布仓库/U_TatDRList.dfm @@ -641,6 +641,22 @@ inherited frmTatDRList: TfrmTatDRList HeaderAlignmentHorz = taCenter Width = 73 end + object TV2DR_LongitudeBatchNo: TcxGridDBColumn + Caption = #32463#32433#25209#21495 + DataBinding.FieldName = 'DR_LongitudeBatchNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end + object TV2DR_LatitudeBatchNo: TcxGridDBColumn + Caption = #32428#32433#25209#21495 + DataBinding.FieldName = 'DR_LatitudeBatchNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end end object cxGridLevel1: TcxGridLevel GridView = TV2 diff --git a/E04梭织坯布仓库/U_TatDRList.pas b/E04梭织坯布仓库/U_TatDRList.pas index d29b80f..8b49844 100644 --- a/E04梭织坯布仓库/U_TatDRList.pas +++ b/E04梭织坯布仓库/U_TatDRList.pas @@ -87,6 +87,8 @@ type TV2Column5: TcxGridDBColumn; ToolButton2: TToolButton; IdHTTP1: TIdHTTP; + TV2DR_LongitudeBatchNo: TcxGridDBColumn; + TV2DR_LatitudeBatchNo: TcxGridDBColumn; //RMllPDFExport1: TRMllPDFExport; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); diff --git a/E04梭织坯布仓库/U_TatDRtInPut.dfm b/E04梭织坯布仓库/U_TatDRtInPut.dfm index 98085e1..54e34ef 100644 --- a/E04梭织坯布仓库/U_TatDRtInPut.dfm +++ b/E04梭织坯布仓库/U_TatDRtInPut.dfm @@ -380,6 +380,22 @@ object frmTatDRtInPut: TfrmTatDRtInPut HeaderAlignmentHorz = taCenter Width = 66 end + object Tv1DR_LongitudeBatchNo: TcxGridDBColumn + Caption = #32463#32433#25209#21495 + DataBinding.FieldName = 'DR_LongitudeBatchNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end + object Tv1DR_LatitudeBatchNo: TcxGridDBColumn + Caption = #32428#32433#25209#21495 + DataBinding.FieldName = 'DR_LatitudeBatchNo' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/E04梭织坯布仓库/U_TatDRtInPut.pas b/E04梭织坯布仓库/U_TatDRtInPut.pas index 4a27100..21aa715 100644 --- a/E04梭织坯布仓库/U_TatDRtInPut.pas +++ b/E04梭织坯布仓库/U_TatDRtInPut.pas @@ -56,6 +56,8 @@ type Tv1Column5: TcxGridDBColumn; ToolButton6: TToolButton; Tv1C_code: TcxGridDBColumn; + Tv1DR_LongitudeBatchNo: TcxGridDBColumn; + Tv1DR_LatitudeBatchNo: TcxGridDBColumn; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); @@ -552,6 +554,8 @@ begin FieldByName('C_code').Value := frmTatClothStkHZListSEL.CDS_1.fieldbyname('C_code').Value; FieldByName('Piece').Value := frmTatClothStkHZListSEL.CDS_1.fieldbyname('js').Value; FieldByName('Qty').Value := frmTatClothStkHZListSEL.CDS_1.fieldbyname('stkmeter').Value; + FieldByName('DR_LongitudeBatchNo').Value := frmTatClothStkHZListSEL.CDS_1.fieldbyname('C_LongBatchNo').Value; + FieldByName('DR_LatitudeBatchNo').Value := frmTatClothStkHZListSEL.CDS_1.fieldbyname('C_LatBatchNo').Value; end; end;