Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev

xiaoding721

2024-11-18 dad14c2cf836e8074918c915070662ef00eb8359

Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev

 _Main/BL/Type_FinancialProductionReport/Method_GenerateShow.qbl

@@ -24,7 +24,7 @@
        showrow               := selectobject( this, FinancialProductionRow, fprow, fprow.Name() = factory.Format( 'S(Len(10))' ).Concat( row.Name() ) and fprow.Unit() = factory and factory = factory );
        if( isnull( showrow ) ){
          showrow             := this.FinancialProductionRow( relnew, Name := factory.Format( 'S(Len(10))' ).Concat( row.Name() ), Unit := factory, Factory := factory );
          row.Product_MP().FinancialProductionRow( relinsert, showrow );
    //      row.Product_MP().FinancialProductionRow( relinsert, showrow );
        }
        yearcell              := selectobject( yearcolumn, FinancialProductionCell, fpcell, fpcell.FinancialProductionRow() = showrow );
        if( isnull( yearcell ) ){

 _Main/BL/Type_PackagingPlanCell/StaticMethod_Package.qbl

@@ -46,6 +46,13 @@
          canPackagingQuantity  := ifexpr( ceil( needPackagingQuantity / ppls.LotSize() ) < floor( ppnc.MaximumDailyPackagingQuantity() / ppls.LotSize() ),
                                           ceil( needPackagingQuantity / ppls.LotSize() ),
                                           floor( ppnc.MaximumDailyPackagingQuantity() / ppls.LotSize() ) ) * ppls.LotSize();
          // 改类下其他产品包装总和
          categoryPackageQuantity := sum( indexPPCell, PackagingPlanColumn.PackagingPlanCell, tempPPCell, 
                                          tempPPCell <> indexPPCell                                                            and
                                          tempPPCell.PackagingPlanRow().Factory() = indexPPCell.PackagingPlanRow().Factory()   and
                                          tempPPCell.PackagingPlanRow().Category() = indexPPCell.PackagingPlanRow().Category(),
                                          tempPPCell.Package() );
          canPackagingQuantity    := minvalue( [Number] ( ppnc.MaximumDailyPackagingQuantity() - categoryPackageQuantity ), canPackagingQuantity );
    //        info( "开始包装的日期：", indexPPCell.StartDate().Format( "Y-M2-D2" ), "    能包装的数量:", canPackagingQuantity );
            
          indexPPCell.Package( canPackagingQuantity );

 _Main/BL/Type_ShippingActualData/StaticMethod_GenerateData.qbl

@@ -13,7 +13,7 @@
    createtime       := guard( item.Get( "create_time").GetString(),"");
    dday             := guard( item.Get( "dday").GetString(),"");
    fourcode         := guard( item.Get( "four_code").GetString(),"");
    quantity         := guard( item.Get( "qty").GetReal(), 0);
    quantity         := [Real]guard( item.Get( "qty").GetString(), "");
    fac              := guard( item.Get( "fac").GetString(),"");
    id               := guard( item.Get( "id").GetNumber(),0);
    

 _Main/BL/Type_ShippingActualData/StaticMethod_Synchronize.qbl

@@ -55,7 +55,7 @@
      traverse( sadatalist, Elements, e ){
        row := selectobject( owner, ShippingActualRow, row, row.Name() = e.FourCode() );
        if( isnull( row ) ){
          owner.ShippingActualRow( relnew, Name := e.FourCode() );
          row := owner.ShippingActualRow( relnew, Name := e.FourCode() );
        }
        
        cell := row.ShippingActualCell( relnew, Quantity := e.Quantity() );