From 8f3d8d1cc588efbeaa370918c867a7b09a742c00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cusername=E2=80=9D?= <“email”> Date: Sun, 4 May 2025 14:54:15 +0800 Subject: [PATCH] 111 --- A00通用窗体/U_UserSel.dfm | 11 +- A00通用窗体/U_UserSel.pas | 6 +- A01基础公司管理/Company.dproj.local | 34 +- A01基础公司管理/Company.identcache | Bin 2031 -> 2121 bytes A01基础公司管理/U_CustInput.dfm | 91 ++- A01基础公司管理/U_CustInput.pas | 84 +- A01基础公司管理/U_Customer.dfm | 16 + A01基础公司管理/U_Customer.pas | 2 + A01基础公司管理/U_EmployeeInPut.dfm | 17 + A01基础公司管理/U_EmployeeInPut.pas | 15 +- A01基础公司管理/U_EmployeeList.dfm | 22 + A01基础公司管理/U_EmployeeList.pas | 4 +- A01基础公司管理/U_LabelInput.dfm | 140 ++++ A01基础公司管理/U_LabelInput.pas | 178 ++++ A01基础公司管理/U_TradeInspSet.dfm | 767 ++++++++++++++++++ A01基础公司管理/U_TradeInspSet.pas | 532 ++++++++++++ A05基础资料管理/BaseInfo.dproj.local | 8 +- A05基础资料管理/BaseInfo.identcache | Bin 1511 -> 1423 bytes A05基础资料管理/ProjectGroup1.groupproj.local | 2 +- A05基础资料管理/testDll.identcache | Bin 186 -> 170 bytes B02基础纱线仓库/U_DataLink.dfm | 1 + B02基础纱线仓库/U_YarnInEdit.pas | 6 +- B02基础纱线仓库/U_YarnOutEdit.pas | 72 +- B02基础纱线仓库/U_YarnStkHZSel.dfm | 16 +- B02基础纱线仓库/U_YarnStkHZSel.pas | 28 +- B02基础纱线仓库/U_YarnStkSel.dfm | 19 + B02基础纱线仓库/U_YarnStkSel.pas | 2 +- B02基础纱线仓库/YarnStk.dproj | 2 +- B02基础纱线仓库/YarnStk.dproj.local | 8 +- B02基础纱线仓库/YarnStk.identcache | Bin 2566 -> 2477 bytes D01针织生产计划/KnitPlan.dpr | 5 +- D01针织生产计划/KnitPlan.dproj | 12 +- D01针织生产计划/KnitPlan.dproj.local | 85 +- D01针织生产计划/KnitPlan.identcache | Bin 2370 -> 2284 bytes D01针织生产计划/U_KnitPlanInPut.dfm | 291 ++++--- D01针织生产计划/U_KnitPlanInPut.pas | 71 +- D01针织生产计划/U_KnitPlanList.dfm | 8 + D01针织生产计划/U_KnitPlanList.pas | 26 +- D01针织生产计划/U_LCKQuery.dfm | 26 +- D01针织生产计划/U_LCKQuery.pas | 66 +- D01针织生产计划/U_TradeInspSet2.dfm | 764 +++++++++++++++++ D01针织生产计划/U_TradeInspSet2.pas | 532 ++++++++++++ D02针织坯布检验/KnitInsp.identcache | Bin 1676 -> 1676 bytes D02针织坯布检验/U_KnitMachInsp.dfm | 9 +- D02针织坯布检验/U_KnitMachInsp.pas | 7 +- D03针织坯布仓库/KnitClothStk.dproj.local | 52 +- D03针织坯布仓库/KnitClothStk.identcache | Bin 2416 -> 2264 bytes D03针织坯布仓库/ProjectGroup1.groupproj.local | 2 +- D03针织坯布仓库/testDll.identcache | Bin 186 -> 170 bytes F01染色坯布仓库/DyeGreyClothStk.identcache | Bin 1500 -> 1500 bytes T03贸易布匹检验/U_TradeMachInsp.dfm | 86 +- T03贸易布匹检验/U_TradeMachInsp.pas | 48 +- 52 files changed, 3729 insertions(+), 444 deletions(-) create mode 100644 A01基础公司管理/U_LabelInput.dfm create mode 100644 A01基础公司管理/U_LabelInput.pas create mode 100644 A01基础公司管理/U_TradeInspSet.dfm create mode 100644 A01基础公司管理/U_TradeInspSet.pas create mode 100644 D01针织生产计划/U_TradeInspSet2.dfm create mode 100644 D01针织生产计划/U_TradeInspSet2.pas diff --git a/A00通用窗体/U_UserSel.dfm b/A00通用窗体/U_UserSel.dfm index 8b10776..9e2f68a 100644 --- a/A00通用窗体/U_UserSel.dfm +++ b/A00通用窗体/U_UserSel.dfm @@ -120,6 +120,7 @@ inherited frmUserSel: TfrmUserSel Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False Navigator.Buttons.Delete.Visible = False + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_1 DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] DataController.Summary.DefaultGroupSummaryItems = <> @@ -136,6 +137,7 @@ inherited frmUserSel: TfrmUserSel object VC_SSel: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True HeaderAlignmentHorz = taCenter @@ -143,21 +145,24 @@ inherited frmUserSel: TfrmUserSel end object v2Column1: TcxGridDBColumn Caption = #32534#21495 - DataBinding.FieldName = 'UserID' + DataBinding.FieldName = 'EECode' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 76 end object v2Column2: TcxGridDBColumn Caption = #21517#31216 - DataBinding.FieldName = 'UserName' + DataBinding.FieldName = 'EEName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 171 end object v2Column3: TcxGridDBColumn Caption = #37096#38376 - DataBinding.FieldName = 'Udept' + DataBinding.FieldName = 'dept' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 71 diff --git a/A00通用窗体/U_UserSel.pas b/A00通用窗体/U_UserSel.pas index 900602c..ecae157 100644 --- a/A00通用窗体/U_UserSel.pas +++ b/A00通用窗体/U_UserSel.pas @@ -14,7 +14,7 @@ uses IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit, cxTextEdit, cxDBLookupComboBox, ComObj, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator, dxDateRanges, U_BaseHelp, - dxBarBuiltInMenu, System.ImageList, Vcl.ImgList; + dxBarBuiltInMenu, System.ImageList, Vcl.ImgList, dxScrollbarAnnotations; type FdDy = record @@ -86,11 +86,11 @@ begin Filtered := False; Close; SQL.Clear; - sql.Add(' select * from SY_User where 1=1 '); + sql.Add(' select * from SY_Employee where 1=1 '); if Trim(Fdept) <> '' then begin - sql.Add('and Udept=' + QuotedStr(Trim(Fdept))); + sql.Add('and dept=' + QuotedStr(Trim(Fdept))); end; Open; end; diff --git a/A01基础公司管理/Company.dproj.local b/A01基础公司管理/Company.dproj.local index 6e40018..cd7b4a0 100644 --- a/A01基础公司管理/Company.dproj.local +++ b/A01基础公司管理/Company.dproj.local @@ -1,31 +1,31 @@  - 1899-12-30 00:00:00.000.140,=D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelMapSet.pas + 1899-12-30 00:00:00.000.591,=D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelMapSet.pas + 1899-12-30 00:00:00.000.441,D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelMapSet.pas= + 1899-12-30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.dfm=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.dfm 1899-12-30 00:00:00.000.449,=D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelMapSet.pas 1899-12-30 00:00:00.000.558,=D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelMapSet.pas - 1899-12-30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.pas 1899-12-30 00:00:00.000.853,D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelMapSet.pas= - 1899-12-30 00:00:00.000.591,=D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelMapSet.pas - 1899-12-30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.dfm - 1899-12-30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm=D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.dfm + 1899-12-30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas 1899-12-30 00:00:00.000.402,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas - 1899-12-30 00:00:00.000.441,D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelMapSet.pas= - 1899-12-30 00:00:00.000.411,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_YGSel.pas= - 1899-12-30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.pas=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.pas - 1899-12-30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.dfm=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.dfm - 1899-12-30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.dfm - 1899-12-30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.pas + 1899-12-30 00:00:00.000.744,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Customer.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm + 1899-12-30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.dfm + 1899-12-30 00:00:00.000.967,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_FactoryInput.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_CustInput.pas + 1899-12-30 00:00:00.000.481,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899-12-30 00:00:00.000.140,=D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelMapSet.pas + 1899-12-30 00:00:00.000.956,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_EmployeeList.pas + 1899-12-30 00:00:00.000.333,=D:\Dp10Repo\public10\design\U_BaseHelp.pas + 1899-12-30 00:00:00.000.076,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_ZdyAttachGYS.pas= 1899-12-30 00:00:00.000.531,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas 1899-12-30 00:00:00.000.294,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas 1899-12-30 00:00:00.000.342,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas - 1899-12-30 00:00:00.000.076,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_ZdyAttachGYS.pas= + 1899-12-30 00:00:00.000.033,D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_YGSel.pas=D:\Dp10Repo\项目代码\瑜量\客户供应商管理(Company.dll)\U_ZDYHelp.pas + 1899-12-30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.dfm=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.dfm + 1899-12-30 00:00:00.000.411,D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_YGSel.pas= 1899-12-30 00:00:00.000.525,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_BankList.pas 1899-12-30 00:00:00.000.169,=D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelPrint.pas - 1899-12-30 00:00:00.000.333,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899-12-30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas=D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.pas - 1899-12-30 00:00:00.000.956,=D:\Dp10Repo\项目代码\RTBasics\A01基础公司管理\U_EmployeeList.pas - 2025-03-20 14:16:07.481,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899-12-30 00:00:00.000.921,D:\Dp10Repo\项目代码\鹏华\员工管理(StaffManage.dll)\U_CompanySel.pas=D:\Dp10Repo\项目代码\鹏华\客户供应商管理(Company.dll)\U_Company.pas @@ -56,7 +56,7 @@ - + diff --git a/A01基础公司管理/Company.identcache b/A01基础公司管理/Company.identcache index 89c7d40bd2e0d145fe3b258a5c9522c0e7098285..8ae52311e755b64f96c070b1ba590f6f9a713ba9 100644 GIT binary patch delta 144 zcmaFQe^P)^W+G$YPusATdqCJ9F0$&8G0+D@4ziTN=u28J&ubv)nQ{(Q>(C%cxvShw(L u$E29h_>iK+lvK~W;)3AR5~GP9%)!p@SdMhdLm=s Navigator.Buttons.Delete.Enabled = False @@ -471,7 +534,7 @@ object frmCustInput: TfrmCustInput object ADOQueryCmd: TADOQuery Connection = DataLink_Company.ADOLink Parameters = <> - Left = 830 + Left = 831 Top = 192 end object ADOQueryMain: TADOQuery diff --git a/A01基础公司管理/U_CustInput.pas b/A01基础公司管理/U_CustInput.pas index 726776a..220f15a 100644 --- a/A01基础公司管理/U_CustInput.pas +++ b/A01基础公司管理/U_CustInput.pas @@ -63,6 +63,11 @@ type Label5: TLabel; Saleser: TBtnEditC; Salesid: TEdit; + Code: TEdit; + lbl1: TLabel; + LabPackage: TBtnEditC; + lbl2: TLabel; + RuleBeforeTare: TEdit; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); @@ -91,7 +96,7 @@ var implementation uses - U_DataLink, U_RTFun, U_ZDYHelp, U_YGSel, U_UserSel; + U_DataLink, U_RTFun, U_ZDYHelp, U_YGSel, U_UserSel, U_TradeInspSet; {$R *.dfm} @@ -140,25 +145,18 @@ begin end; procedure TfrmCustInput.cocountryBtnUpClick(Sender: TObject); -var - fsj: string; - FWZ: Integer; begin - fsj := Trim(TEdit(Sender).Hint); - FWZ := Pos('/', fsj); try - frmZDYHelp := TfrmZDYHelp.Create(Application); - with frmZDYHelp do + frmTradeInspSet := TfrmTradeInspSet.Create(Application); + with frmTradeInspSet do begin - flag := Copy(fsj, 1, FWZ - 1); - flagname := Copy(fsj, FWZ + 1, Length(fsj) - FWZ); if ShowModal = 1 then begin - TEdit(Sender).Text := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString); + self.LabPackage.Text := Trim(frmTradeInspSet.CDS_Label.fieldbyname('LabelCaption').AsString); end; end; finally - frmZDYHelp.Free; + frmTradeInspSet.Free; end; end; @@ -182,19 +180,17 @@ var begin ReadCxGrid(trim(self.Caption) + 'TV2', Tv2, 'Ӧ̹'); InitGrid(); - if trim(FCOID) = '' then - begin - with ADOQueryTemp do - begin - Close; - sql.Clear; - sql.Add(' exec P_BS_Com_Get_No @Str=''K'' '); - Open; - end; - CoCode.Text := trim(ADOQueryTemp.FieldByName('NewCoCode').asstring); - end; - - +// if trim(FCOID) = '' then +// begin +// with ADOQueryTemp do +// begin +// Close; +// sql.Clear; +// sql.Add(' exec P_BS_Com_Get_No @Str=''K'' '); +// Open; +// end; +// CoCode.Text := trim(ADOQueryTemp.FieldByName('NewCoCode').asstring); +// end; //˵ҲҪ޸ı棬޸ݣֻܸ // with ADOQueryTemp do // begin @@ -223,8 +219,20 @@ begin Fdept := 'ҵ'; if ShowModal = 1 then begin - SalesId.Text := Trim(CDS_1.fieldbyname('UserID').AsString); - Saleser.Text := Trim(CDS_1.fieldbyname('UserName').AsString); + SalesId.Text := Trim(CDS_1.fieldbyname('EECode').AsString); + Saleser.Text := Trim(CDS_1.fieldbyname('EEName').AsString); + Code.Text := Trim(CDS_1.fieldbyname('UserCode').AsString); +// if trim(FCOID) = '' then +// begin +// with ADOQueryTemp do +// begin +// Close; +// sql.Clear; +// sql.Add(' exec P_BS_Com_Get_No @Str=''K'' '); +// Open; +// end; +// CoCode.Text := trim(ADOQueryTemp.FieldByName('NewCoCode').asstring); +// end; end; end; finally @@ -234,7 +242,7 @@ end; function TfrmCustInput.SaveData(): Boolean; var - MaxId, MaxSubId, FCoCode, FCCID: string; + MaxId, MaxSubId, FCoCode, FCCID, MaxCodeId: string; begin try ADOQueryCmd.Connection.BeginTrans; @@ -248,17 +256,14 @@ begin Exit; end; - if trim(CoCode.Text) = '' then + if GetLSNo(ADOQueryCmd, MaxCodeId, Code.Text, 'BS_Company', 3, 0) = False then begin - with ADOQueryTemp do - begin - Close; - sql.Clear; - sql.Add(' exec P_BS_Com_Get_No @Str=''K'' '); - Open; - end; - CoCode.Text := trim(ADOQueryTemp.FieldByName('NewCoCode').asstring); + Result := False; + ADOQueryCmd.Connection.RollbackTrans; + Application.MessageBox('ȡʧܣ', 'ʾ', 0); + Exit; end; + Cocode.Text := Trim(MaxCodeId); end else begin @@ -431,6 +436,11 @@ begin Application.MessageBox('ƲΪ!', 'ʾ', 0); Exit; end; + if Trim(Saleser.Text) = '' then + begin + Application.MessageBox('ҵԱΪ!', 'ʾ', 0); + Exit; + end; if SaveData() then begin Application.MessageBox('ɹ!', 'ʾ', 0); diff --git a/A01基础公司管理/U_Customer.dfm b/A01基础公司管理/U_Customer.dfm index b02a388..7196d03 100644 --- a/A01基础公司管理/U_Customer.dfm +++ b/A01基础公司管理/U_Customer.dfm @@ -352,6 +352,22 @@ inherited frmCustomer: TfrmCustomer Options.Editing = False Width = 66 end + object cxgrdbclmnTv1Column7: TcxGridDBColumn + Caption = #23458#25143#40664#35748#26631#31614 + DataBinding.FieldName = 'LabPackage' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 90 + end + object cxgrdbclmnTv1Column8: TcxGridDBColumn + Caption = #30382#37325 + DataBinding.FieldName = 'RuleBeforeTare' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 70 + end end object cxGridLevel1: TcxGridLevel GridView = Tv1 diff --git a/A01基础公司管理/U_Customer.pas b/A01基础公司管理/U_Customer.pas index df6ed87..5fe0d60 100644 --- a/A01基础公司管理/U_Customer.pas +++ b/A01基础公司管理/U_Customer.pas @@ -78,6 +78,8 @@ type ToolButton1: TToolButton; GPM_2: TcxGridPopupMenu; ToolButton3: TToolButton; + cxgrdbclmnTv1Column7: TcxGridDBColumn; + cxgrdbclmnTv1Column8: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); diff --git a/A01基础公司管理/U_EmployeeInPut.dfm b/A01基础公司管理/U_EmployeeInPut.dfm index c90bd44..8e04f97 100644 --- a/A01基础公司管理/U_EmployeeInPut.dfm +++ b/A01基础公司管理/U_EmployeeInPut.dfm @@ -80,6 +80,7 @@ object frmYGInPut: TfrmYGInPut TabOrder = 1 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] DataController.Summary.DefaultGroupSummaryItems = <> @@ -92,24 +93,28 @@ object frmYGInPut: TfrmYGInPut object v1RuZhiDate: TcxGridDBColumn Caption = #20837#32844#26085#26399 DataBinding.FieldName = 'EntryDate' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 70 end object v1YGNo: TcxGridDBColumn Caption = #21592#24037#32534#21495 DataBinding.FieldName = 'EECode' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 75 end object v1YGName: TcxGridDBColumn Caption = #22995#21517 DataBinding.FieldName = 'EEName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 88 end object v1Column1: TcxGridDBColumn Caption = #37096#38376 DataBinding.FieldName = 'Dept' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -117,18 +122,21 @@ object frmYGInPut: TfrmYGInPut object v1GangWei: TcxGridDBColumn Caption = #23703#20301 DataBinding.FieldName = 'Post' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 82 end object v1SFZNo: TcxGridDBColumn Caption = #29983#26085 DataBinding.FieldName = 'Birthday' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 70 end object v1YGSex: TcxGridDBColumn Caption = #24615#21035 DataBinding.FieldName = 'Sex' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsEditFixedList Properties.Items.Strings = ( @@ -140,15 +148,24 @@ object frmYGInPut: TfrmYGInPut object v1Phone: TcxGridDBColumn Caption = #25163#26426 DataBinding.FieldName = 'Phone' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 91 end object Tv1Column1: TcxGridDBColumn Caption = #36523#20221#35777 DataBinding.FieldName = 'IdCard' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 73 end + object cxgrdbclmnTv1Column2: TcxGridDBColumn + Caption = #19994#21153#32534#21495 + DataBinding.FieldName = 'UserCode' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 70 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/A01基础公司管理/U_EmployeeInPut.pas b/A01基础公司管理/U_EmployeeInPut.pas index abfcf6d..d72dfe0 100644 --- a/A01基础公司管理/U_EmployeeInPut.pas +++ b/A01基础公司管理/U_EmployeeInPut.pas @@ -12,7 +12,7 @@ uses cxDropDownEdit, jpeg, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP, cxPC, cxGridCustomPopupMenu, cxGridPopupMenu, Menus, ExtDlgs, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxSkinsCore, - dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu; + dxSkinsDefaultPainters, dxDateRanges, dxBarBuiltInMenu, dxScrollbarAnnotations; type TfrmYGInPut = class(TForm) @@ -40,6 +40,7 @@ type v1SFZNo: TcxGridDBColumn; v1YGNo: TcxGridDBColumn; Tv1Column1: TcxGridDBColumn; + cxgrdbclmnTv1Column2: TcxGridDBColumn; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); @@ -210,11 +211,13 @@ var FSFNO: string; begin ToolBar1.SetFocus; - if Order_Sub.Locate('IdCard', '', []) = true then - begin - application.MessageBox('֤Ϊ', 'ʾ'); - exit; - end; + if Order_Sub.IsEmpty then + Exit; +// if Order_Sub.Locate('IdCard', null, []) = true then +// begin +// application.MessageBox('֤Ϊ', 'ʾ'); +// exit; +// end; if SaveData() then begin Application.MessageBox('ɹ', 'ʾ', 0); diff --git a/A01基础公司管理/U_EmployeeList.dfm b/A01基础公司管理/U_EmployeeList.dfm index cca16c6..8ac892a 100644 --- a/A01基础公司管理/U_EmployeeList.dfm +++ b/A01基础公司管理/U_EmployeeList.dfm @@ -292,6 +292,7 @@ inherited frmEmployeeList: TfrmEmployeeList OptionsView.CellAutoHeight = True OptionsView.Headers = False RootValue = -1 + ScrollbarAnnotations.CustomAnnotations = <> Styles.Inactive = DataLink_Company.Red Styles.Selection = DataLink_Company.Red Styles.IncSearch = DataLink_Company.Red @@ -359,6 +360,7 @@ inherited frmEmployeeList: TfrmEmployeeList TabOrder = 1 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -373,6 +375,7 @@ inherited frmEmployeeList: TfrmEmployeeList object v1Column4: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True HeaderAlignmentHorz = taCenter @@ -381,6 +384,7 @@ inherited frmEmployeeList: TfrmEmployeeList object v1RuZhiDate: TcxGridDBColumn Caption = #20837#32844#26085#26399 DataBinding.FieldName = 'EntryDate' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 84 @@ -388,6 +392,7 @@ inherited frmEmployeeList: TfrmEmployeeList object v1YGNo: TcxGridDBColumn Caption = #32534#21495 DataBinding.FieldName = 'EECode' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -395,6 +400,7 @@ inherited frmEmployeeList: TfrmEmployeeList object v1YGName: TcxGridDBColumn Caption = #22995#21517 DataBinding.FieldName = 'EEName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 88 @@ -402,6 +408,7 @@ inherited frmEmployeeList: TfrmEmployeeList object v1Column1: TcxGridDBColumn Caption = #37096#38376 DataBinding.FieldName = 'Dept' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -415,6 +422,7 @@ inherited frmEmployeeList: TfrmEmployeeList object v1Column2: TcxGridDBColumn Caption = #23703#20301 DataBinding.FieldName = 'Post' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 82 @@ -422,6 +430,7 @@ inherited frmEmployeeList: TfrmEmployeeList object v1Column8: TcxGridDBColumn Caption = #31867#21035 DataBinding.FieldName = 'EEType' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 78 @@ -429,6 +438,7 @@ inherited frmEmployeeList: TfrmEmployeeList object v1SFZNo: TcxGridDBColumn Caption = #36523#20221#35777#21495 DataBinding.FieldName = 'IdCard' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -436,6 +446,7 @@ inherited frmEmployeeList: TfrmEmployeeList object v1Column6: TcxGridDBColumn Caption = #24615#21035 DataBinding.FieldName = 'Sex' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 85 @@ -443,6 +454,7 @@ inherited frmEmployeeList: TfrmEmployeeList object v1Column29: TcxGridDBColumn Caption = #25163#26426 DataBinding.FieldName = 'Phone' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 91 @@ -450,6 +462,7 @@ inherited frmEmployeeList: TfrmEmployeeList object v1SJLiZhiDate: TcxGridDBColumn Caption = #31163#32844#26085#26399 DataBinding.FieldName = 'SJLiZhiDate' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxDateEditProperties' Properties.SaveTime = False Properties.ShowTime = False @@ -461,9 +474,18 @@ inherited frmEmployeeList: TfrmEmployeeList object Tv1Column1: TcxGridDBColumn Caption = #31163#32844#26102#38388 DataBinding.FieldName = 'DepartureDate' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 69 end + object cxgrdbclmnTv1Column2: TcxGridDBColumn + Caption = #19994#21153#32534#21495 + DataBinding.FieldName = 'UserCode' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 70 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/A01基础公司管理/U_EmployeeList.pas b/A01基础公司管理/U_EmployeeList.pas index 51e18ee..46c9640 100644 --- a/A01基础公司管理/U_EmployeeList.pas +++ b/A01基础公司管理/U_EmployeeList.pas @@ -12,7 +12,8 @@ uses RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxButtonEdit, cxDropDownEdit, cxPC, cxTL, cxMaskEdit, cxInplaceContainer, cxDBTL, cxTLData, cxLookAndFeels, cxLookAndFeelPainters, cxTLdxBarBuiltInMenu, dxBarBuiltInMenu, - cxNavigator, U_BaseList, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges; + cxNavigator, U_BaseList, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, + dxScrollbarAnnotations; type TfrmEmployeeList = class(TfrmBaseList) @@ -79,6 +80,7 @@ type ToolButton2: TToolButton; v1Column4: TcxGridDBColumn; Tv1Column1: TcxGridDBColumn; + cxgrdbclmnTv1Column2: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); diff --git a/A01基础公司管理/U_LabelInput.dfm b/A01基础公司管理/U_LabelInput.dfm new file mode 100644 index 0000000..5d13a1c --- /dev/null +++ b/A01基础公司管理/U_LabelInput.dfm @@ -0,0 +1,140 @@ +object frmLabelInput: TfrmLabelInput + Left = 443 + Top = 146 + BorderIcons = [biMaximize] + Caption = #26631#31614#32534#36753 + ClientHeight = 282 + ClientWidth = 420 + Color = clWhite + Font.Charset = ANSI_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [] + OldCreateOrder = False + Position = poMainFormCenter + OnShow = FormShow + PixelsPerInch = 96 + TextHeight = 12 + object Panel1: TPanel + Left = 0 + Top = 38 + Width = 420 + Height = 244 + Align = alClient + BevelInner = bvRaised + BevelOuter = bvLowered + TabOrder = 1 + object Label3: TLabel + Left = 34 + Top = 63 + Width = 60 + Height = 12 + Caption = #22791' '#27880#65306 + end + object Label9: TLabel + Left = 34 + Top = 41 + Width = 60 + Height = 12 + Caption = #26631#31614#21517#31216#65306 + Font.Charset = ANSI_CHARSET + Font.Color = clBlue + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + end + object Label10: TLabel + Left = 34 + Top = 15 + Width = 60 + Height = 12 + Caption = #26631#31614#31867#22411#65306 + Font.Charset = ANSI_CHARSET + Font.Color = clBlue + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + end + object note: TMemo + Tag = 1 + Left = 92 + Top = 61 + Width = 257 + Height = 149 + ScrollBars = ssBoth + TabOrder = 1 + end + object LabelCaption: TEdit + Tag = 1 + Left = 92 + Top = 37 + Width = 258 + Height = 20 + TabOrder = 0 + end + object LabelType: TComboBox + Tag = 1 + Left = 92 + Top = 13 + Width = 257 + Height = 22 + Style = csOwnerDrawFixed + TabOrder = 2 + Items.Strings = ( + #20013#25991#26631#31614 + #33521#25991#26631#31614 + #20013#33521#25991#26631#31614) + end + end + object ToolBar1: TToolBar + Left = 0 + Top = 0 + Width = 420 + Height = 38 + AutoSize = True + ButtonHeight = 38 + ButtonWidth = 91 + Caption = 'ToolBar2' + Color = clBtnFace + Images = DataLink_Company.ImageList_new32 + List = True + ParentColor = False + ShowCaptions = True + TabOrder = 0 + Transparent = False + object Tsave: TToolButton + Left = 0 + Top = 0 + AutoSize = True + Caption = #20445#23384#26631#31614 + ImageIndex = 16 + OnClick = TsaveClick + end + object Tclose: TToolButton + Left = 95 + Top = 0 + AutoSize = True + Caption = #20851#38381 + ImageIndex = 7 + OnClick = TcloseClick + end + end + object ADOQueryCmd: TADOQuery + Connection = DataLink_Company.ADOLink + CommandTimeout = 300 + Parameters = <> + Left = 32 + Top = 180 + end + object ADOQueryTmp: TADOQuery + Connection = DataLink_Company.ADOLink + LockType = ltReadOnly + CommandTimeout = 300 + Parameters = <> + Left = 32 + Top = 120 + end +end diff --git a/A01基础公司管理/U_LabelInput.pas b/A01基础公司管理/U_LabelInput.pas new file mode 100644 index 0000000..30e1cc3 --- /dev/null +++ b/A01基础公司管理/U_LabelInput.pas @@ -0,0 +1,178 @@ +unit U_LabelInput; + +interface + +uses + Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, + Dialogs, ComCtrls, ToolWin, StdCtrls, BtnEdit, ExtCtrls, DB, ADODB, RM_System, + RM_Common, RM_Class, RM_GridReport, Buttons, RTComboBox, RM_Preview, RM_e_Xls, + RM_e_Graphic, RM_e_bmp, RM_BarCode, RM_DsgGridReport, RM_Dataset, cxStyles, + cxCustomData, cxGraphics, cxFilter, cxData, cxDataStorage, cxEdit, cxDBData, + cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, + cxClasses, cxControls, cxGridCustomView, cxGrid; + +type + TfrmLabelInput = class(TForm) + Panel1: TPanel; + Label3: TLabel; + note: TMemo; + ToolBar1: TToolBar; + Tsave: TToolButton; + Tclose: TToolButton; + ADOQueryCmd: TADOQuery; + Label9: TLabel; + LabelCaption: TEdit; + Label10: TLabel; + ADOQueryTmp: TADOQuery; + LabelType: TComboBox; + procedure TcloseClick(Sender: TObject); + procedure TsaveClick(Sender: TObject); + procedure FormShow(Sender: TObject); + private + function SaveData(): Boolean; + procedure InitWinData(); + public + FLabelId: string; + end; + +var + frmLabelInput: TfrmLabelInput; + +implementation + +uses + U_DataLink, U_RTFun; +{$R *.dfm} + +procedure TfrmLabelInput.TcloseClick(Sender: TObject); +begin + close; +end; + +procedure TfrmLabelInput.TsaveClick(Sender: TObject); +begin + if trim(labelCaption.Text) = '' then + begin + application.MessageBox('ǩƲΪգ', 'ʾ'); + labelCaption.SetFocus; + exit; + end; + if trim(LabelCaption.Text) = '' then + begin + application.MessageBox('ǩͲΪգ', 'ʾ'); + exit; + end; + + if SaveData() then + begin + ModalResult := 1; + end; + +end; + + + + +///////////////////////////////////////////////////////////////////// + //ܣ +///////////////////////////////////////////////////////////////////// +function TfrmLabelInput.SaveData(): Boolean; +var + maxno: string; +begin + try + ADOQueryCmd.Connection.BeginTrans; + + if Trim(FLabelId) = '' then + begin + if GetLSNo(ADOQueryCmd, maxno, 'LB', 'Trade_Label', 3, 1) = False then + begin + ADOQueryCmd.Connection.RollbackTrans; + Application.MessageBox('ȡʧ!', 'ʾ', 0); + Exit; + end; + end + else + begin + maxno := Trim(FLabelId); + end; + with ADOQueryCmd do + begin + Close; + sql.Clear; + SQL.Add('select * from Trade_Label where LabelId=''' + Trim(FLabelId) + ''''); + Open; + end; + with ADOQueryCmd do + begin + if Trim(FLabelId) = '' then + begin + Append; + FieldByName('FillId').Value := Trim(DCode); + FieldByName('Filler').Value := Trim(DName); + FieldByName('EditTime').Value := SGetServerDateTime(ADOQueryTmp); + end + else + begin + Edit; + FieldByName('EditId').Value := Trim(DCode); + FieldByName('Editer').Value := Trim(DName); + FieldByName('EditTime').Value := SGetServerDateTime(ADOQueryTmp); + end; + RTSetsavedata(ADOQueryCmd, 'Trade_Label', Panel1, 1); + FieldByName('LabelId').Value := Trim(maxno); + Post; + end; + with ADOQueryTmp do + begin + Close; + sql.Clear; + sql.Add('select * from Trade_Label where LabelCaption=''' + Trim(LabelCaption.text) + ''''); + Open; + end; + if ADOQueryTmp.RecordCount > 1 then + begin + ADOQueryCmd.Connection.RollbackTrans; + Result := False; + Application.MessageBox('ǩظ!', 'ʾ', 0); + Exit; + end; + + ADOQueryCmd.Connection.CommitTrans; + result := true; + except + ADOQueryCmd.Connection.RollbackTrans; + Result := false; + application.MessageBox('ǩģ!', 'Ϣ', 0); + end; +end; + + +//////////////////////////////////////////////////////////// + //ʼ +//////////////////////////////////////////////////////////// + +procedure TfrmLabelInput.InitWinData(); +begin + + with ADOQueryTmp do + begin + close; + sql.Clear; + sql.Add('select A.*'); + sql.Add('from Trade_Label A'); + sql.Add('WHERE LabelId=' + QuotedStr(FLabelId)); + Open; + SCSHData(ADOQueryTmp, panel1, 1); + end; + +end; + +procedure TfrmLabelInput.FormShow(Sender: TObject); +begin + + InitWinData(); +end; + +end. + diff --git a/A01基础公司管理/U_TradeInspSet.dfm b/A01基础公司管理/U_TradeInspSet.dfm new file mode 100644 index 0000000..4c48475 --- /dev/null +++ b/A01基础公司管理/U_TradeInspSet.dfm @@ -0,0 +1,767 @@ +inherited frmTradeInspSet: TfrmTradeInspSet + Left = 261 + Top = 149 + Caption = #25171#21367#21253#35013#35774#32622 + ClientHeight = 772 + ClientWidth = 1320 + Color = clWhite + Font.Charset = GB2312_CHARSET + Font.Height = -12 + Font.Name = #23435#20307 + OldCreateOrder = True + Position = poScreenCenter + OnClose = FormClose + ExplicitTop = -139 + ExplicitWidth = 1336 + ExplicitHeight = 811 + PixelsPerInch = 96 + TextHeight = 12 + object ToolBar1: TToolBar [0] + Tag = 1 + Left = 0 + Top = 0 + Width = 1320 + Height = 38 + AutoSize = True + ButtonHeight = 38 + ButtonWidth = 75 + Caption = 'ToolBar1' + Color = clWhite + Images = DataLink_Company.ImageList_new32 + List = True + ParentColor = False + ShowCaptions = True + TabOrder = 0 + object ToolButton3: TToolButton + Left = 0 + Top = 0 + AutoSize = True + Caption = #20445#23384 + ImageIndex = 16 + Visible = False + OnClick = ToolButton3Click + end + object btn2: TToolButton + Left = 71 + Top = 0 + Caption = #36873#25321 + ImageIndex = 12 + OnClick = btn2Click + end + object TBClose: TToolButton + Left = 146 + Top = 0 + AutoSize = True + Caption = #20851#38381 + ImageIndex = 7 + OnClick = TBCloseClick + end + end + object ScrollBox1: TScrollBox [1] + Left = 0 + Top = 38 + Width = 1320 + Height = 83 + Align = alTop + BevelInner = bvNone + BevelOuter = bvNone + BorderStyle = bsNone + Color = clWhite + Ctl3D = False + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -14 + Font.Name = #23435#20307 + Font.Style = [] + ParentColor = False + ParentCtl3D = False + ParentFont = False + TabOrder = 1 + Visible = False + ExplicitTop = 18 + object Label14: TLabel + Left = 32 + Top = 17 + Width = 39 + Height = 15 + Caption = #21367#26631#31614 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -12 + Font.Name = 'Times New Roman' + Font.Style = [fsBold] + ParentFont = False + end + object Label1: TLabel + Left = 728 + Top = 40 + Width = 39 + Height = 15 + Caption = #21253#26631#31614 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -12 + Font.Name = 'Times New Roman' + Font.Style = [fsBold] + ParentFont = False + end + object Label2: TLabel + Left = 483 + Top = 15 + Width = 52 + Height = 15 + Caption = #19978#31216#30382#37325 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -12 + Font.Name = 'Times New Roman' + Font.Style = [fsBold] + ParentFont = False + end + object Label3: TLabel + Left = 275 + Top = 17 + Width = 52 + Height = 15 + Caption = #31995#25968#31867#22411 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -12 + Font.Name = 'Times New Roman' + Font.Style = [fsBold] + ParentFont = False + end + object Label4: TLabel + Left = 301 + Top = 41 + Width = 26 + Height = 15 + Caption = #31995#25968 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -12 + Font.Name = 'Times New Roman' + Font.Style = [fsBold] + ParentFont = False + end + object Label5: TLabel + Left = 715 + Top = 14 + Width = 52 + Height = 15 + Caption = #21367#21495#35268#21017 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -12 + Font.Name = 'Times New Roman' + Font.Style = [fsBold] + ParentFont = False + end + object Label6: TLabel + Left = 19 + Top = 44 + Width = 52 + Height = 15 + Caption = #38271#24230#21333#20301 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -12 + Font.Name = 'Times New Roman' + Font.Style = [fsBold] + ParentFont = False + end + object Label8: TLabel + Left = 470 + Top = 41 + Width = 65 + Height = 15 + Caption = #19981#19978#31216#30382#37325 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -12 + Font.Name = 'Times New Roman' + Font.Style = [fsBold] + ParentFont = False + end + object RuleBeforeTare: TEdit + Tag = 2 + Left = 541 + Top = 12 + Width = 90 + Height = 20 + TabOrder = 0 + end + object RuleConversion: TComboBox + Tag = 2 + Left = 333 + Top = 13 + Width = 100 + Height = 22 + Style = csDropDownList + ItemIndex = 0 + TabOrder = 1 + Text = #26080#38656#36716#25442 + Items.Strings = ( + #26080#38656#36716#25442 + #31859#36716#20844#26020 + #20928#37325#36716#31859 + #27611#37325#36716#31859) + end + object Coefficient: TEdit + Tag = 2 + Left = 333 + Top = 38 + Width = 100 + Height = 20 + TabOrder = 2 + end + object LabVolume: TEdit + Tag = 2 + Left = 77 + Top = 14 + Width = 172 + Height = 20 + ReadOnly = True + TabOrder = 3 + end + object LabPackage: TEdit + Tag = 2 + Left = 773 + Top = 38 + Width = 172 + Height = 20 + ReadOnly = True + TabOrder = 4 + end + object RulePieceNo: TComboBox + Tag = 2 + Left = 773 + Top = 10 + Width = 120 + Height = 22 + Style = csDropDownList + ItemIndex = 0 + TabOrder = 5 + Text = #25353#29983#20135#21333#29983#25104 + Items.Strings = ( + #25353#29983#20135#21333#29983#25104 + #25353#32568#21495#29983#25104 + #25163#21160#29983#25104) + end + object RuleLenUnit: TComboBox + Tag = 2 + Left = 77 + Top = 40 + Width = 172 + Height = 22 + Style = csDropDownList + TabOrder = 6 + Items.Strings = ( + 'M' + 'Y') + end + object RuleLaterTare: TEdit + Tag = 2 + Left = 541 + Top = 38 + Width = 90 + Height = 20 + TabOrder = 7 + end + end + object cxPageControl1: TcxPageControl [2] + Left = 0 + Top = 121 + Width = 1320 + Height = 651 + Align = alClient + Color = clWhite + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -21 + Font.Name = #23435#20307 + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 2 + Properties.ActivePage = cxTabSheet1 + Properties.CustomButtons.Buttons = <> + Properties.Style = 6 + OnChange = cxPageControl1Change + ExplicitTop = 101 + ExplicitHeight = 671 + ClientRectBottom = 651 + ClientRectRight = 1320 + ClientRectTop = 32 + object cxTabSheet1: TcxTabSheet + Caption = #26631#31614#35774#32622 + ImageIndex = 2 + ExplicitHeight = 639 + object Panel1: TPanel + Left = 0 + Top = 0 + Width = 1320 + Height = 619 + Align = alClient + Caption = 'Panel1' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + TabOrder = 0 + ExplicitHeight = 639 + object Panel2: TPanel + Left = 1 + Top = 39 + Width = 376 + Height = 579 + Align = alLeft + Caption = 'Panel1' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + TabOrder = 0 + ExplicitHeight = 599 + object cxGridLabel: TcxGrid + Left = 1 + Top = 35 + Width = 374 + Height = 543 + Align = alClient + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + TabOrder = 0 + ExplicitWidth = 369 + object TVLabel: TcxGridDBTableView + Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> + OnCellClick = TVLabelCellClick + DataController.DataSource = DS_Label + DataController.Filter.AutoDataSetFilter = True + DataController.Summary.DefaultGroupSummaryItems = <> + DataController.Summary.FooterSummaryItems = <> + DataController.Summary.SummaryGroups = <> + OptionsCustomize.ColumnFiltering = False + OptionsSelection.CellSelect = False + OptionsView.GroupByBox = False + object TVLabellabelId: TcxGridDBColumn + Caption = #26631#31614'ID' + DataBinding.FieldName = 'labelId' + DataBinding.IsNullValueType = True + Visible = False + Width = 53 + end + object TVLabellabeltype: TcxGridDBColumn + Caption = #26631#31614#31867#22411 + DataBinding.FieldName = 'labeltype' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 107 + end + object TVLabellabelCaption: TcxGridDBColumn + Caption = #26631#31614#21517#31216 + DataBinding.FieldName = 'labelCaption' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 261 + end + object TVLabellabelFile: TcxGridDBColumn + Caption = #25991#20214#21517 + DataBinding.FieldName = 'labelFile' + DataBinding.IsNullValueType = True + Visible = False + HeaderAlignmentHorz = taCenter + Width = 167 + end + object TVLabelColumn2: TcxGridDBColumn + Caption = #25805#20316#26102#38388 + DataBinding.FieldName = 'EditTime' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 99 + end + object TVLabelColumn1: TcxGridDBColumn + Caption = #25805#20316#20154 + DataBinding.FieldName = 'Editer' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end + end + object cxGridLabelLevel1: TcxGridLevel + GridView = TVLabel + end + end + object Panel4: TPanel + Left = 1 + Top = 1 + Width = 374 + Height = 34 + Align = alTop + BevelInner = bvRaised + BevelOuter = bvLowered + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + TabOrder = 1 + object Label9: TLabel + Left = 17 + Top = 9 + Width = 48 + Height = 12 + Caption = #26631#31614#31867#22411 + end + object Label10: TLabel + Left = 184 + Top = 10 + Width = 48 + Height = 12 + Caption = #26631#31614#21517#31216 + end + object LabelCaption: TEdit + Left = 236 + Top = 6 + Width = 100 + Height = 20 + TabOrder = 0 + OnChange = LabelTypeChange + end + object LabelType: TRTComboBox + Tag = 99 + Left = 69 + Top = 6 + Width = 100 + Height = 20 + Style = csDropDownList + ItemIndex = 0 + TabOrder = 1 + OnChange = LabelTypeChange + Items.Strings = ( + '' + #20013#25991#26631#31614 + #33521#25991#26631#31614 + #20013#33521#25991#26631#31614) + end + end + end + object RMPreview3: TRMPreview + Left = 377 + Top = 39 + Width = 942 + Height = 579 + Align = alClient + BevelOuter = bvLowered + Caption = 'Insert After' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + ParentShowHint = False + ShowHint = False + TabOrder = 1 + Options.RulerUnit = rmutScreenPixels + Options.RulerVisible = False + Options.DrawBorder = False + Options.BorderPen.Color = clGray + Options.BorderPen.Style = psDash + ExplicitLeft = 396 + ExplicitTop = 207 + end + object ToolBar2: TToolBar + Tag = 1 + Left = 1 + Top = 1 + Width = 1318 + Height = 38 + AutoSize = True + ButtonHeight = 38 + ButtonWidth = 103 + Caption = 'ToolBar2' + Color = clBtnFace + Images = DataLink_Company.ImageList_new32 + List = True + ParentColor = False + ShowCaptions = True + TabOrder = 2 + Transparent = False + ExplicitTop = 2 + object Tadd: TToolButton + Left = 0 + Top = 0 + AutoSize = True + Caption = #26032#22686 + ImageIndex = 2 + OnClick = TaddClick + end + object btn1: TToolButton + Left = 71 + Top = 0 + AutoSize = True + Caption = #22797#21046 + ImageIndex = 9 + OnClick = btn1Click + end + object Tupd: TToolButton + Left = 142 + Top = 0 + AutoSize = True + Caption = #20462#25913 + ImageIndex = 3 + OnClick = TupdClick + end + object ToolButton4: TToolButton + Left = 213 + Top = 0 + AutoSize = True + Caption = #35774#35745#26631#31614 + ImageIndex = 3 + OnClick = ToolButton4Click + end + object Tdel: TToolButton + Left = 308 + Top = 0 + AutoSize = True + Caption = #21024#38500 + ImageIndex = 5 + OnClick = TdelClick + end + object ToolButton2: TToolButton + Left = 379 + Top = 0 + AutoSize = True + Caption = #35774#20026#21253#26631#31614 + ImageIndex = 22 + Visible = False + OnClick = ToolButton2Click + end + object ToolButton1: TToolButton + Left = 486 + Top = 0 + AutoSize = True + Caption = #35774#20026#21367#26631#31614 + ImageIndex = 22 + Visible = False + OnClick = ToolButton1Click + end + end + end + end + object cxTabSheet4: TcxTabSheet + Caption = ' '#21367#26631#31614' ' + ImageIndex = 3 + ExplicitHeight = 639 + object RMPreview1: TRMPreview + Left = 0 + Top = 0 + Width = 1320 + Height = 619 + Align = alClient + BevelOuter = bvLowered + Caption = 'Insert After' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + ParentShowHint = False + ShowHint = False + TabOrder = 0 + Options.RulerUnit = rmutScreenPixels + Options.RulerVisible = False + Options.DrawBorder = False + Options.BorderPen.Color = clGray + Options.BorderPen.Style = psDash + ExplicitHeight = 639 + end + end + end + inherited ADOQueryBaseCmd: TADOQuery + Connection = DataLink_Company.ADOLink + Left = 417 + Top = 576 + end + inherited ADOQueryBaseTemp: TADOQuery + Connection = DataLink_Company.ADOLink + Left = 473 + Top = 657 + end + inherited ImageList_new32: TImageList + Left = 88 + Top = 432 + end + object ADOQueryTemp: TADOQuery + Connection = DataLink_Company.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 171 + Top = 280 + end + object ADOQueryCmd: TADOQuery + Connection = DataLink_Company.ADOLink + Parameters = <> + Left = 78 + Top = 280 + end + object ADOQueryMain: TADOQuery + Connection = DataLink_Company.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 181 + Top = 489 + end + object ADOQueryLabel: TADOQuery + Connection = DataLink_Company.ADOLink + Parameters = <> + Left = 228 + Top = 365 + end + object RM1: TRMGridReport + ThreadPrepareReport = True + InitialZoom = pzDefault + PreviewButtons = [rmpbZoom, rmpbLoad, rmpbSave, rmpbPrint, rmpbFind, rmpbPageSetup, rmpbExit, rmpbSaveToXLS, rmpbExport, rmpbNavigator] + DefaultCollate = False + ShowPrintDialog = False + SaveReportOptions.RegistryPath = 'Software\ReportMachine\ReportSettings\' + PreviewOptions.RulerUnit = rmutScreenPixels + PreviewOptions.RulerVisible = False + PreviewOptions.DrawBorder = False + PreviewOptions.BorderPen.Color = clGray + PreviewOptions.BorderPen.Style = psDash + Dataset = RMDB_1 + CompressLevel = rmzcFastest + CompressThread = False + LaterBuildEvents = True + OnlyOwnerDataSet = False + Left = 472 + Top = 240 + ReportData = {} + end + object RMDB_1: TRMDBDataSet + Visible = True + DataSet = ADO_1 + Left = 428 + Top = 244 + end + object ADO_1: TADOQuery + Connection = DataLink_Company.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 283 + Top = 288 + end + object RM2: TRMGridReport + ThreadPrepareReport = True + InitialZoom = pzDefault + PreviewButtons = [rmpbZoom, rmpbLoad, rmpbSave, rmpbPrint, rmpbFind, rmpbPageSetup, rmpbExit, rmpbSaveToXLS, rmpbExport, rmpbNavigator] + DefaultCollate = False + ShowPrintDialog = False + SaveReportOptions.RegistryPath = 'Software\ReportMachine\ReportSettings\' + PreviewOptions.RulerUnit = rmutScreenPixels + PreviewOptions.RulerVisible = False + PreviewOptions.DrawBorder = False + PreviewOptions.BorderPen.Color = clGray + PreviewOptions.BorderPen.Style = psDash + Dataset = RMDB_1 + CompressLevel = rmzcFastest + CompressThread = False + LaterBuildEvents = True + OnlyOwnerDataSet = False + Left = 472 + Top = 296 + ReportData = {} + end + object RMDB_2: TRMDBDataSet + Visible = True + DataSet = ADO_1 + Left = 428 + Top = 300 + end + object DS_Label: TDataSource + DataSet = CDS_Label + Left = 234 + Top = 568 + end + object CDS_Label: TClientDataSet + Aggregates = <> + Params = <> + Left = 164 + Top = 563 + end + object RMDB_Label: TRMDBDataSet + Visible = True + DataSet = ADO_1 + Left = 164 + Top = 620 + end + object RMLabel: TRMGridReport + ThreadPrepareReport = True + InitialZoom = pzDefault + PreviewButtons = [rmpbZoom, rmpbLoad, rmpbSave, rmpbPrint, rmpbFind, rmpbPageSetup, rmpbExit, rmpbSaveToXLS, rmpbExport, rmpbNavigator] + DefaultCollate = False + ShowPrintDialog = False + SaveReportOptions.RegistryPath = 'Software\ReportMachine\ReportSettings\' + PreviewOptions.RulerUnit = rmutScreenPixels + PreviewOptions.RulerVisible = False + PreviewOptions.DrawBorder = False + PreviewOptions.BorderPen.Color = clGray + PreviewOptions.BorderPen.Style = psDash + Dataset = RMDB_Label + CompressLevel = rmzcFastest + CompressThread = False + LaterBuildEvents = True + OnlyOwnerDataSet = False + Left = 232 + Top = 624 + ReportData = {} + end + object RMBarCodeObject1: TRMBarCodeObject + Left = 504 + Top = 412 + end + object RMXLSExport1: TRMXLSExport + ShowAfterExport = True + ExportPrecision = 1 + PagesOfSheet = 10 + ExportImages = True + ExportFrames = True + ExportImageFormat = ifBMP + JPEGQuality = 0 + ScaleX = 1.000000000000000000 + ScaleY = 1.000000000000000000 + CompressFile = False + Left = 432 + Top = 472 + end + object RMDataDictionary1: TRMDataDictionary + FieldFieldNames.TableName = 'TableName' + FieldFieldNames.FieldName = 'FieldName' + FieldFieldNames.FieldAlias = 'FieldAlias' + Left = 434 + Top = 400 + end + object ADO_Down: TADOQuery + Connection = DataLink_Company.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 59 + Top = 352 + end +end diff --git a/A01基础公司管理/U_TradeInspSet.pas b/A01基础公司管理/U_TradeInspSet.pas new file mode 100644 index 0000000..ccb27d2 --- /dev/null +++ b/A01基础公司管理/U_TradeInspSet.pas @@ -0,0 +1,532 @@ +unit U_TradeInspSet; + +interface + +uses + Windows, Messages, StrUtils, SysUtils, Variants, Classes, Graphics, Controls, + Forms, Dialogs, cxGraphics, cxCustomData, cxStyles, cxTL, cxMaskEdit, DB, + ADODB, cxInplaceContainer, cxDBTL, cxControls, cxTLData, ComCtrls, ToolWin, + StdCtrls, cxFilter, cxData, cxDataStorage, cxEdit, cxDBData, DBClient, + cxGridCustomTableView, cxGridTableView, cxGridDBTableView, ExtCtrls, + cxSplitter, cxGridLevel, cxClasses, cxGridCustomView, cxGrid, + cxGridCustomPopupMenu, cxGridPopupMenu, RM_Dataset, RM_System, RM_Common, + RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection, + IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit, + cxTextEdit, cxDropDownEdit, BtnEdit, cxLookAndFeels, cxLookAndFeelPainters, + cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, + dxBarBuiltInMenu, U_BaseList, cxContainer, dxCore, cxDateUtils, cxImage, + cxDBEdit, IdExplicitTLSClientServerBase, RM_Preview, cxPC, U_BaseHelp, + System.ImageList, Vcl.ImgList, RTComboBox, RM_BarCode, RM_e_Xls, + dxScrollbarAnnotations; + +type + TfrmTradeInspSet = class(TfrmBaseHelp) + ToolBar1: TToolBar; + TBClose: TToolButton; + ADOQueryTemp: TADOQuery; + ADOQueryCmd: TADOQuery; + ADOQueryMain: TADOQuery; + ToolButton3: TToolButton; + ScrollBox1: TScrollBox; + Label14: TLabel; + Label1: TLabel; + cxPageControl1: TcxPageControl; + cxTabSheet4: TcxTabSheet; + RMPreview1: TRMPreview; + Label2: TLabel; + RuleBeforeTare: TEdit; + RuleConversion: TComboBox; + Label3: TLabel; + Coefficient: TEdit; + Label4: TLabel; + ADOQueryLabel: TADOQuery; + RM1: TRMGridReport; + RMDB_1: TRMDBDataSet; + ADO_1: TADOQuery; + RM2: TRMGridReport; + RMDB_2: TRMDBDataSet; + cxTabSheet1: TcxTabSheet; + DS_Label: TDataSource; + CDS_Label: TClientDataSet; + RMDB_Label: TRMDBDataSet; + RMLabel: TRMGridReport; + Panel1: TPanel; + Panel2: TPanel; + cxGridLabel: TcxGrid; + TVLabel: TcxGridDBTableView; + TVLabellabelId: TcxGridDBColumn; + TVLabellabeltype: TcxGridDBColumn; + TVLabellabelCaption: TcxGridDBColumn; + TVLabellabelFile: TcxGridDBColumn; + cxGridLabelLevel1: TcxGridLevel; + RMPreview3: TRMPreview; + Panel4: TPanel; + Label9: TLabel; + Label10: TLabel; + LabelCaption: TEdit; + LabelType: TRTComboBox; + ToolBar2: TToolBar; + ToolButton1: TToolButton; + ToolButton2: TToolButton; + Tadd: TToolButton; + Tupd: TToolButton; + Tdel: TToolButton; + ToolButton4: TToolButton; + RMBarCodeObject1: TRMBarCodeObject; + RMXLSExport1: TRMXLSExport; + RMDataDictionary1: TRMDataDictionary; + ADO_Down: TADOQuery; + TVLabelColumn1: TcxGridDBColumn; + TVLabelColumn2: TcxGridDBColumn; + LabVolume: TEdit; + LabPackage: TEdit; + Label5: TLabel; + RulePieceNo: TComboBox; + Label6: TLabel; + RuleLenUnit: TComboBox; + Label8: TLabel; + RuleLaterTare: TEdit; + btn1: TToolButton; + btn2: TToolButton; + procedure FormDestroy(Sender: TObject); + procedure FormClose(Sender: TObject; var Action: TCloseAction); + procedure TBCloseClick(Sender: TObject); + procedure FormShow(Sender: TObject); + procedure TBRafreshClick(Sender: TObject); + procedure ToolButton3Click(Sender: TObject); + procedure cxPageControl1Change(Sender: TObject); + procedure ToolButton1Click(Sender: TObject); + procedure ToolButton2Click(Sender: TObject); + procedure TupdClick(Sender: TObject); + procedure TdelClick(Sender: TObject); + procedure TaddClick(Sender: TObject); + procedure ToolButton4Click(Sender: TObject); + procedure LabelTypeChange(Sender: TObject); + procedure TVLabelCellClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); + procedure btn1Click(Sender: TObject); + procedure btn2Click(Sender: TObject); + private + { Private declarations } + procedure InitGrid(); + function SaveData(): Boolean; + procedure InitLabel(); + function SaveLabel(MLabelID: string): Boolean; + procedure InitLabVolume(); + procedure InitLabPackage(); + public + FDataID: string; + end; + +var + frmTradeInspSet: TfrmTradeInspSet; + +implementation + +uses + U_DataLink, U_RTFun, U_LabelInput, U_LabelList; + +{$R *.dfm} + +function TfrmTradeInspSet.SaveLabel(MLabelID: string): Boolean; +begin + try + ADOQueryCmd.Connection.BeginTrans; + with ADOQueryCmd do + begin + close; + sql.Clear; + sql.Add('select * from Trade_Label'); + sql.Add('where LabelID=' + Quotedstr(MLabelID)); + Open; + Edit; + fieldByName('Editer').value := DName; + FieldByName('EditTime').Value := SGetServerDateTime(ADOQueryTemp); +// RMLabel.SaveToBlobField(TBlobField(FieldByName('LabelFile'))); + Post; + end; + ADOQueryCmd.Connection.CommitTrans; + result := true; + except + ADOQueryCmd.Connection.RollbackTrans; + Result := false; + application.MessageBox('ǩģ!', 'Ϣ', 0); + end; +end; + +procedure TfrmTradeInspSet.InitLabel(); +begin + with ADOQueryMain do + begin + close; + sql.Clear; + sql.Add(' select * from Trade_Label'); + sql.Add(' order by labeltype,labelCaption'); + Open; + end; + SDofilter(ADOQueryMain, SGetFilters(Panel4, 1, 2)); + SCreateCDS(ADOQueryMain, CDS_Label); + SInitCDSData(ADOQueryMain, CDS_Label); +end; + +procedure TfrmTradeInspSet.InitLabVolume(); +begin + + with ADOQueryLabel do + begin + close; + sql.Clear; + sql.Add('select top 1 * from RT_FileUpdate'); + sql.Add('where FileName=' + quotedstr(trim(LabVolume.Text) + '.rmf')); + Open; + end; + + if ADOQueryLabel.IsEmpty then + exit; + with RM1 do + begin + LoadFromBlobField(tblobfield(ADOQueryLabel.fieldbyname('Files'))); + Preview := RMPreview1; + ShowReport; + end; + +end; + +procedure TfrmTradeInspSet.InitLabPackage(); +begin + +end; + +procedure TfrmTradeInspSet.LabelTypeChange(Sender: TObject); +begin + if ADOQueryMain.Active then + begin + SDofilter(ADOQueryMain, SGetFilters(Panel4, 1, 2)); + SCreateCDS(ADOQueryMain, CDS_Label); + SInitCDSData(ADOQueryMain, CDS_Label); + end; + +end; + +procedure TfrmTradeInspSet.InitGrid(); +begin + + with ADOQueryTemp do + begin + Close; + SQL.Clear; + sql.Add(' select * from Trade_Cloth_Inspect_Rule where RuleID=''' + Trim(FDataID) + ''''); + Open; + end; + SCSHData(ADOQueryTemp, ScrollBox1, 2); + +// with ADOQueryTemp do +// begin +// close; +// sql.Clear; +// sql.Add(' select C.LabName from Knit_Plan_Main A '); +// sql.Add(' INNER JOIN Knit_Plan_Sub B on A.MainID=B.MainID'); +// sql.Add(' INNER JOIN BS_Contract_Sub C on B.ConSId =C.ConSId'); +// sql.Add(' where A.MainId=''' + Trim(FDataID) + ''''); +// Open; +// end; +// +// LabVolume.text := Trim(ADOQueryTemp.fieldbyname('LabName').AsString); +end; + +procedure TfrmTradeInspSet.FormDestroy(Sender: TObject); +begin + inherited; + frmTradeInspSet := nil; +end; + +procedure TfrmTradeInspSet.btn1Click(Sender: TObject); +var + MFromLabelId: string; +begin + MFromLabelId := trim(CDS_Label.fieldbyname('LabelId').asstring); + try + frmLabelInput := TfrmLabelInput.create(self); + with frmLabelInput do + begin + + if showModal = 1 then + begin + FLabelId := frmLabelInput.LabelCaption.Text; + with ADOQueryCmd do + begin + close; + sql.clear; + sql.Add(' exec P_BS_Label_Copy'); + sql.Add(' @FromLabelId=' + quotedstr(trim(MFromLabelId))); + sql.Add(',@ToLabelId=' + quotedstr(trim(FLabelId))); +// ShowMessage(sql.text); + execSql; + end; + InitLabel(); + end; + end; + finally + frmLabelInput.Free; + end; +end; + +procedure TfrmTradeInspSet.btn2Click(Sender: TObject); +begin + ModalResult := 1; +end; + +procedure TfrmTradeInspSet.cxPageControl1Change(Sender: TObject); +begin + case cxPageControl1.ActivePageIndex of + 1: + begin + InitLabVolume(); + end; + 2: + begin + InitLabPackage(); + end; + end; +end; + +procedure TfrmTradeInspSet.FormClose(Sender: TObject; var Action: TCloseAction); +begin + inherited; + Action := caFree; +end; + +procedure TfrmTradeInspSet.TaddClick(Sender: TObject); +begin + try + frmLabelInput := TfrmLabelInput.create(self); + with frmLabelInput do + begin + FLabelId := ''; + if showModal = 1 then + begin + InitLabel(); + end; + end; + finally + frmLabelInput.Free; + end; +end; + +procedure TfrmTradeInspSet.TBCloseClick(Sender: TObject); +begin + ModalResult := 1; +end; + +procedure TfrmTradeInspSet.FormShow(Sender: TObject); +begin + inherited; + ExportFtErpFile('ģǩ.rmf', ADOQueryTemp); + + with ADO_1 do + begin + Close; + SQL.Clear; + sql.Add('exec P_BS_Label_Get_Test'); + Open; + end; + Initlabel(); + InitGrid(); + +end; + +procedure TfrmTradeInspSet.TBRafreshClick(Sender: TObject); +begin + InitGrid(); +end; + +procedure TfrmTradeInspSet.TdelClick(Sender: TObject); +begin + try + with ADOQueryCmd do + begin + close; + sql.clear; + sql.Add('delete Trade_Label'); + sql.Add('where labelId=' + quotedstr(CDS_Label.fieldByName('LabelID').asString)); + + sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( '); + sql.Add(' ' + quotedstr(trim(DName))); + sql.Add(',getdate() '); + sql.Add(',' + quotedstr(trim(self.Caption))); + sql.Add(',' + quotedstr(trim('ǩɾ'))); + sql.Add(',' + quotedstr(trim('ǩƣ' + trim(CDS_Label.fieldByName('labelCaption').asString)))); + sql.Add(',' + quotedstr(trim('ɹ'))); + sql.Add(')'); + execSql; + end; + CDS_Label.Delete; + except + application.MessageBox('ɾʧ!', 'Ϣ', 0); + end; + +end; + +function TfrmTradeInspSet.SaveData(): Boolean; +var + MaxId, MaxSubId, FCoCode, FCCID, MaxCFID: string; +begin + try + ADOQueryCmd.Connection.BeginTrans; + + if Trim(FDataID) = '' then + begin + if GetLSNo(ADOQueryCmd, MaxId, 'R', 'Trade_Cloth_Inspect_Rule', 4, 1) = False then + begin + Result := False; + ADOQueryCmd.Connection.RollbackTrans; + Application.MessageBox('ȡʧܣ', 'ʾ', 0); + Exit; + end; + end + else + begin + MaxId := Trim(FDataID); + end; + + with ADOQueryCmd do + begin + Close; + SQL.Clear; + sql.Add('select * from Trade_Cloth_Inspect_Rule where RuleID=''' + Trim(FDataID) + ''''); + Open; + end; + with ADOQueryCmd do + begin + if Trim(FDataID) = '' then + begin + Append; + FieldByName('Filler').Value := Trim(DName); + end + else + begin + Edit; + FieldByName('Editer').Value := Trim(DName); + FieldByName('Edittime').Value := SGetServerDateTime(ADOQueryTemp); + end; + FieldByName('RuleID').Value := Trim(MaxId); + + RTSetsavedata(ADOQueryCmd, 'Trade_Cloth_Inspect_Rule', ScrollBox1, 2); + + Post; + end; + + with ADOQueryTemp do + begin + close; + sql.Clear; + sql.Add(' UPDATE BS_Contract_Sub set LabName =''' + Trim(LabVolume.text) + ''''); + sql.Add(' from BS_Contract_Sub A '); + sql.Add(' INNER JOIN Knit_Plan_Sub B on A.ConSId=B.ConSId'); + sql.Add(' where B.MainId =''' + Trim(FDataID) + ''''); + ExecSQL; + end; + + ADOQueryCmd.Connection.CommitTrans; + FCCID := Trim(MaxSubId); + Result := True; + except + Result := false; + ADOQueryCmd.Connection.RollbackTrans; + Application.MessageBox('쳣!', 'ʾ', 0); + end; +end; + +procedure TfrmTradeInspSet.ToolButton1Click(Sender: TObject); +begin + if CDS_Label.IsEmpty then + exit; + LabVolume.Text := trim(CDS_Label.fieldbyname('labelCaption').asstring); +end; + +procedure TfrmTradeInspSet.ToolButton2Click(Sender: TObject); +begin + if CDS_Label.IsEmpty then + exit; + LabPackage.Text := trim(CDS_Label.fieldbyname('labelCaption').asstring); +end; + +procedure TfrmTradeInspSet.ToolButton3Click(Sender: TObject); +begin + + if SaveData() then + begin + Application.MessageBox('ɹ!', 'ʾ', 0); + end; +end; + +procedure TfrmTradeInspSet.ToolButton4Click(Sender: TObject); +var + fFileName, fPrintFile: string; + MLabelID, MLabelCaption: string; +begin + if CDS_Label.IsEmpty then + exit; + MLabelID := TRIM(CDS_Label.fieldByName('LabelID').asString); + MLabelCaption := TRIM(CDS_Label.fieldByName('LabelCaption').asString); + ExportFtErpFile(MLabelCaption + '.rmf', ADOQueryTemp); + fPrintFile := ExtractFilePath(Application.ExeName) + 'report\' + MLabelCaption + '.rmf'; + + if not FileExists(fPrintFile) then + CopyFile(PChar(ExtractFilePath(Application.ExeName) + 'Report\ģǩ.rmf'), PChar(fPrintFile), False); + + with RMLabel do + begin + RMLabel.Clear; + RMDB_Label.DataSet := nil; + Dictionary.FieldAliases.Clear; + Dictionary.FieldAliases['RMDB_Label'] := 'ǩ'; + RMDB_Label.DataSet := ADO_1; + LoadFromFile(fPrintFile); + application.ProcessMessages; + DesignReport(); +// RMLabel.SaveToFile(fPrintFile); + SaveLabel(MLabelID); + ExportToFtErp(fPrintFile, ADOQueryCmd); + end; +end; + +procedure TfrmTradeInspSet.TupdClick(Sender: TObject); +begin + if CDS_Label.IsEmpty then + exit; + try + frmLabelInput := TfrmLabelInput.create(self); + with frmLabelInput do + begin + fLabelId := CDS_Label.fieldByName('LabelId').AsString; + if showModal = 1 then + begin + InitLabel(); + end; + end; + finally + frmLabelInput.Free; + end; +end; + +procedure TfrmTradeInspSet.TVLabelCellClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); +var + fPrintFile: string; +begin + if CDS_Label.IsEmpty then + exit; + ExportFtErpFile(TRIM(CDS_Label.fieldByName('LabelCaption').asString) + '.rmf', ADOQueryTemp); + fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + CDS_Label.fieldbyname('LabelCaption').AsString + '.rmf'; + if not FileExists(fPrintFile) then + CopyFile(PChar(ExtractFilePath(Application.ExeName) + 'Report\ģǩ.rmf'), PChar(fPrintFile), False); + + with RMLabel do + begin + RMLabel.LoadFromFile(fPrintFile); + Preview := RMPreview3; + ShowReport; + end; +end; + +end. + diff --git a/A05基础资料管理/BaseInfo.dproj.local b/A05基础资料管理/BaseInfo.dproj.local index ee99f97..572d608 100644 --- a/A05基础资料管理/BaseInfo.dproj.local +++ b/A05基础资料管理/BaseInfo.dproj.local @@ -1,10 +1,10 @@  - 1899-12-30 00:00:00.000.260,D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_KuWeiManage.dfm=D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_PositionList.dfm - 1899-12-30 00:00:00.000.260,D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_KuWeiManage.pas=D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_PositionList.pas + 1899-12-30 00:00:00.000.260,D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_PositionList.dfm=D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_KuWeiManage.dfm 1899-12-30 00:00:00.000.471,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas - 1899-12-30 00:00:00.000.872,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.dfm=D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_LbaelMapList.dfm - 1899-12-30 00:00:00.000.872,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas=D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_LbaelMapList.pas + 1899-12-30 00:00:00.000.260,D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_PositionList.pas=D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_KuWeiManage.pas + 1899-12-30 00:00:00.000.872,D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_LbaelMapList.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas + 1899-12-30 00:00:00.000.872,D:\Dp10Repo\项目代码\RTBasics\A05基础资料管理\U_LbaelMapList.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.dfm diff --git a/A05基础资料管理/BaseInfo.identcache b/A05基础资料管理/BaseInfo.identcache index 3109db6ea124bfb29c97b6393a084cb019586a45..d86bb1e14837b78f69f1a4274e8e2d375a3d31cb 100644 GIT binary patch delta 256 zcmaFP-OtS^JlTLniPb5yBr$)oA(J_y$K(Y}a&W%nJIpeSUPxkz%u~i- sr6&Iay3!3rx%lKV76}ZOhcQY3)hbW!W)hh=%YI^l6{9bbu0&=t0M(67j{pDw delta 342 zcmeC@e$LG*%)r3lKiQB)jyEDR&!aREhypVc^ClZIN=~+57N7i^#cJ{%7W>I2O!AW- zF-bB8;82^(A^}um!5D-?zK2 - + diff --git a/A05基础资料管理/testDll.identcache b/A05基础资料管理/testDll.identcache index 9fa82947de5dc82a3ebe8d51c168cc8f395b1f02..244e4ffeddbf9cbef6ba2465cb72dd96f795c2a4 100644 GIT binary patch delta 39 lcmdnRxQdaLiGhK^bz;06t5ar4V*W$}Jw|sVp7_Ltk^sl=3lRVS delta 52 qcmZ3*xQmgMiGhK^cVf64Z$xIEM`0 if FstkName <> '' then begin sql.Add(' and isnull(stkName,'''')=''' + Trim(FstkName) + ''''); end; - SQL.Add('GROUP BY FromCoName,StkCoName,Brand,Y_Name,Price,QtyUnit,StkPosition'); + SQL.Add('GROUP BY FromCoName,StkCoName,Brand,Y_Name,QtyUnit,StkPosition'); SQL.Add('HAVING sum(ioqtyflag*qty)<0'); sql.Add('order by StkCoName,Brand,Y_Name'); // sql.Add('select * from BS_Yarn_IO where BYIOID=''' + Trim(CDS_Sub.fieldbyname('STKID').AsString) + ''''); @@ -401,7 +401,7 @@ begin FieldByName('Price').Value := CDS_1.fieldbyname('Price').value; FieldByName('Amount').Value := CDS_1.fieldbyname('Amount').value; FieldByName('QtyUnit').Value := CDS_1.fieldbyname('QtyUnit').value; - FieldByName('IOTime').Value := Trim(FormatDateTime('yyyy-MM-dd', Now)); +// FieldByName('IOTime').Value := Trim(FormatDateTime('yyyy-MM-dd', Now)); FieldByName('FromOrdNo').Value := CDS_1.fieldbyname('PurNo').value; FieldByName('FromMainId').Value := CDS_1.fieldbyname('PurMId').value; diff --git a/B02基础纱线仓库/U_YarnOutEdit.pas b/B02基础纱线仓库/U_YarnOutEdit.pas index 3de64e4..c14ef4f 100644 --- a/B02基础纱线仓库/U_YarnOutEdit.pas +++ b/B02基础纱线仓库/U_YarnOutEdit.pas @@ -293,26 +293,24 @@ begin begin Close; sql.Clear; - sql.Add(' select FromCoName,StkCoName,Brand,Y_Name,stkqty=sum(ioqtyflag*qty),Price,QtyUnit,StkPosition '); + sql.Add(' select FromCoName,StkCoName,Brand,Y_Name,stkqty=sum(ioqtyflag*qty),QtyUnit,StkPosition '); sql.Add(' from BS_Yarn_IO A '); SQL.Add(' where 1=1 '); // isnull(StkQty,0)>0 if FstkName <> '' then begin sql.Add(' and isnull(stkName,'''')=''' + Trim(FstkName) + ''''); end; - SQL.Add('GROUP BY FromCoName,StkCoName,Brand,Y_Name,Price,QtyUnit,StkPosition'); + SQL.Add('GROUP BY FromCoName,StkCoName,Brand,Y_Name,QtyUnit,StkPosition'); SQL.Add('HAVING sum(ioqtyflag*qty)<0'); sql.Add('order by StkCoName,Brand,Y_Name'); + // showmessage(sql.Text); // sql.Add('select * from BS_Yarn_IO where BYIOID=''' + Trim(CDS_Sub.fieldbyname('STKID').AsString) + ''''); Open; end; - if ADOQueryTemp.IsEmpty = False then - -// if ADOQueryTemp.FieldByName('StkPiece').Value < 0 then - raise Exception.Create('ܱ棡'); - - - +// if ADOQueryTemp.FieldByName('stkqty').Value > CDS_Sub.fieldbyname('Qty').Value then +// +//// if ADOQueryTemp.FieldByName('StkPiece').Value < 0 then +// raise Exception.Create('ܱ棡'); // with ADOQueryCmd do // begin // Close; @@ -439,7 +437,7 @@ begin if SaveCKData() then begin Application.MessageBox('ɹ!', 'ʾ', 0); - //ModalResult:=1; + ModalResult := 1; Exit; end; end; @@ -462,24 +460,40 @@ begin frmYarnStkHZSel.CDS_Main.DisableControls; with frmYarnStkHZSel.CDS_Main do begin - First; - while frmYarnStkHZSel.CDS_Main.Locate('SSel', True, []) do +// First; +// while frmYarnStkHZSel.CDS_Main.Locate('SSel', True, []) do +// begin + if Self.CDS_Sub.IsEmpty = False then begin - with Self.CDS_Sub do + CopyAddRowCDS(CDS_Sub); + + end + else + begin + with CDS_Sub do begin Append; FieldByName('IOTime').Value := Trim(FormatDateTime('yyyy-MM-dd', Now)); + Post; + end; + end; + + with Self.CDS_Sub do + begin + edit; + +// 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('ToCoName').Value := frmYarnStkHZSel.CDS_Main.fieldbyname('StkCoName').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('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; + FieldByName('Brand').Value := frmYarnStkHZSel.CDS_Main.fieldbyname('Brand').Value; + FieldByName('Y_Name').Value := frmYarnStkHZSel.CDS_Main.fieldbyname('Y_Name').Value; // FieldByName('Y_Spec').Value := frmYarnStkSel.CDS_Main.fieldbyname('Y_Spec').Value; // FieldByName('Y_Composition').Value := frmYarnStkSel.CDS_Main.fieldbyname('Y_Composition').Value; // FieldByName('Y_Color').Value := frmYarnStkSel.CDS_Main.fieldbyname('Y_Color').Value; @@ -488,16 +502,16 @@ begin // // FieldByName('Piece').Value := frmYarnStkSel.CDS_Main.fieldbyname('STKPiece').Value; // FieldByName('PieceQty').Value := frmYarnStkSel.CDS_Main.fieldbyname('PieceQty').Value; - FieldByName('Qty').Value := frmYarnStkHZSel.CDS_Main.fieldbyname('STKQTY').Value; - FieldByName('Price').Value := frmYarnStkHZSel.CDS_Main.fieldbyname('Price').Value; + FieldByName('Qty').Value := frmYarnStkHZSel.CDS_Main.fieldbyname('STKQTY').Value; +// FieldByName('Price').Value := frmYarnStkHZSel.CDS_Main.fieldbyname('Price').Value; // - FieldByName('Amount').Value := RoundFloat(frmYarnStkHZSel.CDS_Main.fieldbyname('Price').Value * frmYarnStkHZSel.CDS_Main.fieldbyname('STKQTY').Value, 2); - FieldByName('QtyUnit').Value := frmYarnStkHZSel.CDS_Main.fieldbyname('QtyUnit').Value; - FieldByName('StkPosition').Value := frmYarnStkHZSel.CDS_Main.fieldbyname('StkPosition').Value; - end; - frmYarnStkHZSel.CDS_Main.Delete; +// FieldByName('Amount').Value := RoundFloat(frmYarnStkHZSel.CDS_Main.fieldbyname('Price').Value * frmYarnStkHZSel.CDS_Main.fieldbyname('STKQTY').Value, 2); + FieldByName('QtyUnit').Value := frmYarnStkHZSel.CDS_Main.fieldbyname('QtyUnit').Value; + FieldByName('StkPosition').Value := frmYarnStkHZSel.CDS_Main.fieldbyname('StkPosition').Value; end; + frmYarnStkHZSel.CDS_Main.Delete; end; +// end; frmYarnStkHZSel.CDS_Main.EnableControls; end; end; diff --git a/B02基础纱线仓库/U_YarnStkHZSel.dfm b/B02基础纱线仓库/U_YarnStkHZSel.dfm index 500778d..5aa4bb8 100644 --- a/B02基础纱线仓库/U_YarnStkHZSel.dfm +++ b/B02基础纱线仓库/U_YarnStkHZSel.dfm @@ -260,7 +260,7 @@ inherited frmYarnStkHZSel: TfrmYarnStkHZSel Width = 76 end object v1Column5: TcxGridDBColumn - Caption = #21697#29260 + Caption = #31867#22411 DataBinding.FieldName = 'Brand' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter @@ -292,14 +292,6 @@ inherited frmYarnStkHZSel: TfrmYarnStkHZSel Options.Editing = False Width = 74 end - object Tv1Column8: TcxGridDBColumn - Caption = #21333#20215 - DataBinding.FieldName = 'Price' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 80 - end object v1Column3: TcxGridDBColumn Tag = 2 Caption = #21333#20301 @@ -323,6 +315,12 @@ inherited frmYarnStkHZSel: TfrmYarnStkHZSel Options.Editing = False Width = 76 end + object cxgrdbclmnTv1Column3: TcxGridDBColumn + Caption = #26469#33258#21333#20301#32534#21495 + DataBinding.FieldName = 'FromCoNO' + DataBinding.IsNullValueType = True + Visible = False + end end object cxGrid2Level1: TcxGridLevel GridView = Tv1 diff --git a/B02基础纱线仓库/U_YarnStkHZSel.pas b/B02基础纱线仓库/U_YarnStkHZSel.pas index ab63c73..96ac0e3 100644 --- a/B02基础纱线仓库/U_YarnStkHZSel.pas +++ b/B02基础纱线仓库/U_YarnStkHZSel.pas @@ -49,11 +49,11 @@ type v1Column5: TcxGridDBColumn; v2Column1: TcxGridDBColumn; v2Column6: TcxGridDBColumn; - Tv1Column8: TcxGridDBColumn; v1Column3: TcxGridDBColumn; Tv1Column6: TcxGridDBColumn; cxGrid2Level1: TcxGridLevel; Tv1Column1: TcxGridDBColumn; + cxgrdbclmnTv1Column3: TcxGridDBColumn; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBRafreshClick(Sender: TObject); @@ -109,10 +109,14 @@ begin Filtered := False; Close; sql.Clear; - sql.Add(' select FromCoName,StkCoName,Brand,Y_Name,stkqty=sum(ioqtyflag*qty),Price,QtyUnit,StkPosition'); - sql.Add(' from BS_Yarn_IO A where'); - sql.Add(' isnull(stkName,'''')=''' + Trim(FstkName) + ''''); - sql.Add('GROUP BY FromCoName,StkCoName,Brand,Y_Name,Price,QtyUnit,StkPosition'); + sql.Add(' select FromCoNO,FromCoName,StkCoNo,StkCoName,Brand,Y_Name,stkqty=sum(ioqtyflag*qty),QtyUnit,StkPosition'); + sql.Add(' from BS_Yarn_IO A '); + SQL.Add(' where 1=1 '); + if FstkName <> '' then + begin + sql.Add(' and isnull(stkName,'''')=''' + Trim(FstkName) + ''''); + end; + SQL.Add('GROUP BY FromCoNO,FromCoName,StkCoNo,StkCoName,Brand,Y_Name,QtyUnit,StkPosition'); SQL.Add('HAVING sum(ioqtyflag*qty)>0'); sql.Add('order by StkCoName,Brand,Y_Name'); Open; @@ -187,13 +191,13 @@ end; procedure TfrmYarnStkHZSel.ToolButton1Click(Sender: TObject); begin - if CDS_Main.IsEmpty then - Exit; - if CDS_Main.Locate('SSel', True, []) = False then - begin - Application.MessageBox('ûѡ!', 'ʾ', 0); - Exit; - end; +// if CDS_Main.IsEmpty then +// Exit; +// if CDS_Main.Locate('SSel', True, []) = False then +// begin +// Application.MessageBox('ûѡ!', 'ʾ', 0); +// Exit; +// end; ModalResult := 1; end; diff --git a/B02基础纱线仓库/U_YarnStkSel.dfm b/B02基础纱线仓库/U_YarnStkSel.dfm index 2cb18d7..0397b5b 100644 --- a/B02基础纱线仓库/U_YarnStkSel.dfm +++ b/B02基础纱线仓库/U_YarnStkSel.dfm @@ -164,6 +164,7 @@ inherited frmYarnStkSel: TfrmYarnStkSel TabOrder = 2 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Summary.DefaultGroupSummaryItems = < item @@ -224,6 +225,7 @@ inherited frmYarnStkSel: TfrmYarnStkSel object v1Column17: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True Properties.NullStyle = nssUnchecked @@ -233,6 +235,7 @@ inherited frmYarnStkSel: TfrmYarnStkSel object v1Column6: TcxGridDBColumn Caption = #20837#24211#26102#38388 DataBinding.FieldName = 'IOTime' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 87 @@ -241,6 +244,7 @@ inherited frmYarnStkSel: TfrmYarnStkSel Tag = 2 Caption = #26469#33258#21333#20301 DataBinding.FieldName = 'FromCoName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Alignment.Horz = taLeftJustify Properties.Buttons = < @@ -256,6 +260,7 @@ inherited frmYarnStkSel: TfrmYarnStkSel object Tv1Column3: TcxGridDBColumn Caption = #23384#25918#21333#20301 DataBinding.FieldName = 'StkCoName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 88 @@ -263,6 +268,7 @@ inherited frmYarnStkSel: TfrmYarnStkSel object v1Column4: TcxGridDBColumn Caption = #21697#29260 DataBinding.FieldName = 'Brand' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 73 @@ -271,6 +277,7 @@ inherited frmYarnStkSel: TfrmYarnStkSel Tag = 2 Caption = #21697#21517 DataBinding.FieldName = 'Y_Name' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -285,6 +292,7 @@ inherited frmYarnStkSel: TfrmYarnStkSel Tag = 2 Caption = #35268#26684 DataBinding.FieldName = 'Y_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Options.Editing = False @@ -293,6 +301,7 @@ inherited frmYarnStkSel: TfrmYarnStkSel object Tv1Column4: TcxGridDBColumn Caption = #25104#20998 DataBinding.FieldName = 'Y_Composition' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -300,6 +309,7 @@ inherited frmYarnStkSel: TfrmYarnStkSel object Tv1Column5: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'Y_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 86 @@ -307,6 +317,7 @@ inherited frmYarnStkSel: TfrmYarnStkSel object Tv1Column6: TcxGridDBColumn Caption = 'D'#25968 DataBinding.FieldName = 'Denier' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -314,6 +325,7 @@ inherited frmYarnStkSel: TfrmYarnStkSel object v1Column10: TcxGridDBColumn Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 124 @@ -321,11 +333,13 @@ inherited frmYarnStkSel: TfrmYarnStkSel object Tv1Column1: TcxGridDBColumn Caption = #24211#23384#21253#25968 DataBinding.FieldName = 'StkPiece' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter end object Tv1Column9: TcxGridDBColumn Caption = #27599#21253#25968#37327 DataBinding.FieldName = 'PieceQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -334,6 +348,7 @@ inherited frmYarnStkSel: TfrmYarnStkSel Tag = 2 Caption = #24211#23384#25968#37327 DataBinding.FieldName = 'stkqty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -342,6 +357,7 @@ inherited frmYarnStkSel: TfrmYarnStkSel object Tv1Column2: TcxGridDBColumn Caption = #21333#20215 DataBinding.FieldName = 'Price' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -350,6 +366,7 @@ inherited frmYarnStkSel: TfrmYarnStkSel Tag = 2 Caption = #21333#20301 DataBinding.FieldName = 'QtyUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsFixedList Properties.Items.Strings = ( @@ -363,6 +380,7 @@ inherited frmYarnStkSel: TfrmYarnStkSel object Tv1Column7: TcxGridDBColumn Caption = #24211#20301 DataBinding.FieldName = 'StkPosition' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -370,6 +388,7 @@ inherited frmYarnStkSel: TfrmYarnStkSel object Tv1Column8: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 diff --git a/B02基础纱线仓库/U_YarnStkSel.pas b/B02基础纱线仓库/U_YarnStkSel.pas index b8678dc..19922f6 100644 --- a/B02基础纱线仓库/U_YarnStkSel.pas +++ b/B02基础纱线仓库/U_YarnStkSel.pas @@ -13,7 +13,7 @@ uses RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseHelp, System.ImageList, - Vcl.ImgList; + Vcl.ImgList, dxScrollbarAnnotations; type TfrmYarnStkSel = class(TfrmBaseHelp) diff --git a/B02基础纱线仓库/YarnStk.dproj b/B02基础纱线仓库/YarnStk.dproj index acdec03..576d561 100644 --- a/B02基础纱线仓库/YarnStk.dproj +++ b/B02基础纱线仓库/YarnStk.dproj @@ -124,7 +124,7 @@ CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName) - D:\Dp10Repo\项目代码\D10gmbitao\B02基础纱线仓库\testDll.exe + D:\Dp10Repo\项目代码\D10gmBitao\B02基础纱线仓库\testDll.exe diff --git a/B02基础纱线仓库/YarnStk.dproj.local b/B02基础纱线仓库/YarnStk.dproj.local index db6f436..907c3c5 100644 --- a/B02基础纱线仓库/YarnStk.dproj.local +++ b/B02基础纱线仓库/YarnStk.dproj.local @@ -31,8 +31,8 @@ 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= 1899-12-30 00:00:00.000.796,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnStkList.pas - 1899-12-30 00:00:00.000.803,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnInfoList.pas 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnInEdit.pas + 1899-12-30 00:00:00.000.803,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnInfoList.pas 1899-12-30 00:00:00.000.224,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas 1899-12-30 00:00:00.000.517,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.dfm 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas @@ -42,11 +42,11 @@ 1899-12-30 00:00:00.000.147,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas 1899-12-30 00:00:00.000.172,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899-12-30 00:00:00.000.471,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas - 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.581,=D:\Dp10Repo\项目代码\阔和\B02基础纱线仓库\U_YarnRackList.pas 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.581,=D:\Dp10Repo\项目代码\阔和\B02基础纱线仓库\U_YarnRackList.pas + 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.471,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas 1899-12-30 00:00:00.000.674,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_testdll.pas diff --git a/B02基础纱线仓库/YarnStk.identcache b/B02基础纱线仓库/YarnStk.identcache index fe753ceb028fb6e3730021e189d58ab86ddd6ff7..dcbca04fbf896732b294f5ff3b5828aee4318e64 100644 GIT binary patch delta 34 qcmZn@Su4z{z`(%ZH93*dY~!0d%oAB6CReelPF}zywwalgnH2!7I|-uz delta 54 zcmZ20+$O@R$iTqhJ(-bFW%7GQiOC@>(v$Zw%QHGne#oN88eEd?5j8oA&0=DM&_?S! K%$xIB>{tPjPY=)l diff --git a/D01针织生产计划/KnitPlan.dpr b/D01针织生产计划/KnitPlan.dpr index 5431733..338ca77 100644 --- a/D01针织生产计划/KnitPlan.dpr +++ b/D01针织生产计划/KnitPlan.dpr @@ -27,16 +27,15 @@ uses U_LabelMapSet in '..\A00ͨô\U_LabelMapSet.pas' {frmLabelMapSet}, U_LabelPrint in '..\A00ͨô\U_LabelPrint.pas' {frmLabelPrint}, U_TradeSalesContractSel in 'U_TradeSalesContractSel.pas' {frmTradeSalesContractSel}, - U_TradeInspSet in 'U_TradeInspSet.pas' {frmTradeInspSet}, U_LabelList in '..\B01ͬ\U_LabelList.pas' {frmLabelList}, - U_LabelInput in 'U_LabelInput.pas' {frmLabelInput}, U_LabelAdd in 'U_LabelAdd.pas' {frmLabelAdd}, U_PlanCardOFF in 'U_PlanCardOFF.pas' {frmPlanCardOFF}, U_LCKInput in 'U_LCKInput.pas' {frmLCKInput}, U_BaseDataLink in '..\..\..\public10\design\U_BaseDataLink.pas' {BaseDataLink: TDataModule}, U_LCKQuery in 'U_LCKQuery.pas' {frmLCKQuery}, U_KnitPlanCardOFF in 'U_KnitPlanCardOFF.pas' {frmKnitPlanCardOFF}, - uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas'; + uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas', + U_TradeInspSet2 in 'U_TradeInspSet2.pas' {frmTradeInspSet2}; {$R *.res} diff --git a/D01针织生产计划/KnitPlan.dproj b/D01针织生产计划/KnitPlan.dproj index 6bd25e0..aaa7b69 100644 --- a/D01针织生产计划/KnitPlan.dproj +++ b/D01针织生产计划/KnitPlan.dproj @@ -189,18 +189,10 @@
frmTradeSalesContractSel
dfm - -
frmTradeInspSet
- dfm -
frmLabelList
dfm - -
frmLabelInput
- dfm -
frmLabelAdd
dfm @@ -227,6 +219,10 @@ dfm + +
frmTradeInspSet2
+ dfm + Cfg_2 Base diff --git a/D01针织生产计划/KnitPlan.dproj.local b/D01针织生产计划/KnitPlan.dproj.local index 5a1c06f..1294820 100644 --- a/D01针织生产计划/KnitPlan.dproj.local +++ b/D01针织生产计划/KnitPlan.dproj.local @@ -1,52 +1,57 @@  - 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas - 1899-12-30 00:00:00.000.938,=D:\Dp10Repo\项目代码\D10gmXinHua\D01针织生产计划\U_LCKInput.pas - 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= - 1899-12-30 00:00:00.000.238,=D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelPrint.pas - 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\阔和\D01针织生产计划\U_TradeSalesContractSel.pas - 1899-12-30 00:00:00.000.898,=D:\Dp10Repo\项目代码\D10gmXinHuaHuaQian\D01针织生产计划\U_LCKQuery.pas + 1899-12-30 00:00:00.000.938,=D:\Dp10Repo\项目代码\D10gmXinHua\D01针织生产计划\U_LCKInput.pas + 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas + 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas + 1899-12-30 00:00:00.000.496,D:\Dp10Repo\项目代码\D10gmBitao\A01基础公司管理\U_LabelInput.dfm=D:\Dp10Repo\项目代码\D10gmBitao\D01针织生产计划\U_LabelInput.dfm + 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899-12-30 00:00:00.000.726,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas + 1899-12-30 00:00:00.000.898,=D:\Dp10Repo\项目代码\D10gmXinHuaHuaQian\D01针织生产计划\U_LCKQuery.pas 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas - 1899-12-30 00:00:00.000.904,D:\Dp10Repo\项目代码\D10gmbitao\D01针织生产计划\U_KnitPlanCardOFF.dfm=D:\Dp10Repo\项目代码\D10gmbitao\D01针织生产计划\U_KnitPlanCard.dfm - 1899-12-30 00:00:00.000.925,D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\Unit1.pas= - 1899-12-30 00:00:00.000.756,=D:\Dp10Repo\项目代码\东亚\D01针织生产计划\U_LabelList.pas - 1899-12-30 00:00:00.000.030,D:\Dp10Repo\项目代码\东亚\D01针织生产计划\U_LabelList.pas=D:\Dp10Repo\项目代码\东亚\B01基础合同管理\U_LabelList.pas - 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899-12-30 00:00:00.000.227,=D:\Dp10Repo\项目代码\东亚\D01针织生产计划\U_LabelAdd.pas - 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899-12-30 00:00:00.000.830,=D:\Dp10Repo\项目代码\东亚\D01针织生产计划\U_PlanCardOFF.pas - 1899-12-30 00:00:00.000.175,=D:\Dp10Repo\项目代码\D10gmXinHuaHuaQian\D01针织生产计划\U_KnitPlanCard.pas - 1899-12-30 00:00:00.000.904,D:\Dp10Repo\项目代码\D10gmbitao\D01针织生产计划\U_KnitPlanCardOFF.pas=D:\Dp10Repo\项目代码\D10gmbitao\D01针织生产计划\U_KnitPlanCard.pas - 1899-12-30 00:00:00.000.914,=D:\Dp10Repo\项目代码\阔和\D01针织生产计划\U_testdll.pas - 1899-12-30 00:00:00.000.383,=D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelMapSet.pas - 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas - 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= - 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas - 1899-12-30 00:00:00.000.881,=D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\U_KnitCardInPut.pas - 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm - 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas - 1899-12-30 00:00:00.000.030,D:\Dp10Repo\项目代码\东亚\D01针织生产计划\U_LabelList.dfm=D:\Dp10Repo\项目代码\东亚\B01基础合同管理\U_LabelList.dfm - 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas - 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas + 1899-12-30 00:00:00.000.238,=D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelPrint.pas 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas 1899-12-30 00:00:00.000.913,=D:\Dp10Repo\项目代码\东亚\D01针织生产计划\U_TradeInspSet.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.988,D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\KnitPlan.dproj=D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\InformationBase.dproj + 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas + 1899-12-30 00:00:00.000.756,=D:\Dp10Repo\项目代码\东亚\D01针织生产计划\U_LabelList.pas + 1899-12-30 00:00:00.000.830,=D:\Dp10Repo\项目代码\东亚\D01针织生产计划\U_PlanCardOFF.pas + 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899-12-30 00:00:00.000.227,=D:\Dp10Repo\项目代码\东亚\D01针织生产计划\U_LabelAdd.pas + 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm + 1899-12-30 00:00:00.000.175,=D:\Dp10Repo\项目代码\D10gmXinHuaHuaQian\D01针织生产计划\U_KnitPlanCard.pas + 1899-12-30 00:00:00.000.925,D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\Unit1.pas= + 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas + 1899-12-30 00:00:00.000.383,=D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelMapSet.pas + 1899-12-30 00:00:00.000.914,=D:\Dp10Repo\项目代码\阔和\D01针织生产计划\U_testdll.pas + 1899-12-30 00:00:00.000.726,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas + 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= + 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas + 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas + 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas + 1899-12-30 00:00:00.000.089,=D:\Dp10Repo\项目代码\D10gmBitao\D01针织生产计划\U_TradeInspSet2.pas + 1899-12-30 00:00:00.000.128,D:\Dp10Repo\项目代码\D10gmBitao\A01基础公司管理\U_TradeInspSet.pas=D:\Dp10Repo\项目代码\D10gmBitao\D01针织生产计划\U_TradeInspSet.pas + 1899-12-30 00:00:00.000.030,D:\Dp10Repo\项目代码\东亚\B01基础合同管理\U_LabelList.pas=D:\Dp10Repo\项目代码\东亚\D01针织生产计划\U_LabelList.pas + 1899-12-30 00:00:00.000.881,=D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\U_KnitCardInPut.pas + 1899-12-30 00:00:00.000.030,D:\Dp10Repo\项目代码\东亚\B01基础合同管理\U_LabelList.dfm=D:\Dp10Repo\项目代码\东亚\D01针织生产计划\U_LabelList.dfm + 1899-12-30 00:00:00.000.128,D:\Dp10Repo\项目代码\D10gmBitao\A01基础公司管理\U_TradeInspSet.dfm=D:\Dp10Repo\项目代码\D10gmBitao\D01针织生产计划\U_TradeInspSet.dfm + 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas + 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899-12-30 00:00:00.000.904,=D:\Dp10Repo\项目代码\东亚\D01针织生产计划\U_LabelInput.pas - 1899-12-30 00:00:00.000.988,D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\KnitPlan.dproj - 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas + 1899-12-30 00:00:00.000.496,D:\Dp10Repo\项目代码\D10gmBitao\A01基础公司管理\U_LabelInput.pas=D:\Dp10Repo\项目代码\D10gmBitao\D01针织生产计划\U_LabelInput.pas + 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm 1899-12-30 00:00:00.000.951,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas 1899-12-30 00:00:00.000.811,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899-12-30 00:00:00.000.904,D:\Dp10Repo\项目代码\D10gmbitao\D01针织生产计划\U_KnitPlanCard.pas=D:\Dp10Repo\项目代码\D10gmbitao\D01针织生产计划\U_KnitPlanCardOFF.pas + 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas + 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899-12-30 00:00:00.000.904,D:\Dp10Repo\项目代码\D10gmbitao\D01针织生产计划\U_KnitPlanCard.dfm=D:\Dp10Repo\项目代码\D10gmbitao\D01针织生产计划\U_KnitPlanCardOFF.dfm @@ -124,10 +129,6 @@ - - - - @@ -138,5 +139,7 @@ + + diff --git a/D01针织生产计划/KnitPlan.identcache b/D01针织生产计划/KnitPlan.identcache index 6fa16db5c3cdd86ca6e5748fe52435e5f4c1cdc2..d6f30a619424383820a6c20ea1fa793f91f3dacb 100644 GIT binary patch delta 49 zcmV-10M7ry66_HH9 Properties.Style = 6 - ExplicitWidth = 1261 - ExplicitHeight = 71 - ClientRectBottom = 44 - ClientRectRight = 1227 + ClientRectBottom = 80 + ClientRectRight = 1361 ClientRectTop = 32 object cxTabSheet1: TcxTabSheet Caption = ' '#37197' '#27604' ' Color = clWhite ImageIndex = 0 ParentColor = False - ExplicitWidth = 1261 - ExplicitHeight = 39 object cxGrid2: TcxGrid Left = 0 Top = 38 - Width = 1227 - Height = 1 + Width = 1361 + Height = 10 Align = alClient Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -1189,7 +1223,6 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut Font.Style = [] ParentFont = False TabOrder = 0 - ExplicitWidth = 1261 object Tv2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -1380,7 +1413,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut Tag = 1 Left = 0 Top = 0 - Width = 1227 + Width = 1361 Height = 38 AutoSize = True ButtonHeight = 38 @@ -1401,7 +1434,6 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut ParentFont = False ShowCaptions = True TabOrder = 1 - ExplicitWidth = 1261 object ToolButton3: TToolButton Left = 0 Top = 0 @@ -1431,11 +1463,10 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut object cxTabSheet2: TcxTabSheet Caption = #25490#38024#19977#35282 ImageIndex = 1 - ExplicitHeight = 39 object Panel1: TPanel Left = 0 Top = 183 - Width = 1227 + Width = 1361 Height = 25 Align = alTop BevelInner = bvRaised @@ -1453,7 +1484,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut object Panel3: TPanel Left = 0 Top = 0 - Width = 1227 + Width = 1361 Height = 25 Align = alTop BevelInner = bvRaised @@ -1471,7 +1502,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut object cxGrid5: TcxGrid Left = 0 Top = 208 - Width = 1227 + Width = 1361 Height = 165 Align = alClient Font.Charset = GB2312_CHARSET @@ -2753,7 +2784,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut object cxGrid3: TcxGrid Left = 0 Top = 25 - Width = 1227 + Width = 1361 Height = 158 Align = alTop Font.Charset = GB2312_CHARSET @@ -3881,18 +3912,18 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut end inherited ADOQueryBaseTemp: TADOQuery Connection = DataLink_KnitPlan.ADOLink - Left = 713 - Top = 481 + Left = 732 + Top = 552 end inherited ImageList_new32: TImageList - Left = 656 - Top = 480 + Left = 663 + Top = 541 end object ADOQuery1: TADOQuery Connection = DataLink_KnitPlan.ADOLink Parameters = <> - Left = 602 - Top = 481 + Left = 600 + Top = 529 end object ADOQueryTemp: TADOQuery Connection = DataLink_KnitPlan.ADOLink @@ -3915,8 +3946,8 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut object ADOQueryCmd: TADOQuery Connection = DataLink_KnitPlan.ADOLink Parameters = <> - Left = 522 - Top = 473 + Left = 568 + Top = 584 end object ClientDataSet5: TClientDataSet Aggregates = <> diff --git a/D01针织生产计划/U_KnitPlanInPut.pas b/D01针织生产计划/U_KnitPlanInPut.pas index 0c2f17c..80e6433 100644 --- a/D01针织生产计划/U_KnitPlanInPut.pas +++ b/D01针织生产计划/U_KnitPlanInPut.pas @@ -78,7 +78,7 @@ type Label26: TLabel; Label27: TLabel; Label28: TLabel; - OrdTare: TEdit; + RuleBeforeTare: TEdit; v2Column1: TcxGridDBColumn; v2Column3: TcxGridDBColumn; v2Column5: TcxGridDBColumn; @@ -385,9 +385,12 @@ type C_jiaceng: TBtnEditC; Label24: TLabel; khconno: TEdit; - lbl4: TLabel; lbl5: TLabel; C_Material_Name: TBtnEditC; + lbl4: TLabel; + C_MainYarn: TBtnEditC; + lbl6: TLabel; + LabPackage: TBtnEditC; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); @@ -415,6 +418,7 @@ type procedure MenuItem1Click(Sender: TObject); procedure MenuItem2Click(Sender: TObject); procedure btn1Click(Sender: TObject); + procedure LabPackageBtnUpClick(Sender: TObject); private FXS, FGridFlag: Integer; procedure InitData(); @@ -436,7 +440,7 @@ implementation uses U_DataLink, U_ZDYHelp, U_RTFun, U_ClothInfoSel, U_CompanySel, U_YarnInfoSel, - U_TradeSalesContractSel; + U_TradeSalesContractSel,U_TradeInspSet2; {$R *.dfm} @@ -633,6 +637,22 @@ begin end; +procedure TfrmKnitPlanInPut.LabPackageBtnUpClick(Sender: TObject); +begin + try + frmTradeInspSet2 := TfrmTradeInspSet2.Create(Application); + with frmTradeInspSet2 do + begin + if ShowModal = 1 then + begin + self.LabPackage.Text := Trim(frmTradeInspSet2.CDS_Label.fieldbyname('LabelCaption').AsString); + end; + end; + finally + frmTradeInspSet2.Free; + end; +end; + procedure TfrmKnitPlanInPut.ZDYHelp(FButn: TcxButtonEdit; LType: string); begin @@ -782,7 +802,8 @@ begin end; FieldByName('RuleID').Value := Trim(maxno); - FieldByName('RuleBeforeTare').value := '1'; + FieldByName('RuleBeforeTare').value := RuleBeforeTare.Text; + FieldByName('LabPackage').value := LabPackage.Text; Post; end; ////////////////////////// ǩ ////////////////////////// @@ -1020,31 +1041,32 @@ begin Application.MessageBox('ƷŲΪ!', 'ʾ', 0); Exit; end; - + if Trim(C_MainYarn.Text) = '' then + begin + Application.MessageBox('Ҫɴ߲Ϊ!', 'ʾ', 0); + C_MainYarn.SetFocus; + Exit; + end; if Trim(OrdQty.Text) = '' then begin Application.MessageBox('Ϊ!', 'ʾ', 0); Exit; end; -// if Trim(OrdPieceWeight.Text) = '' then -// begin -// Application.MessageBox('ƥزΪ!', 'ʾ', 0); -// Exit; -// end; + if Trim(RuleBeforeTare.Text) = '' then + begin + Application.MessageBox('ƤزΪ!', 'ʾ', 0); + Exit; + end; if Trim(OrdPiece.Text) = '' then begin Application.MessageBox('ƥΪ!', 'ʾ', 0); Exit; end; - if Trim(OrdTare.Text) = '' then - begin - OrdTare.Text := '0'; - end; - if Trim(OrdTare.Text) = '' then + if Trim(LabPackage.Text) = '' then begin - Application.MessageBox('ռӲΪ!', 'ʾ', 0); + Application.MessageBox('ǩΪ!', 'ʾ', 0); Exit; end; @@ -1063,12 +1085,11 @@ begin Application.MessageBox('ƥǷ!', 'ʾ', 0); Exit; end; - if TryStrToFloat(OrdTare.Text, FReal) = False then + if TryStrToFloat(RuleBeforeTare.Text, FReal) = False then begin - Application.MessageBox('ռӷǷ!', 'ʾ', 0); + Application.MessageBox('ƤطǷ!', 'ʾ', 0); Exit; end; - // if Trim(C_Spec.Text) = '' then // begin // Application.MessageBox('Ϊ!', 'ʾ', 0); @@ -1084,6 +1105,7 @@ begin Application.MessageBox('ɹ', 'ʾ', 0); FMainId := ''; FSubId := ''; + C_MainYarn.Text := ''; // ModalResult := 1; end; end; @@ -1298,8 +1320,7 @@ var fsj: string; FWZ: Integer; begin - fsj := Trim(TBtnEditC(Sender).Hint); - + fsj := Trim(TEdit(Sender).Hint); FWZ := Pos('/', fsj); try frmZDYHelp := TfrmZDYHelp.Create(Application); @@ -1307,16 +1328,14 @@ begin begin flag := Copy(fsj, 1, FWZ - 1); flagname := Copy(fsj, FWZ + 1, Length(fsj) - FWZ); - if ShowModal = 1 then begin - TBtnEditC(Sender).Text := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString); + TEdit(Sender).Text := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString); end; end; finally frmZDYHelp.Free; end; - end; procedure TfrmKnitPlanInPut.MenuItem1Click(Sender: TObject); @@ -1665,7 +1684,7 @@ begin Self.C_jiaceng.Text := frmClothInfoSel.CDS_1.fieldbyname('C_jiaceng').AsString; Self.C_DYARN.Text := frmClothInfoSel.CDS_1.fieldbyname('C_DYARN').AsString; - + Self.C_Material_Name.Text := frmClothInfoSel.CDS_1.fieldbyname('C_KHCode').AsString; Self.OrdSNote.Text := frmClothInfoSel.CDS_1.fieldbyname('Note').AsString; Self.C_Deal.Text := frmClothInfoSel.CDS_1.fieldbyname('C_Deal').AsString; @@ -1694,6 +1713,8 @@ begin CustName.TxtCode := Trim(CDS_1.fieldbyname('CoCode').AsString); CustName.Text := Trim(CDS_1.fieldbyname('CoAbbrName').AsString); Saleser.Text := Trim(CDS_1.fieldbyname('Saleser').AsString); + RuleBeforeTare.Text := Trim(CDS_1.fieldbyname('RuleBeforeTare').AsString); + LabPackage.Text := Trim(CDS_1.fieldbyname('LabPackage').AsString); end; end; finally diff --git a/D01针织生产计划/U_KnitPlanList.dfm b/D01针织生产计划/U_KnitPlanList.dfm index 9161cda..fe80efa 100644 --- a/D01针织生产计划/U_KnitPlanList.dfm +++ b/D01针织生产计划/U_KnitPlanList.dfm @@ -804,6 +804,14 @@ inherited frmKnitPlanList: TfrmKnitPlanList Options.Editing = False Width = 90 end + object cxgrdbclmnTv1Column20: TcxGridDBColumn + Caption = #20027#35201#32433#32447 + DataBinding.FieldName = 'C_MainYarn' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 90 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/D01针织生产计划/U_KnitPlanList.pas b/D01针织生产计划/U_KnitPlanList.pas index 1891036..d6d2864 100644 --- a/D01针织生产计划/U_KnitPlanList.pas +++ b/D01针织生产计划/U_KnitPlanList.pas @@ -155,6 +155,7 @@ type Tv1Column18: TcxGridDBColumn; ToolButton10: TToolButton; cxgrdbclmnTv1Column19: TcxGridDBColumn; + cxgrdbclmnTv1Column20: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); procedure TBFindClick(Sender: TObject); @@ -197,9 +198,7 @@ type procedure ToolButton8Click(Sender: TObject); procedure ToolButton9Click(Sender: TObject); procedure ToolButton10Click(Sender: TObject); - procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; - ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; - AShift: TShiftState; var AHandled: Boolean); + procedure Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); private FInt, PFInt: Integer; procedure InitGrid(); @@ -1003,11 +1002,24 @@ begin begin Close; sql.Clear; + //ɾ̿ SQL.Add(' DELETE from PB_LCK'); sql.Add(' where LCKID=''' + Trim(CDS_3.fieldbyname('LCKID').AsString) + ''''); - + //ɾ SQL.Add(' DELETE from Dye_Plan_Glide'); sql.Add(' where PCID=''' + Trim(CDS_3.fieldbyname('LCKID').AsString) + ''''); + //޸Ŀ + SQL.Add(' update knit_cloth_stock set StkExists = 1'); + sql.Add(' where STKID in(select PCID from PB_CK_LCK where LCKID =''' + Trim(CDS_1.fieldbyname('LCKID').AsString) + ''')'); + //ɾ + SQL.Add(' DELETE from PB_CK_LCK'); + sql.Add(' where LCKID=''' + Trim(CDS_3.fieldbyname('LCKID').AsString) + ''''); + //ɾ + SQL.Add(' DELETE from BS_Cloth_IO'); + sql.Add(' where IOFlag='''' and StkID=''' + Trim(CDS_3.fieldbyname('LCKID').AsString) + ''''); + //ɾ + SQL.Add(' DELETE from Knit_Cloth_IO'); + sql.Add(' where IONo=''' + Trim(CDS_3.fieldbyname('LCKID').AsString) + ''''); ExecSQL; end; end; @@ -1061,12 +1073,10 @@ begin // ؿؼֹظ ToolButton9.Enabled := False; // Application.ProcessMessages; - // 3ִѭ for i := 1 to iLoopCount do begin // ½ʾǰ - // Application.ProcessMessages; // ֽӦ with ADOQueryCmd do @@ -1092,9 +1102,7 @@ begin end; -procedure TfrmKnitPlanList.Tv1CellDblClick(Sender: TcxCustomGridTableView; - ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; - AShift: TShiftState; var AHandled: Boolean); +procedure TfrmKnitPlanList.Tv1CellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); begin TBView.Click; end; diff --git a/D01针织生产计划/U_LCKQuery.dfm b/D01针织生产计划/U_LCKQuery.dfm index 6c32ed5..7f8a3d3 100644 --- a/D01针织生产计划/U_LCKQuery.dfm +++ b/D01针织生产计划/U_LCKQuery.dfm @@ -17,7 +17,7 @@ inherited frmLCKQuery: TfrmLCKQuery Height = 38 AutoSize = True ButtonHeight = 38 - ButtonWidth = 91 + ButtonWidth = 103 Caption = 'ToolBar1' Color = clSkyBlue DisabledImages = DataLink_KnitPlan.ImageList_new32 @@ -56,22 +56,30 @@ inherited frmLCKQuery: TfrmLCKQuery ImageIndex = 16 OnClick = ToolButton2Click end - object btn3: TToolButton + object btn5: TToolButton Left = 237 Top = 0 + AutoSize = True + Caption = #21024#38500#27969#31243#21345 + ImageIndex = 5 + OnClick = btn5Click + end + object btn3: TToolButton + Left = 344 + Top = 0 Caption = #20462#25913#36710#21495 ImageIndex = 3 OnClick = btn3Click end object btn4: TToolButton - Left = 328 + Left = 447 Top = 0 Caption = #36710#21495#26631#40644 ImageIndex = 3 OnClick = btn4Click end object TBClose: TToolButton - Left = 419 + Left = 550 Top = 0 AutoSize = True Caption = #20851#38381 @@ -301,14 +309,6 @@ inherited frmLCKQuery: TfrmLCKQuery Options.Editing = False Width = 80 end - object cxgrdbclmnTv1Column5: TcxGridDBColumn - Caption = #26426#21488 - DataBinding.FieldName = 'CarNo' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 80 - end object cxgrdbclmnTv1Column6: TcxGridDBColumn Caption = #36710#21495 DataBinding.FieldName = 'CarNumber' @@ -327,6 +327,7 @@ inherited frmLCKQuery: TfrmLCKQuery Caption = #25171#21367#21305#25968 DataBinding.FieldName = 'InspectNumber' DataBinding.IsNullValueType = True + Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -335,6 +336,7 @@ inherited frmLCKQuery: TfrmLCKQuery Caption = #20986#24211#21305#25968 DataBinding.FieldName = 'IoNumber' DataBinding.IsNullValueType = True + Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 diff --git a/D01针织生产计划/U_LCKQuery.pas b/D01针织生产计划/U_LCKQuery.pas index bdc99c4..a9e61ea 100644 --- a/D01针织生产计划/U_LCKQuery.pas +++ b/D01针织生产计划/U_LCKQuery.pas @@ -72,7 +72,6 @@ type cxgrdbclmnTv1Column2: TcxGridDBColumn; cxgrdbclmnTv1Column3: TcxGridDBColumn; cxgrdbclmnTv1Column4: TcxGridDBColumn; - cxgrdbclmnTv1Column5: TcxGridDBColumn; pnl1: TPanel; lbl3: TLabel; edt1: TEdit; @@ -84,6 +83,7 @@ type cxgrdbclmnTv1Column7: TcxGridDBColumn; cxgrdbclmnTv1Column8: TcxGridDBColumn; cxgrdbclmnTv1Column9: TcxGridDBColumn; + btn5: TToolButton; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); procedure TBRafreshClick(Sender: TObject); @@ -100,6 +100,7 @@ type procedure btn3Click(Sender: TObject); procedure Tv1CustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); procedure btn4Click(Sender: TObject); + procedure btn5Click(Sender: TObject); private FInt, PFInt: Integer; FFMainID, BPFlag, FFPCID, FLCKID: string; @@ -140,16 +141,16 @@ begin Close; sql.Clear; sql.Add('select count(I.PCID) IONumber,count(H.PCID) InspectNumber,OutNumber=(select count(C.LCKID) OutNumber from PB_LCK C inner join PB_CK_LCK B on C.LCKID=B.LCKID where B.LCKID = A.LCKID),A.LCKID,A.MainID,A.C_Code '); - sql.Add(',A.C_Name,A.KKDate,A.KKPS,A.HCLNote,A.CraFt,A.CarNumber,A.IFBL,E.C_Color,E.C_Width,E.C_GramWeight,F.CarNo'); + sql.Add(',A.C_Name,A.KKDate,A.KKPS,A.HCLNote,A.CraFt,A.CarNumber,A.IFBL,E.C_Color,E.C_Width,E.C_GramWeight'); sql.Add(' from PB_LCK A INNER JOIN PB_CK_LCK G on A.LCKID = G.LCKID '); sql.Add(' INNER JOIN knit_Plan_Main D on A.MainId = D.Mainid '); sql.Add(' INNER JOIN Knit_Plan_Sub E on D.MainId = E.MainId '); sql.Add(' INNER JOIN Knit_Plan_Card F on F.PCID = G.PCID '); sql.Add(' left JOIN Trade_Cloth_Inspect H on H.MainId = A.MainID and H.PCID = G.PCID '); - sql.add(' left JOIN V_Trade_Cloth_Io I on H.MainId = A.MainID and I.PCID = G.PCID and I.IOFlag = '''+''''); + sql.add(' left JOIN V_Trade_Cloth_Io I on H.MainId = A.MainID and I.PCID = G.PCID and I.IOFlag = ''' + ''''); sql.Add(' where A.KKDate>=''' + Trim(FormatDateTime('yyyy-MM-dd', BegDate.DateTime)) + ''''); sql.Add(' and A.KKDate<''' + Trim(FormatDateTime('yyyy-MM-dd', EndDate.DateTime + 1)) + ''''); - sql.Add(' GROUP BY A.LCKID,A.MainID,A.C_Code,A.C_Name,A.KKDate,A.KKPS,A.HCLNote,A.CraFt,A.CarNumber,A.IFBL,E.C_Color,E.C_Width,E.C_GramWeight,F.CarNo'); + sql.Add(' GROUP BY A.LCKID,A.MainID,A.C_Code,A.C_Name,A.KKDate,A.KKPS,A.HCLNote,A.CraFt,A.CarNumber,A.IFBL,E.C_Color,E.C_Width,E.C_GramWeight'); //ShowMessage(sql.text); Open; end; @@ -390,6 +391,63 @@ begin TBRafresh.Click; end; +procedure TfrmLCKQuery.btn5Click(Sender: TObject); +var + MLCKIDS: string; +begin + + if CDS_1.IsEmpty then + exit; + if not CDS_1.Locate('SSel', True, []) then + begin + application.MessageBox('ѡ', 'ʾ'); + Exit; + end; + // if CDS_3.IsEmpty then + // Exit; + if Application.MessageBox('ȷҪɾ', 'ʾ', 32 + 4) <> IDYES then + Exit; + with CDS_1 do + begin + DisableControls; + First; + while not eof do + begin + if fieldbyname('SSel').AsBoolean then + begin + with ADOQueryTemp do + begin + Close; + sql.Clear; + //ɾ̿ + SQL.Add(' DELETE from PB_LCK'); + sql.Add(' where LCKID=''' + Trim(CDS_1.fieldbyname('LCKID').AsString) + ''''); + //ɾ + SQL.Add(' DELETE from Dye_Plan_Glide'); + sql.Add(' where PCID=''' + Trim(CDS_1.fieldbyname('LCKID').AsString) + ''''); + //޸Ŀ + SQL.Add(' update knit_cloth_stock set StkExists = 1'); + sql.Add(' where STKID in(select PCID from PB_CK_LCK where LCKID =''' + Trim(CDS_1.fieldbyname('LCKID').AsString) + ''')'); + //ɾ + SQL.Add(' DELETE from PB_CK_LCK'); + sql.Add(' where LCKID=''' + Trim(CDS_1.fieldbyname('LCKID').AsString) + ''''); + //ɾ + SQL.Add(' DELETE from BS_Cloth_IO'); + sql.Add(' where IOFlag='''' and StkID=''' + Trim(CDS_1.fieldbyname('LCKID').AsString) + ''''); + //ɾ + SQL.Add(' DELETE from Knit_Cloth_IO'); + sql.Add(' where IONo=''' + Trim(CDS_1.fieldbyname('LCKID').AsString) + ''''); + ExecSQL; + end; + end; + next; + end; + EnableControls; + + end; + InitGrid(); +end; + procedure TfrmLCKQuery.cxTabControl1Change(Sender: TObject); begin InitGrid(); diff --git a/D01针织生产计划/U_TradeInspSet2.dfm b/D01针织生产计划/U_TradeInspSet2.dfm new file mode 100644 index 0000000..adc124e --- /dev/null +++ b/D01针织生产计划/U_TradeInspSet2.dfm @@ -0,0 +1,764 @@ +inherited frmTradeInspSet2: TfrmTradeInspSet2 + Left = 261 + Top = 149 + Caption = #25171#21367#21253#35013#35774#32622 + ClientHeight = 772 + ClientWidth = 1320 + Color = clWhite + Font.Charset = GB2312_CHARSET + Font.Height = -12 + Font.Name = #23435#20307 + OldCreateOrder = True + Position = poScreenCenter + OnClose = FormClose + ExplicitWidth = 1336 + ExplicitHeight = 811 + PixelsPerInch = 96 + TextHeight = 12 + object ToolBar1: TToolBar [0] + Tag = 1 + Left = 0 + Top = 0 + Width = 1320 + Height = 38 + AutoSize = True + ButtonHeight = 38 + ButtonWidth = 75 + Caption = 'ToolBar1' + Color = clWhite + Images = DataLink_KnitPlan.ImageList_new32 + List = True + ParentColor = False + ShowCaptions = True + TabOrder = 0 + object ToolButton3: TToolButton + Left = 0 + Top = 0 + AutoSize = True + Caption = #20445#23384 + ImageIndex = 16 + Visible = False + OnClick = ToolButton3Click + end + object btn2: TToolButton + Left = 71 + Top = 0 + Caption = #36873#25321 + ImageIndex = 12 + OnClick = btn2Click + end + object TBClose: TToolButton + Left = 146 + Top = 0 + AutoSize = True + Caption = #20851#38381 + ImageIndex = 7 + OnClick = TBCloseClick + end + end + object ScrollBox1: TScrollBox [1] + Left = 0 + Top = 38 + Width = 1320 + Height = 83 + Align = alTop + BevelInner = bvNone + BevelOuter = bvNone + BorderStyle = bsNone + Color = clWhite + Ctl3D = False + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -14 + Font.Name = #23435#20307 + Font.Style = [] + ParentColor = False + ParentCtl3D = False + ParentFont = False + TabOrder = 1 + Visible = False + ExplicitTop = 18 + object Label14: TLabel + Left = 32 + Top = 17 + Width = 39 + Height = 15 + Caption = #21367#26631#31614 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -12 + Font.Name = 'Times New Roman' + Font.Style = [fsBold] + ParentFont = False + end + object Label1: TLabel + Left = 728 + Top = 40 + Width = 39 + Height = 15 + Caption = #21253#26631#31614 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -12 + Font.Name = 'Times New Roman' + Font.Style = [fsBold] + ParentFont = False + end + object Label2: TLabel + Left = 483 + Top = 15 + Width = 52 + Height = 15 + Caption = #19978#31216#30382#37325 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -12 + Font.Name = 'Times New Roman' + Font.Style = [fsBold] + ParentFont = False + end + object Label3: TLabel + Left = 275 + Top = 17 + Width = 52 + Height = 15 + Caption = #31995#25968#31867#22411 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -12 + Font.Name = 'Times New Roman' + Font.Style = [fsBold] + ParentFont = False + end + object Label4: TLabel + Left = 301 + Top = 41 + Width = 26 + Height = 15 + Caption = #31995#25968 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -12 + Font.Name = 'Times New Roman' + Font.Style = [fsBold] + ParentFont = False + end + object Label5: TLabel + Left = 715 + Top = 14 + Width = 52 + Height = 15 + Caption = #21367#21495#35268#21017 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -12 + Font.Name = 'Times New Roman' + Font.Style = [fsBold] + ParentFont = False + end + object Label6: TLabel + Left = 19 + Top = 44 + Width = 52 + Height = 15 + Caption = #38271#24230#21333#20301 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -12 + Font.Name = 'Times New Roman' + Font.Style = [fsBold] + ParentFont = False + end + object Label8: TLabel + Left = 470 + Top = 41 + Width = 65 + Height = 15 + Caption = #19981#19978#31216#30382#37325 + Font.Charset = ANSI_CHARSET + Font.Color = clBlack + Font.Height = -12 + Font.Name = 'Times New Roman' + Font.Style = [fsBold] + ParentFont = False + end + object RuleBeforeTare: TEdit + Tag = 2 + Left = 541 + Top = 12 + Width = 90 + Height = 20 + TabOrder = 0 + end + object RuleConversion: TComboBox + Tag = 2 + Left = 333 + Top = 13 + Width = 100 + Height = 22 + Style = csDropDownList + ItemIndex = 0 + TabOrder = 1 + Text = #26080#38656#36716#25442 + Items.Strings = ( + #26080#38656#36716#25442 + #31859#36716#20844#26020 + #20928#37325#36716#31859 + #27611#37325#36716#31859) + end + object Coefficient: TEdit + Tag = 2 + Left = 333 + Top = 38 + Width = 100 + Height = 20 + TabOrder = 2 + end + object LabVolume: TEdit + Tag = 2 + Left = 77 + Top = 14 + Width = 172 + Height = 20 + ReadOnly = True + TabOrder = 3 + end + object LabPackage: TEdit + Tag = 2 + Left = 773 + Top = 38 + Width = 172 + Height = 20 + ReadOnly = True + TabOrder = 4 + end + object RulePieceNo: TComboBox + Tag = 2 + Left = 773 + Top = 10 + Width = 120 + Height = 22 + Style = csDropDownList + ItemIndex = 0 + TabOrder = 5 + Text = #25353#29983#20135#21333#29983#25104 + Items.Strings = ( + #25353#29983#20135#21333#29983#25104 + #25353#32568#21495#29983#25104 + #25163#21160#29983#25104) + end + object RuleLenUnit: TComboBox + Tag = 2 + Left = 77 + Top = 40 + Width = 172 + Height = 22 + Style = csDropDownList + TabOrder = 6 + Items.Strings = ( + 'M' + 'Y') + end + object RuleLaterTare: TEdit + Tag = 2 + Left = 541 + Top = 38 + Width = 90 + Height = 20 + TabOrder = 7 + end + end + object cxPageControl1: TcxPageControl [2] + Left = 0 + Top = 121 + Width = 1320 + Height = 651 + Align = alClient + Color = clWhite + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -21 + Font.Name = #23435#20307 + Font.Style = [] + ParentBackground = False + ParentColor = False + ParentFont = False + TabOrder = 2 + Properties.ActivePage = cxTabSheet1 + Properties.CustomButtons.Buttons = <> + Properties.Style = 6 + OnChange = cxPageControl1Change + ExplicitTop = 101 + ExplicitHeight = 671 + ClientRectBottom = 651 + ClientRectRight = 1320 + ClientRectTop = 32 + object cxTabSheet1: TcxTabSheet + Caption = #26631#31614#35774#32622 + ImageIndex = 2 + ExplicitHeight = 639 + object Panel1: TPanel + Left = 0 + Top = 0 + Width = 1320 + Height = 619 + Align = alClient + Caption = 'Panel1' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + TabOrder = 0 + ExplicitHeight = 639 + object Panel2: TPanel + Left = 1 + Top = 39 + Width = 376 + Height = 579 + Align = alLeft + Caption = 'Panel1' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + TabOrder = 0 + ExplicitHeight = 599 + object cxGridLabel: TcxGrid + Left = 1 + Top = 35 + Width = 374 + Height = 543 + Align = alClient + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + TabOrder = 0 + ExplicitHeight = 563 + object TVLabel: TcxGridDBTableView + Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> + OnCellClick = TVLabelCellClick + DataController.DataSource = DS_Label + DataController.Filter.AutoDataSetFilter = True + DataController.Summary.DefaultGroupSummaryItems = <> + DataController.Summary.FooterSummaryItems = <> + DataController.Summary.SummaryGroups = <> + OptionsCustomize.ColumnFiltering = False + OptionsSelection.CellSelect = False + OptionsView.GroupByBox = False + object TVLabellabelId: TcxGridDBColumn + Caption = #26631#31614'ID' + DataBinding.FieldName = 'labelId' + DataBinding.IsNullValueType = True + Visible = False + Width = 53 + end + object TVLabellabeltype: TcxGridDBColumn + Caption = #26631#31614#31867#22411 + DataBinding.FieldName = 'labeltype' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 107 + end + object TVLabellabelCaption: TcxGridDBColumn + Caption = #26631#31614#21517#31216 + DataBinding.FieldName = 'labelCaption' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Width = 261 + end + object TVLabellabelFile: TcxGridDBColumn + Caption = #25991#20214#21517 + DataBinding.FieldName = 'labelFile' + DataBinding.IsNullValueType = True + Visible = False + HeaderAlignmentHorz = taCenter + Width = 167 + end + object TVLabelColumn2: TcxGridDBColumn + Caption = #25805#20316#26102#38388 + DataBinding.FieldName = 'EditTime' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 99 + end + object TVLabelColumn1: TcxGridDBColumn + Caption = #25805#20316#20154 + DataBinding.FieldName = 'Editer' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 80 + end + end + object cxGridLabelLevel1: TcxGridLevel + GridView = TVLabel + end + end + object Panel4: TPanel + Left = 1 + Top = 1 + Width = 374 + Height = 34 + Align = alTop + BevelInner = bvRaised + BevelOuter = bvLowered + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + TabOrder = 1 + object Label9: TLabel + Left = 17 + Top = 9 + Width = 48 + Height = 12 + Caption = #26631#31614#31867#22411 + end + object Label10: TLabel + Left = 184 + Top = 10 + Width = 48 + Height = 12 + Caption = #26631#31614#21517#31216 + end + object LabelCaption: TEdit + Left = 236 + Top = 6 + Width = 100 + Height = 20 + TabOrder = 0 + OnChange = LabelTypeChange + end + object LabelType: TRTComboBox + Tag = 99 + Left = 69 + Top = 6 + Width = 100 + Height = 20 + Style = csDropDownList + ItemIndex = 0 + TabOrder = 1 + OnChange = LabelTypeChange + Items.Strings = ( + '' + #20013#25991#26631#31614 + #33521#25991#26631#31614 + #20013#33521#25991#26631#31614) + end + end + end + object RMPreview3: TRMPreview + Left = 377 + Top = 39 + Width = 942 + Height = 579 + Align = alClient + BevelOuter = bvLowered + Caption = 'Insert After' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + ParentShowHint = False + ShowHint = False + TabOrder = 1 + Options.RulerUnit = rmutScreenPixels + Options.RulerVisible = False + Options.DrawBorder = False + Options.BorderPen.Color = clGray + Options.BorderPen.Style = psDash + ExplicitHeight = 599 + end + object ToolBar2: TToolBar + Tag = 1 + Left = 1 + Top = 1 + Width = 1318 + Height = 38 + AutoSize = True + ButtonHeight = 38 + ButtonWidth = 103 + Caption = 'ToolBar2' + Color = clBtnFace + Images = DataLink_KnitPlan.ImageList_new32 + List = True + ParentColor = False + ShowCaptions = True + TabOrder = 2 + Transparent = False + object Tadd: TToolButton + Left = 0 + Top = 0 + AutoSize = True + Caption = #26032#22686 + ImageIndex = 2 + OnClick = TaddClick + end + object btn1: TToolButton + Left = 71 + Top = 0 + AutoSize = True + Caption = #22797#21046 + ImageIndex = 9 + OnClick = btn1Click + end + object Tupd: TToolButton + Left = 142 + Top = 0 + AutoSize = True + Caption = #20462#25913 + ImageIndex = 3 + OnClick = TupdClick + end + object ToolButton4: TToolButton + Left = 213 + Top = 0 + AutoSize = True + Caption = #35774#35745#26631#31614 + ImageIndex = 3 + OnClick = ToolButton4Click + end + object Tdel: TToolButton + Left = 308 + Top = 0 + AutoSize = True + Caption = #21024#38500 + ImageIndex = 5 + OnClick = TdelClick + end + object ToolButton2: TToolButton + Left = 379 + Top = 0 + AutoSize = True + Caption = #35774#20026#21253#26631#31614 + ImageIndex = 22 + Visible = False + OnClick = ToolButton2Click + end + object ToolButton1: TToolButton + Left = 486 + Top = 0 + AutoSize = True + Caption = #35774#20026#21367#26631#31614 + ImageIndex = 22 + Visible = False + OnClick = ToolButton1Click + end + end + end + end + object cxTabSheet4: TcxTabSheet + Caption = ' '#21367#26631#31614' ' + ImageIndex = 3 + ExplicitHeight = 639 + object RMPreview1: TRMPreview + Left = 0 + Top = 0 + Width = 1320 + Height = 619 + Align = alClient + BevelOuter = bvLowered + Caption = 'Insert After' + Font.Charset = GB2312_CHARSET + Font.Color = clWindowText + Font.Height = -12 + Font.Name = #23435#20307 + Font.Style = [] + ParentFont = False + ParentShowHint = False + ShowHint = False + TabOrder = 0 + Options.RulerUnit = rmutScreenPixels + Options.RulerVisible = False + Options.DrawBorder = False + Options.BorderPen.Color = clGray + Options.BorderPen.Style = psDash + ExplicitHeight = 639 + end + end + end + inherited ADOQueryBaseCmd: TADOQuery + Connection = DataLink_KnitPlan.ADOLink + Left = 417 + Top = 576 + end + inherited ADOQueryBaseTemp: TADOQuery + Connection = DataLink_KnitPlan.ADOLink + Left = 473 + Top = 657 + end + inherited ImageList_new32: TImageList + Left = 88 + Top = 432 + end + object ADOQueryTemp: TADOQuery + Connection = DataLink_KnitPlan.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 171 + Top = 280 + end + object ADOQueryCmd: TADOQuery + Connection = DataLink_KnitPlan.ADOLink + Parameters = <> + Left = 78 + Top = 280 + end + object ADOQueryMain: TADOQuery + Connection = DataLink_KnitPlan.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 181 + Top = 489 + end + object ADOQueryLabel: TADOQuery + Connection = DataLink_KnitPlan.ADOLink + Parameters = <> + Left = 228 + Top = 365 + end + object RM1: TRMGridReport + ThreadPrepareReport = True + InitialZoom = pzDefault + PreviewButtons = [rmpbZoom, rmpbLoad, rmpbSave, rmpbPrint, rmpbFind, rmpbPageSetup, rmpbExit, rmpbSaveToXLS, rmpbExport, rmpbNavigator] + DefaultCollate = False + ShowPrintDialog = False + SaveReportOptions.RegistryPath = 'Software\ReportMachine\ReportSettings\' + PreviewOptions.RulerUnit = rmutScreenPixels + PreviewOptions.RulerVisible = False + PreviewOptions.DrawBorder = False + PreviewOptions.BorderPen.Color = clGray + PreviewOptions.BorderPen.Style = psDash + Dataset = RMDB_1 + CompressLevel = rmzcFastest + CompressThread = False + LaterBuildEvents = True + OnlyOwnerDataSet = False + Left = 472 + Top = 240 + ReportData = {} + end + object RMDB_1: TRMDBDataSet + Visible = True + DataSet = ADO_1 + Left = 428 + Top = 244 + end + object ADO_1: TADOQuery + Connection = DataLink_KnitPlan.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 283 + Top = 288 + end + object RM2: TRMGridReport + ThreadPrepareReport = True + InitialZoom = pzDefault + PreviewButtons = [rmpbZoom, rmpbLoad, rmpbSave, rmpbPrint, rmpbFind, rmpbPageSetup, rmpbExit, rmpbSaveToXLS, rmpbExport, rmpbNavigator] + DefaultCollate = False + ShowPrintDialog = False + SaveReportOptions.RegistryPath = 'Software\ReportMachine\ReportSettings\' + PreviewOptions.RulerUnit = rmutScreenPixels + PreviewOptions.RulerVisible = False + PreviewOptions.DrawBorder = False + PreviewOptions.BorderPen.Color = clGray + PreviewOptions.BorderPen.Style = psDash + Dataset = RMDB_1 + CompressLevel = rmzcFastest + CompressThread = False + LaterBuildEvents = True + OnlyOwnerDataSet = False + Left = 472 + Top = 296 + ReportData = {} + end + object RMDB_2: TRMDBDataSet + Visible = True + DataSet = ADO_1 + Left = 428 + Top = 300 + end + object DS_Label: TDataSource + DataSet = CDS_Label + Left = 234 + Top = 568 + end + object CDS_Label: TClientDataSet + Aggregates = <> + Params = <> + Left = 164 + Top = 563 + end + object RMDB_Label: TRMDBDataSet + Visible = True + DataSet = ADO_1 + Left = 164 + Top = 620 + end + object RMLabel: TRMGridReport + ThreadPrepareReport = True + InitialZoom = pzDefault + PreviewButtons = [rmpbZoom, rmpbLoad, rmpbSave, rmpbPrint, rmpbFind, rmpbPageSetup, rmpbExit, rmpbSaveToXLS, rmpbExport, rmpbNavigator] + DefaultCollate = False + ShowPrintDialog = False + SaveReportOptions.RegistryPath = 'Software\ReportMachine\ReportSettings\' + PreviewOptions.RulerUnit = rmutScreenPixels + PreviewOptions.RulerVisible = False + PreviewOptions.DrawBorder = False + PreviewOptions.BorderPen.Color = clGray + PreviewOptions.BorderPen.Style = psDash + Dataset = RMDB_Label + CompressLevel = rmzcFastest + CompressThread = False + LaterBuildEvents = True + OnlyOwnerDataSet = False + Left = 232 + Top = 624 + ReportData = {} + end + object RMBarCodeObject1: TRMBarCodeObject + Left = 504 + Top = 412 + end + object RMXLSExport1: TRMXLSExport + ShowAfterExport = True + ExportPrecision = 1 + PagesOfSheet = 10 + ExportImages = True + ExportFrames = True + ExportImageFormat = ifBMP + JPEGQuality = 0 + ScaleX = 1.000000000000000000 + ScaleY = 1.000000000000000000 + CompressFile = False + Left = 432 + Top = 472 + end + object RMDataDictionary1: TRMDataDictionary + FieldFieldNames.TableName = 'TableName' + FieldFieldNames.FieldName = 'FieldName' + FieldFieldNames.FieldAlias = 'FieldAlias' + Left = 434 + Top = 400 + end + object ADO_Down: TADOQuery + Connection = DataLink_KnitPlan.ADOLink + LockType = ltReadOnly + Parameters = <> + Left = 59 + Top = 352 + end +end diff --git a/D01针织生产计划/U_TradeInspSet2.pas b/D01针织生产计划/U_TradeInspSet2.pas new file mode 100644 index 0000000..2d744cf --- /dev/null +++ b/D01针织生产计划/U_TradeInspSet2.pas @@ -0,0 +1,532 @@ +unit U_TradeInspSet2; + +interface + +uses + Windows, Messages, StrUtils, SysUtils, Variants, Classes, Graphics, Controls, + Forms, Dialogs, cxGraphics, cxCustomData, cxStyles, cxTL, cxMaskEdit, DB, + ADODB, cxInplaceContainer, cxDBTL, cxControls, cxTLData, ComCtrls, ToolWin, + StdCtrls, cxFilter, cxData, cxDataStorage, cxEdit, cxDBData, DBClient, + cxGridCustomTableView, cxGridTableView, cxGridDBTableView, ExtCtrls, + cxSplitter, cxGridLevel, cxClasses, cxGridCustomView, cxGrid, + cxGridCustomPopupMenu, cxGridPopupMenu, RM_Dataset, RM_System, RM_Common, + RM_Class, RM_GridReport, IdBaseComponent, IdComponent, IdTCPConnection, + IdTCPClient, IdFTP, ShellAPI, IniFiles, cxCheckBox, cxCalendar, cxButtonEdit, + cxTextEdit, cxDropDownEdit, BtnEdit, cxLookAndFeels, cxLookAndFeelPainters, + cxNavigator, dxSkinsCore, dxSkinsDefaultPainters, dxDateRanges, + dxBarBuiltInMenu, U_BaseList, cxContainer, dxCore, cxDateUtils, cxImage, + cxDBEdit, IdExplicitTLSClientServerBase, RM_Preview, cxPC, U_BaseHelp, + System.ImageList, Vcl.ImgList, RTComboBox, RM_BarCode, RM_e_Xls, + dxScrollbarAnnotations; + +type + TfrmTradeInspSet2 = class(TfrmBaseHelp) + ToolBar1: TToolBar; + TBClose: TToolButton; + ADOQueryTemp: TADOQuery; + ADOQueryCmd: TADOQuery; + ADOQueryMain: TADOQuery; + ToolButton3: TToolButton; + ScrollBox1: TScrollBox; + Label14: TLabel; + Label1: TLabel; + cxPageControl1: TcxPageControl; + cxTabSheet4: TcxTabSheet; + RMPreview1: TRMPreview; + Label2: TLabel; + RuleBeforeTare: TEdit; + RuleConversion: TComboBox; + Label3: TLabel; + Coefficient: TEdit; + Label4: TLabel; + ADOQueryLabel: TADOQuery; + RM1: TRMGridReport; + RMDB_1: TRMDBDataSet; + ADO_1: TADOQuery; + RM2: TRMGridReport; + RMDB_2: TRMDBDataSet; + cxTabSheet1: TcxTabSheet; + DS_Label: TDataSource; + CDS_Label: TClientDataSet; + RMDB_Label: TRMDBDataSet; + RMLabel: TRMGridReport; + Panel1: TPanel; + Panel2: TPanel; + cxGridLabel: TcxGrid; + TVLabel: TcxGridDBTableView; + TVLabellabelId: TcxGridDBColumn; + TVLabellabeltype: TcxGridDBColumn; + TVLabellabelCaption: TcxGridDBColumn; + TVLabellabelFile: TcxGridDBColumn; + cxGridLabelLevel1: TcxGridLevel; + RMPreview3: TRMPreview; + Panel4: TPanel; + Label9: TLabel; + Label10: TLabel; + LabelCaption: TEdit; + LabelType: TRTComboBox; + ToolBar2: TToolBar; + ToolButton1: TToolButton; + ToolButton2: TToolButton; + Tadd: TToolButton; + Tupd: TToolButton; + Tdel: TToolButton; + ToolButton4: TToolButton; + RMBarCodeObject1: TRMBarCodeObject; + RMXLSExport1: TRMXLSExport; + RMDataDictionary1: TRMDataDictionary; + ADO_Down: TADOQuery; + TVLabelColumn1: TcxGridDBColumn; + TVLabelColumn2: TcxGridDBColumn; + LabVolume: TEdit; + LabPackage: TEdit; + Label5: TLabel; + RulePieceNo: TComboBox; + Label6: TLabel; + RuleLenUnit: TComboBox; + Label8: TLabel; + RuleLaterTare: TEdit; + btn1: TToolButton; + btn2: TToolButton; + procedure FormDestroy(Sender: TObject); + procedure FormClose(Sender: TObject; var Action: TCloseAction); + procedure TBCloseClick(Sender: TObject); + procedure FormShow(Sender: TObject); + procedure TBRafreshClick(Sender: TObject); + procedure ToolButton3Click(Sender: TObject); + procedure cxPageControl1Change(Sender: TObject); + procedure ToolButton1Click(Sender: TObject); + procedure ToolButton2Click(Sender: TObject); + procedure TupdClick(Sender: TObject); + procedure TdelClick(Sender: TObject); + procedure TaddClick(Sender: TObject); + procedure ToolButton4Click(Sender: TObject); + procedure LabelTypeChange(Sender: TObject); + procedure TVLabelCellClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); + procedure btn1Click(Sender: TObject); + procedure btn2Click(Sender: TObject); + private + { Private declarations } + procedure InitGrid(); + function SaveData(): Boolean; + procedure InitLabel(); + function SaveLabel(MLabelID: string): Boolean; + procedure InitLabVolume(); + procedure InitLabPackage(); + public + FDataID: string; + end; + +var + frmTradeInspSet2: TfrmTradeInspSet2; + +implementation + +uses + U_DataLink, U_RTFun, U_LabelInput, U_LabelList; + +{$R *.dfm} + +function TfrmTradeInspSet2.SaveLabel(MLabelID: string): Boolean; +begin + try + ADOQueryCmd.Connection.BeginTrans; + with ADOQueryCmd do + begin + close; + sql.Clear; + sql.Add('select * from Trade_Label'); + sql.Add('where LabelID=' + Quotedstr(MLabelID)); + Open; + Edit; + fieldByName('Editer').value := DName; + FieldByName('EditTime').Value := SGetServerDateTime(ADOQueryTemp); +// RMLabel.SaveToBlobField(TBlobField(FieldByName('LabelFile'))); + Post; + end; + ADOQueryCmd.Connection.CommitTrans; + result := true; + except + ADOQueryCmd.Connection.RollbackTrans; + Result := false; + application.MessageBox('ǩģ!', 'Ϣ', 0); + end; +end; + +procedure TfrmTradeInspSet2.InitLabel(); +begin + with ADOQueryMain do + begin + close; + sql.Clear; + sql.Add(' select * from Trade_Label'); + sql.Add(' order by labeltype,labelCaption'); + Open; + end; + SDofilter(ADOQueryMain, SGetFilters(Panel4, 1, 2)); + SCreateCDS(ADOQueryMain, CDS_Label); + SInitCDSData(ADOQueryMain, CDS_Label); +end; + +procedure TfrmTradeInspSet2.InitLabVolume(); +begin + + with ADOQueryLabel do + begin + close; + sql.Clear; + sql.Add('select top 1 * from RT_FileUpdate'); + sql.Add('where FileName=' + quotedstr(trim(LabVolume.Text) + '.rmf')); + Open; + end; + + if ADOQueryLabel.IsEmpty then + exit; + with RM1 do + begin + LoadFromBlobField(tblobfield(ADOQueryLabel.fieldbyname('Files'))); + Preview := RMPreview1; + ShowReport; + end; + +end; + +procedure TfrmTradeInspSet2.InitLabPackage(); +begin + +end; + +procedure TfrmTradeInspSet2.LabelTypeChange(Sender: TObject); +begin + if ADOQueryMain.Active then + begin + SDofilter(ADOQueryMain, SGetFilters(Panel4, 1, 2)); + SCreateCDS(ADOQueryMain, CDS_Label); + SInitCDSData(ADOQueryMain, CDS_Label); + end; + +end; + +procedure TfrmTradeInspSet2.InitGrid(); +begin + + with ADOQueryTemp do + begin + Close; + SQL.Clear; + sql.Add(' select * from Trade_Cloth_Inspect_Rule where RuleID=''' + Trim(FDataID) + ''''); + Open; + end; + SCSHData(ADOQueryTemp, ScrollBox1, 2); + +// with ADOQueryTemp do +// begin +// close; +// sql.Clear; +// sql.Add(' select C.LabName from Knit_Plan_Main A '); +// sql.Add(' INNER JOIN Knit_Plan_Sub B on A.MainID=B.MainID'); +// sql.Add(' INNER JOIN BS_Contract_Sub C on B.ConSId =C.ConSId'); +// sql.Add(' where A.MainId=''' + Trim(FDataID) + ''''); +// Open; +// end; +// +// LabVolume.text := Trim(ADOQueryTemp.fieldbyname('LabName').AsString); +end; + +procedure TfrmTradeInspSet2.FormDestroy(Sender: TObject); +begin + inherited; + frmTradeInspSet2 := nil; +end; + +procedure TfrmTradeInspSet2.btn1Click(Sender: TObject); +var + MFromLabelId: string; +begin + MFromLabelId := trim(CDS_Label.fieldbyname('LabelId').asstring); + try + frmLabelInput := TfrmLabelInput.create(self); + with frmLabelInput do + begin + + if showModal = 1 then + begin + FLabelId := frmLabelInput.LabelCaption.Text; + with ADOQueryCmd do + begin + close; + sql.clear; + sql.Add(' exec P_BS_Label_Copy'); + sql.Add(' @FromLabelId=' + quotedstr(trim(MFromLabelId))); + sql.Add(',@ToLabelId=' + quotedstr(trim(FLabelId))); +// ShowMessage(sql.text); + execSql; + end; + InitLabel(); + end; + end; + finally + frmLabelInput.Free; + end; +end; + +procedure TfrmTradeInspSet2.btn2Click(Sender: TObject); +begin + ModalResult := 1; +end; + +procedure TfrmTradeInspSet2.cxPageControl1Change(Sender: TObject); +begin + case cxPageControl1.ActivePageIndex of + 1: + begin + InitLabVolume(); + end; + 2: + begin + InitLabPackage(); + end; + end; +end; + +procedure TfrmTradeInspSet2.FormClose(Sender: TObject; var Action: TCloseAction); +begin + inherited; + Action := caFree; +end; + +procedure TfrmTradeInspSet2.TaddClick(Sender: TObject); +begin + try + frmLabelInput := TfrmLabelInput.create(self); + with frmLabelInput do + begin + FLabelId := ''; + if showModal = 1 then + begin + InitLabel(); + end; + end; + finally + frmLabelInput.Free; + end; +end; + +procedure TfrmTradeInspSet2.TBCloseClick(Sender: TObject); +begin + ModalResult := 1; +end; + +procedure TfrmTradeInspSet2.FormShow(Sender: TObject); +begin + inherited; + ExportFtErpFile('ģǩ.rmf', ADOQueryTemp); + + with ADO_1 do + begin + Close; + SQL.Clear; + sql.Add('exec P_BS_Label_Get_Test'); + Open; + end; + Initlabel(); + InitGrid(); + +end; + +procedure TfrmTradeInspSet2.TBRafreshClick(Sender: TObject); +begin + InitGrid(); +end; + +procedure TfrmTradeInspSet2.TdelClick(Sender: TObject); +begin + try + with ADOQueryCmd do + begin + close; + sql.clear; + sql.Add('delete Trade_Label'); + sql.Add('where labelId=' + quotedstr(CDS_Label.fieldByName('LabelID').asString)); + + sql.Add('insert into SY_SysLog(operor,opertime,Model,acction,opevent,result) values( '); + sql.Add(' ' + quotedstr(trim(DName))); + sql.Add(',getdate() '); + sql.Add(',' + quotedstr(trim(self.Caption))); + sql.Add(',' + quotedstr(trim('ǩɾ'))); + sql.Add(',' + quotedstr(trim('ǩƣ' + trim(CDS_Label.fieldByName('labelCaption').asString)))); + sql.Add(',' + quotedstr(trim('ɹ'))); + sql.Add(')'); + execSql; + end; + CDS_Label.Delete; + except + application.MessageBox('ɾʧ!', 'Ϣ', 0); + end; + +end; + +function TfrmTradeInspSet2.SaveData(): Boolean; +var + MaxId, MaxSubId, FCoCode, FCCID, MaxCFID: string; +begin + try + ADOQueryCmd.Connection.BeginTrans; + + if Trim(FDataID) = '' then + begin + if GetLSNo(ADOQueryCmd, MaxId, 'R', 'Trade_Cloth_Inspect_Rule', 4, 1) = False then + begin + Result := False; + ADOQueryCmd.Connection.RollbackTrans; + Application.MessageBox('ȡʧܣ', 'ʾ', 0); + Exit; + end; + end + else + begin + MaxId := Trim(FDataID); + end; + + with ADOQueryCmd do + begin + Close; + SQL.Clear; + sql.Add('select * from Trade_Cloth_Inspect_Rule where RuleID=''' + Trim(FDataID) + ''''); + Open; + end; + with ADOQueryCmd do + begin + if Trim(FDataID) = '' then + begin + Append; + FieldByName('Filler').Value := Trim(DName); + end + else + begin + Edit; + FieldByName('Editer').Value := Trim(DName); + FieldByName('Edittime').Value := SGetServerDateTime(ADOQueryTemp); + end; + FieldByName('RuleID').Value := Trim(MaxId); + + RTSetsavedata(ADOQueryCmd, 'Trade_Cloth_Inspect_Rule', ScrollBox1, 2); + + Post; + end; + + with ADOQueryTemp do + begin + close; + sql.Clear; + sql.Add(' UPDATE BS_Contract_Sub set LabName =''' + Trim(LabVolume.text) + ''''); + sql.Add(' from BS_Contract_Sub A '); + sql.Add(' INNER JOIN Knit_Plan_Sub B on A.ConSId=B.ConSId'); + sql.Add(' where B.MainId =''' + Trim(FDataID) + ''''); + ExecSQL; + end; + + ADOQueryCmd.Connection.CommitTrans; + FCCID := Trim(MaxSubId); + Result := True; + except + Result := false; + ADOQueryCmd.Connection.RollbackTrans; + Application.MessageBox('쳣!', 'ʾ', 0); + end; +end; + +procedure TfrmTradeInspSet2.ToolButton1Click(Sender: TObject); +begin + if CDS_Label.IsEmpty then + exit; + LabVolume.Text := trim(CDS_Label.fieldbyname('labelCaption').asstring); +end; + +procedure TfrmTradeInspSet2.ToolButton2Click(Sender: TObject); +begin + if CDS_Label.IsEmpty then + exit; + LabPackage.Text := trim(CDS_Label.fieldbyname('labelCaption').asstring); +end; + +procedure TfrmTradeInspSet2.ToolButton3Click(Sender: TObject); +begin + + if SaveData() then + begin + Application.MessageBox('ɹ!', 'ʾ', 0); + end; +end; + +procedure TfrmTradeInspSet2.ToolButton4Click(Sender: TObject); +var + fFileName, fPrintFile: string; + MLabelID, MLabelCaption: string; +begin + if CDS_Label.IsEmpty then + exit; + MLabelID := TRIM(CDS_Label.fieldByName('LabelID').asString); + MLabelCaption := TRIM(CDS_Label.fieldByName('LabelCaption').asString); + ExportFtErpFile(MLabelCaption + '.rmf', ADOQueryTemp); + fPrintFile := ExtractFilePath(Application.ExeName) + 'report\' + MLabelCaption + '.rmf'; + + if not FileExists(fPrintFile) then + CopyFile(PChar(ExtractFilePath(Application.ExeName) + 'Report\ģǩ.rmf'), PChar(fPrintFile), False); + + with RMLabel do + begin + RMLabel.Clear; + RMDB_Label.DataSet := nil; + Dictionary.FieldAliases.Clear; + Dictionary.FieldAliases['RMDB_Label'] := 'ǩ'; + RMDB_Label.DataSet := ADO_1; + LoadFromFile(fPrintFile); + application.ProcessMessages; + DesignReport(); +// RMLabel.SaveToFile(fPrintFile); + SaveLabel(MLabelID); + ExportToFtErp(fPrintFile, ADOQueryCmd); + end; +end; + +procedure TfrmTradeInspSet2.TupdClick(Sender: TObject); +begin + if CDS_Label.IsEmpty then + exit; + try + frmLabelInput := TfrmLabelInput.create(self); + with frmLabelInput do + begin + fLabelId := CDS_Label.fieldByName('LabelId').AsString; + if showModal = 1 then + begin + InitLabel(); + end; + end; + finally + frmLabelInput.Free; + end; +end; + +procedure TfrmTradeInspSet2.TVLabelCellClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); +var + fPrintFile: string; +begin + if CDS_Label.IsEmpty then + exit; + ExportFtErpFile(TRIM(CDS_Label.fieldByName('LabelCaption').asString) + '.rmf', ADOQueryTemp); + fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + CDS_Label.fieldbyname('LabelCaption').AsString + '.rmf'; + if not FileExists(fPrintFile) then + CopyFile(PChar(ExtractFilePath(Application.ExeName) + 'Report\ģǩ.rmf'), PChar(fPrintFile), False); + + with RMLabel do + begin + RMLabel.LoadFromFile(fPrintFile); + Preview := RMPreview3; + ShowReport; + end; +end; + +end. + diff --git a/D02针织坯布检验/KnitInsp.identcache b/D02针织坯布检验/KnitInsp.identcache index cd4d22ca357f7bd1cf8524557268e827fd318d8d..733a8f0c296fb313883296cc1dfdcbcfe610fb62 100644 GIT binary patch delta 42 ycmeC-?crq + 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas + 1899-12-30 00:00:00.000.680,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas + 1899-12-30 00:00:00.000.349,=D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelPrint.pas 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas 1899-12-30 00:00:00.000.834,=D:\Dp10Repo\项目代码\东亚\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.600,D:\Dp10Repo\项目代码\东亚\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\东亚\D03针织坯布仓库\U_KnitDyePlan.pas - 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= - 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.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.822,D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\KnitClothStk.dproj 1899-12-30 00:00:00.000.057,=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitDRList.pas 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm - 1899-12-30 00:00:00.000.349,=D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelPrint.pas - 1899-12-30 00:00:00.000.822,D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\KnitClothStk.dproj=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\InformationBase.dproj + 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899-12-30 00:00:00.000.987,=D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelMapSet.pas + 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas 1899-12-30 00:00:00.000.858,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas + 1899-12-30 00:00:00.000.600,D:\Dp10Repo\项目代码\东亚\D03针织坯布仓库\U_KnitDyePlan.dfm=D:\Dp10Repo\项目代码\东亚\A00通用窗体\U_CompanySel.dfm 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas 1899-12-30 00:00:00.000.978,=D:\Dp10Repo\项目代码\阔和\D03针织坯布仓库\U_KnitDRSel.pas - 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm + 1899-12-30 00:00:00.000.987,=D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelMapSet.pas 1899-12-30 00:00:00.000.132,=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitPlanSel.pas 1899-12-30 00:00:00.000.376,=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitDRtInPut.pas - 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas - 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= - 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas - 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.054,=D:\Dp10Repo\项目代码\东亚\D03针织坯布仓库\U_KnitClothTotalStkList_Sel.pas - 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas 1899-12-30 00:00:00.000.865,=D:\Dp10Repo\项目代码\D10gmXinHua\D03针织坯布仓库\TfrmKnitClothTotalOutList.pas + 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= + 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas 1899-12-30 00:00:00.000.038,D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\Unit1.pas= - 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899-12-30 00:00:00.000.176,=D:\Dp10Repo\项目代码\D10gmXinHua\D03针织坯布仓库\U_KnitClothTotalInList.pas - 1899-12-30 00:00:00.000.600,D:\Dp10Repo\项目代码\东亚\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\东亚\D03针织坯布仓库\U_KnitDyePlan.dfm - 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas - 1899-12-30 00:00:00.000.680,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas - 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas - 1899-12-30 00:00:00.000.038,=D:\Dp10Repo\项目代码\D10gmXinHua\D03针织坯布仓库\U_KnitClothTotalOutList.pas + 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm + 1899-12-30 00:00:00.000.054,=D:\Dp10Repo\项目代码\东亚\D03针织坯布仓库\U_KnitClothTotalStkList_Sel.pas + 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas + 1899-12-30 00:00:00.000.600,D:\Dp10Repo\项目代码\东亚\D03针织坯布仓库\U_KnitDyePlan.pas=D:\Dp10Repo\项目代码\东亚\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas + 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= 1899-12-30 00:00:00.000.365,=D:\Dp10Repo\项目代码\阔和\D03针织坯布仓库\U_KnitClothOutEdit.pas + 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas + 1899-12-30 00:00:00.000.176,=D:\Dp10Repo\项目代码\D10gmXinHua\D03针织坯布仓库\U_KnitClothTotalInList.pas + 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.038,=D:\Dp10Repo\项目代码\D10gmXinHua\D03针织坯布仓库\U_KnitClothTotalOutList.pas + 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas @@ -73,7 +73,7 @@ - + diff --git a/D03针织坯布仓库/KnitClothStk.identcache b/D03针织坯布仓库/KnitClothStk.identcache index 4025e3a49f6472faa7f74e4729f0023e28ef1ce3..14cc24a6f4e6bf5e238a3c0163f4c9806671d6f6 100644 GIT binary patch delta 371 zcmew$bVHC;mVtr6Yw|rtIaa64lEnOp{j!s{u!%7u3mF(Qx*$|cmSoXIk?t3t{E|h6 z(G^L_H#WV=T+Ee>-Uu;}!69tolUFjyLu{J7o>_fz6sOqax6DuxkdjYK5{#h;T|h;4 zj2;O7#D2-iIgAo0?%BYoJDHWWWU>mo{NzuplIY5%IV8~C(a$2z7>O_x?2K>8F|Kn?5J44nj#^Akc!w; zUBDKI_?tvl{(^BTx$bz<)T%8nEKB#Cx#ygF=T@y&^Uy;diH750!TrVeKgrjhv+0lI znmjN&8-{heHHtAq$0`HXpUL{JZJn}5)P!;;p*DhB;JL<4ar0QGPx>d0u zPqmmE7ZOy@6Nq>~$*|%00hVOMbO0ZL#H$Q!TwOYRvmKG38B4{(rj({jFZ0#w#_uYZ zE_BpGlImzO-7siv7+~r~gcX20Rkh$!U>5T$nC@(W=#13^5oPO1e>nN$XV!Pe5yo3F z^V5Z(6L5fD>|iQPQEyv|FXhHowwo_o=X!DImtO3G=-`4Gck;+tHuO)Ue_YVlYC|Qky) - + diff --git a/D03针织坯布仓库/testDll.identcache b/D03针织坯布仓库/testDll.identcache index 5e5fc76ddc07959aa0c79a692b1e3ea9e653d7c8..2f99e26258a9c7f3a93a474e84ffbb3d654bb67e 100644 GIT binary patch delta 39 lcmdnRxQdaLiGhK^ePX;Et5ar4V*W$}@res18C{VC^Z?903lRVS delta 52 qcmZ3*xQmgMiGhK^cVeU*Z$xIEM` IDYES then -// begin -// edtScan.Text := ''; -// ClearGlobal(); -// Exit; -// end; - Application.MessageBox('Ѽ', 'ʾ', 0); - edtScan.Text := ''; - ClearGlobal(); - exit; + if Application.MessageBox('òƱѼ,Ƿ', 'ʾ', 32 + 4) <> IDYES then + begin + edtScan.Text := ''; + ClearGlobal(); + Exit; + end; +// Application.MessageBox('Ѽ', 'ʾ', 0); +// edtScan.Text := ''; +// ClearGlobal(); +// exit; end; with ADOTmp do @@ -1034,7 +1038,7 @@ begin // DelQty.text := Trim(ADOTmp.fieldbyname('DelMeter').AsString); MPlace.Text := Trim(ADOTmp.fieldbyname('LengthNumber').AsString); - Tare.Text := ADOTmp.fieldbyname('RuleLaterTare').AsString; // Ƥأϳƣ + Tare.Text := ADOTmp.fieldbyname('RuleBeforeTare').AsString; // Ƥأϳƣ FRuleBeforeTare := ADOTmp.fieldbyname('RuleBeforeTare').AsString; // Ƥأϳƣ FRuleLaterTare := ADOTmp.fieldbyname('RuleLaterTare').AsString; // Ƥأϳƣ InputLen.SetFocus; @@ -1479,10 +1483,13 @@ begin FieldByName('Coefficient').Value := StrToFloatdef(trim(Coefficient.Text), 0); //ϵ ///////////////////////// ///////////////////////// + //ϳƤ + if Tare.Text <> '' then + MRuleBeforeTare := StrToFloatdef(Tare.Text, 0) + else + MRuleBeforeTare := StrToFloatdef(FRuleBeforeTare, 0); - - MRuleBeforeTare := StrToFloatdef(FRuleBeforeTare, 0); - MRuleLaterTare := StrToFloatdef(FRuleLaterTare, 0); + MRuleLaterTare := StrToFloatdef(FRuleLaterTare, 0); //ϳƤ MTare := MRuleBeforeTare + MRuleLaterTare; //Ƥ MInputWeight := RoundFloat(StrToFloatdef(trim(InputWeight.Text), 0), StrTointdef(KgPlace.Text, 0)); //ë MGrossWeight := MInputWeight + MRuleLaterTare; //ë @@ -1714,6 +1721,19 @@ begin end; end; +procedure TfrmTradeMachInsp.btn1Click(Sender: TObject); +var + mvalue: Double; +begin + if Trim(edtKJ.Text) <> '' then + begin + if TryStrToFloat(edtKJ.Text, mvalue) = False then + raise Exception.Create('¼!'); + DelQty.Text := FloatToStr(strtofloatdef(trim(DelQty.Text), 0) + strtofloatdef(trim(edtKJ.Text), 0)); + edtKJ.Text := ''; + end; +end; + procedure TfrmTradeMachInsp.btnCXRKClick(Sender: TObject); var MStkIds: string;