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

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

@ -1636,7 +1636,8 @@ begin
Open;
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
with ADOQueryTemp do
begin
@ -1663,7 +1664,7 @@ begin
Open;
end;
end;
if (trim(ComboBox1.Text) = '金超复合厂') then
if (trim(ComboBox1.Text) = '金超复合厂') or (trim(ComboBox1.Text) = '金超复合厂(净重)') or (trim(ComboBox1.Text) = '金超复合厂(毛重)') then
begin
with ADOQueryTemp do
begin

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

@ -1941,14 +1941,14 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF
Font.Name = #23435#20307
Font.Style = []
ItemHeight = 24
ItemIndex = 0
ParentFont = False
TabOrder = 5
Text = #36890#29992#26631#31614
OnChange = SLbNameChange
Items.Strings = (
#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')')
end
object Button9: TButton

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

@ -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)
@ -836,17 +849,18 @@ begin
begin
Close;
sql.Clear;
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('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('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(' 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(' Where A.MainId=''' + Trim(Order_Main.fieldbyname('MainId').AsString) + '''');
sql.Add(' order by B.PRTCode,B.PRTCodeName,B.subID ');
// 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('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('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(' 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(' Where A.MainId=''' + Trim(Order_Main.fieldbyname('MainId').AsString) + '''');
// 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;
end;
SCreateCDS20(ADOQueryPrint, CDS_Print);