From 9494acc603a08b8592898b10217ef6b00a8d6b85 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Wed, 13 Aug 2025 14:48:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=9D=AF=E5=B8=83=EF=BC=9A?= =?UTF-8?q?=E6=9D=A5=E8=87=AA=E6=A0=BC=E7=BE=8E=E7=9A=84=20=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E6=95=B0=E6=8D=AE=E5=85=A5=E5=BA=93=EF=BC=8C=EF=BC=88?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=B7=B2=E5=8F=91=E7=9A=84=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8D=95=EF=BC=89=E4=BF=9D=E5=AD=98=E5=B7=B2=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=85=A5=E5=BA=93=20=E6=9D=A5=E8=87=AA?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E7=9A=84=20=E9=80=89=E4=BA=A7=E5=93=81=20?= =?UTF-8?q?=E7=84=B6=E5=90=8E=E8=BE=93=E5=85=A5=E6=95=B0=E6=8D=AE=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- T02贸易汇总仓库/U_GeMeiOutputSel.dfm | 6 +- T02贸易汇总仓库/U_GeMeiOutputSel.pas | 146 +----------------- T02贸易汇总仓库/U_GetDllForm.pas | 4 +- T02贸易汇总仓库/U_TradeClothTotalInInput.dfm | 1 + T02贸易汇总仓库/U_TradeClothTotalInInput.pas | 64 +++++++- T02贸易汇总仓库/U_TradeClothTotalOutList.dfm | 1 + T02贸易汇总仓库/U_TradeClothTotalOutList.pas | 21 +++ .../U_TradeTotallClothOutinput.dfm | 1 - .../U_TradeTotallClothOutinput.pas | 2 + 9 files changed, 88 insertions(+), 158 deletions(-) diff --git a/T02贸易汇总仓库/U_GeMeiOutputSel.dfm b/T02贸易汇总仓库/U_GeMeiOutputSel.dfm index 44ed56c..69be96f 100644 --- a/T02贸易汇总仓库/U_GeMeiOutputSel.dfm +++ b/T02贸易汇总仓库/U_GeMeiOutputSel.dfm @@ -20,7 +20,6 @@ inherited frmGeMeiOutputSel: TfrmGeMeiOutputSel Height = 687 Align = alClient TabOrder = 0 - ExplicitWidth = 1491 object TV1: TcxGridDBTableView OnDblClick = TV1DblClick Navigator.Buttons.CustomButtons = <> @@ -409,13 +408,12 @@ inherited frmGeMeiOutputSel: TfrmGeMeiOutputSel List = True ShowCaptions = True TabOrder = 1 - ExplicitWidth = 1491 object ToolButton1: TToolButton Left = 0 Top = 0 AutoSize = True - Caption = #20445#23384 - ImageIndex = 16 + Caption = #36873#25321 + ImageIndex = 12 OnClick = ToolButton1Click end object TBSave: TToolButton diff --git a/T02贸易汇总仓库/U_GeMeiOutputSel.pas b/T02贸易汇总仓库/U_GeMeiOutputSel.pas index 57ad6cd..e8791e1 100644 --- a/T02贸易汇总仓库/U_GeMeiOutputSel.pas +++ b/T02贸易汇总仓库/U_GeMeiOutputSel.pas @@ -106,10 +106,10 @@ type procedure ToolButton1Click(Sender: TObject); private procedure InitGrid(); - function SaveData(): Boolean; + //function SaveData(): Boolean; { Private declarations } public - FCoType, FAuthority, FStores,FSTKName: string; + FCoType, FAuthority, FStores, FSTKName: string; { Public declarations } end; @@ -193,148 +193,8 @@ begin end; procedure TfrmGeMeiOutputSel.ToolButton1Click(Sender: TObject); -var - MBCIONO: string; begin - - - //Application.MessageBox('±£´æ³É¹¦!', 'Ìáʾ', 0); - ModalResult:=1; - - -end; - -function TfrmGeMeiOutputSel.SaveData(): Boolean; -var - Maxno, MBCIOID: string; -begin - try - ADOQueryCmd.Connection.BeginTrans; - CDS_1.DisableControls; - with CDS_1 do - begin - First; - while not eof do - begin - with ADOQueryTemp do - begin - Close; - sql.Clear; - sql.Add('select * from BS_Cloth_IO where BCIOID=''' + Trim(CDS_1.fieldbyname('BCIOID').AsString) + ''''); - open; - end; - MBCIOID := Trim(ADOQueryTemp.fieldbyname('BCIOID').AsString); - - if Trim(MBCIOID) = '' then - begin - if not GetLSNo(ADOQueryCmd, Maxno, 'MR', 'BS_Cloth_IO', 4, 1) then - raise Exception.Create('ȡȾɫÅ÷²¼Èë¿â±àºÅʧ°Ü£¡'); - end - else - begin - Maxno := Trim(MBCIOID); - end; - - with ADOQueryCmd do - begin - Close; - sql.Clear; - sql.Add('select * from BS_Cloth_IO where BCIOID=''' + Trim(Maxno) + ''''); - Open; - end; - with ADOQueryCmd do - begin - if Trim(MBCIOID) = '' then - begin - Append; - FieldByName('Fillid').Value := Trim(Dcode); - FieldByName('Filler').Value := Trim(DName); - FieldByName('BCIONO').Value := Trim(Maxno); - FieldByName('BCIOID').Value := Trim(Maxno); - FieldByName('BCIONO').Value := Trim(Maxno); - FieldByName('STKID').Value := Trim(Maxno); - FieldByName('CIID').Value := Trim(Maxno); - end - else - begin - Edit; - FieldByName('Editid').Value := Trim(Dcode); - FieldByName('Editer').Value := Trim(DName); - FieldByName('EditTime').Value := SGetServerDate(ADOQueryTemp); - end; - RTSetSaveDataCDS(ADOQueryCmd, Tv1, CDS_1, 'BS_Cloth_IO', 0); - FieldByName('FromCoNo').Value := CDS_1.fieldbyname('FromCoNo').Value; - FieldByName('StkCoNo').Value := CDS_1.fieldbyname('StkCoNo').Value; - - FieldByName('FromMainId').Value := CDS_1.fieldbyname('FromMainId').Value; - FieldByName('FromSubId').Value := CDS_1.fieldbyname('FromSubId').Value; - - FieldByName('FromConMId').Value := CDS_1.fieldbyname('FromConMId').Value; - FieldByName('FromConSId').Value := CDS_1.fieldbyname('FromConSId').Value; - - FieldByName('FromPurMId').Value := CDS_1.fieldbyname('FromPurMId').Value; - FieldByName('FromPurSId').Value := CDS_1.fieldbyname('FromPurSId').Value; - - FieldByName('FromTPNID').Value := CDS_1.fieldbyname('FromTPNID').Value; - - //FieldByName('STKName').Value := FSTKName; - FieldByName('IOFlag').Value := 'Èë¿â'; - FieldByName('IOQtyFlag').Value := 1; - 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(Maxno) + ''''); - ExecSQL; - end; - with ADOQueryTemp do - begin - Close; - sql.Clear; - sql.Add('select stkQty,StkPiece from BS_Cloth_IO where BCIOID=''' + Trim(Maxno) + ''''); - Open; - end; - if ADOQueryTemp.FieldByName('stkQty').Value < 0 then - raise Exception.Create('Èë¿âÊýÁ¿Ð¡ÓÚ³ö¿âÊýÁ¿²»Äܱ£´æ!'); - if ADOQueryTemp.FieldByName('StkPiece').Value < 0 then - raise Exception.Create('Èë¿âÆ¥ÊýСÓÚ³ö¿âÆ¥Êý²»Äܱ£´æ!'); - with ADOQueryCmd do - begin - Close; - sql.Clear; - sql.Add('insert into Finance_Need_Up(UType,UDataId,UOperation,UOperator,UModule,UDetails) '); - sql.Add('values(''óÒ×´ý¼ì²¼Èë¿â'' '); - sql.Add(',' + quotedstr(Maxno)); - sql.Add(',''±£´æ'' '); - sql.Add(',' + quotedstr(DName)); - sql.Add(',' + quotedstr(trim(self.Caption))); - sql.Add(',' + quotedstr(Maxno)); - sql.Add(') '); - ExecSQL; - end; - - - Edit; - FieldByName('BCIOID').Value := Trim(Maxno); - Post; - Next; - end; - end; - - CDS_1.EnableControls; - ADOQueryCmd.Connection.CommitTrans; - - Result := True; - except - Result := False; - ADOQueryCmd.Connection.RollbackTrans; - application.MessageBox(PChar(Exception(ExceptObject).Message), 'ÌáʾÐÅÏ¢', 0); - end; - + ModalResult := 1; end; procedure TfrmGeMeiOutputSel.TV1DblClick(Sender: TObject); diff --git a/T02贸易汇总仓库/U_GetDllForm.pas b/T02贸易汇总仓库/U_GetDllForm.pas index eeaeb71..685c009 100644 --- a/T02贸易汇总仓库/U_GetDllForm.pas +++ b/T02贸易汇总仓库/U_GetDllForm.pas @@ -86,8 +86,8 @@ begin DConString := 'Provider=SQLOLEDB.1;Password=' + pswd + ';Persist Security Info=True;User ID=' + user + ';Initial Catalog=' + dtbase + ';Data Source=' + server; Parameters1 := '¹ÜÀí'; // Parameters2 := 'óÒײ¼Æ¥'; - Parameters2 := '¸ñÃÀÃŵê'; - //Parameters4 := 'ÐÂÓà'; +// Parameters2 := '¸ñÃÀÃŵê'; + Parameters2 := 'ÐÂÓà'; DName := 'ADMIN'; DCode := 'ADMIN'; end diff --git a/T02贸易汇总仓库/U_TradeClothTotalInInput.dfm b/T02贸易汇总仓库/U_TradeClothTotalInInput.dfm index 8b31ac7..a096ad6 100644 --- a/T02贸易汇总仓库/U_TradeClothTotalInInput.dfm +++ b/T02贸易汇总仓库/U_TradeClothTotalInInput.dfm @@ -498,6 +498,7 @@ inherited frmTradeClothTotalInInput: TfrmTradeClothTotalInInput AutoSize = True Caption = #26684#32654#20986#24211#25968#25454 ImageIndex = 17 + Visible = False OnClick = GeMeiOutputSelClick end end diff --git a/T02贸易汇总仓库/U_TradeClothTotalInInput.pas b/T02贸易汇总仓库/U_TradeClothTotalInInput.pas index a8660b8..47dec4e 100644 --- a/T02贸易汇总仓库/U_TradeClothTotalInInput.pas +++ b/T02贸易汇总仓库/U_TradeClothTotalInInput.pas @@ -91,9 +91,10 @@ type { Private declarations } function SaveData(MSaveType: string): Boolean; function CheckData(): Boolean; + procedure SetStatus(); public { Public declarations } - FBCId, canshu3, FSTKName, FKHName: string; + FBCId, canshu3, FSTKName, FKHName, FBCIOID: string; end; var @@ -234,6 +235,7 @@ begin FieldByName('Editid').Value := Trim(Dcode); FieldByName('Editer').Value := Trim(DName); FieldByName('EditTime').Value := SGetServerDate(ADOQueryTemp); + FieldByName('status').value := '1'; end; RTSetSaveDataCDS(ADOQueryCmd, Tv1, CDS_Sub, 'BS_Cloth_IO', 0); FieldByName('FromCoNo').Value := CDS_Sub.fieldbyname('FromCoNo').Value; @@ -264,6 +266,16 @@ begin sql.Add(' where BCIOID=''' + Trim(Maxno) + ''''); ExecSQL; end; + + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('Update BS_Cloth_IO Set status = 1'); + + sql.Add(' where BCIOID=''' + Trim(FBCIOID) + ''''); + ExecSQL; + end; with ADOQueryTemp do begin Close; @@ -346,6 +358,8 @@ begin end; SCreateCDS(ADOQueryTemp, CDS_Sub); SInitCDSData(ADOQueryTemp, CDS_Sub); + + SetStatus(); end; procedure TfrmTradeClothTotalInInput.GeMeiOutputSelClick(Sender: TObject); @@ -359,13 +373,40 @@ begin begin with Self.CDS_Sub do begin - First; - while frmGeMeiOutputSel.CDS_1.Locate('SSel', True, []) do - begin - Append; - Self.CDS_Sub.FieldByName('BCIONO').AsString := CDS_1.FieldByName('BCIONO').AsString; - Post; - end; + Append; + FBCIOID := frmGeMeiOutputSel.CDS_1.FieldByName('BCIOID').AsString; + FieldByName('BCIONO').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('BCIONO').AsString; + FieldByName('FromCoName').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('FromCoName').AsString; + FieldByName('C_Code').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('C_Code').AsString; + FieldByName('C_Name').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('C_Name').AsString; + FieldByName('C_EName').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('C_EName').AsString; + FieldByName('C_Spec').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('C_Spec').AsString; + FieldByName('C_Width').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('C_Width').AsString; + FieldByName('C_GramWeight').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('C_GramWeight').AsString; + FieldByName('FtyPCId').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('FtyPCId').AsString; + FieldByName('Piece').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('Pieceint').AsString; + FieldByName('Qty').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('Qty').AsString; + FieldByName('QtyUnit').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('QtyUnit').AsString; + FieldByName('Workshop').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('Workshop').AsString; + FieldByName('C_ColorDepth').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('C_ColorDepth').AsString; + FieldByName('C_Color').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('C_Color').AsString; + FieldByName('C_ColorNo').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('C_ColorNo').AsString; + FieldByName('C_StyleNo').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('C_StyleNo').AsString; + FieldByName('C_Composition').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('C_Composition').AsString; + FieldByName('BatchNo').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('BatchNo').AsString; + FieldByName('C_Pattern').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('C_Pattern').AsString; + FieldByName('Note').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('Note').AsString; + FieldByName('C_EColor').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('C_EColor').AsString; + FieldByName('CraftCode').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('CraftCode').AsString; + FieldByName('CraftName').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('CraftName').AsString; + FieldByName('CraftEName').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('CraftEName').AsString; + FieldByName('GC_Name').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('GC_Name').AsString; + FieldByName('C_Degree').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('C_Degree').AsString; + //FieldByName('StkConNo').AsString := frmGeMeiOutputSel.CDS_1.FieldByName('fromConNo').AsString; + + + Post; + end; end; end; @@ -375,6 +416,13 @@ begin end; +procedure TfrmTradeClothTotalInInput.SetStatus(); +begin + if FSTKName = 'ÐÂÓà' then + GeMeiOutputSel.Visible := True; + +end; + procedure TfrmTradeClothTotalInInput.TBDelClick(Sender: TObject); begin if CDS_Sub.IsEmpty then diff --git a/T02贸易汇总仓库/U_TradeClothTotalOutList.dfm b/T02贸易汇总仓库/U_TradeClothTotalOutList.dfm index f0050c4..195a55a 100644 --- a/T02贸易汇总仓库/U_TradeClothTotalOutList.dfm +++ b/T02贸易汇总仓库/U_TradeClothTotalOutList.dfm @@ -1065,6 +1065,7 @@ inherited frmTradeClothTotalOutList: TfrmTradeClothTotalOutList #26032#20313#26410#20837#24211 #26032#20313#24050#20837#24211 #20840#37096) + OnChange = cxTabControl1Change ClientRectRight = 0 ClientRectTop = 0 end diff --git a/T02贸易汇总仓库/U_TradeClothTotalOutList.pas b/T02贸易汇总仓库/U_TradeClothTotalOutList.pas index 1e468d9..d9c01ab 100644 --- a/T02贸易汇总仓库/U_TradeClothTotalOutList.pas +++ b/T02贸易汇总仓库/U_TradeClothTotalOutList.pas @@ -207,6 +207,16 @@ begin SqlStr := SqlStr + ' and A.IOTime<''' + Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.enddate.Date + 1)) + ''''; SqlStr := SqlStr + ' and isnull(stkName,'''')=''' + Trim(FstkName) + ''''; SqlStr := SqlStr + ' and ioFlag=''³ö¿â'' '; + case cxTabControl1.TabIndex of + 0: + begin + SqlStr := SqlStr + ' and Status=''0'' '; + end; + 1: + begin + SqlStr := SqlStr + ' and Status=''1'' '; + end; + end; if Trim(canshu4) <> '' then SqlStr := SqlStr + ' and isnull(StkCoName,'''')=''' + Trim(canshu4) + ''''; SqlStr := SqlStr + ' group by A.ReceiptType,A.BCIONO,A.ToCoName,C_Code,C_Name,C_Color,C_ColorNo,C_Degree,C_Pattern,QtyUnit'; @@ -246,6 +256,16 @@ begin SqlStr := SqlStr + ' and A.IOTime<''' + Trim(FormatDateTime('yyyy-MM-dd', frmFrameDateSel1.enddate.Date + 1)) + ''''; SqlStr := SqlStr + ' and isnull(stkName,'''')=''' + Trim(FstkName) + ''''; SqlStr := SqlStr + ' and ioFlag=''³ö¿â'' '; + case cxTabControl1.TabIndex of + 0: + begin + SqlStr := SqlStr + ' and Status=''0'' '; + end; + 1: + begin + SqlStr := SqlStr + ' and Status=''1'' '; + end; + end; WSqlStr := CommonFiltersByTv(Tv2, '{"RemovalNull":true,"Fields":"BCIONO"}'); if TRIM(WSqlStr) <> '' then SqlStr := SqlStr + ' and ' + WSqlStr; @@ -732,6 +752,7 @@ end; procedure TfrmTradeClothTotalOutList.cxTabControl1Change(Sender: TObject); begin InitGrid2(); + initgrid1(); end; end. diff --git a/T02贸易汇总仓库/U_TradeTotallClothOutinput.dfm b/T02贸易汇总仓库/U_TradeTotallClothOutinput.dfm index 614c074..2e1ab3b 100644 --- a/T02贸易汇总仓库/U_TradeTotallClothOutinput.dfm +++ b/T02贸易汇总仓库/U_TradeTotallClothOutinput.dfm @@ -66,7 +66,6 @@ inherited frmTradeTotallClothOutinput: TfrmTradeTotallClothOutinput Height = 402 Align = alClient TabOrder = 1 - ExplicitHeight = 390 object Tv1: TcxGridDBTableView OnMouseDown = Tv1MouseDown Navigator.Buttons.CustomButtons = <> diff --git a/T02贸易汇总仓库/U_TradeTotallClothOutinput.pas b/T02贸易汇总仓库/U_TradeTotallClothOutinput.pas index c746c45..3fb8fe5 100644 --- a/T02贸易汇总仓库/U_TradeTotallClothOutinput.pas +++ b/T02贸易汇总仓库/U_TradeTotallClothOutinput.pas @@ -226,6 +226,7 @@ begin Append; FieldByName('Fillid').Value := Trim(Dcode); FieldByName('Filler').Value := Trim(DName); + FieldByName('status').value:='0'; end else begin @@ -233,6 +234,7 @@ begin FieldByName('Editid').Value := Trim(Dcode); FieldByName('Editer').Value := Trim(DName); FieldByName('EditTime').Value := SGetServerDate(ADOQueryTemp); + end; RTSetSaveDataCDS(ADOQueryCmd, Tv1, CDS_Sub, 'BS_Cloth_IO', 0); RTSetsavedata(ADOQueryCmd, 'BS_Cloth_IO', Panel1, 0);