diff --git a/T02贸易汇总仓库/TradeTotalClothStk.dproj.local b/T02贸易汇总仓库/TradeTotalClothStk.dproj.local index 8d41729..431397f 100644 --- a/T02贸易汇总仓库/TradeTotalClothStk.dproj.local +++ b/T02贸易汇总仓库/TradeTotalClothStk.dproj.local @@ -1,46 +1,46 @@  - 1899/12/30 00:00:00.000.226,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradePlanSel.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.719,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T02贸易汇总仓库\U_LabelPrintPV.pas - 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas - 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= - 1899/12/30 00:00:00.000.217,=D:\Dp10Repo\项目代码\D10myBiaoqi\T02贸易汇总仓库\U_ClothTotalFileUp.pas 1899/12/30 00:00:00.000.295,=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.975,=D:\Dp10Repo\public10\ThreeFun\Fun\U_CompressionFun.pas 1899/12/30 00:00:00.000.832,=D:\Dp10Repo\public10\design\U_BaseHelp.pas + 1899/12/30 00:00:00.000.226,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradePlanSel.pas + 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas + 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= + 1899/12/30 00:00:00.000.217,=D:\Dp10Repo\项目代码\D10myBiaoqi\T02贸易汇总仓库\U_ClothTotalFileUp.pas + 1899/12/30 00:00:00.000.475,=D:\Dp10Repo\项目代码\D10myBiaoqi\T02贸易汇总仓库\U_ClothTotalFileUp.pas + 1899/12/30 00:00:00.000.147,D:\Dp10Repo\项目代码\D10myBiaoqi\T02贸易汇总仓库\U_ClothTotalFileUp.pas= + 1899/12/30 00:00:00.000.493,=D:\Dp10Repo\项目代码\RTBasics\A00通用模板\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.974,=D:\Dp10Repo\public10\design\U_BaseDataLink.pas 1899/12/30 00:00:00.000.111,=D:\Dp10Repo\项目代码\D10myBiaoqi\A02基础产品管理\U_SLT.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.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.dfm=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.dfm + 1899/12/30 00:00:00.000.719,=E:\temp\Dp10Repo\项目代码\D10zzbiaoqi\T02贸易汇总仓库\U_LabelPrintPV.pas + 1899/12/30 00:00:00.000.048,=D:\Dp10Repo\public10\design\U_BaseList.pas + 1899/12/30 00:00:00.000.135,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelp.pas= 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas - 1899/12/30 00:00:00.000.010,D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.dfm=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.dfm - 1899/12/30 00:00:00.000.010,D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.pas=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.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.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.893,D:\Dp10Repo\项目代码\RTBasics\G02贸易汇总仓库\TradeTotalClothStk.dproj=D:\Dp10Repo\项目代码\RTBasics\G02贸易汇总仓库\InformationBase.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.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas - 1899/12/30 00:00:00.000.202,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.pas - 1899/12/30 00:00:00.000.478,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.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.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.893,D:\Dp10Repo\项目代码\RTBasics\G02贸易汇总仓库\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\G02贸易汇总仓库\TradeTotalClothStk.dproj + 1899/12/30 00:00:00.000.010,D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.pas=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.pas + 1899/12/30 00:00:00.000.202,=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.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.478,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelMapSet.pas + 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas + 1899/12/30 00:00:00.000.465,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradeSalesContractSel.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.699,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas 1899/12/30 00:00:00.000.382,=D:\Dp10Repo\项目代码\D10myBiaoqi\T02贸易汇总仓库\U_TPUp.pas - 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas - 1899/12/30 00:00:00.000.475,=D:\Dp10Repo\项目代码\D10myBiaoqi\T02贸易汇总仓库\U_ClothTotalFileUp.pas - 1899/12/30 00:00:00.000.147,D:\Dp10Repo\项目代码\D10myBiaoqi\T02贸易汇总仓库\U_ClothTotalFileUp.pas= + 1899/12/30 00:00:00.000.010,D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradeSalesContractSel.dfm=D:\Dp10Repo\项目代码\RTBasics\G00贸易通用窗体\U_TradePlanSel.dfm + 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.465,=D:\Dp10Repo\项目代码\RTBasics\T00贸易通用窗体\U_TradeSalesContractSel.pas - 1899/12/30 00:00:00.000.699,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas - 1899/12/30 00:00:00.000.487,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ZDYHelpSel.pas= 2026/05/19 10:49:12.000.956,=D:\D10W\public10\ThreeFun\Fun\uSZHN_JSON.pas diff --git a/T02贸易汇总仓库/TradeTotalClothStk.identcache b/T02贸易汇总仓库/TradeTotalClothStk.identcache index 86c1986..122024a 100644 Binary files a/T02贸易汇总仓库/TradeTotalClothStk.identcache and b/T02贸易汇总仓库/TradeTotalClothStk.identcache differ diff --git a/T02贸易汇总仓库/U_TradeGreyClothStkList.dfm b/T02贸易汇总仓库/U_TradeGreyClothStkList.dfm index ecf9cfd..7d9c654 100644 --- a/T02贸易汇总仓库/U_TradeGreyClothStkList.dfm +++ b/T02贸易汇总仓库/U_TradeGreyClothStkList.dfm @@ -5,6 +5,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList ClientHeight = 472 ClientWidth = 1400 Position = poDefault + ExplicitLeft = -67 ExplicitWidth = 1416 ExplicitHeight = 511 PixelsPerInch = 96 @@ -77,32 +78,32 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList ParentBackground = False TabOrder = 1 object Label3: TLabel - Left = 227 + Left = 195 Top = 11 Width = 24 Height = 12 Caption = #21697#21517 end object Label4: TLabel - Left = 59 + Left = 46 Top = 11 - Width = 24 + Width = 36 Height = 12 - Caption = #23458#25143 + Caption = #20379#24212#21830 end object Label8: TLabel - Left = 369 + Left = 345 Top = 11 Width = 24 Height = 12 Caption = #35268#26684 end object Label2: TLabel - Left = 510 + Left = 495 Top = 11 - Width = 36 + Width = 48 Height = 12 - Caption = #25209' '#21495 + Caption = #35745#21010#21333#21495 end object Label5: TLabel Left = 641 @@ -126,8 +127,8 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList end object C_name: TEdit Tag = 2 - Left = 254 - Top = 7 + Left = 225 + Top = 6 Width = 100 Height = 20 TabOrder = 0 @@ -144,14 +145,14 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList end object C_spec: TEdit Tag = 2 - Left = 396 - Top = 7 + Left = 375 + Top = 6 Width = 100 Height = 20 TabOrder = 2 OnChange = TBFindClick end - object BatchNo: TEdit + object FromOrdNo: TEdit Tag = 2 Left = 549 Top = 7 @@ -160,7 +161,7 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList TabOrder = 3 OnChange = FromCoNameChange end - object Saleser: TEdit + object plan_Saleser: TEdit Tag = 2 Left = 680 Top = 7 @@ -346,9 +347,9 @@ inherited frmTradeGreyClothStkList: TfrmTradeGreyClothStkList Options.Editing = False Width = 124 end - object v1Column11: TcxGridDBColumn + object v1plan_Saleser: TcxGridDBColumn Caption = #19994#21153#21592 - DataBinding.FieldName = 'Saleser' + DataBinding.FieldName = 'plan_Saleser' DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 68 diff --git a/T02贸易汇总仓库/U_TradeGreyClothStkList.pas b/T02贸易汇总仓库/U_TradeGreyClothStkList.pas index b312427..5df9ba7 100644 --- a/T02贸易汇总仓库/U_TradeGreyClothStkList.pas +++ b/T02贸易汇总仓库/U_TradeGreyClothStkList.pas @@ -50,14 +50,14 @@ type C_name: TEdit; FromCoName: TEdit; C_spec: TEdit; - BatchNo: TEdit; + FromOrdNo: TEdit; v1Column6: TcxGridDBColumn; v1Column7: TcxGridDBColumn; v1Column9: TcxGridDBColumn; - v1Column11: TcxGridDBColumn; + v1plan_Saleser: TcxGridDBColumn; v1Column12: TcxGridDBColumn; Label5: TLabel; - Saleser: TEdit; + plan_Saleser: TEdit; ToolButton2: TToolButton; Tv1Column1: TcxGridDBColumn; Tv1Column2: TcxGridDBColumn; @@ -131,8 +131,10 @@ begin Filtered := False; Close; sql.Clear; - sql.Add(' select A.*,DATEDIFF(Day, A.IOTime, GETDATE()) KL '); + sql.Add(' select A.*,DATEDIFF(Day, A.IOTime, GETDATE()) KL, '); + sql.Add(' ISNULL(B.Saleser, '''') as plan_Saleser '); sql.Add(' from BS_Cloth_IO A '); + sql.Add(' left join Trade_Plan_Main B on B.OrderNo = A.FromOrdNo '); SQL.Add(' where A.IOFlag='''' and (isnull(StkQty,0)>0 or isnull(StkPiece,0)>0) '); sql.Add(' and isnull(stkName,'''')=''' + Trim(FstkName) + ''''); Open;