diff --git a/E04梭织坯布仓库/TatClothStk.dproj.local b/E04梭织坯布仓库/TatClothStk.dproj.local index 5362165..0d13a09 100644 --- a/E04梭织坯布仓库/TatClothStk.dproj.local +++ b/E04梭织坯布仓库/TatClothStk.dproj.local @@ -26,7 +26,7 @@ 1899/12/30 00:00:00.000.316,=D:\Dp10Repo\项目代码\路尚\A02基础产品管理\U_TatClothInfoInput.pas 1899/12/30 00:00:00.000.376,=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitDRtInPut.pas 1899/12/30 00:00:00.000.408,D:\Dp10RepoV1\项目代码\D10gmHuahudie\E03梭织坯布检验\U_DCGCL.dfm=D:\Dp10RepoV1\项目代码\D10szJinCheng\E04梭织坯布仓库\U_TatClothStkList.dfm - 1899/12/30 00:00:00.000.390,=D:\Dp10Repo\项目代码\路尚\A00通用窗体\U_ProductInfoSel.pas + 1899/12/30 00:00:00.000.280,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRSel.pas 1899/12/30 00:00:00.000.338,=D:\Dp10RepoV1\项目代码\D10gmHuahudie\A00通用窗体\U_WBSpecSel.pas 1899/12/30 00:00:00.000.999,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatClothStkList.pas 1899/12/30 00:00:00.000.390,D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRtInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRtInPut.dfm @@ -34,7 +34,7 @@ 1899/12/30 00:00:00.000.538,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_KnitDRtInPut.pas=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRtInPut.pas 1899/12/30 00:00:00.000.471,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.dfm=D:\Dp10Repo\项目代码\RTBasics\F06染色成品仓库\U_DyeDRList.dfm 1899/12/30 00:00:00.000.627,=D:\Dp10RepoV1\public10\design\U_BaseDataLink.pas - 1899/12/30 00:00:00.000.280,=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRSel.pas + 1899/12/30 00:00:00.000.390,=D:\Dp10Repo\项目代码\路尚\A00通用窗体\U_ProductInfoSel.pas 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm 1899/12/30 00:00:00.000.057,=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitDRList.pas @@ -82,12 +82,12 @@ 1899/12/30 00:00:00.000.132,=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitPlanSel.pas 1899/12/30 00:00:00.000.663,D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_KnitDRList.dfm=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.dfm 1899/12/30 00:00:00.000.378,D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRList.pas= - 1899/12/30 00:00:00.000.202,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E04梭织坯布仓库\U_TatClothStkSel.pas 1899/12/30 00:00:00.000.410,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E04梭织坯布仓库\U_TatClothStkSel.pas= - 1899/12/30 00:00:00.000.139,=D:\Dp10Repo\项目代码\路尚\A02基础产品管理\U_ClothInfoTechnicsSel.pas - 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas - 1899/12/30 00:00:00.000.822,D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\KnitClothStk.dproj 1899/12/30 00:00:00.000.435,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E04梭织坯布仓库\U_TatClothStkSel.pas + 1899/12/30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas + 1899/12/30 00:00:00.000.139,=D:\Dp10Repo\项目代码\路尚\A02基础产品管理\U_ClothInfoTechnicsSel.pas + 1899/12/30 00:00:00.000.822,D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\KnitClothStk.dproj + 1899/12/30 00:00:00.000.202,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E04梭织坯布仓库\U_TatClothStkSel.pas 1899/12/30 00:00:00.000.993,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E04梭织坯布仓库\U_TatClothStkSel.pas 1899/12/30 00:00:00.000.720,D:\Dp10Repo\项目代码\RTBasics\H05涂层成品仓库\U_CoatDRList.pas=D:\Dp10Repo\项目代码\RTBasics\E04梭织坯布仓库\U_TatDRList.pas 1899/12/30 00:00:00.000.590,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\E04梭织坯布仓库\U_TatClothStkSel.pas= diff --git a/E04梭织坯布仓库/TatClothStk.identcache b/E04梭织坯布仓库/TatClothStk.identcache index 767b94e..3fdd1ca 100644 Binary files a/E04梭织坯布仓库/TatClothStk.identcache and b/E04梭织坯布仓库/TatClothStk.identcache differ diff --git a/E04梭织坯布仓库/U_GetDllForm.pas b/E04梭织坯布仓库/U_GetDllForm.pas index 408d220..cf73f4b 100644 --- a/E04梭织坯布仓库/U_GetDllForm.pas +++ b/E04梭织坯布仓库/U_GetDllForm.pas @@ -1,4 +1,4 @@ -unit U_GetDllForm; +unit U_GetDllForm; interface @@ -20,12 +20,12 @@ uses U_TatClothInList_ZDDY,U_TatClothStkSummary; ///////////////////////////////////////////////////////////////// - // ˵:ȡDllеô // - // ˵App>>Ӧó // - // FormH>>ôھ // - // FormID>>ں; // - // Language>>; // - // WinStyle>>ͣ // + // 功能说明:取Dll中得窗体 // + // 参数说明：App>>调用应用程序； // + // FormH>>调用窗口句柄 ； // + // FormID>>窗口号; // + // Language>>语言种类; // + // WinStyle>>窗口类型； // ///////////////////////////////////////////////////////////////// function GetDllForm(App: Tapplication; FormH: hwnd; FormID: integer; Language: integer; WinStyle: integer; GCode: Pchar; GName: Pchar; DataBase: Pchar; Title: PChar; Parameters1: PChar; Parameters2: PChar; Parameters3: PChar; Parameters4: PChar; Parameters5: PChar; Parameters6: PChar; Parameters7: PChar; Parameters8: PChar; Parameters9: PChar; Parameters10: PChar; DataBaseStr: PChar): hwnd; @@ -33,7 +33,7 @@ var i: Integer; bFound: Boolean; mnewHandle: hwnd; - mstyle: TFormStyle; // 0:Ӵ; 1ͨ + mstyle: TFormStyle; // 0:子窗口; 1：普通窗口 mstate: TWindowState; mborderstyle: TFormBorderStyle; begin @@ -63,7 +63,7 @@ begin DCurHandle := 0; -//ֵַ +//赋值链接字符串 SetLength(server, 255); SetLength(dtbase, 255); SetLength(user, 255); @@ -76,7 +76,10 @@ begin user := 'kaixiyasa'; pswd := 'rightsoft,.KXY@YN'; DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; - Parameters1 := ''; + Parameters1 := '管理'; + + DNAME := '范黄氏玉簪PHẠM HOÀNG THỊ NGỌC TRÂM'; + DCODE := 'DSVP01'; end else begin @@ -93,7 +96,7 @@ begin else WriteINIFile; GetsysParam('', ''); - // 崰 ״̬ + // 定义窗口类型 、状态 if WinStyle = 0 then begin mstyle := fsMDIChild; @@ -122,10 +125,10 @@ begin end; end; ///////////////////// - //ģ鴰 + //调用子模块窗口 case FormID of - 111: //ɨ + 111: //坯布扫描入库 begin with TfrmTatClothInEdit.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // begin @@ -137,7 +140,7 @@ begin end; end; - 121: // + 121: //坯布入库管理 begin with TfrmTatClothInList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // begin @@ -149,7 +152,7 @@ begin end; end; - 122: //Զӡ뵥 + 122: //自动打印入库码单 begin with TfrmTatClothInList_ZDDY.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // begin @@ -161,7 +164,7 @@ begin end; end; - 211: // + 211: //坯布发货申请 begin with TfrmTatDRList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // begin @@ -173,7 +176,7 @@ begin end; end; - 221: // + 221: //坯布申请出库 begin with TfrmTatClothDROutEdit.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // begin @@ -185,7 +188,7 @@ begin end; end; - 311: //ɨ + 311: //坯布扫描出库 begin with TfrmTatClothOutEdit.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // begin @@ -197,7 +200,7 @@ begin end; end; - 321: //б + 321: //坯布出库列表 begin with TfrmTatClothOutList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // begin @@ -209,7 +212,7 @@ begin end; end; - 411: //б + 411: //坯布库存列表 begin with TfrmTatClothStkList.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // begin @@ -221,7 +224,7 @@ begin end; end; - 444: //б + 444: //坯布库存汇总列表 begin with TfrmTatClothStkSummary.Create(Application.MainForm, Title, trim(Parameters1), trim(Parameters2), trim(Parameters3), trim(Parameters4), trim(Parameters5), trim(Parameters10)) do // begin @@ -253,7 +256,7 @@ begin result := true; ////////////////////////////// // shortDateFormat := 'yyyy-MM-dd'; - // + //服务器日期 with DataLink_TatClothStk.AdoDataLink do begin close; @@ -266,7 +269,7 @@ begin end; //=========================================================== - //ݿӳ + //建立数据库连接池 //=========================================================== function ConnData(): Boolean; @@ -275,8 +278,8 @@ var begin try IniFile := TIniFile.Create(ExtractFilePath(Application.ExeName) + 'SYSTEMSET.INI'); - PicSvr := IniFile.ReadString('SERVER', 'ַ', '127.0.0.1'); - UserDataFlag := IniFile.ReadString('SERVER', 'ַ', '-1'); + PicSvr := IniFile.ReadString('SERVER', '服务器地址', '127.0.0.1'); + UserDataFlag := IniFile.ReadString('SERVER', '服务器地址类型', '-1'); finally IniFile.Free; end; @@ -296,7 +299,7 @@ begin Result := true; except Result := false; - application.MessageBox('ݿʧܣ', '', mb_Ok + MB_ICONERROR); + application.MessageBox('数据库连接失败！', '错误', mb_Ok + MB_ICONERROR); end; end; diff --git a/E04梭织坯布仓库/U_TatClothOutEdit.pas b/E04梭织坯布仓库/U_TatClothOutEdit.pas index 7695132..869c5e1 100644 --- a/E04梭织坯布仓库/U_TatClothOutEdit.pas +++ b/E04梭织坯布仓库/U_TatClothOutEdit.pas @@ -28,7 +28,7 @@ uses dxScrollbarAnnotations, cxContainer, cxProgressBar, dxSkinsCore, - dxSkinsDefaultPainters; + dxSkinsDefaultPainters, dxSkinWXI; type TfrmTatClothOutEdit = class(TfrmBaseList) diff --git a/E04梭织坯布仓库/U_TatClothStkList.dfm b/E04梭织坯布仓库/U_TatClothStkList.dfm index 6724939..72f4ae3 100644 --- a/E04梭织坯布仓库/U_TatClothStkList.dfm +++ b/E04梭织坯布仓库/U_TatClothStkList.dfm @@ -82,7 +82,7 @@ inherited frmTatClothStkList: TfrmTatClothStkList Height = 570 Align = alClient TabOrder = 3 - Properties.ActivePage = cxTabSheet1 + Properties.ActivePage = cxTabSheet2 Properties.CustomButtons.Buttons = <> Properties.Style = 5 OnChange = cxPageControl1Change @@ -267,7 +267,6 @@ inherited frmTatClothStkList: TfrmTatClothStkList Left = 16 Top = 6 Caption = #26597#35810#26085#26399 - State = cbsChecked TabOrder = 11 end end @@ -763,7 +762,6 @@ inherited frmTatClothStkList: TfrmTatClothStkList Left = 8 Top = 7 Caption = #26597#35810#26085#26399 - State = cbsChecked TabOrder = 12 end object BegDate: TcxDateEdit diff --git a/E04梭织坯布仓库/U_TatClothStkScanSel.dfm b/E04梭织坯布仓库/U_TatClothStkScanSel.dfm index 77490bd..64a897a 100644 --- a/E04梭织坯布仓库/U_TatClothStkScanSel.dfm +++ b/E04梭织坯布仓库/U_TatClothStkScanSel.dfm @@ -101,9 +101,6 @@ inherited frmTatClothStkScanSel: TfrmTatClothStkScanSel Caption = ' '#20135#21697#27719#24635#20449#24687' ' ImageIndex = 0 TabVisible = False - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 object Pnl_F2: TPanel Left = 0 Top = 0 @@ -419,9 +416,6 @@ inherited frmTatClothStkScanSel: TfrmTatClothStkScanSel object cxTabSheet2: TcxTabSheet Caption = ' '#20135#21697#26126#32454#20449#24687' ' ImageIndex = 1 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 570 object Panel6: TPanel Left = 0 Top = 102 @@ -737,7 +731,6 @@ inherited frmTatClothStkScanSel: TfrmTatClothStkScanSel Left = 8 Top = 7 Caption = #26597#35810#26085#26399 - State = cbsChecked TabOrder = 12 end object BegDate: TcxDateEdit @@ -764,7 +757,6 @@ inherited frmTatClothStkScanSel: TfrmTatClothStkScanSel BorderStyle = cxcbsNone PopupMenu = PM_1 TabOrder = 2 - ExplicitHeight = 435 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -776,15 +768,12 @@ inherited frmTatClothStkScanSel: TfrmTatClothStkScanSel DataController.Summary.FooterSummaryItems = < item Kind = skSum - Column = v1Column8 end item Kind = skSum - Column = v1Column27 end item Kind = skSum - Column = v1Column28 end item Kind = skSum @@ -792,7 +781,6 @@ inherited frmTatClothStkScanSel: TfrmTatClothStkScanSel end item Kind = skSum - Column = Tv1Column10 end item Kind = skCount @@ -890,9 +878,33 @@ inherited frmTatClothStkScanSel: TfrmTatClothStkScanSel Options.Editing = False Width = 66 end - object Tv1Column6: TcxGridDBColumn - Caption = #25209#21495 - DataBinding.FieldName = 'BatchNO' + object Tv1PCID: TcxGridDBColumn + Caption = #24067#31080#26465#30721 + DataBinding.FieldName = 'PCID' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end + object v1Column6: TcxGridDBColumn + Caption = #21367#26465#30721 + DataBinding.FieldName = 'CIID' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 66 + end + object v1Column12: TcxGridDBColumn + Caption = #31561#32423 + DataBinding.FieldName = 'Grade' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 66 + end + object Tv1PacketNo: TcxGridDBColumn + Caption = #21253#21495 + DataBinding.FieldName = 'PacketNo' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 66 @@ -905,30 +917,6 @@ inherited frmTatClothStkScanSel: TfrmTatClothStkScanSel Options.Editing = False Width = 66 end - object v1Column8: TcxGridDBColumn - Caption = #27611#37325 - DataBinding.FieldName = 'GrossWeight' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object v1Column27: TcxGridDBColumn - Caption = #30382#37325 - DataBinding.FieldName = 'Tare' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object v1Column28: TcxGridDBColumn - Caption = #20928#37325 - DataBinding.FieldName = 'NetWeight' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end object v1Column10: TcxGridDBColumn Caption = #31859#25968 DataBinding.FieldName = 'Meter' @@ -937,22 +925,6 @@ inherited frmTatClothStkScanSel: TfrmTatClothStkScanSel Options.Editing = False Width = 66 end - object Tv1Column10: TcxGridDBColumn - Caption = #30721#25968 - DataBinding.FieldName = 'Yardage' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object v1Column12: TcxGridDBColumn - Caption = #21697#36136 - DataBinding.FieldName = 'Grade' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end object v1Column42: TcxGridDBColumn Caption = #24635#35760#24405#25968 DataBinding.FieldName = 'TotalCount' @@ -961,14 +933,6 @@ inherited frmTatClothStkScanSel: TfrmTatClothStkScanSel Options.Editing = False Width = 99 end - object v1Column6: TcxGridDBColumn - Caption = #21367#26465#30721 - DataBinding.FieldName = 'CIID' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/E04梭织坯布仓库/U_TatClothStkScanSel.pas b/E04梭织坯布仓库/U_TatClothStkScanSel.pas index 2a9ca95..528d390 100644 --- a/E04梭织坯布仓库/U_TatClothStkScanSel.pas +++ b/E04梭织坯布仓库/U_TatClothStkScanSel.pas @@ -110,18 +110,14 @@ type v1Column13: TcxGridDBColumn; v1Column4: TcxGridDBColumn; v1Column23: TcxGridDBColumn; - v1Column8: TcxGridDBColumn; - v1Column27: TcxGridDBColumn; - v1Column28: TcxGridDBColumn; v1Column10: TcxGridDBColumn; Tv1Column11: TcxGridDBColumn; - Tv1Column10: TcxGridDBColumn; v1Column12: TcxGridDBColumn; v1Column42: TcxGridDBColumn; v1Column6: TcxGridDBColumn; v1Column3: TcxGridDBColumn; v1Column5: TcxGridDBColumn; - Tv1Column6: TcxGridDBColumn; + Tv1PacketNo: TcxGridDBColumn; cxGrid1Level1: TcxGridLevel; Label1: TLabel; BegDate2: TcxDateEdit; @@ -134,6 +130,7 @@ type TV2Column1: TcxGridDBColumn; TV2SSel: TcxGridDBColumn; ToolButton1: TToolButton; + Tv1PCID: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); diff --git a/E04梭织坯布仓库/U_TatClothStkSel.dfm b/E04梭织坯布仓库/U_TatClothStkSel.dfm index 5d8761e..1d5a46d 100644 --- a/E04梭织坯布仓库/U_TatClothStkSel.dfm +++ b/E04梭织坯布仓库/U_TatClothStkSel.dfm @@ -94,7 +94,6 @@ inherited frmTatClothStkSel: TfrmTatClothStkSel Properties.CustomButtons.Buttons = <> Properties.Style = 5 OnChange = cxPageControl1Change - ExplicitTop = 36 ClientRectBottom = 570 ClientRectRight = 1540 ClientRectTop = 32 @@ -276,7 +275,6 @@ inherited frmTatClothStkSel: TfrmTatClothStkSel Left = 16 Top = 6 Caption = #26597#35810#26085#26399 - State = cbsChecked TabOrder = 11 end end @@ -289,7 +287,6 @@ inherited frmTatClothStkSel: TfrmTatClothStkSel BorderStyle = cxcbsNone PopupMenu = PM_2 TabOrder = 1 - ExplicitTop = 72 object TV2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -376,17 +373,9 @@ inherited frmTatClothStkSel: TfrmTatClothStkSel Options.Editing = False Width = 80 end - object cxGridDBColumn18: TcxGridDBColumn - Caption = #25209#21495 - DataBinding.FieldName = 'BatchNo' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 66 - end - object cxGridDBColumn14: TcxGridDBColumn - Caption = #21697#36136 - DataBinding.FieldName = 'Grade' + object Tv2PacketNoNum: TcxGridDBColumn + Caption = #21253#25968 + DataBinding.FieldName = 'PacketNoNum' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False @@ -408,6 +397,14 @@ inherited frmTatClothStkSel: TfrmTatClothStkSel Options.Editing = False Width = 66 end + object cxGridDBColumn14: TcxGridDBColumn + Caption = #31561#32423 + DataBinding.FieldName = 'Grade' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 66 + end end object cxGridLevel1: TcxGridLevel GridView = TV2 @@ -532,7 +529,6 @@ inherited frmTatClothStkSel: TfrmTatClothStkSel Color = clWhite ParentBackground = False TabOrder = 1 - ExplicitTop = -1 object Label3: TLabel Left = 236 Top = 9 diff --git a/E04梭织坯布仓库/U_TatClothStkSel.pas b/E04梭织坯布仓库/U_TatClothStkSel.pas index 895be48..2291e7e 100644 --- a/E04梭织坯布仓库/U_TatClothStkSel.pas +++ b/E04梭织坯布仓库/U_TatClothStkSel.pas @@ -102,7 +102,7 @@ type cxGridDBColumn14: TcxGridDBColumn; cxGridDBColumn15: TcxGridDBColumn; cxGridDBColumn16: TcxGridDBColumn; - cxGridDBColumn18: TcxGridDBColumn; + Tv2PacketNoNum: TcxGridDBColumn; cxGridLevel1: TcxGridLevel; TV2Column3: TcxGridDBColumn; Label18: TLabel; @@ -262,6 +262,7 @@ begin sql.Add(' select OrderNo,C_Code,C_Name,IOType,Grade,CustName,C_Width,C_GramWeight,BatchNo,C_Color'); sql.Add(' ,COUNT(PieceNo) SumPieceNo,sum(GrossWeight) SumGrossWeight,sum(Tare) SumTare,sum(NetWeight) SumNetWeight'); sql.Add(' ,Sum(Meter) SumMeter,Sum(Yardage) SumYardage,ConNo,ConMID,ConSID'); + sql.Add(' ,(SELECT COUNT(DISTINCT PacketNo) FROM Tat_Cloth_Stock X inner join Tat_Cloth_io Y on X.stkID=Y.stkID and X.StkCycles=Y.IOCycles where X.OrderNo = A.OrderNo and X.StkExists=1 and Y.IOFlag='''' ' + WSql+ ') as PacketNoNum'); sql.Add(' from V_Tat_Cloth_Stk A where 1=1 '); sql.Add(WSql); // sql.Add(' GROUP BY DATEDIFF(dd,IOTime, GETDATE()), CONVERT(VARCHAR(10),IOTime,120),OrderNo,C_Code,C_Name,IOType,Grade,CustName,C_Width,C_GramWeight,BatchNo,C_Color,ConNo,ConMID,ConSID'); diff --git a/E04梭织坯布仓库/U_TatDRtInPut.dfm b/E04梭织坯布仓库/U_TatDRtInPut.dfm index 817a9df..e7c134e 100644 --- a/E04梭织坯布仓库/U_TatDRtInPut.dfm +++ b/E04梭织坯布仓库/U_TatDRtInPut.dfm @@ -41,7 +41,6 @@ object frmTatDRtInPut: TfrmTatDRtInPut ParentFont = False ShowCaptions = True TabOrder = 0 - ExplicitTop = 4 object TBSave: TToolButton Left = 0 Top = 0 @@ -373,7 +372,6 @@ object frmTatDRtInPut: TfrmTatDRtInPut ParentFont = False ShowCaptions = True TabOrder = 2 - ExplicitTop = 155 object SelectStk: TToolButton Left = 0 Top = 0 @@ -408,8 +406,6 @@ object frmTatDRtInPut: TfrmTatDRtInPut Hint = 'SHAddress/'#36865#36135#22320#22336 Align = alClient TabOrder = 3 - ExplicitLeft = 8 - ExplicitTop = 191 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/E04梭织坯布仓库/U_TatDRtInPut.pas b/E04梭织坯布仓库/U_TatDRtInPut.pas index 8cb10c2..6a461f9 100644 --- a/E04梭织坯布仓库/U_TatDRtInPut.pas +++ b/E04梭织坯布仓库/U_TatDRtInPut.pas @@ -11,7 +11,8 @@ uses StdCtrls, ToolWin, DBClient, ADODB, ExtCtrls, BtnEdit, cxCalendar, StrUtils, cxDropDownEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, - dxScrollbarAnnotations, dxSkinsCore, dxSkinsDefaultPainters, U_BaseInput; + dxScrollbarAnnotations, dxSkinsCore, dxSkinsDefaultPainters, U_BaseInput, + dxSkinWXI; type TfrmTatDRtInPut = class(TForm)