From cebba7d3b27ae28ddce9e2180898aad8b018739c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cusername=E2=80=9D?= <“email”> Date: Tue, 15 Apr 2025 20:16:06 +0800 Subject: [PATCH] 111 --- A00通用窗体/U_YarnInfoSel.dfm | 13 + A00通用窗体/U_YarnInfoSel.pas | 2 +- B02基础纱线仓库/U_DataLink.dfm | 9 +- B02基础纱线仓库/U_DataLink.pas | 7 +- B02基础纱线仓库/U_YarnInList.dfm | 17 +- B02基础纱线仓库/U_YarnInList.pas | 25 +- B02基础纱线仓库/U_YarnPurchasePlanList.pas | 2 +- B02基础纱线仓库/U_YarnPurchasePlanPut.dfm | 2 + B02基础纱线仓库/U_YarnPurchasePlanPut.pas | 7 +- B02基础纱线仓库/YarnStk.dpr | 3 +- B02基础纱线仓库/YarnStk.dproj | 5 + B02基础纱线仓库/YarnStk.dproj.local | 31 ++- B02基础纱线仓库/YarnStk.identcache | Bin 2418 -> 2477 bytes D01针织生产计划/KnitPlan.dproj | 2 +- D01针织生产计划/KnitPlan.dproj.local | 50 ++-- D01针织生产计划/U_KnitPlanInPut.dfm | 242 +++++++++++------- D01针织生产计划/U_KnitPlanInPut.pas | 3 + D01针织生产计划/U_KnitPlanList.dfm | 30 ++- D01针织生产计划/U_KnitPlanList.pas | 1 + D01针织生产计划/U_LCKInput.dfm | 5 - D01针织生产计划/U_LCKInput.pas | 1 + D02针织坯布检验/KnitInsp.dproj.local | 18 +- D02针织坯布检验/KnitInspLogin.dproj.local | 24 +- D02针织坯布检验/U_KnitClothInspList.dfm | 41 ++- D02针织坯布检验/U_KnitClothInspList.pas | 18 +- F01染色坯布仓库/DyeGreyClothStk.dproj.local | 38 +-- F01染色坯布仓库/DyeGreyClothStk.identcache | Bin 1500 -> 1500 bytes F01染色坯布仓库/U_DyeGreyClothOutList.dfm | 63 ++--- F01染色坯布仓库/U_DyeGreyClothOutList.pas | 15 +- F04染色刷卡/DyeProcess.dproj.local | 14 +- F04染色刷卡/DyeProcess.identcache | Bin 1161 -> 1161 bytes F04染色刷卡/InformationBase.dproj.local | 8 +- F04染色刷卡/InformationBase.identcache | Bin 991 -> 1015 bytes F04染色刷卡/U_DyeOutput.dfm | 93 +++++-- F04染色刷卡/U_DyeOutput.pas | 120 ++++++++- T03贸易布匹检验/TradeInsp.dproj.local | 12 +- T03贸易布匹检验/TradeInspLogin.dproj.local | 24 +- T03贸易布匹检验/U_TradeClothInspList.pas | 4 +- T03贸易布匹检验/U_TradeMachInsp.dfm | 17 +- T03贸易布匹检验/U_TradeMachInsp.pas | 64 +++-- T03贸易布匹检验/U_TradePACKETPrint.dfm | 1 - T03贸易布匹检验/U_TradePACKETPrint.pas | 2 +- T04贸易明细仓库/TradeClothStk.dproj.local | 20 +- .../U_TradeClothTotalStkList_Sel.dfm | 16 +- .../U_TradeClothTotalStkList_Sel.pas | 10 +- T04贸易明细仓库/U_TradeDeliveryRequest.dfm | 2 +- .../U_TradeDeliveryRequestInPut.pas | 4 +- 47 files changed, 719 insertions(+), 366 deletions(-) diff --git a/A00通用窗体/U_YarnInfoSel.dfm b/A00通用窗体/U_YarnInfoSel.dfm index 2366332..1586ad3 100644 --- a/A00通用窗体/U_YarnInfoSel.dfm +++ b/A00通用窗体/U_YarnInfoSel.dfm @@ -98,6 +98,7 @@ inherited frmYarnInfoSel: TfrmYarnInfoSel object Tv1: TcxGridDBTableView OnDblClick = TV1DblClick Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_1 DataController.Summary.DefaultGroupSummaryItems = <> DataController.Summary.FooterSummaryItems = < @@ -126,6 +127,7 @@ inherited frmYarnInfoSel: TfrmYarnInfoSel object Tv1Column1: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSEL' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True HeaderAlignmentHorz = taCenter @@ -135,6 +137,7 @@ inherited frmYarnInfoSel: TfrmYarnInfoSel Tag = 2 Caption = #21697#29260 DataBinding.FieldName = 'Brand' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 100 @@ -142,6 +145,7 @@ inherited frmYarnInfoSel: TfrmYarnInfoSel object v1Column18: TcxGridDBColumn Caption = #37319#36141#21152#24037#21512#21516#21495 DataBinding.FieldName = 'ConNo' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -159,6 +163,7 @@ inherited frmYarnInfoSel: TfrmYarnInfoSel Tag = 2 Caption = #21697#29260 DataBinding.FieldName = 'SXPinPai' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -175,6 +180,7 @@ inherited frmYarnInfoSel: TfrmYarnInfoSel Tag = 2 Caption = #21697#21517 DataBinding.FieldName = 'Y_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 101 @@ -183,6 +189,7 @@ inherited frmYarnInfoSel: TfrmYarnInfoSel Tag = 2 Caption = #35268#26684 DataBinding.FieldName = 'Y_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter HeaderGlyphAlignmentHorz = taCenter Options.Editing = False @@ -192,6 +199,7 @@ inherited frmYarnInfoSel: TfrmYarnInfoSel Tag = 2 Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False @@ -202,6 +210,7 @@ inherited frmYarnInfoSel: TfrmYarnInfoSel Tag = 2 Caption = #25104#20998 DataBinding.FieldName = 'Y_Composition' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 96 @@ -210,6 +219,7 @@ inherited frmYarnInfoSel: TfrmYarnInfoSel Tag = 2 Caption = #36816#36153 DataBinding.FieldName = 'YunFei' + DataBinding.IsNullValueType = True Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False @@ -219,6 +229,7 @@ inherited frmYarnInfoSel: TfrmYarnInfoSel object Tv1Column2: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'Y_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 71 @@ -227,6 +238,7 @@ inherited frmYarnInfoSel: TfrmYarnInfoSel Tag = 2 Caption = 'D'#25968 DataBinding.FieldName = 'Denier' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 55 @@ -235,6 +247,7 @@ inherited frmYarnInfoSel: TfrmYarnInfoSel Tag = 2 Caption = #22791#27880 DataBinding.FieldName = 'Note' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 118 diff --git a/A00通用窗体/U_YarnInfoSel.pas b/A00通用窗体/U_YarnInfoSel.pas index 8ad6359..6df4bb8 100644 --- a/A00通用窗体/U_YarnInfoSel.pas +++ b/A00通用窗体/U_YarnInfoSel.pas @@ -11,7 +11,7 @@ uses cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, cxButtonEdit, - cxCheckBox, Vcl.Menus; + cxCheckBox, Vcl.Menus, dxScrollbarAnnotations; type TfrmYarnInfoSel = class(TfrmBaseHelp) diff --git a/B02基础纱线仓库/U_DataLink.dfm b/B02基础纱线仓库/U_DataLink.dfm index 96ed26a..ce2a9bb 100644 --- a/B02基础纱线仓库/U_DataLink.dfm +++ b/B02基础纱线仓库/U_DataLink.dfm @@ -1,9 +1,10 @@ -object DataLink_YarnStk: TDataLink_YarnStk - OldCreateOrder = False - OnCreate = DataModuleCreate +inherited DataLink_YarnStk: TDataLink_YarnStk OnDestroy = DataModuleDestroy Height = 349 Width = 482 + inherited cxImageList_bar: TcxImageList + FormatVersion = 1 + end object AdoDataLink: TADOQuery Connection = ADOLink Parameters = <> @@ -10426,6 +10427,8 @@ object DataLink_YarnStk: TDataLink_YarnStk object ThreeLookAndFeelCol: TcxLookAndFeelController Kind = lfStandard NativeStyle = False + ScrollbarMode = sbmHybrid + SkinName = 'WXI' Left = 253 Top = 12 end diff --git a/B02基础纱线仓库/U_DataLink.pas b/B02基础纱线仓库/U_DataLink.pas index bccd5d4..5d71a22 100644 --- a/B02基础纱线仓库/U_DataLink.pas +++ b/B02基础纱线仓库/U_DataLink.pas @@ -5,7 +5,8 @@ interface uses SysUtils, Classes, DB, ADODB, ImgList, Controls, cxStyles, cxLookAndFeels, Windows, Messages, forms, OleCtnrs, DateUtils, ExtCtrls, SyncObjs, cxClasses, - dxSkinsCore, dxSkinsDefaultPainters, System.ImageList; + dxSkinsCore, dxSkinsDefaultPainters, System.ImageList, U_BaseDataLink, dxCore, + cxLocalization, cxImageList, cxGraphics, dxSkinsForm; type TMyThread = class(TThread) @@ -37,7 +38,7 @@ var UserDataFlag: string; type - TDataLink_YarnStk = class(TDataModule) + TDataLink_YarnStk = class(TBaseDataLink) AdoDataLink: TADOQuery; ADOLink: TADOConnection; ThreeImgList: TImageList; @@ -109,6 +110,7 @@ end; procedure TDataLink_YarnStk.DataModuleDestroy(Sender: TObject); begin + inherited; CriticalSection.Free; DataLink_YarnStk := nil; end; @@ -120,6 +122,7 @@ end; procedure TDataLink_YarnStk.DataModuleCreate(Sender: TObject); begin + inherited; CriticalSection := TCriticalSection.Create; end; diff --git a/B02基础纱线仓库/U_YarnInList.dfm b/B02基础纱线仓库/U_YarnInList.dfm index 7e42149..74682c1 100644 --- a/B02基础纱线仓库/U_YarnInList.dfm +++ b/B02基础纱线仓库/U_YarnInList.dfm @@ -16,7 +16,7 @@ inherited frmYarnInList: TfrmYarnInList Height = 38 AutoSize = True ButtonHeight = 38 - ButtonWidth = 91 + ButtonWidth = 103 Caption = 'ToolBar1' Color = clSkyBlue Font.Charset = GB2312_CHARSET @@ -79,16 +79,23 @@ inherited frmYarnInList: TfrmYarnInList ImageIndex = 20 OnClick = TBExportClick end - object ToolButton1: TToolButton + object btn1: TToolButton Left = 426 Top = 0 + Caption = #25171#21360#20837#24211#21333 + ImageIndex = 21 + OnClick = btn1Click + end + object ToolButton1: TToolButton + Left = 529 + Top = 0 AutoSize = True Caption = #20445#23384#26684#24335 ImageIndex = 16 OnClick = ToolButton1Click end object TBClose: TToolButton - Left = 521 + Left = 624 Top = 0 AutoSize = True Caption = #20851#38381 @@ -548,8 +555,8 @@ inherited frmYarnInList: TfrmYarnInList object CDS_Main: TClientDataSet Aggregates = <> Params = <> - Left = 1056 - Top = 152 + Left = 1026 + Top = 220 end object RM1: TRMGridReport ThreadPrepareReport = True diff --git a/B02基础纱线仓库/U_YarnInList.pas b/B02基础纱线仓库/U_YarnInList.pas index 82e4c20..223e6c3 100644 --- a/B02基础纱线仓库/U_YarnInList.pas +++ b/B02基础纱线仓库/U_YarnInList.pas @@ -82,6 +82,7 @@ type Tv1Column7: TcxGridDBColumn; Tv1Column8: TcxGridDBColumn; Tv1Column9: TcxGridDBColumn; + btn1: TToolButton; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); @@ -100,6 +101,7 @@ type procedure FromCoNameChange(Sender: TObject); procedure cxTabControl1Change(Sender: TObject); procedure ToolButton1Click(Sender: TObject); + procedure btn1Click(Sender: TObject); private canshu1, FStkName, canshu3: string; procedure InitGrid(); @@ -113,7 +115,7 @@ type implementation uses - U_DataLink, U_RTFun, U_YarnInEdit; + U_DataLink, U_RTFun, U_YarnInEdit, U_LabelPrint; {$R *.dfm} procedure TfrmYarnInList.setStatus(); @@ -369,6 +371,27 @@ begin end; end; +procedure TfrmYarnInList.btn1Click(Sender: TObject); +begin + if CDS_Main.IsEmpty then + Exit; + try + frmLabelPrint := TfrmLabelPrint.Create(Application); + with frmLabelPrint do + begin + FLMType := 'YarnStoragePrint'; + FFiltration1 := QuotedStr(Trim(self.CDS_Main.fieldbyname('BYIOID').AsString)); + CheckBox1.Checked := True; + if ShowModal = 1 then + begin + + end; + end; + finally + frmLabelPrint.Free; + end; +end; + procedure TfrmYarnInList.BYIOIDChange(Sender: TObject); begin if Length(Trim(BYIOID.Text)) < 4 then diff --git a/B02基础纱线仓库/U_YarnPurchasePlanList.pas b/B02基础纱线仓库/U_YarnPurchasePlanList.pas index 85fbee1..f93de75 100644 --- a/B02基础纱线仓库/U_YarnPurchasePlanList.pas +++ b/B02基础纱线仓库/U_YarnPurchasePlanList.pas @@ -892,7 +892,7 @@ begin sql.Add(',@Operation=''ȡ'' '); Sql.Add(',@DCode=' + quotedstr(Trim(DCode))); Sql.Add(',@DName=' + quotedstr(Trim(DName))); - ShowMessage(sql.Text); + //ShowMessage(sql.Text); open; end; if ADOQueryCmd.FieldByName('intReturn').AsInteger = -1 then diff --git a/B02基础纱线仓库/U_YarnPurchasePlanPut.dfm b/B02基础纱线仓库/U_YarnPurchasePlanPut.dfm index df72081..3c481a9 100644 --- a/B02基础纱线仓库/U_YarnPurchasePlanPut.dfm +++ b/B02基础纱线仓库/U_YarnPurchasePlanPut.dfm @@ -95,6 +95,7 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut AutoSize = True Caption = #35745#21010#21333 ImageIndex = 12 + Visible = False OnClick = ToolButton1Click end object ToolButton5: TToolButton @@ -193,6 +194,7 @@ inherited frmYarnPurchasePlanPut: TfrmYarnPurchasePlanPut Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'orderno' DataBinding.IsNullValueType = True + Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False Width = 78 diff --git a/B02基础纱线仓库/U_YarnPurchasePlanPut.pas b/B02基础纱线仓库/U_YarnPurchasePlanPut.pas index 1924c0b..86964da 100644 --- a/B02基础纱线仓库/U_YarnPurchasePlanPut.pas +++ b/B02基础纱线仓库/U_YarnPurchasePlanPut.pas @@ -98,7 +98,6 @@ type private FLeft, FTop: Integer; fuserName, Fstatus: string; - procedure JSMoney(); procedure InitData(); procedure ZDYHelp(FButn: TcxButtonEdit; LType: string); @@ -676,10 +675,10 @@ procedure TfrmYarnPurchasePlanPut.ToolButton2Click(Sender: TObject); begin if Order_Sub.IsEmpty then Exit; - if Application.MessageBox('ȷҪɾ', 'ʾ', 32 + 4) <> IDYES then - Exit; while Order_Sub.Locate('SSel', True, []) do begin + if Application.MessageBox('ȷҪɾѡ', 'ʾ', 32 + 4) <> IDYES then + Exit; // with ADOTemp do // begin // Close; @@ -773,7 +772,7 @@ begin FieldByName('SSEL').Value := False; FieldByName('SerialNo').Value := i; FieldByName('PurSId').Value := maxno + INTTOSTR(i); - + FieldByName('Y_Code').value := CDS_1.fieldbyname('Y_Code').value; FieldByName('Brand').Value := CDS_1.fieldbyname('Brand').value; FieldByName('Y_Name').Value := CDS_1.fieldbyname('Y_Name').value; FieldByName('Y_Spec').Value := CDS_1.fieldbyname('Y_Spec').value; diff --git a/B02基础纱线仓库/YarnStk.dpr b/B02基础纱线仓库/YarnStk.dpr index 49b00a8..827bbdb 100644 --- a/B02基础纱线仓库/YarnStk.dpr +++ b/B02基础纱线仓库/YarnStk.dpr @@ -36,7 +36,8 @@ uses U_YarnStkTotalList in 'U_YarnStkTotalList.pas' {frmYarnTotalStkList}, U_YarnInfoSel in '..\A00ͨô\U_YarnInfoSel.pas' {frmYarnInfoSel}, U_ZDYHelp in '..\..\..\public10\ThreeFun\Form\U_ZDYHelp.pas' {frmZDYHelp}, - uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas'; + uSZHN_JSON in '..\..\..\public10\ThreeFun\Fun\uSZHN_JSON.pas', + U_BaseDataLink in '..\..\..\public10\design\U_BaseDataLink.pas' {BaseDataLink: TDataModule}; {$R *.res} diff --git a/B02基础纱线仓库/YarnStk.dproj b/B02基础纱线仓库/YarnStk.dproj index 1795d2a..acdec03 100644 --- a/B02基础纱线仓库/YarnStk.dproj +++ b/B02基础纱线仓库/YarnStk.dproj @@ -226,6 +226,11 @@ dfm + +
BaseDataLink
+ dfm + TDataModule +
Cfg_2 Base diff --git a/B02基础纱线仓库/YarnStk.dproj.local b/B02基础纱线仓库/YarnStk.dproj.local index 2c6bb4a..79ccee5 100644 --- a/B02基础纱线仓库/YarnStk.dproj.local +++ b/B02基础纱线仓库/YarnStk.dproj.local @@ -1,52 +1,53 @@  - 1899-12-30 00:00:00.000.172,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas 1899-12-30 00:00:00.000.792,=D:\Dp10Repo\项目代码\共佳\A00通用窗体\U_YarnInfoSel.pas 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.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.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas - 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899-12-30 00:00:00.000.147,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas + 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas + 1899-12-30 00:00:00.000.172,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas 1899-12-30 00:00:00.000.687,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas 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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas + 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas 1899-12-30 00:00:00.000.146,D:\Dp10Repo\项目代码\共佳\B02基础纱线仓库\U_PlanYarnSel.pas=D:\Dp10Repo\项目代码\共佳\A00通用窗体\U_YarnInfoSel.pas 1899-12-30 00:00:00.000.983,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\Unit1.pas= + 1899-12-30 00:00:00.000.572,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899-12-30 00:00:00.000.079,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas - 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas + 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= 1899-12-30 00:00:00.000.311,D:\Dp10Repo\项目代码\阔禾\B02基础纱线仓库\U_YarnStkTotalList.dfm=D:\Dp10Repo\项目代码\阔禾\B02基础纱线仓库\U_YarnStkList.dfm 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas 1899-12-30 00:00:00.000.267,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanPut.pas + 1899-12-30 00:00:00.000.079,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanList.pas + 1899-12-30 00:00:00.000.147,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas 1899-12-30 00:00:00.000.517,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.dfm 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899-12-30 00:00:00.000.224,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.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.339,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnInEdit.pas + 1899-12-30 00:00:00.000.224,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.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.146,D:\Dp10Repo\项目代码\共佳\B02基础纱线仓库\U_PlanYarnSel.dfm=D:\Dp10Repo\项目代码\共佳\A00通用窗体\U_YarnInfoSel.dfm 1899-12-30 00:00:00.000.796,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnStkList.pas 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.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 1899-12-30 00:00:00.000.581,=D:\Dp10Repo\项目代码\阔和\B02基础纱线仓库\U_YarnRackList.pas + 1899-12-30 00:00:00.000.674,=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_testdll.pas + 1899-12-30 00:00:00.000.471,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_PictureUpload.pas 1899-12-30 00:00:00.000.425,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas 1899-12-30 00:00:00.000.517,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\U_YarnPurchasePlanSel.pas - 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899-12-30 00:00:00.000.311,D:\Dp10Repo\项目代码\阔禾\B02基础纱线仓库\U_YarnStkTotalList.pas=D:\Dp10Repo\项目代码\阔禾\B02基础纱线仓库\U_YarnStkList.pas 1899-12-30 00:00:00.000.907,D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\B02基础纱线仓库\YarnStk.dproj 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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas @@ -77,7 +78,7 @@ - + @@ -107,6 +108,8 @@ + + diff --git a/B02基础纱线仓库/YarnStk.identcache b/B02基础纱线仓库/YarnStk.identcache index 7bb544ff6438cc0390bb8215e6eb35fa2a7374d2..aa88913ba7b01b8078572c27ea9256c1fd92ea25 100644 GIT binary patch delta 54 zcmV-60LlOI60H*fAh7{g0g+rKlRybF0WOoS0UiWGVRL1(l>v?glRO1Ila&D&vvdci M0h0#-H%PAF%;f0h3?{RkP{=b_J7M2~o4P2d4p%TqTq51{jl-0U8lr4XgkF diff --git a/D01针织生产计划/KnitPlan.dproj b/D01针织生产计划/KnitPlan.dproj index f9d2e91..6bd25e0 100644 --- a/D01针织生产计划/KnitPlan.dproj +++ b/D01针织生产计划/KnitPlan.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\D01针织生产计划\testDll.exe + D:\Dp10Repo\项目代码\D10gmBitao\D01针织生产计划\testDll.exe diff --git a/D01针织生产计划/KnitPlan.dproj.local b/D01针织生产计划/KnitPlan.dproj.local index 4a70cfc..5a1c06f 100644 --- a/D01针织生产计划/KnitPlan.dproj.local +++ b/D01针织生产计划/KnitPlan.dproj.local @@ -1,52 +1,52 @@  + 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.493,=D:\Dp10Repo\项目代码\阔和\D01针织生产计划\U_TradeSalesContractSel.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.988,D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\KnitPlan.dproj=D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\InformationBase.dproj - 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.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.832,=D:\Dp10Repo\public10\design\U_BaseHelp.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.238,=D:\Dp10Repo\项目代码\阔和\A00通用窗体\U_LabelPrint.pas + 1899-12-30 00:00:00.000.726,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm + 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.422,=D:\Dp10Repo\项目代码\RTBasics\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.881,=D:\Dp10Repo\项目代码\RTBasics\D01针织生产计划\U_KnitCardInPut.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.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.030,D:\Dp10Repo\项目代码\东亚\B01基础合同管理\U_LabelList.dfm=D:\Dp10Repo\项目代码\东亚\D01针织生产计划\U_LabelList.dfm - 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.811,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas - 1899-12-30 00:00:00.000.951,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_YarnInfoSel.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.726,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas - 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas - 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.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.904,D:\Dp10Repo\项目代码\D10gmbitao\D01针织生产计划\U_KnitPlanCard.dfm=D:\Dp10Repo\项目代码\D10gmbitao\D01针织生产计划\U_KnitPlanCardOFF.dfm - 1899-12-30 00:00:00.000.904,=D:\Dp10Repo\项目代码\东亚\D01针织生产计划\U_LabelInput.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.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.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.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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas @@ -77,7 +77,7 @@ - + diff --git a/D01针织生产计划/U_KnitPlanInPut.dfm b/D01针织生产计划/U_KnitPlanInPut.dfm index da566f7..2c691de 100644 --- a/D01针织生产计划/U_KnitPlanInPut.dfm +++ b/D01针织生产计划/U_KnitPlanInPut.dfm @@ -3,21 +3,35 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut Top = 14 Caption = #36710#38388#29983#20135#35745#21010#21333#24405#20837 ClientHeight = 658 - ClientWidth = 1263 + ClientWidth = 1229 Color = clWhite Font.Charset = GB2312_CHARSET Font.Height = -12 Font.Name = #23435#20307 Position = poScreenCenter - ExplicitWidth = 1279 + ExplicitTop = -10 + ExplicitWidth = 1245 ExplicitHeight = 697 PixelsPerInch = 96 TextHeight = 12 - object ToolBar1: TToolBar [0] + object lbl4: TLabel [0] + Left = 570 + Top = 325 + Width = 112 + Height = 21 + Caption = #21518' '#22788' '#29702#65306 + Font.Charset = GB2312_CHARSET + Font.Color = clBlack + Font.Height = -21 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end + object ToolBar1: TToolBar [1] Tag = 1 Left = 0 Top = 0 - Width = 1263 + Width = 1229 Height = 38 AutoSize = True ButtonHeight = 38 @@ -36,6 +50,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut ParentFont = False ShowCaptions = True TabOrder = 0 + ExplicitWidth = 1263 object TBSave: TToolButton Left = 0 Top = 0 @@ -67,11 +82,11 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut OnClick = btn1Click end end - object ScrollBox1: TScrollBox [1] + object ScrollBox1: TScrollBox [2] Left = 0 Top = 38 - Width = 1263 - Height = 547 + Width = 1229 + Height = 574 Align = alTop BevelInner = bvNone BevelOuter = bvNone @@ -217,9 +232,9 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut end object Label16: TLabel Left = 9 - Top = 456 + Top = 483 Width = 114 - Height = 21 + Height = 20 Caption = #22791' '#27880#65306 Font.Charset = GB2312_CHARSET Font.Color = clBlack @@ -242,10 +257,10 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut ParentFont = False end object Label27: TLabel - Left = 1105 - Top = 430 + Left = 1106 + Top = 470 Width = 24 - Height = 21 + Height = 20 Caption = 'KG' Font.Charset = GB2312_CHARSET Font.Color = clBlack @@ -256,10 +271,10 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut Visible = False end object Label28: TLabel - Left = 974 - Top = 430 + Left = 975 + Top = 470 Width = 66 - Height = 21 + Height = 20 Caption = #30382#37325#65306 Font.Charset = GB2312_CHARSET Font.Color = clBlack @@ -297,9 +312,9 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut end object Label54: TLabel Left = 562 - Top = 317 + Top = 310 Width = 112 - Height = 21 + Height = 20 Caption = #21518' '#22788' '#29702#65306 Font.Charset = GB2312_CHARSET Font.Color = clBlack @@ -375,9 +390,9 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut end object Label9: TLabel Left = 9 - Top = 317 + Top = 310 Width = 114 - Height = 21 + Height = 20 Caption = #39068' '#33394#65306 Font.Charset = GB2312_CHARSET Font.Color = clBlack @@ -388,9 +403,9 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut end object Label10: TLabel Left = 850 - Top = 317 + Top = 310 Width = 110 - Height = 21 + Height = 20 Caption = #32986#24067#35201#27714#65306 Font.Charset = GB2312_CHARSET Font.Color = clBlack @@ -401,9 +416,9 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut end object Label11: TLabel Left = 270 - Top = 315 + Top = 308 Width = 114 - Height = 21 + Height = 20 Caption = #25104' '#20998#65306 Font.Charset = GB2312_CHARSET Font.Color = clBlack @@ -427,9 +442,9 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut end object Label17: TLabel Left = 9 - Top = 362 + Top = 355 Width = 114 - Height = 21 + Height = 20 Caption = #25552' '#33457#65306 Font.Charset = GB2312_CHARSET Font.Color = clBlack @@ -439,10 +454,10 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut ParentFont = False end object Label19: TLabel - Left = 270 - Top = 362 + Left = 9 + Top = 400 Width = 114 - Height = 21 + Height = 20 Caption = #38754' '#32433#65306 Font.Charset = GB2312_CHARSET Font.Color = clBlack @@ -453,9 +468,9 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut end object Label20: TLabel Left = 564 - Top = 362 + Top = 355 Width = 112 - Height = 21 + Height = 20 Caption = #20844' '#26020' '#25968#65306 Font.Charset = GB2312_CHARSET Font.Color = clBlack @@ -479,9 +494,9 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut end object lbl3: TLabel Left = 851 - Top = 360 + Top = 353 Width = 110 - Height = 21 + Height = 20 Caption = #33394#19997#27604#20363#65306 Font.Charset = GB2312_CHARSET Font.Color = clBlack @@ -492,9 +507,9 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut end object Label21: TLabel Left = 9 - Top = 407 + Top = 438 Width = 114 - Height = 21 + Height = 20 Caption = #24213' '#32433#65306 Font.Charset = GB2312_CHARSET Font.Color = clBlack @@ -504,10 +519,10 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut ParentFont = False end object Label23: TLabel - Left = 270 - Top = 407 + Left = 562 + Top = 400 Width = 114 - Height = 21 + Height = 20 Caption = #22841' '#23618#65306 Font.Charset = GB2312_CHARSET Font.Color = clBlack @@ -529,6 +544,19 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut Font.Style = [fsBold] ParentFont = False end + object lbl5: TLabel + Left = 562 + Top = 264 + Width = 112 + Height = 21 + Caption = #29289' '#26009' '#21495#65306 + Font.Charset = GB2312_CHARSET + Font.Color = clBlack + Font.Height = -21 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + end object OrdDate: TDateTimePicker Left = 957 Top = 4 @@ -587,7 +615,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut Left = 114 Top = 261 Width = 150 - Height = 27 + Height = 30 Font.Charset = GB2312_CHARSET Font.Color = clBlack Font.Height = -21 @@ -602,8 +630,8 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut Tag = 2 Left = 389 Top = 261 - Width = 150 - Height = 27 + Width = 101 + Height = 30 Font.Charset = GB2312_CHARSET Font.Color = clBlack Font.Height = -21 @@ -617,9 +645,9 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut object OrdTare: TEdit Tag = 2 Left = 1030 - Top = 428 + Top = 468 Width = 60 - Height = 27 + Height = 26 Font.Charset = GB2312_CHARSET Font.Color = clBlack Font.Height = -21 @@ -758,7 +786,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut object C_Deal: TBtnEditC Tag = 2 Left = 665 - Top = 313 + Top = 306 Width = 180 Height = 30 Hint = 'C_Deal/'#21518#22788#29702 @@ -829,7 +857,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut Left = 958 Top = 261 Width = 180 - Height = 27 + Height = 30 Font.Charset = GB2312_CHARSET Font.Color = clBlack Font.Height = -21 @@ -843,7 +871,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut object C_Color: TBtnEditC Tag = 2 Left = 114 - Top = 313 + Top = 306 Width = 150 Height = 30 Hint = 'CYYS/'#39068#33394 @@ -860,7 +888,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut object C_KnitNote: TBtnEditC Tag = 2 Left = 958 - Top = 313 + Top = 306 Width = 180 Height = 30 Hint = 'C_KnitNote/'#32986#24067#35201#27714 @@ -877,7 +905,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut object C_Composition: TBtnEditC Tag = 2 Left = 390 - Top = 313 + Top = 306 Width = 150 Height = 30 Hint = 'CYCF/'#25104#20998 @@ -909,8 +937,8 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut object C_Figure: TBtnEditC Tag = 2 Left = 114 - Top = 358 - Width = 150 + Top = 351 + Width = 426 Height = 30 Hint = 'C_Figure/'#25552#33457 Font.Charset = GB2312_CHARSET @@ -925,9 +953,9 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut end object C_Yarn: TBtnEditC Tag = 2 - Left = 390 - Top = 358 - Width = 150 + Left = 114 + Top = 396 + Width = 426 Height = 30 Hint = 'C_Yarn/'#38754#32433 Font.Charset = GB2312_CHARSET @@ -943,9 +971,9 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut object KGQty: TEdit Tag = 2 Left = 665 - Top = 359 + Top = 352 Width = 180 - Height = 27 + Height = 30 Font.Charset = GB2312_CHARSET Font.Color = clBlack Font.Height = -21 @@ -989,9 +1017,9 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut object OrdSNote: TRichEdit Tag = 2 Left = 114 - Top = 447 + Top = 474 Width = 809 - Height = 66 + Height = 65 Font.Charset = GB2312_CHARSET Font.Color = clBlack Font.Height = -21 @@ -1005,7 +1033,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut object SSBL: TBtnEditC Tag = 2 Left = 959 - Top = 356 + Top = 349 Width = 180 Height = 30 Hint = 'SSBL/'#33394#19997#27604#20363 @@ -1021,8 +1049,8 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut end object OrdUnit: TComboBox Tag = 2 - Left = 548 - Top = 259 + Left = 492 + Top = 260 Width = 61 Height = 29 Font.Charset = GB2312_CHARSET @@ -1043,8 +1071,8 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut object C_DYARN: TBtnEditC Tag = 2 Left = 114 - Top = 403 - Width = 150 + Top = 434 + Width = 426 Height = 30 Hint = 'C_DYARN/'#24213#32433 Font.Charset = GB2312_CHARSET @@ -1059,9 +1087,9 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut end object C_jiaceng: TBtnEditC Tag = 2 - Left = 390 - Top = 403 - Width = 150 + Left = 665 + Top = 396 + Width = 474 Height = 30 Hint = 'C_jiaceng/'#22841#23618 Font.Charset = GB2312_CHARSET @@ -1088,20 +1116,40 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut TabOrder = 33 OnKeyPress = ConNoKeyPress end + object C_Material_Name: TBtnEditC + Tag = 2 + Left = 665 + Top = 261 + Width = 180 + Height = 30 + Hint = 'C_Material_Name/'#29289#26009#21495 + Font.Charset = GB2312_CHARSET + Font.Color = clBlack + Font.Height = -21 + Font.Name = #23435#20307 + Font.Style = [fsBold] + ParentFont = False + TabOrder = 34 + OnBtnUpClick = MCTypeBtnUpClick + OnBtnDnClick = CustNameBtnDnClick + end end - object Panel2: TPanel [2] + object Panel2: TPanel [3] Left = 0 - Top = 585 - Width = 1263 - Height = 73 + Top = 612 + Width = 1229 + Height = 46 Align = alClient TabOrder = 2 Visible = False + ExplicitTop = 585 + ExplicitWidth = 1263 + ExplicitHeight = 73 object cxPageControl1: TcxPageControl Left = 1 Top = 1 - Width = 1261 - Height = 71 + Width = 1227 + Height = 44 Align = alClient Color = clWhite Font.Charset = GB2312_CHARSET @@ -1116,18 +1164,22 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut Properties.ActivePage = cxTabSheet1 Properties.CustomButtons.Buttons = <> Properties.Style = 6 - ClientRectBottom = 71 - ClientRectRight = 1261 + ExplicitWidth = 1261 + ExplicitHeight = 71 + ClientRectBottom = 44 + ClientRectRight = 1227 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 = 1261 + Width = 1227 Height = 1 Align = alClient Font.Charset = GB2312_CHARSET @@ -1137,6 +1189,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut Font.Style = [] ParentFont = False TabOrder = 0 + ExplicitWidth = 1261 object Tv2: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -1327,7 +1380,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut Tag = 1 Left = 0 Top = 0 - Width = 1261 + Width = 1227 Height = 38 AutoSize = True ButtonHeight = 38 @@ -1348,6 +1401,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut ParentFont = False ShowCaptions = True TabOrder = 1 + ExplicitWidth = 1261 object ToolButton3: TToolButton Left = 0 Top = 0 @@ -1377,13 +1431,11 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut object cxTabSheet2: TcxTabSheet Caption = #25490#38024#19977#35282 ImageIndex = 1 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 + ExplicitHeight = 39 object Panel1: TPanel Left = 0 Top = 183 - Width = 1261 + Width = 1227 Height = 25 Align = alTop BevelInner = bvRaised @@ -1401,7 +1453,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut object Panel3: TPanel Left = 0 Top = 0 - Width = 1261 + Width = 1227 Height = 25 Align = alTop BevelInner = bvRaised @@ -1419,7 +1471,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut object cxGrid5: TcxGrid Left = 0 Top = 208 - Width = 1261 + Width = 1227 Height = 165 Align = alClient Font.Charset = GB2312_CHARSET @@ -2701,7 +2753,7 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut object cxGrid3: TcxGrid Left = 0 Top = 25 - Width = 1261 + Width = 1227 Height = 158 Align = alTop Font.Charset = GB2312_CHARSET @@ -3846,19 +3898,19 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut Connection = DataLink_KnitPlan.ADOLink LockType = ltReadOnly Parameters = <> - Left = 426 - Top = 473 + Left = 437 + Top = 544 end object DataSource2: TDataSource DataSet = CDS_YuanLiao - Left = 328 - Top = 472 + Left = 342 + Top = 524 end object CDS_YuanLiao: TClientDataSet Aggregates = <> Params = <> - Left = 479 - Top = 474 + Left = 509 + Top = 547 end object ADOQueryCmd: TADOQuery Connection = DataLink_KnitPlan.ADOLink @@ -3874,8 +3926,8 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut end object DataSource3: TDataSource DataSet = ClientDataSet3 - Left = 376 - Top = 472 + Left = 383 + Top = 523 end object ClientDataSet3: TClientDataSet Aggregates = <> @@ -3885,12 +3937,12 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut end object DataSource5: TDataSource DataSet = ClientDataSet5 - Left = 288 - Top = 472 + Left = 280 + Top = 520 end object PM_3: TPopupMenu - Left = 185 - Top = 477 + Left = 129 + Top = 533 object N1: TMenuItem Caption = #22686#34892 OnClick = N1Click @@ -3901,8 +3953,8 @@ inherited frmKnitPlanInPut: TfrmKnitPlanInPut end end object PM_5: TPopupMenu - Left = 233 - Top = 477 + Left = 168 + Top = 528 object MenuItem1: TMenuItem Caption = #22686#34892 OnClick = MenuItem1Click diff --git a/D01针织生产计划/U_KnitPlanInPut.pas b/D01针织生产计划/U_KnitPlanInPut.pas index b285ca0..0c2f17c 100644 --- a/D01针织生产计划/U_KnitPlanInPut.pas +++ b/D01针织生产计划/U_KnitPlanInPut.pas @@ -385,6 +385,9 @@ type C_jiaceng: TBtnEditC; Label24: TLabel; khconno: TEdit; + lbl4: TLabel; + lbl5: TLabel; + C_Material_Name: TBtnEditC; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); diff --git a/D01针织生产计划/U_KnitPlanList.dfm b/D01针织生产计划/U_KnitPlanList.dfm index fe99ff9..476a6d6 100644 --- a/D01针织生产计划/U_KnitPlanList.dfm +++ b/D01针织生产计划/U_KnitPlanList.dfm @@ -3,9 +3,9 @@ inherited frmKnitPlanList: TfrmKnitPlanList Top = 194 Caption = #36710#38388#29983#20135#35745#21010#21333 ClientHeight = 778 - ClientWidth = 1935 + ClientWidth = 1924 Position = poScreenCenter - ExplicitWidth = 1951 + ExplicitWidth = 1940 ExplicitHeight = 817 PixelsPerInch = 96 TextHeight = 12 @@ -13,7 +13,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList Tag = 1 Left = 0 Top = 0 - Width = 1935 + Width = 1924 Height = 76 AutoSize = True ButtonHeight = 38 @@ -230,7 +230,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList object Panel1: TPanel [1] Left = 0 Top = 76 - Width = 1935 + Width = 1924 Height = 67 Align = alTop BevelInner = bvRaised @@ -238,7 +238,6 @@ inherited frmKnitPlanList: TfrmKnitPlanList Color = clWhite ParentBackground = False TabOrder = 1 - ExplicitWidth = 1540 object Label1: TLabel Left = 18 Top = 13 @@ -402,12 +401,10 @@ inherited frmKnitPlanList: TfrmKnitPlanList object cxGrid1: TcxGrid [2] Left = 0 Top = 171 - Width = 1935 + Width = 1924 Height = 374 Align = alClient TabOrder = 2 - ExplicitWidth = 1540 - ExplicitHeight = 294 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -798,6 +795,14 @@ inherited frmKnitPlanList: TfrmKnitPlanList Options.Editing = False Width = 80 end + object cxgrdbclmnTv1Column19: TcxGridDBColumn + Caption = #29289#26009#21495 + DataBinding.FieldName = 'C_Material_Name' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 90 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 @@ -806,7 +811,7 @@ inherited frmKnitPlanList: TfrmKnitPlanList object cxTabControl1: TcxTabControl [3] Left = 0 Top = 143 - Width = 1935 + Width = 1924 Height = 28 Align = alTop Font.Charset = GB2312_CHARSET @@ -825,9 +830,8 @@ inherited frmKnitPlanList: TfrmKnitPlanList #24050#32467#26463 #20840#37096) OnChange = cxTabControl1Change - ExplicitWidth = 1540 ClientRectBottom = 30 - ClientRectRight = 1935 + ClientRectRight = 1924 ClientRectTop = 30 end object Panel2: TPanel [4] @@ -975,13 +979,11 @@ inherited frmKnitPlanList: TfrmKnitPlanList object cxGrid3: TcxGrid [5] Left = 0 Top = 545 - Width = 1935 + Width = 1924 Height = 233 Align = alBottom PopupMenu = PopupMenu1 TabOrder = 5 - ExplicitLeft = 29 - ExplicitWidth = 1552 object Tv3: TcxGridDBTableView PopupMenu = PopupMenu1 Navigator.Buttons.CustomButtons = <> diff --git a/D01针织生产计划/U_KnitPlanList.pas b/D01针织生产计划/U_KnitPlanList.pas index 09e3a70..cde0dff 100644 --- a/D01针织生产计划/U_KnitPlanList.pas +++ b/D01针织生产计划/U_KnitPlanList.pas @@ -154,6 +154,7 @@ type ToolButton9: TToolButton; Tv1Column18: TcxGridDBColumn; ToolButton10: TToolButton; + cxgrdbclmnTv1Column19: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure TBCloseClick(Sender: TObject); procedure TBFindClick(Sender: TObject); diff --git a/D01针织生产计划/U_LCKInput.dfm b/D01针织生产计划/U_LCKInput.dfm index 7619896..22761e3 100644 --- a/D01针织生产计划/U_LCKInput.dfm +++ b/D01针织生产计划/U_LCKInput.dfm @@ -78,7 +78,6 @@ object frmLCKInput: TfrmLCKInput ParentCtl3D = False ParentFont = False TabOrder = 1 - ExplicitHeight = 652 object Label2: TLabel Left = 23 Top = 33 @@ -686,10 +685,6 @@ object frmLCKInput: TfrmLCKInput Font.Style = [] ParentFont = False TabOrder = 1 - ExplicitLeft = 0 - ExplicitTop = 391 - ExplicitWidth = 1376 - ExplicitHeight = 406 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> diff --git a/D01针织生产计划/U_LCKInput.pas b/D01针织生产计划/U_LCKInput.pas index ee3d389..2202514 100644 --- a/D01针织生产计划/U_LCKInput.pas +++ b/D01针织生产计划/U_LCKInput.pas @@ -213,6 +213,7 @@ begin C_Name.text := Trim(self.ADOQueryTemp.fieldbyname('C_Name').AsString); HclNote.text := Trim(self.ADOQueryTemp.fieldbyname('C_Deal').AsString); + Note.Text := Trim(self.ADOQueryTemp.fieldbyname('OrdSNote').AsString); PBKC.Text := FPBKC; with ADOQueryTemp do begin diff --git a/D02针织坯布检验/KnitInsp.dproj.local b/D02针织坯布检验/KnitInsp.dproj.local index 33e7d2b..6cb13b8 100644 --- a/D02针织坯布检验/KnitInsp.dproj.local +++ b/D02针织坯布检验/KnitInsp.dproj.local @@ -7,20 +7,20 @@ 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899-12-30 00:00:00.000.963,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeMachInsp.dfm=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitMachInsp.dfm + 1899-12-30 00:00:00.000.617,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas 1899-12-30 00:00:00.000.638,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas 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.983,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\Unit1.pas= 1899-12-30 00:00:00.000.506,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas 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.983,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\Unit1.pas= + 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\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_ClothInfoSel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm 1899-12-30 00:00:00.000.925,=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.123,=D:\Dp10Repo\public10\design\U_globalVar.pas + 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas 1899-12-30 00:00:00.000.963,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeMachInsp.pas=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitMachInsp.pas 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= @@ -28,17 +28,17 @@ 1899-12-30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj 1899-12-30 00:00:00.000.909,=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\U_DyeClothInspList.pas 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.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.802,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeClothInspList.pas=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitClothInspList.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.617,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas 1899-12-30 00:00:00.000.802,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeClothInspList.dfm=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitClothInspList.dfm - 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.963,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_DyeMachInsp.dfm=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\U_KnitMachInsp.dfm + 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899-12-30 00:00:00.000.017,D:\Dp10Repo\项目代码\RTBasics\D02针织检验\DyeInsp.dproj=D:\Dp10Repo\项目代码\RTBasics\D02针织检验\KnitInsp.dproj 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.422,=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.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas @@ -69,7 +69,7 @@ - + diff --git a/D02针织坯布检验/KnitInspLogin.dproj.local b/D02针织坯布检验/KnitInspLogin.dproj.local index 74ade84..4808574 100644 --- a/D02针织坯布检验/KnitInspLogin.dproj.local +++ b/D02针织坯布检验/KnitInspLogin.dproj.local @@ -29,24 +29,24 @@ - - - - - - - - - - - - + + + + + + + + + + + + 1899-12-30 00:00:00.000.552,D:\Dp10Repo\项目代码\东亚\D02针织坯布检验\KnitInspLogin.dproj=D:\Dp10Repo\项目代码\东亚\D02针织坯布检验\DyeInspLogin.dproj diff --git a/D02针织坯布检验/U_KnitClothInspList.dfm b/D02针织坯布检验/U_KnitClothInspList.dfm index ea1b33e..f2fa5c4 100644 --- a/D02针织坯布检验/U_KnitClothInspList.dfm +++ b/D02针织坯布检验/U_KnitClothInspList.dfm @@ -127,10 +127,10 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList ParentFont = False PopupMenu = PM_1 TabOrder = 2 - ExplicitTop = 136 object Tv1: TcxGridDBTableView OnMouseUp = Tv1MouseUp Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> OnCellDblClick = Tv1CellDblClick DataController.DataSource = DS_1 DataController.Filter.AutoDataSetFilter = True @@ -204,6 +204,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object v1Column22: TcxGridDBColumn Caption = #36873#20013 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True Properties.NullStyle = nssUnchecked @@ -214,6 +215,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object v1Column21: TcxGridDBColumn Caption = #25171#30721#26102#38388 DataBinding.FieldName = 'FillTime' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -221,6 +223,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object v1Column32: TcxGridDBColumn Caption = #21512#21516#21495 DataBinding.FieldName = 'conNO' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -228,6 +231,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object v1Column1: TcxGridDBColumn Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'OrderNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -235,6 +239,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object Tv1Column4: TcxGridDBColumn Caption = #20135#21697#32534#21495 DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -242,6 +247,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object v1Column13: TcxGridDBColumn Caption = #20135#21697#21517#31216 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -249,6 +255,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object v1Column3: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -256,6 +263,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object Tv1Column6: TcxGridDBColumn Caption = #22383#24067#20811#37325 DataBinding.FieldName = 'C_KnitGramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -263,6 +271,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object v1Column5: TcxGridDBColumn Caption = #25104#21697#20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -270,6 +279,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object Tv1Column3: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -277,6 +287,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object Tv1Column5: TcxGridDBColumn Caption = #25104#20998 DataBinding.FieldName = 'C_Composition' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -284,6 +295,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object Tv1Column8: TcxGridDBColumn Caption = #25552#33457 DataBinding.FieldName = 'C_Figure' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -291,6 +303,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object Tv1Column9: TcxGridDBColumn Caption = #38754#32433 DataBinding.FieldName = 'C_Yarn' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -298,6 +311,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object Tv1Column7: TcxGridDBColumn Caption = #25209#21495 DataBinding.FieldName = 'BatchNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -305,6 +319,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object v1Column7: TcxGridDBColumn Caption = #30133#28857#24773#20917 DataBinding.FieldName = 'FlawList' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -312,6 +327,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object v1Column17: TcxGridDBColumn Caption = #29366#24577 DataBinding.FieldName = 'CIIOFlag' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -319,6 +335,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object Tv1Column1: TcxGridDBColumn Caption = #26426#21488#21495 DataBinding.FieldName = 'Loom' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 80 @@ -326,6 +343,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object v1Column23: TcxGridDBColumn Caption = #21367#21495 DataBinding.FieldName = 'PieceNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -333,6 +351,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object v1Column18: TcxGridDBColumn Caption = #24067#31080#21495 DataBinding.FieldName = 'CIID' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -340,6 +359,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object v1Column8: TcxGridDBColumn Caption = #27611#37325 DataBinding.FieldName = 'GrossWeight' + DataBinding.IsNullValueType = True Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False @@ -348,6 +368,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object v1Column27: TcxGridDBColumn Caption = #30382#37325 DataBinding.FieldName = 'Tare' + DataBinding.IsNullValueType = True Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False @@ -356,6 +377,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object v1Column28: TcxGridDBColumn Caption = #20928#37325 DataBinding.FieldName = 'NetWeight' + DataBinding.IsNullValueType = True Visible = False HeaderAlignmentHorz = taCenter Options.Editing = False @@ -364,6 +386,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object v1Column10: TcxGridDBColumn Caption = #31859#25968 DataBinding.FieldName = 'Meter' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -371,6 +394,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object Tv1Column10: TcxGridDBColumn Caption = #30721#25968 DataBinding.FieldName = 'Yardage' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -378,6 +402,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object Tv1Column2: TcxGridDBColumn Caption = #21333#20301 DataBinding.FieldName = 'LenUnit' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -385,6 +410,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object v1Column20: TcxGridDBColumn Caption = #25171#30721#20154 DataBinding.FieldName = 'Filler' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -392,6 +418,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object v1Column14: TcxGridDBColumn Caption = #25187#20998 DataBinding.FieldName = 'KouFenQty' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False VisibleForCustomization = False @@ -400,6 +427,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object v1Column12: TcxGridDBColumn Caption = #21697#36136 DataBinding.FieldName = 'Grade' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -407,6 +435,7 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList object v1Column42: TcxGridDBColumn Caption = #24635#35760#24405#25968 DataBinding.FieldName = 'TotalCount' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 66 @@ -800,8 +829,16 @@ inherited frmKnitClothInspList: TfrmKnitClothInspList Left = 748 Top = 324 object N1: TMenuItem - Caption = #22797#21046 + Caption = #20840#36873 OnClick = N1Click end + object N2: TMenuItem + Caption = #20840#24323 + OnClick = N2Click + end + object N3: TMenuItem + Caption = #22797#21046 + OnClick = N3Click + end end end diff --git a/D02针织坯布检验/U_KnitClothInspList.pas b/D02针织坯布检验/U_KnitClothInspList.pas index bf63983..8d6a5bc 100644 --- a/D02针织坯布检验/U_KnitClothInspList.pas +++ b/D02针织坯布检验/U_KnitClothInspList.pas @@ -13,7 +13,8 @@ uses cxContainer, cxCurrencyEdit, BtnEdit, RM_e_main, RM_e_htm, RM_e_Graphic, RM_e_Jpeg, RM_e_txt, RM_e_csv, Math, Clipbrd, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, dxSkinsCore, - dxSkinsDefaultPainters, dxDateRanges, U_BaseList, dxDateTimeWheelPicker; + dxSkinsDefaultPainters, dxDateRanges, U_BaseList, dxDateTimeWheelPicker, + dxScrollbarAnnotations; type TfrmKnitClothInspList = class(TfrmBaseList) @@ -95,6 +96,8 @@ type Tv1Column6: TcxGridDBColumn; Tv1Column8: TcxGridDBColumn; Tv1Column9: TcxGridDBColumn; + N2: TMenuItem; + N3: TMenuItem; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBCloseClick(Sender: TObject); @@ -121,6 +124,8 @@ type procedure TBExportClick(Sender: TObject); procedure ToolButton1Click(Sender: TObject); procedure N1Click(Sender: TObject); + procedure N2Click(Sender: TObject); + procedure N3Click(Sender: TObject); private DQdate: TDateTime; FLeft, FTop: Integer; @@ -538,8 +543,17 @@ end; procedure TfrmKnitClothInspList.N1Click(Sender: TObject); begin - Clipboard.SetTextBuf(PChar(Trim(Order_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString))); + SelOKNo(Order_Main, true); +end; +procedure TfrmKnitClothInspList.N2Click(Sender: TObject); +begin + SelOKNo(Order_Main, false); +end; + +procedure TfrmKnitClothInspList.N3Click(Sender: TObject); +begin + Clipboard.SetTextBuf(PChar(Trim(Order_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString))); end; procedure TfrmKnitClothInspList.RKOrdIDKeyPress(Sender: TObject; var Key: Char); diff --git a/F01染色坯布仓库/DyeGreyClothStk.dproj.local b/F01染色坯布仓库/DyeGreyClothStk.dproj.local index 2b0ee6c..6922ef2 100644 --- a/F01染色坯布仓库/DyeGreyClothStk.dproj.local +++ b/F01染色坯布仓库/DyeGreyClothStk.dproj.local @@ -1,46 +1,46 @@  - 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas - 1899-12-30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm + 1899-12-30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.dfm 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.pas - 1899-12-30 00:00:00.000.394,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.pas 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas + 1899-12-30 00:00:00.000.440,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanCardSel.pas + 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas 1899-12-30 00:00:00.000.865,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LbaelMapSet.pas 1899-12-30 00:00:00.000.844,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_AttachmentUpload.pas 1899-12-30 00:00:00.000.796,=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas - 1899-12-30 00:00:00.000.398,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.pas - 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas + 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas - 1899-12-30 00:00:00.000.951,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\DyeGreyClothStk.dproj + 1899-12-30 00:00:00.000.398,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.pas=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.pas 1899-12-30 00:00:00.000.817,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas 1899-12-30 00:00:00.000.339,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899-12-30 00:00:00.000.440,=D:\Dp10Repo\项目代码\RTBasics\F00染色通用窗体\U_DyePlanCardSel.pas - 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= - 1899-12-30 00:00:00.000.070,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMacStkSel.dfm + 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.398,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.dfm + 1899-12-30 00:00:00.000.394,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.pas=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.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.070,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMacStkSel.dfm=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.dfm + 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas + 1899-12-30 00:00:00.000.951,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\DyeGreyClothStk.dproj=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\InformationBase.dproj 1899-12-30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899-12-30 00:00:00.000.791,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.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.070,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMacStkSel.pas=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.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.070,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.pas=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMacStkSel.pas + 1899-12-30 00:00:00.000.619,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas 1899-12-30 00:00:00.000.492,=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothStkSel.pas 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas + 1899-12-30 00:00:00.000.398,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachInEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothInEdit.dfm + 1899-12-30 00:00:00.000.394,D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.dfm + 1899-12-30 00:00:00.000.734,=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.069,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 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.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas - 1899-12-30 00:00:00.000.619,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas - 1899-12-30 00:00:00.000.394,D:\Dp10Repo\项目代码\RTBasics\F01染色坯布仓库\U_DyeGreyClothOutEdit.dfm=D:\Dp10Repo\项目代码\RTBasics\B03基础物料仓库\U_BSPrtMachOutEdit.dfm @@ -71,7 +71,7 @@ - + diff --git a/F01染色坯布仓库/DyeGreyClothStk.identcache b/F01染色坯布仓库/DyeGreyClothStk.identcache index 0804c6869d7eef29a0b600069e1cfed44eae3a6c..6e51d253dbce09165c30eba8b55837618d68f295 100644 GIT binary patch delta 65 zcmV-H0KWg+3)~BkS(A?fACuAn8If5!lj{LDlL!H;lg9!#lj{N8lZ*o(lM@9(lMn(D XlQjcZv&jQW0h6o)9g&khlQ0FWFku&v delta 66 zcmV-I0KNa*3)~BkS&@-Clkx;Uk;~$dSvZl)H ScrollbarAnnotations.CustomAnnotations = <> @@ -706,27 +707,27 @@ inherited frmDyeGreyClothOutList: TfrmDyeGreyClothOutList object ADOQueryCmd: TADOQuery Connection = DataLink_DyeGreyClothStk.ADOLink Parameters = <> - Left = 984 - Top = 152 + Left = 964 + Top = 134 end object ADOQueryMain: TADOQuery Connection = DataLink_DyeGreyClothStk.ADOLink LockType = ltReadOnly Parameters = <> - Left = 1048 - Top = 168 + Left = 1020 + Top = 178 end object ADOQueryTemp: TADOQuery Connection = DataLink_DyeGreyClothStk.ADOLink LockType = ltReadOnly Parameters = <> - Left = 1016 - Top = 160 + Left = 956 + Top = 218 end object DataSource1: TDataSource DataSet = CDS_Main - Left = 920 - Top = 152 + Left = 864 + Top = 164 end object cxGridPopupMenu1: TcxGridPopupMenu Grid = cxGrid2 @@ -737,8 +738,8 @@ inherited frmDyeGreyClothOutList: TfrmDyeGreyClothOutList object CDS_Main: TClientDataSet Aggregates = <> Params = <> - Left = 952 - Top = 152 + Left = 923 + Top = 166 end object RM1: TRMGridReport ThreadPrepareReport = True @@ -756,15 +757,15 @@ inherited frmDyeGreyClothOutList: TfrmDyeGreyClothOutList CompressThread = False LaterBuildEvents = True OnlyOwnerDataSet = False - Left = 360 - Top = 232 + Left = 339 + Top = 282 ReportData = {} end object RMDBMain: TRMDBDataSet Visible = True DataSet = CDS_PRT - Left = 424 - Top = 232 + Left = 453 + Top = 186 end object RMXLSExport1: TRMXLSExport ShowAfterExport = True @@ -777,37 +778,41 @@ inherited frmDyeGreyClothOutList: TfrmDyeGreyClothOutList ScaleX = 1.000000000000000000 ScaleY = 1.000000000000000000 CompressFile = False - Left = 392 - Top = 232 + Left = 401 + Top = 275 end object RMDBHZ: TRMDBDataSet Visible = True DataSet = CDS_HZ - Left = 296 - Top = 232 + Left = 265 + Top = 259 end object CDS_HZ: TClientDataSet Aggregates = <> Params = <> - Left = 488 - Top = 232 + Left = 510 + Top = 230 end object CDS_PRT: TClientDataSet Aggregates = <> Params = <> - Left = 456 - Top = 232 + Left = 492 + Top = 294 end - object PopupMenu1: TPopupMenu - Left = 328 - Top = 233 - object N1: TMenuItem + object PM_1: TPopupMenu + Left = 561 + Top = 343 + object MenuItem1: TMenuItem Caption = #20840#36873 OnClick = N1Click end - object N2: TMenuItem + object MenuItem2: TMenuItem Caption = #20840#24323 OnClick = N2Click end + object N3: TMenuItem + Caption = #22797#21046 + OnClick = N3Click + end end end diff --git a/F01染色坯布仓库/U_DyeGreyClothOutList.pas b/F01染色坯布仓库/U_DyeGreyClothOutList.pas index 9ad07c9..4a3d5ed 100644 --- a/F01染色坯布仓库/U_DyeGreyClothOutList.pas +++ b/F01染色坯布仓库/U_DyeGreyClothOutList.pas @@ -12,7 +12,7 @@ uses cxDropDownEdit, cxCheckBox, RM_Common, RM_Class, RM_e_Xls, RM_Dataset, RM_System, RM_GridReport, Menus, cxCalendar, cxButtonEdit, cxTextEdit, cxPC, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, - cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, + cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList,Clipbrd, dxScrollbarAnnotations; type @@ -40,9 +40,6 @@ type CDS_HZ: TClientDataSet; CDS_PRT: TClientDataSet; TBDel: TToolButton; - PopupMenu1: TPopupMenu; - N1: TMenuItem; - N2: TMenuItem; TBAdd: TToolButton; TBEdit: TToolButton; cxGrid2: TcxGrid; @@ -105,6 +102,10 @@ type Tv1Column11: TcxGridDBColumn; Tv1Column12: TcxGridDBColumn; Tv1Column13: TcxGridDBColumn; + PM_1: TPopupMenu; + MenuItem1: TMenuItem; + MenuItem2: TMenuItem; + N3: TMenuItem; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -125,6 +126,7 @@ type procedure cxTabControl1Change(Sender: TObject); procedure ToolButton1Click(Sender: TObject); procedure ToolButton2Click(Sender: TObject); + procedure N3Click(Sender: TObject); private canshu1, canshu2, FWorkshop: string; procedure InitGrid(); @@ -327,6 +329,11 @@ begin SelOKNo(CDS_Main, False); end; +procedure TfrmDyeGreyClothOutList.N3Click(Sender: TObject); +begin + Clipboard.SetTextBuf(PChar(Trim(CDS_Main.fieldbyname(TV1.Controller.FocusedColumn.DataBinding.FilterFieldName).AsString))); +end; + procedure TfrmDyeGreyClothOutList.TBDelClick(Sender: TObject); var MBCIOID: string; diff --git a/F04染色刷卡/DyeProcess.dproj.local b/F04染色刷卡/DyeProcess.dproj.local index c5b3735..aa3f4ab 100644 --- a/F04染色刷卡/DyeProcess.dproj.local +++ b/F04染色刷卡/DyeProcess.dproj.local @@ -1,17 +1,18 @@  + 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= 1899-12-30 00:00:00.000.734,=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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= - 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899-12-30 00:00:00.000.138,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutput.pas - 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas + 1899-12-30 00:00:00.000.138,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutput.pas 1899-12-30 00:00:00.000.963,=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\U_DyeOutputList.pas - 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas + 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas + 1899-12-30 00:00:00.000.882,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899-12-30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas + 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas 1899-12-30 00:00:00.000.998,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\Unit1.pas= 1899-12-30 00:00:00.000.326,D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\DyeProcess.dproj=D:\Dp10Repo\项目代码\RTBasics\F04染色刷卡\InformationBase.dproj @@ -19,7 +20,6 @@ 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 - 2025-04-09 23:36:47.882,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas @@ -50,7 +50,7 @@ - + diff --git a/F04染色刷卡/DyeProcess.identcache b/F04染色刷卡/DyeProcess.identcache index 752c0211357c30792b65a84411e4723e0cbdfddc..664b6318f9f97b4a6b88f0db0b62966564794ae5 100644 GIT binary patch delta 45 zcmV+|0Mh@735f}iK9e{EC6g-xERjAxlePg+v3)rKlYaptlX?R0lf45ylW7A~lllXX DS3wXN delta 44 zcmV+{0Mq}835f}iK9P?tAAOa(kdIIm0rUO)yECV2ui31&z`U8(& C1P{;v diff --git a/F04染色刷卡/InformationBase.dproj.local b/F04染色刷卡/InformationBase.dproj.local index 1d74751..c2aa4df 100644 --- a/F04染色刷卡/InformationBase.dproj.local +++ b/F04染色刷卡/InformationBase.dproj.local @@ -3,17 +3,17 @@ 1899-12-30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas 1899-12-30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= - 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.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899-12-30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas 1899-12-30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\Unit1.pas 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= - 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas + 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas 1899-12-30 00:00:00.000.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.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.123,=D:\Dp10Repo\public10\design\U_globalVar.pas @@ -45,7 +45,7 @@ - + diff --git a/F04染色刷卡/InformationBase.identcache b/F04染色刷卡/InformationBase.identcache index d44c5dfefe15325b5d0e8b44e496daa222058d70..34485cd792f7575774f865a6bcf11fe038740aba 100644 GIT binary patch delta 155 zcmcc5{+*qbpMinFcCrDJB$tb!L3*xJW=UfH Left = 1012 Top = 380 @@ -872,4 +929,10 @@ inherited frmDyeOutput: TfrmDyeOutput Left = 569 Top = 379 end + object ADOQueryTemp: TADOQuery + Connection = DataLink_DyeProcess.ADOLink + Parameters = <> + Left = 1105 + Top = 369 + end end diff --git a/F04染色刷卡/U_DyeOutput.pas b/F04染色刷卡/U_DyeOutput.pas index f180065..18878bd 100644 --- a/F04染色刷卡/U_DyeOutput.pas +++ b/F04染色刷卡/U_DyeOutput.pas @@ -40,7 +40,7 @@ type SpeedButton10: TSpeedButton; SpeedButton12: TSpeedButton; SpeedButton49: TSpeedButton; - ADOQuery1: TADOQuery; + ADOQueryCmd: TADOQuery; ADO_Car: TADOQuery; ADO_YG: TADOQuery; ADO_Cmd: TADOQuery; @@ -77,6 +77,11 @@ type tishi: TLabel; Button1: TButton; Timer1: TTimer; + lbl1: TLabel; + OutNumber: TcxTextEdit; + MachineNo: TcxTextEdit; + lbl2: TLabel; + ADOQueryTemp: TADOQuery; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormDestroy(Sender: TObject); procedure FormCreate(Sender: TObject); @@ -183,10 +188,10 @@ begin begin close; sql.Clear; - sql.Add(' select * from PB_LCK A INNER JOIN Knit_Plan_Sub B ON A.SUBID=B.SUBID '); + sql.Add(' select OutNumber=(select count(C.LCKID) OutNumber from PB_LCK C,PB_CK_LCK B where B.LCKID = C.LCKID and C.LCKID = A.LCKID),* from PB_LCK A INNER JOIN Knit_Plan_Sub B ON A.SUBID=B.SUBID '); SQL.Add('INNER JOIN Knit_Plan_MAIN C ON A.MAINID=B.MAINID'); sql.Add('where LCKID=' + quotedstr(trim(fPCID))); -// showmessage(sql.Text); + // showmessage(sql.Text); open; end; // if trim(ADO_Car.fieldbyname('ShowMsg').AsString) <> '' then @@ -198,8 +203,7 @@ begin // end // else SInData(ADO_Car, Panel2, 2); - ROLLNUM.text := ADO_Car.FieldByName('KKPS').AsString; - + ROLLNUM.text := ADO_Car.FieldByName('OutNumber').AsString; Scan.text := ''; Scan.OnClick(Scan); @@ -417,6 +421,8 @@ begin end; procedure TfrmDyeOutput.SpeedButton14Click(Sender: TObject); +var + Maxno: string; begin try @@ -469,11 +475,11 @@ begin exit; end; - if StrToFloatDef(ROLLNUM.Text, 0) > StrToFloatDef(KKPS.Text, 0) then + if StrToFloatDef(ROLLNUM.Text, 0) > StrToFloatDef(OutNumber.Text, 0) then begin MovePanel1.Visible := true; SpeedButton14.Enabled := True; - tishi.Caption := 'Ǽƥƥ'; + tishi.Caption := 'Ǽƥʵƥ'; Timer1.Enabled := true; exit; end; @@ -485,12 +491,14 @@ begin // SpeedButton14.Enabled := True; // Exit; // end; -// if (CDS_GX.FieldByName('GlideNo').AsString = CDS_GX.FieldByName('maxGlideNo').AsString) and (StrToFloatDef(QTY.Text, 0) = 0) then -// begin -// Application.MessageBox('һ', 'ʾϢ', 0); -// SpeedButton14.Enabled := True; -// Exit; -// end; + if (CDS_GX.FieldByName('GlideNo').AsString = CDS_GX.FieldByName('maxGlideNo').AsString) and (MachineNo.Text = '') then + begin + MovePanel1.Visible := true; + SpeedButton14.Enabled := True; + tishi.Caption := '복ţ'; + Timer1.Enabled := true; + Exit; + end; with ADO_Cmd do begin @@ -513,12 +521,96 @@ begin end; FieldByName('Qty').Value := 0; - + FieldByName('MachineNo').Value := trim(MachineNo.text); FieldByName('RollNum').Value := trim(ROLLNUM.text); FieldByName('Filler').Value := trim(DName); Post; end; + //͹ύ֮ѿԶ + if CDS_GX.FieldByName('GlideNo').AsString = CDS_GX.FieldByName('maxGlideNo').AsString then + begin + if not GetLSNo(ADOQueryCmd, Maxno, 'PC', 'BS_Cloth_IO', 3, 1) then + raise Exception.Create('ȡȾɫʧܣ'); + with ADOQueryTemp do + begin + close; + sql.Clear; + sql.Add(' select * from BS_Cloth_IO where IOFlag = '''' and StkID = ' + quotedstr(trim(LCKID.text))); +// showmessage(sql.Text); + open; + end; + with ADOQueryCmd do + begin + close; + sql.Clear; + sql.Add(' select * from BS_Cloth_IO where IOFlag = '''' and StkID = ' + quotedstr(trim(LCKID.text))); +// showmessage(sql.Text); + open; + end; + with ADOQueryCmd do + begin + Append; + FieldByName('BCIOID').Value := Trim(Maxno); + FieldByName('STKName').Value := ADOQueryTemp.fieldbyname('STKName').Value; + FieldByName('Workshop').Value := ADOQueryTemp.fieldbyname('Workshop').Value; + FieldByName('IOTime').Value := Trim(FormatDateTime('yyyy-MM-dd', Now)); + FieldByName('IOQtyFlag').Value := -1; + FieldByName('STKID').Value := ADOQueryTemp.fieldbyname('STKID').Value; + FieldByName('IOFlag').Value := ''; + FieldByName('IOType').Value := 'ӹ'; + FieldByName('C_code').Value := ADOQueryTemp.fieldbyname('C_code').Value; + FieldByName('C_Name').Value := ADOQueryTemp.fieldbyname('C_Name').Value; + FieldByName('C_Composition').Value := ADOQueryTemp.fieldbyname('C_Composition').Value; + FieldByName('C_Spec').Value := ADOQueryTemp.fieldbyname('C_Spec').Value; + FieldByName('C_Width').Value := ADOQueryTemp.fieldbyname('C_Width').Value; + FieldByName('C_GramWeight').Value := ADOQueryTemp.fieldbyname('C_GramWeight').Value; + FieldByName('C_Color').Value := ADOQueryTemp.fieldbyname('C_Color').Value; + FieldByName('C_ColorNo').Value := ADOQueryTemp.fieldbyname('C_ColorNo').Value; + FieldByName('C_EColor').Value := ADOQueryTemp.fieldbyname('C_EColor').Value; + FieldByName('C_Pattern').Value := ADOQueryTemp.fieldbyname('C_Pattern').Value; + FieldByName('C_StyleNo').Value := ADOQueryTemp.fieldbyname('C_StyleNo').Value; + FieldByName('C_ColorDepth').Value := ADOQueryTemp.fieldbyname('C_ColorDepth').Value; + FieldByName('BatchNO').Value := ADOQueryTemp.fieldbyname('BatchNo').Value; + FieldByName('StkCoNo').Value := ADOQueryTemp.fieldbyname('StkCoNo').Value; + FieldByName('StkCoName').Value := ADOQueryTemp.fieldbyname('StkCoName').Value; + FieldByName('FromCoNo').Value := ADOQueryTemp.fieldbyname('FromCoNo').Value; + FieldByName('FromCoName').Value := ADOQueryTemp.fieldbyname('FromCoName').Value; + FieldByName('ToCoNo').Value := ADOQueryTemp.fieldbyname('ToCoNo').Value; + FieldByName('ToCoName').Value := ADOQueryTemp.fieldbyname('ToCoName').Value; + FieldByName('FromOrdNo').Value := ADOQueryTemp.fieldbyname('FromOrdNo').Value; + FieldByName('FromMainId').Value := ADOQueryTemp.fieldbyname('FromMainId').Value; + FieldByName('FromSubId').Value := ADOQueryTemp.fieldbyname('FromSubId').Value; + FieldByName('ToOrdNo').Value := ADOQueryTemp.fieldbyname('ToOrdNo').Value; + FieldByName('ToMainId').Value := ADOQueryTemp.fieldbyname('ToMainId').Value; + FieldByName('ToSubId').Value := ADOQueryTemp.fieldbyname('ToSubId').Value; + FieldByName('PieceWeight').Value := ADOQueryTemp.fieldbyname('PieceWeight').Value; + FieldByName('PieceLen').Value := ADOQueryTemp.fieldbyname('PieceLen').Value; + FieldByName('StkPosition').Value := ADOQueryTemp.fieldbyname('StkPosition').Value; + FieldByName('BZSpec').Value := ADOQueryTemp.fieldbyname('BZSpec').Value; + FieldByName('QtyUnit').Value := ADOQueryTemp.fieldbyname('QtyUnit').Value; + FieldByName('Qty').Value := ADOQueryTemp.fieldbyname('STKQTY').Value; + FieldByName('Piece').Value := RollNum.Text; + FieldByName('Filler').Value := Trim(DName); + FieldByName('C_XINHAO').Value := ADOQueryTemp.fieldbyname('C_XINHAO').Value; + FieldByName('C_GONGYI').Value := ADOQueryTemp.fieldbyname('C_GONGYI').Value; + FieldByName('C_JITAI').Value := ADOQueryTemp.fieldbyname('C_JITAI').Value; + FieldByName('C_ZHUANGKUANG').Value := ADOQueryTemp.fieldbyname('C_ZHUANGKUANG').Value; + FieldByName('C_JIAJI').Value := ADOQueryTemp.fieldbyname('C_JIAJI').Value; + FieldByName('JIAZINO').Value := MachineNo.Text; + Post; + end; + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('Update BS_Cloth_IO Set StkPiece=(select Sum(isnull(Piece,0)*IOQtyFlag) from BS_Cloth_IO A where A.STKID=BS_Cloth_IO.BCIOID)'); + sql.Add(',STKQty=(select Sum(isnull(Qty,0)*IOQtyFlag) from BS_Cloth_IO A where A.STKID=BS_Cloth_IO.BCIOID )'); + sql.Add('where BCIOID=''' + Trim(ADOQueryTemp.fieldbyname('STKID').AsString) + ''''); + ExecSQL; + end; + end; + ////////////////// ½ ////////////////// // with ADO_Cmd do // begin diff --git a/T03贸易布匹检验/TradeInsp.dproj.local b/T03贸易布匹检验/TradeInsp.dproj.local index db86dc7..56b07e5 100644 --- a/T03贸易布匹检验/TradeInsp.dproj.local +++ b/T03贸易布匹检验/TradeInsp.dproj.local @@ -7,8 +7,8 @@ 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas 1899-12-30 00:00:00.000.965,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInsp.dproj 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899-12-30 00:00:00.000.136,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899-12-30 00:00:00.000.108,=D:\Dp10Repo\项目代码\D10gmXinHuaHuaQian\T03贸易布匹检验\U_LabelAdd.pas + 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas + 1899-12-30 00:00:00.000.401,D:\Dp10Repo\项目代码\D10gmbitao\T03贸易布匹检验\U_TradePACKETPrint.pas=D:\Dp10Repo\项目代码\D10gmbitao\T03贸易布匹检验\U_TradeLabelPrint.pas 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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas 1899-12-30 00:00:00.000.901,=D:\Dp10Repo\项目代码\D10gmXinHuaHuaQian\T03贸易布匹检验\U_LabSet.pas @@ -34,15 +34,15 @@ 1899-12-30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas 1899-12-30 00:00:00.000.401,D:\Dp10Repo\项目代码\D10gmbitao\T03贸易布匹检验\U_TradePACKETPrint.dfm=D:\Dp10Repo\项目代码\D10gmbitao\T03贸易布匹检验\U_TradeLabelPrint.dfm 1899-12-30 00:00:00.000.344,=D:\Dp10Repo\项目代码\东亚\T03贸易布匹检验\U_TradeLabelPrint.pas - 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas + 1899-12-30 00:00:00.000.136,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas 1899-12-30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= 1899-12-30 00:00:00.000.641,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas - 1899-12-30 00:00:00.000.401,D:\Dp10Repo\项目代码\D10gmbitao\T03贸易布匹检验\U_TradePACKETPrint.pas=D:\Dp10Repo\项目代码\D10gmbitao\T03贸易布匹检验\U_TradeLabelPrint.pas + 1899-12-30 00:00:00.000.108,=D:\Dp10Repo\项目代码\D10gmXinHuaHuaQian\T03贸易布匹检验\U_LabelAdd.pas 1899-12-30 00:00:00.000.861,=D:\Dp10Repo\项目代码\D10gmXinHuaHuaQian\T03贸易布匹检验\U_LabelInput.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.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas @@ -73,7 +73,7 @@ - + diff --git a/T03贸易布匹检验/TradeInspLogin.dproj.local b/T03贸易布匹检验/TradeInspLogin.dproj.local index 1537058..eaeabc1 100644 --- a/T03贸易布匹检验/TradeInspLogin.dproj.local +++ b/T03贸易布匹检验/TradeInspLogin.dproj.local @@ -29,24 +29,24 @@ - - - - - - - - - - - - + + + + + + + + + + + + 1899-12-30 00:00:00.000.635,D:\Dp10Repo\项目代码\RTBasics\F05染色检验\WFBProduction.dproj=D:\Dp10Repo\项目代码\RTBasics\F05染色检验\DyeInspLogin.dproj diff --git a/T03贸易布匹检验/U_TradeClothInspList.pas b/T03贸易布匹检验/U_TradeClothInspList.pas index 4808b14..c1e25fb 100644 --- a/T03贸易布匹检验/U_TradeClothInspList.pas +++ b/T03贸易布匹检验/U_TradeClothInspList.pas @@ -396,7 +396,7 @@ begin end; if Trim(ADOQueryPrint.fieldbyname('Grade').AsString) = 'Ʒ' then - FLabVolume := Trim(ADOQueryPrint.fieldbyname('LabVolume').AsString) + FLabVolume := Trim(ADOQueryPrint.fieldbyname('LabPackage').AsString) else FLabVolume := 'Ʒǩ'; @@ -406,7 +406,7 @@ begin if FileExists(fPrintFile) then begin RM1.LoadFromFile(fPrintFile); - if Trim(ADOQueryPrint.fieldbyname('LabVolume').AsString) <> 'Ʒǩ' then + if Trim(ADOQueryPrint.fieldbyname('LabPackage').AsString) <> 'Ʒǩ' then Rm1.DefaultCopies := strtointdef((edt1.Text),1) else Rm1.DefaultCopies:=strtointdef((edt1.Text),1); diff --git a/T03贸易布匹检验/U_TradeMachInsp.dfm b/T03贸易布匹检验/U_TradeMachInsp.dfm index 8298bf0..0a14a86 100644 --- a/T03贸易布匹检验/U_TradeMachInsp.dfm +++ b/T03贸易布匹检验/U_TradeMachInsp.dfm @@ -37,7 +37,6 @@ ParentBackground = False ParentFont = False TabOrder = 1 - ExplicitTop = 186 object lblLenUnit: TLabel Left = 203 Top = 89 @@ -53,7 +52,7 @@ OnClick = lblLenUnitClick end object Label4: TLabel - Left = 231 + Left = 238 Top = 142 Width = 44 Height = 34 @@ -318,8 +317,8 @@ OnKeyPress = MJstr3KeyPress end object Tare: TEdit - Left = 161 - Top = 139 + Left = 168 + Top = 138 Width = 66 Height = 41 Font.Charset = ANSI_CHARSET @@ -426,9 +425,9 @@ OnClick = Button5Click end object DelQty: TEdit - Left = 230 + Left = 223 Top = 39 - Width = 50 + Width = 76 Height = 41 Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -1958,7 +1957,6 @@ BevelInner = bvRaised BevelOuter = bvLowered TabOrder = 0 - ExplicitTop = 1 object AOrdDefNote1: TRichEdit Left = 2 Top = 78 @@ -2359,10 +2357,6 @@ object 查看: TcxTabSheet Caption = #26597#30475 ImageIndex = 1 - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 object cxGrid1: TcxGrid Left = 0 Top = 0 @@ -2814,7 +2808,6 @@ ParentBackground = False TabOrder = 5 Visible = False - ExplicitTop = 1 object Label35: TLabel Left = 27 Top = 55 diff --git a/T03贸易布匹检验/U_TradeMachInsp.pas b/T03贸易布匹检验/U_TradeMachInsp.pas index 2797cd8..619b1d2 100644 --- a/T03贸易布匹检验/U_TradeMachInsp.pas +++ b/T03贸易布匹检验/U_TradeMachInsp.pas @@ -2023,30 +2023,60 @@ procedure TfrmTradeMachInsp.SpeedButton13Click(Sender: TObject); var i: Integer; begin - if CheckData('õ') = False then - exit; +// if CheckData('õ') = False then +// exit; +// +// FCIFName := Trim(TSpeedButton(Sender).Hint); +// MovePanel1.Visible := True; +// lblCIFName.Caption := Trim(FCIFName); +// +// +// +// //ʾּ +//// CIFBeg.Text := InputLen.Text; +// with Panel3 do +// begin +// for i := 0 to ControlCount - 1 do +// begin +// if Controls[i] is TSpeedButton then +// begin +// TSpeedButton(Controls[i]).Hint := Trim(CIFBeg.Name); +// end; +// end; +// end; +// +// CIFNumber.OnClick(CIFNumber); +// CIFNumber.SetFocus; - FCIFName := Trim(TSpeedButton(Sender).Hint); - MovePanel1.Visible := True; - lblCIFName.Caption := Trim(FCIFName); - - - - //ʾּ -// CIFBeg.Text := InputLen.Text; - with Panel3 do + with CDS_2 do begin - for i := 0 to ControlCount - 1 do + Append; +// if RadioGroup1.ItemIndex = 5 then +// FieldByName('CIFName').Value := '' + Trim(FCIFName) +// else if RadioGroup1.ItemIndex = 4 then +// FieldByName('CIFName').Value := 'ƥ' + Trim(FCIFName) +// else + FieldByName('CIFName').Value := Trim(TSpeedButton(Sender).Hint); + FieldByName('CIFbeg').Value := Trim(InputLen.Text); + FieldByName('CIFEnd').Value := Trim(InputLen.Text); + FieldByName('CIFNumber').Value := 1; + FieldByName('CIFPoints').Value := 0; + + if RadioGroup1.ItemIndex > -1 then begin - if Controls[i] is TSpeedButton then + if RadioGroup1.ItemIndex < 3 then begin - TSpeedButton(Controls[i]).Hint := Trim(CIFBeg.Name); + FieldByName('CIFPoints').Value := RadioGroup1.ItemIndex + 1; + end + else + begin + FieldByName('CIFPoints').Value := 4; end; end; - end; + FieldByName('CIFQty').Value := 0; - CIFNumber.OnClick(CIFNumber); - CIFNumber.SetFocus; + Post; + end; end; procedure TfrmTradeMachInsp.cxDBImage1DblClick(Sender: TObject); diff --git a/T03贸易布匹检验/U_TradePACKETPrint.dfm b/T03贸易布匹检验/U_TradePACKETPrint.dfm index e0cf34a..8cbf031 100644 --- a/T03贸易布匹检验/U_TradePACKETPrint.dfm +++ b/T03贸易布匹检验/U_TradePACKETPrint.dfm @@ -7,7 +7,6 @@ inherited frmTradePACKETPrint: TfrmTradePACKETPrint FormStyle = fsMDIChild Position = poScreenCenter Visible = True - ExplicitLeft = -185 ExplicitWidth = 1382 ExplicitHeight = 650 PixelsPerInch = 96 diff --git a/T03贸易布匹检验/U_TradePACKETPrint.pas b/T03贸易布匹检验/U_TradePACKETPrint.pas index 81741ce..752692a 100644 --- a/T03贸易布匹检验/U_TradePACKETPrint.pas +++ b/T03贸易布匹检验/U_TradePACKETPrint.pas @@ -161,7 +161,7 @@ begin end; if Trim(ADOQueryPrint.fieldbyname('Grade').AsString) = 'Ʒ' then - FLabVolume := Trim(ADOQueryPrint.fieldbyname('LabVolume').AsString) + FLabVolume := Trim(ADOQueryPrint.fieldbyname('LabPackage').AsString) else FLabVolume := 'Ʒǩ'; diff --git a/T04贸易明细仓库/TradeClothStk.dproj.local b/T04贸易明细仓库/TradeClothStk.dproj.local index 7bd1b00..f47b895 100644 --- a/T04贸易明细仓库/TradeClothStk.dproj.local +++ b/T04贸易明细仓库/TradeClothStk.dproj.local @@ -4,7 +4,7 @@ 1899-12-30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas 1899-12-30 00:00:00.000.742,=D:\Dp10Repo\项目代码\东亚\T04贸易明细仓库\U_TradeClothTotalOutList.pas 1899-12-30 00:00:00.000.760,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradePlanSel.pas - 1899-12-30 00:00:00.000.059,=D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelPrint.pas + 1899-12-30 00:00:00.000.900,=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.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= 1899-12-30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas @@ -24,7 +24,7 @@ 1899-12-30 00:00:00.000.734,=D:\Dp10Repo\项目代码\东亚\T04贸易明细仓库\U_TradeClothTotalStkList_Sel.pas 1899-12-30 00:00:00.000.572,D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitPlanSel.pas 1899-12-30 00:00:00.000.572,D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\D03针织成品仓库\U_KnitPlanSel.dfm - 1899-12-30 00:00:00.000.900,=D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelPrint.pas + 1899-12-30 00:00:00.000.059,=D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelPrint.pas 1899-12-30 00:00:00.000.521,D:\Dp10Repo\项目代码\D10gmXinHuaHuaQian\T04贸易明细仓库\U_TradeClothTotalInList.pas=D:\Dp10Repo\项目代码\D10gmXinHuaHuaQian\T04贸易明细仓库\U_TradeClothTotalOutList.pas 1899-12-30 00:00:00.000.649,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.pas 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.pas @@ -42,20 +42,20 @@ 1899-12-30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas 1899-12-30 00:00:00.000.684,D:\Dp10Repo\项目代码\RTBasics\G04贸易明细仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\G04贸易明细仓库\TradeClothStk.dproj 1899-12-30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas - 1899-12-30 00:00:00.000.952,D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelMapSet.pas= - 1899-12-30 00:00:00.000.499,=D:\Dp10Repo\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899-12-30 00:00:00.000.903,=D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelMapSet.pas 1899-12-30 00:00:00.000.150,=D:\Dp10Repo\项目代码\东亚\T04贸易明细仓库\U_TradeSalesContractSel2.pas + 1899-12-30 00:00:00.000.499,=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.025,D:\Dp10Repo\项目代码\东亚\T00贸易通用窗体\U_TradeSalesContractSel.dfm=D:\Dp10Repo\项目代码\东亚\T04贸易明细仓库\U_TradeSalesContractSel2.dfm 1899-12-30 00:00:00.000.370,D:\Dp10Repo\项目代码\RTBasics\G04贸易明细仓库\Unit1.pas= 1899-12-30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas 1899-12-30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas - 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.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.903,=D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelMapSet.pas - 1899-12-30 00:00:00.000.928,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradeSalesContractSel.pas - 1899-12-30 00:00:00.000.422,=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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas + 1899-12-30 00:00:00.000.952,D:\Dp10Repo\项目代码\华府\A00通用窗体\U_LabelMapSet.pas= + 1899-12-30 00:00:00.000.928,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradeSalesContractSel.pas + 1899-12-30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899-12-30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas @@ -86,7 +86,7 @@ - + diff --git a/T04贸易明细仓库/U_TradeClothTotalStkList_Sel.dfm b/T04贸易明细仓库/U_TradeClothTotalStkList_Sel.dfm index 8e829f8..ea216d0 100644 --- a/T04贸易明细仓库/U_TradeClothTotalStkList_Sel.dfm +++ b/T04贸易明细仓库/U_TradeClothTotalStkList_Sel.dfm @@ -560,14 +560,6 @@ inherited frmTradeClothTotalStkList_Sel: TfrmTradeClothTotalStkList_Sel Options.Editing = False Width = 80 end - object Tv1Column6: TcxGridDBColumn - Caption = #21512#21516#21495 - DataBinding.FieldName = 'ConNo' - DataBinding.IsNullValueType = True - HeaderAlignmentHorz = taCenter - Options.Editing = False - Width = 80 - end object Tv1Column8: TcxGridDBColumn Caption = #35745#21010#21333#21495 DataBinding.FieldName = 'orderno' @@ -675,6 +667,14 @@ inherited frmTradeClothTotalStkList_Sel: TfrmTradeClothTotalStkList_Sel Options.Editing = False Width = 80 end + object cxgrdbclmnTv1Column6: TcxGridDBColumn + Caption = #23458#25143#21333#21495 + DataBinding.FieldName = 'khconno' + DataBinding.IsNullValueType = True + HeaderAlignmentHorz = taCenter + Options.Editing = False + Width = 75 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/T04贸易明细仓库/U_TradeClothTotalStkList_Sel.pas b/T04贸易明细仓库/U_TradeClothTotalStkList_Sel.pas index ab20db4..47f3230 100644 --- a/T04贸易明细仓库/U_TradeClothTotalStkList_Sel.pas +++ b/T04贸易明细仓库/U_TradeClothTotalStkList_Sel.pas @@ -72,7 +72,6 @@ type Grade: TEdit; Tv1Column3: TcxGridDBColumn; Tv1Column5: TcxGridDBColumn; - Tv1Column6: TcxGridDBColumn; Label4: TLabel; BuyName: TEdit; Label6: TLabel; @@ -83,6 +82,7 @@ type Tv1Column8: TcxGridDBColumn; Tv1Column9: TcxGridDBColumn; Tv1Column11: TcxGridDBColumn; + cxgrdbclmnTv1Column6: TcxGridDBColumn; procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); procedure TBRafreshClick(Sender: TObject); @@ -185,15 +185,15 @@ begin sql.Add(' from '); sql.Add('(select rownumber=cast((row_number() over(order by AA.C_Code desc)) as int)'); sql.Add(',COUNT(1) OVER() AS TotalCount'); - sql.Add(',* from (select a.mainid,a.subid,C_Width,C_GramWeight,OrderNo,A.C_Code,A.C_Name,C_Color,C_ColorNo,A.LenUnit,A.Grade,isnull(C.ConNo,'''') AS ConNo,isnull(C.BuyName,'''') AS BuyName,isnull(A.ConMID,'''') AS ConMID,isnull(A.ConSID,'''') AS ConSID,C.Saleser '); + sql.Add(',* from (select a.mainid,a.subid,C_Width,C_GramWeight,C.OrderNo,A.C_Code,A.C_Name,C_Color,C_ColorNo,A.LenUnit,A.Grade,isnull(C.CustName,'''') AS BuyName,isnull(A.ConMID,'''') AS ConMID,isnull(A.ConSID,'''') AS ConSID,C.Saleser,C.khconno '); sql.Add(',sum(Meter) AS Meter,sum(Yardage) AS Yardage,sum(GrossWeight) AS GrossWeight,sum(NetWeight) AS NetWeight,Count(*) AS KCPS'); - sql.Add(' from Trade_Cloth_Stock A inner join Trade_Cloth_IO B on B.StkId=A.StkId and A.StkCycles=B.IOCycles left join BS_Contract_Main C on C.ConMId=A.ConMId where A.StkExists=1 and B.IOFlag='''' '); - sql.Add(' GROUP BY A.C_Code,A.C_Name,C_Color,C_ColorNo,A.LenUnit,A.Grade,isnull(C.ConNo,''''),isnull(C.BuyName,''''),isnull(A.ConMID,''''),isnull(A.ConSID,''''),C.Saleser,a.mainid,a.subid,C_Width,C_GramWeight,OrderNo) '); + sql.Add(' from Trade_Cloth_Stock A inner join Trade_Cloth_IO B on B.StkId=A.StkId and A.StkCycles=B.IOCycles left join Knit_Plan_Main C on C.MainId=A.MainId where A.StkExists=1 and B.IOFlag='''' '); + sql.Add(' GROUP BY A.C_Code,A.C_Name,C_Color,C_ColorNo,A.LenUnit,A.Grade,isnull(C.CustName,''''),isnull(A.ConMID,''''),isnull(A.ConSID,''''),C.Saleser,a.mainid,a.subid,C_Width,C_GramWeight,C.OrderNo,C.khconno) '); sql.Add(' AA where 1=1 ' + WSql); sql.Add(') temp_row'); sql.Add(' where rownumber> ' + inttostr(((CurrentPage - 1) * RecordsNumber))); sql.Add(' order by rownumber'); -// showmessage(sql.text); + // showmessage(sql.text); Open; end; SCreateCDS(ADOQueryMain, CDS_1); diff --git a/T04贸易明细仓库/U_TradeDeliveryRequest.dfm b/T04贸易明细仓库/U_TradeDeliveryRequest.dfm index e064f67..ab71771 100644 --- a/T04贸易明细仓库/U_TradeDeliveryRequest.dfm +++ b/T04贸易明细仓库/U_TradeDeliveryRequest.dfm @@ -252,7 +252,7 @@ inherited frmTradeDeliveryRequest: TfrmTradeDeliveryRequest end object v1Column27: TcxGridDBColumn Caption = #21457#36135#26085#26399 - DataBinding.FieldName = 'fhDate' + DataBinding.FieldName = 'DlyDate' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False diff --git a/T04贸易明细仓库/U_TradeDeliveryRequestInPut.pas b/T04贸易明细仓库/U_TradeDeliveryRequestInPut.pas index 41a8b65..3d27fc0 100644 --- a/T04贸易明细仓库/U_TradeDeliveryRequestInPut.pas +++ b/T04贸易明细仓库/U_TradeDeliveryRequestInPut.pas @@ -340,7 +340,7 @@ begin begin Append; - FieldByName('ConNo').Value := Trim(frmTradeClothTotalStkList_Sel.CDS_1.fieldbyname('ConNo').AsString); + //FieldByName('ConNo').Value := Trim(frmTradeClothTotalStkList_Sel.CDS_1.fieldbyname('ConNo').AsString); FieldByName('ConMID').Value := Trim(frmTradeClothTotalStkList_Sel.CDS_1.fieldbyname('ConMID').AsString); FieldByName('ConSID').Value := Trim(frmTradeClothTotalStkList_Sel.CDS_1.fieldbyname('ConSID').AsString); @@ -359,7 +359,7 @@ begin FieldByName('ORDERNO').Value := Trim(frmTradeClothTotalStkList_Sel.CDS_1.fieldbyname('ORDERNO').AsString); FieldByName('Piece').Value := frmTradeClothTotalStkList_Sel.CDS_1.fieldbyname('KCPS').AsInteger; -// FieldByName('Qty').Value := frmTradeClothTotalStkList_Sel.CDS_1.fieldbyname('KCQty').Asfloat; + ToCoName.Text := frmTradeClothTotalStkList_Sel.CDS_1.fieldbyname('BuyName').AsString; end; CDS_1.Edit; CDS_1.fieldbyname('SSel').value := false;