Group_01/D7DJjinchao
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

~

Browse Source
This commit is contained in:
DESKTOP-E401PHE\Administrator 2025-07-21 14:17:40 +08:00
parent fc7e64bb1f
commit f0ef50a40f
4 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
复合检验管理/U_JYOrderCDOne.pas
View File

@ -1636,20 +1636,21 @@ begin
Open; Open;
end; end;
end; end;
if (trim(ComboBox1.Text) = '金超针纺发货码单') then if (trim(ComboBox1.Text) = '金超针纺发货码单') or (trim(ComboBox1.Text) = '金超针纺发货码单(净重)')
or (trim(ComboBox1.Text) = '金超针纺发货码单(重量)') or (trim(ComboBox1.Text) = '金超针纺发货码单(毛重)') then
begin begin
with ADOQueryTemp do with ADOQueryTemp do
begin begin
Close; Close;
sql.Clear; sql.Clear;
sql.add('exec P_Print_CKMDYDL_PY '); sql.add('exec P_Print_CKMDYDL_PY ');
SQL.Add('@ZRow =25'); SQL.Add('@ZRow =25');
SQL.Add(',@Zcol =4'); SQL.Add(',@Zcol =4');
sql.add(',@DName=' + quotedstr(Trim(DCode))); sql.add(',@DName=' + quotedstr(Trim(DCode)));
// ShowMessage(sql.text); // ShowMessage(sql.text);
Open; Open;
end; end;
SCreateCDS20(ADOQueryTemp, CDS_HZ); SCreateCDS20(ADOQueryTemp, CDS_HZ);
SInitCDSData20(ADOQueryTemp, CDS_HZ); SInitCDSData20(ADOQueryTemp, CDS_HZ);
with ADOQueryPrint do with ADOQueryPrint do
@ -1663,7 +1664,7 @@ begin
Open; Open;
end; end;
end; end;
if (trim(ComboBox1.Text) = '金超复合厂') then if (trim(ComboBox1.Text) = '金超复合厂') or (trim(ComboBox1.Text) = '金超复合厂(净重)') or (trim(ComboBox1.Text) = '金超复合厂(毛重)') then
begin begin
with ADOQueryTemp do with ADOQueryTemp do
begin begin

4
复合检验管理/U_MJManageNewFDNew.dfm
View File

@ -1941,14 +1941,14 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
Font.Name = #23435#20307 Font.Name = #23435#20307
Font.Style = [] Font.Style = []
ItemHeight = 24 ItemHeight = 24
ItemIndex = 0
ParentFont = False ParentFont = False
TabOrder = 5 TabOrder = 5
Text = #36890#29992#26631#31614 Text = #36890#29992#26631#31614
OnChange = SLbNameChange OnChange = SLbNameChange
Items.Strings = ( Items.Strings = (
#36890#29992#26631#31614 #36890#29992#26631#31614
#36890#29992#26631#31614'('#37325#37327')' #36890#29992#26631#31614'('#20928#37325')'
#36890#29992#26631#31614'('#27611#37325')'
#36890#29992#26631#31614'('#38271#24230')') #36890#29992#26631#31614'('#38271#24230')')
end end
object Button9: TButton object Button9: TButton

6
复合检验管理/U_MJManageNewFDNew.pas
View File

@ -692,11 +692,11 @@ var
Tf: TMyFunc; Tf: TMyFunc;
Tp: TFarProc; Tp: TFarProc;
Th: Thandle; Th: Thandle;
begin begin
// closeCom(FComFile); // closeCom(FComFile);
Th := LoadLibrary(Pchar(trim(DllNameT))); Th := LoadLibrary(Pchar(trim(DllNameT)));
if Th > 0 then if Th > 0 then
begin begin
try try
Tp := GetProcAddress(Th, 'CommOpen'); Tp := GetProcAddress(Th, 'CommOpen');
if Tp <> nil then if Tp <> nil then

42
复合检验管理/U_ProductOrderNewList.pas
View File

@ -12,7 +12,20 @@ uses
RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxButtonEdit, cxContainer, RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, cxButtonEdit, cxContainer,
cxImage, cxDBEdit, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, cxImage, cxDBEdit, IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient,
IdFTP, shellAPI, cxPC, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, 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 type
TfrmProductOrderNewList = class(TForm) TfrmProductOrderNewList = class(TForm)
@ -831,22 +844,23 @@ begin
Exit; Exit;
RMDBMain.DataSet := CDS_Print; RMDBMain.DataSet := CDS_Print;
LBName := RadioGroup1.Items.Strings[RadioGroup1.ItemIndex]; 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 with ADOQueryPrint do
begin begin
Close; Close;
sql.Clear; sql.Clear;
sql.Add('select A.*,B.*,C.Filesother,ColorCount=(select isnull(Count(subID),0) from JYOrder_Sub where MainId=A.MainId), '); // sql.Add('select A.*,B.*,C.Filesother,ColorCount=(select isnull(Count(subID),0) from JYOrder_Sub where MainId=A.MainId), ');
sql.add('ZQty=(select sum(PRTOrderQty) from JYOrder_Sub where MainId=A.MainId),'); // sql.add('ZQty=(select sum(PRTOrderQty) from JYOrder_Sub where MainId=A.MainId),');
sql.add('FQty=(select sum(PRTOrderQty) from JYOrder_Sub X where X.MainId=B.MainId and X.PrtCodeName=B.PrtCodeName and X.KHorderNo=B.KHorderNo),'); // sql.add('FQty=(select sum(PRTOrderQty) from JYOrder_Sub X where X.MainId=B.MainId and X.PrtCodeName=B.PrtCodeName and X.KHorderNo=B.KHorderNo),');
sql.add('maxkhOrderNO=(select max(khOrderNO) from JYOrder_Sub X where X.MainId=A.MainId ),'); // sql.add('maxkhOrderNO=(select max(khOrderNO) from JYOrder_Sub X where X.MainId=A.MainId ),');
sql.Add('HXFileOther=(select top 1 Filesother from TP_File X where X.WBID=B.HXFile and X.TFType=''HX'' )'); // sql.Add('HXFileOther=(select top 1 Filesother from TP_File X where X.WBID=B.HXFile and X.TFType=''HX'' )');
sql.Add(' from JYOrder_Main A inner join JYOrder_Sub B on A.MainId=B.MainId '); // sql.Add(' from JYOrder_Main A inner join JYOrder_Sub B on A.MainId=B.MainId ');
sql.Add(' left join TP_File C on C.TFID=B.Subid and C.WBID=B.Mainid '); // sql.Add(' left join TP_File C on C.TFID=B.Subid and C.WBID=B.Mainid ');
// sql.Add(' left join TP_File D on D.TFID=A.orderNO '); // // sql.Add(' left join TP_File D on D.TFID=A.orderNO ');
sql.Add(' Where A.MainId=''' + Trim(Order_Main.fieldbyname('MainId').AsString) + ''''); // sql.Add(' Where A.MainId=''' + Trim(Order_Main.fieldbyname('MainId').AsString) + '''');
sql.Add(' order by B.PRTCode,B.PRTCodeName,B.subID '); // sql.Add(' order by B.PRTCode,B.PRTCodeName,B.subID ');
sql.Add('exec P_Trade_Plan_Prt_Sub_bz ');
SQL.add('@mainid=''' + Trim(Order_Main.fieldbyname('MainId').AsString) + '''');
Open; Open;
end; end;
SCreateCDS20(ADOQueryPrint, CDS_Print); SCreateCDS20(ADOQueryPrint, CDS_Print);
@ -855,7 +869,7 @@ begin
begin begin
RM1.LoadFromFile(fPrintFile); RM1.LoadFromFile(fPrintFile);
RM1.ShowReport; RM1.ShowReport;
RMDBMain.DataSet :=nil; RMDBMain.DataSet := nil;
end end
else else
begin begin