From e55ab5c0b943ec4ec767d3335c99662fa59dd55a Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 16 八月 2024 17:56:28 +0800
Subject: [PATCH] 新生成的工艺路线中，PSIP的SP不需要生成
---
/dev/null | 60 ------------------------------
_Main/BL/Type_Routing/StaticMethod_ThermalTrialRatio.qbl | 4 +-
_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl | 8 +++-
3 files changed, 8 insertions(+), 64 deletions(-)
diff --git a/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl b/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl
index 23633d0..1ce8cfa 100644
--- a/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl
+++ b/_Main/BL/Type_MachiningPipelineSource0/StaticMethod_Initialize.qbl
@@ -115,8 +115,12 @@
weekcolumn := table.GetColumnByUnit( Translations::MP_GlobalParameters_Week(), tpcell.TransferPlanColumn().ColumnDate() );
quantity := [Real]tpcell.Value();//鍥涜垗浜斿叆
- row.SetCellTransferValue( daycolumn, ( originiscc and destiisdl ), quantity );
- row.SetCellTransferValue( weekcolumn, ( originiscc and destiisdl ), quantity );
+ if( not isnull( daycolumn ) ){
+ row.SetCellTransferValue( daycolumn, ( originiscc and destiisdl ), quantity );
+ }
+ if( not isnull( weekcolumn ) ){
+ row.SetCellTransferValue( weekcolumn, ( originiscc and destiisdl ), quantity );
+ }
}
}
}
diff --git a/_Main/BL/Type_Routing/StaticMethod_ThermalTrialRatio.qbl b/_Main/BL/Type_Routing/StaticMethod_ThermalTrialRatio.qbl
index 53e032b..755e71c 100644
--- a/_Main/BL/Type_Routing/StaticMethod_ThermalTrialRatio.qbl
+++ b/_Main/BL/Type_Routing/StaticMethod_ThermalTrialRatio.qbl
@@ -35,8 +35,8 @@
routingstep := newrouting.LastStep();
newroutingstep := RoutingStep::Create( newrouting, thermaltrial, routingstep.Tool(), false );
- spname := ifexpr( unit.ID().EndsWith( '鎵归噺鐑瘯' ), unit.ID().ReplaceAll( '鎵归噺鐑瘯', '-' + thermaltrial ), unit.ID().ReplaceAll( '鐑瘯', '-' + thermaltrial ) );
- info( '------------------', routingstep.Tool(), ',', unit.ID(), ',', spname );
+ spname := ifexpr( unit.ID().StartsWith( 'CC' ), 'CC-鐑瘯', 'DL-鐑瘯' );
+ //info( '------------------', routingstep.Tool(), ',', unit.ID(), ',', spname );
traverse( routingstep, Operation, operation ){
id := Operation::GetConcatenatedID( newrouting.ID(), newroutingstep.Name(), unit.ID() );
// info( '------------------', operation.Name(), routingstep.Name(), newroutingstep.Name() );
diff --git a/_Main/BL/Type_StockingPoint_MP/StaticMethod_FindCreateUpdate.qbl b/_Main/BL/Type_StockingPoint_MP/StaticMethod_FindCreateUpdate.qbl
deleted file mode 100644
index 28cea4d..0000000
--- a/_Main/BL/Type_StockingPoint_MP/StaticMethod_FindCreateUpdate.qbl
+++ /dev/null
@@ -1,60 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-StaticMethod FindCreateUpdate (
- MacroPlan owner,
- String spid,
- Unit sourceunit,
- Routing routing,
- Boolean isfromdb
-) #extension
-{
- TextBody:
- [*
- stockingpoint := owner.FindStockingPoint( spid );
- parentunit := guard( owner.FindUnit( sourceunit.ParentUnitID() ), null( Unit ) );
- if( sourceunit.Name().FindString( Unit::GetThermalTrial(), 0 ) >= 0 ){
- parentunit := sourceunit;
- }
- uom := guard( owner.FindUnitOfMeasure( sourceunit.UnitOfMeasureName() ), null( UnitOfMeasure_MP ) );
- currency := guard( owner.FindCurrency( sourceunit.CurrencyID() ), null( Currency_MP ) );
-
- if( isnull( stockingpoint ) )
- {
- stockingpoint := StockingPoint_MP::Create( spid,
- owner,
- parentunit,
- spid,
- '', //iconname
- uom,
- currency,
- routing.AllowWIPInventory(),
- sourceunit.StartDate(),
- sourceunit.EndDate(),
- null( Group ),
- '', //giscountrycode
- '', //giscity
- '', //gispostalcode,
- '',
- isfromdb );
- }
- else
- {
- stockingpoint.Update( parentunit,
- spid,
- spid,
- uom,
- currency,
- stockingpoint.IconName(),
- routing.AllowWIPInventory(),
- sourceunit.StartDate(),
- sourceunit.EndDate(),
- stockingpoint.Group(),
- stockingpoint.GISCountryCode(),
- stockingpoint.GISCity(),
- stockingpoint.GISPostalCode(),
- stockingpoint.Notes(),
- isfromdb );
- }
- return stockingpoint
- *]
-}
--
Gitblit v1.9.3