diff --git a/T02贸易汇总仓库/U_TradeClothTotalInList.dfm b/T02贸易汇总仓库/U_TradeClothTotalInList.dfm index 2663394..c8d6691 100644 --- a/T02贸易汇总仓库/U_TradeClothTotalInList.dfm +++ b/T02贸易汇总仓库/U_TradeClothTotalInList.dfm @@ -515,9 +515,6 @@ inherited frmTradeClothTotalInList: TfrmTradeClothTotalInList object cxTabSheet2: TcxTabSheet Caption = #20135#21697#26126#32454 ImageIndex = 1 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 object cxGrid1: TcxGrid Left = 0 Top = 0 diff --git a/T05贸易门市管理/U_TradeMarketInPut.dfm b/T05贸易门市管理/U_TradeMarketInPut.dfm index abe0bea..678496f 100644 --- a/T05贸易门市管理/U_TradeMarketInPut.dfm +++ b/T05贸易门市管理/U_TradeMarketInPut.dfm @@ -8,8 +8,8 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Font.Height = -16 Position = poMainFormCenter WindowState = wsMaximized - ExplicitWidth = 1929 - ExplicitHeight = 691 + ExplicitWidth = 1921 + ExplicitHeight = 683 PixelsPerInch = 96 TextHeight = 21 object ToolBar1: TToolBar [0] @@ -578,7 +578,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut BevelInner = bvNone Date = 40916.000000000000000000 Format = 'yyyy-MM-dd' - Time = 0.670856296288548100 + Time = 0.670856296288548000 TabOrder = 1 end object DLYDate: TDateTimePicker @@ -590,7 +590,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut BevelInner = bvNone Date = 40916.000000000000000000 Format = 'yyyy-MM-dd' - Time = 0.670856296288548100 + Time = 0.670856296288548000 ShowCheckbox = True TabOrder = 2 Visible = False diff --git a/T05贸易门市管理/U_TradeMarketInPut.pas b/T05贸易门市管理/U_TradeMarketInPut.pas index ac55b10..f488542 100644 --- a/T05贸易门市管理/U_TradeMarketInPut.pas +++ b/T05贸易门市管理/U_TradeMarketInPut.pas @@ -156,7 +156,7 @@ type PState, CopyInt, PriceFlag: Integer; FTMMID, FFTMMID, FTMMNo, MTMSId: string; FXS: Integer; - canshu1: string; + canshu1, canshu4: string; fFlileFlag: string; fordtype: string; { Public declarations } @@ -183,7 +183,6 @@ begin i := cds_1.RecordCount; i := i + 1; - CopyAddRow(Tv1, cds_1); if GetLSNo(ADOTemp, maxno, 'JS', 'Trade_Market_Sub', 4, 1) = False then begin @@ -193,10 +192,13 @@ begin end; with cds_1 do begin - Edit; + Append; FieldByName('SerialNo').Value := IntToStr(i); FieldByName('TMSId').Value := Trim(maxno); FieldByName('TMSPiece').Value := 0; + + + FieldByName('TMSQty').Value := 0; Post; end; @@ -477,7 +479,7 @@ begin FieldByName('OurCoNo').Value := Trim(OurCoName.Properties.LookupItems.Text); FieldByName('CustNo').Value := Trim(CustName.Hint); FieldByName('CustName').Value := Trim(CustName.Text); - + FieldByName('Store').Value := Trim(canshu4); Post; end; diff --git a/T05贸易门市管理/U_TradeMarketList.dfm b/T05贸易门市管理/U_TradeMarketList.dfm index b0530f0..7e9dbe7 100644 --- a/T05贸易门市管理/U_TradeMarketList.dfm +++ b/T05贸易门市管理/U_TradeMarketList.dfm @@ -9,8 +9,8 @@ inherited frmTradeMarketList: TfrmTradeMarketList FormStyle = fsMDIChild Position = poScreenCenter Visible = True - ExplicitWidth = 1807 - ExplicitHeight = 633 + ExplicitWidth = 1799 + ExplicitHeight = 625 PixelsPerInch = 96 TextHeight = 21 object ToolBar1: TToolBar [0] diff --git a/T05贸易门市管理/U_TradeMarketList.pas b/T05贸易门市管理/U_TradeMarketList.pas index 8c9fea6..005292b 100644 --- a/T05贸易门市管理/U_TradeMarketList.pas +++ b/T05贸易门市管理/U_TradeMarketList.pas @@ -145,7 +145,7 @@ type { Private declarations } public FFInt, FCloth: Integer; - canshu1, canshu2: string; + canshu1, canshu2, canshu4: string; fFlileFlag: string; FNOTE: string; FOrdType: string; @@ -369,6 +369,7 @@ begin FTMMId := Trim(Self.Order_Main.fieldbyname('TMMId').AsString); FTMMNo := Trim(Self.Order_Main.fieldbyname('TMMNo').AsString); canshu1 := self.canshu1; + canshu4 := self.canshu4; frmTradeMarketInPut.fordtype := self.fordtype; if ShowModal = 1 then begin @@ -472,6 +473,7 @@ begin PState := 0; FTMMId := ''; canshu1 := self.canshu1; + canshu4 := self.canshu4; frmTradeMarketInPut.fordtype := self.fordtype; if ShowModal = 1 then begin @@ -497,6 +499,7 @@ begin inherited; canshu1 := trim(self.fParameters1); canshu2 := trim(self.fParameters2); + canshu4 := trim(self.canshu4); fFlileFlag := UserDataFlag + 'HX'; cxTabControl1.TabIndex := 0; InitForm(); @@ -621,6 +624,7 @@ begin CopyInt := 99; FTMMId := Trim(Self.Order_Main.fieldbyname('TMMId').AsString); canshu1 := self.canshu1; + canshu4 := self.canshu4; frmTradeMarketInPut.fordtype := self.fordtype; if ShowModal = 1 then begin