From 68d671e3a89077a5e3b6727e0b9eda3b29d2c27b Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Sat, 9 Aug 2025 10:20:50 +0800 Subject: [PATCH] ~ --- 复合检验管理/U_GetDllForm.pas | 2 +- 复合检验管理/U_MJManageNewFDNew.pas | 40 +++++++++++++-- 复合检验管理/U_OrderInPut.dfm | 18 +++++++ 复合检验管理/U_OrderInPut.pas | 69 +++++++++++++++++++++++++- 复合检验管理/U_ProductOrderNewList.pas | 23 +++++++-- 5 files changed, 140 insertions(+), 12 deletions(-) diff --git a/复合检验管理/U_GetDllForm.pas b/复合检验管理/U_GetDllForm.pas index d3624c4..9d30713 100644 --- a/复合检验管理/U_GetDllForm.pas +++ b/复合检验管理/U_GetDllForm.pas @@ -70,7 +70,7 @@ begin SetLength(user, 255); SetLength(pswd, 255); - server := '101.132.143.144,7781'; + server := '101.132.143.144,7781'; // server:='.'; dtbase := 'yongshengjydata'; user := 'rtsa'; diff --git a/复合检验管理/U_MJManageNewFDNew.pas b/复合检验管理/U_MJManageNewFDNew.pas index 2a60cf5..0916668 100644 --- a/复合检验管理/U_MJManageNewFDNew.pas +++ b/复合检验管理/U_MJManageNewFDNew.pas @@ -390,8 +390,8 @@ type private { Private declarations } FInt, PState, PrintInt, SCInitGrid, FState, FCK: Integer; - FColumn, FBanZu, FAPID, FMainId, FSubId, FFFMJID: string; - FJZ, FJC, FDC: Double; + FColumn, FBanZu, FAPID, FMainId, FSubId, FFFMJID, FOrderUnit: string; + FJZ, FJC, FDC, FPRTOrderQty: Double; fRollType, fRollType1, fbaotype, fbaosx: string; isCommopen, IsJsMessage: boolean; MValue, FCDName, MggCDFalg: string; @@ -673,7 +673,7 @@ procedure TfrmMJManageNewFDNewSF.InitCDGridID(); begin with ADOQueryMain do begin - Close; + Close; SQL.Clear; sql.Add('select '); //sql.Add('Case when isnull(MJType,'''')=''Ʒ'' then ''B''+RTrim(Cast(MJXH as varchar(20))) else Cast(MJXH as varchar(20)) end as MJXH ,'); @@ -1739,7 +1739,37 @@ begin end; end; end; + if FPRTOrderQty = -1 then + begin + end + else + begin + + with ADOTmp do + begin + Close; + sql.Clear; + SQL.Add('select sum(mjlen)ddzc,sum(mjqty4)DDzz from WFB_MJJY where subid=''' + trim(FsubId) + ''' '); + open; + end; + if (FOrderUnit <> 'KG') or (FOrderUnit <> 'Kg') or (FOrderUnit <> 'kG') or (FOrderUnit <> 'kg') then + begin + if ADOTmp.FieldByName('ddzc').asfloat + strtofloatdef((MJLen.text), 0) > FPRTOrderQty then + begin + Application.MessageBox('Ѿﵽɨ', 'ʾ', 0); + Exit; + end; + end + else + begin + if ADOTmp.FieldByName('ddzz').asfloat + strtofloatdef((mjqty4.text), 0) > FPRTOrderQty then + begin + Application.MessageBox('Ѿﵽɨ', 'ʾ', 0); + Exit; + end; + end; + end; BTPrint.Enabled := False; Timer1.Enabled := True; if SaveData() then @@ -2495,7 +2525,7 @@ begin begin Close; sql.Clear; - sql.Add('select B.*,B.OrderNo OrderNoM,C.*, '); + sql.Add('select COALESCE(B.CustomerNoName,C.PRTkh)CustomerNoName,B.*,B.OrderNo OrderNoM,C.*, '); sql.Add('maxMJxh=isnull((select max(mjxh) from WFB_MJJY X where X.SubID=C.subID),0),'); sql.Add('minMJxh=isnull((select min(mjxh) from WFB_MJJY X where X.SubID=C.subID),1),'); // sql.Add('maxBaoNO=1+isnull((select max(cast(baoNO as int)) from WFB_MJJY X where X.subID=C.subID ),0)'); @@ -2546,6 +2576,8 @@ begin FDC := StrToFloatDef(ADOTmp.fieldbyname('DC').asstring, 0); fbaotype := Trim(ADOTmp.fieldbyname('baotype').AsString); fbaosx := Trim(ADOTmp.fieldbyname('baosx').AsString); + FOrderUnit := Trim(ADOTmp.fieldbyname('OrderUnit').AsString); + FPRTOrderQty := ADOTmp.fieldbyname('PRTOrderQty').AsFloat; if FDC <> 0 then begin Edit12.Visible := True; diff --git a/复合检验管理/U_OrderInPut.dfm b/复合检验管理/U_OrderInPut.dfm index 2683404..3b41371 100644 --- a/复合检验管理/U_OrderInPut.dfm +++ b/复合检验管理/U_OrderInPut.dfm @@ -1837,6 +1837,24 @@ object frmOrderInPut: TfrmOrderInPut HeaderAlignmentHorz = taCenter Width = 70 end + object Tv1Column3: TcxGridDBColumn + Caption = #24213#24067 + DataBinding.FieldName = 'Prtdb' + HeaderAlignmentHorz = taCenter + Width = 60 + end + object Tv1Column4: TcxGridDBColumn + Caption = #38754#24067 + DataBinding.FieldName = 'Prtmb' + HeaderAlignmentHorz = taCenter + Width = 60 + end + object Tv1Column2: TcxGridDBColumn + Caption = #23458#25143 + DataBinding.FieldName = 'PRTkh' + HeaderAlignmentHorz = taCenter + Width = 60 + end end object cxGrid1Level1: TcxGridLevel GridView = Tv1 diff --git a/复合检验管理/U_OrderInPut.pas b/复合检验管理/U_OrderInPut.pas index a81327c..b099fd6 100644 --- a/复合检验管理/U_OrderInPut.pas +++ b/复合检验管理/U_OrderInPut.pas @@ -12,7 +12,20 @@ uses cxCurrencyEdit, cxImage, Menus, cxLookAndFeelPainters, cxButtons, cxDBEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels, cxNavigator, RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport, RM_Preview, - RM_DsgGridReport, RM_e_Graphic, RM_e_bmp; + RM_DsgGridReport, RM_e_Graphic, RM_e_bmp, dxSkinsCore, dxSkinBlack, dxSkinBlue, + dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom, dxSkinDarkSide, + dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy, + dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian, + dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis, + dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black, + dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, + dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue, + dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray, + dxSkinOffice2013White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic, + dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringTime, dxSkinStardust, + dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, + dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, + dxSkinscxPCPainter; type TfrmOrderInPut = class(TForm) @@ -177,6 +190,9 @@ type RMGridReportDesigner1: TRMGridReportDesigner; RMBMPExport1: TRMBMPExport; Tv1Column1: TcxGridDBColumn; + Tv1Column3: TcxGridDBColumn; + Tv1Column4: TcxGridDBColumn; + Tv1Column2: TcxGridDBColumn; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); @@ -219,6 +235,7 @@ type procedure CJEWM(); procedure InitImage(); procedure InitDataSetDictionary(); + function getOrderNo(fconNo: string): string; { Private declarations } public PState, CopyInt, PriceFlag: Integer; @@ -238,6 +255,44 @@ uses U_DataLink, U_ZDYHelp, U_Fun, U_ZDYHelpSel, getpic; {$R *.dfm} +function TfrmOrderInPut.getOrderNo(fconNo: string): string; +var + str1: string; + i: integer; +begin + str1 := trim(fconNo); + with ADOTemp do + begin + close; + sql.Clear; + sql.Add('select MainID from JYOrder_Main where orderNo=' + quotedstr(trim(str1))); + open; + end; + if ADOTemp.IsEmpty then //not + begin + if GetLSNo(ADOCmd, str1, '', 'JYOrder_Main', 0, 1) = False then + begin + ADOCmd.Connection.RollbackTrans; + Application.MessageBox('ȡʧ!', 'ʾ', 0); + Exit; + end; + for i := 1 to 99 do + begin + str1 := trim(fconNo) + '-' + inttostr(i); //rightstr(inttostr(100 + i), 2) + with ADOCmd do + begin + close; + sql.Clear; + sql.Add('select MainID from JYOrder_Main where orderNo=' + quotedstr(trim(str1))); + open; + end; + if ADOCmd.IsEmpty then + break; + end; + end; + result := str1; +end; + function TfrmOrderInPut.ExportToFtErp(mFileName: string; ADOQueryCmd: TADOQuery): boolean; var fFileName, fpathFileName: string; @@ -438,9 +493,19 @@ begin end; procedure TfrmOrderInPut.FormShow(Sender: TObject); + var + Fordmaxno:string; begin readCxGrid(self.Caption + TV1.Name + '1', Tv1, 'ָʾ2'); InitData(); + if GetLSNo(ADOCmd, Fordmaxno, '', 'JYOrder_Main', 0, 1) = False then + begin + ADOCmd.Connection.RollbackTrans; + Application.MessageBox('ȡʧ!', 'ʾ', 0); + Exit; + end; + OrderNo.Text := getOrderNo(trim(Fordmaxno)); + end; procedure TfrmOrderInPut.CJEWM(); @@ -496,7 +561,7 @@ var maxno: string; begin try - + ADOCmd.Connection.BeginTrans; if Trim(FMainId) = '' then begin diff --git a/复合检验管理/U_ProductOrderNewList.pas b/复合检验管理/U_ProductOrderNewList.pas index 324e2fd..0316b77 100644 --- a/复合检验管理/U_ProductOrderNewList.pas +++ b/复合检验管理/U_ProductOrderNewList.pas @@ -12,7 +12,20 @@ uses RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxButtonEdit, cxContainer, cxImage, cxDBEdit, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdFTP, shellAPI, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, - dxBarBuiltInMenu; + dxBarBuiltInMenu, dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinBlueprint, + dxSkinCaramel, dxSkinCoffee, dxSkinDarkRoom, dxSkinDarkSide, + dxSkinDevExpressDarkStyle, dxSkinDevExpressStyle, dxSkinFoggy, + dxSkinGlassOceans, dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian, + dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis, + dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black, + dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, + dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue, + dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, dxSkinOffice2013LightGray, + dxSkinOffice2013White, dxSkinPumpkin, dxSkinSeven, dxSkinSevenClassic, + dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, dxSkinSpringTime, dxSkinStardust, + dxSkinSummer2008, dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, + dxSkinValentine, dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, + dxSkinscxPCPainter; type TfrmProductOrderNewList = class(TForm) @@ -321,7 +334,7 @@ begin with ADOQueryMain do begin - Close; + Close; Filtered := False; sql.Clear; sql.add('exec P_View_Order :begdate,:enddate,:WSql'); @@ -343,7 +356,7 @@ begin ReadCxGrid('ָʾбFF', Tv1, 'ָʾ1'); ReadCxGrid('ָʾӱб', Tv2, 'ָʾ1'); - BegDate.DateTime := SGetServerDate10(ADOQueryTemp) - 15; + BegDate.DateTime := SGetServerDate10(ADOQueryTemp); EndDate.DateTime := SGetServerDate10(ADOQueryTemp); SetStatus(); InitGrid(); @@ -831,7 +844,7 @@ begin Exit; RMDBMain.DataSet := CDS_Print; LBName := RadioGroup1.Items.Strings[RadioGroup1.ItemIndex]; - fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + Trim(LBName) + '.rmf'; + fPrintFile := ExtractFilePath(Application.ExeName) + 'Report\' + Trim(LBName) + '.rmf'; with ADOQueryPrint do begin Close; @@ -855,7 +868,7 @@ begin begin RM1.LoadFromFile(fPrintFile); RM1.ShowReport; - RMDBMain.DataSet :=nil; + RMDBMain.DataSet := nil; end else begin