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

lazhen

2024-11-17 2911ecc4d0eb8578a7c75aa905c947a7d5aa0793

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

 _Main/BL/Type_ExportXMLData/Method_CalculatePriority.qbl

@@ -13,7 +13,7 @@
      priority := 2 ;
    }else if( element.LikeUserLocale( "<name>Unit</name>" )){
      priority := 3 ;
    }else if( element.LikeUserLocale( "<name>    </name>" )){
    }else if( element.LikeUserLocale( "<name>@EMPTY@</name>" )){
      priority := 4 ;
    }else if( element.LikeUserLocale( "<name>Attribute</name>" )){
      priority := 5 ;

 _Main/BL/Type_ExportXMLManager/Function_CalcFinalXML.qbl

@@ -10,7 +10,7 @@
    datas := selectsortedset( this,ExportXMLData,data,data.Priority() );
    
    traverse( datas,Elements,data ){
      xmlTemplate := xmlTemplate + data.XML(); 
      xmlTemplate := xmlTemplate + data.XML().ReplaceAll( "@EMPTY@","    "); 
    }
    
    xmlTemplate := xmlTemplate + "</table>";

 _Main/BL/Type_LocalCell_Default/StaticMethod_GetColumnXML.qbl

@@ -22,7 +22,7 @@
      columnXML := columnXML + "</column>";
    }
    if( type = "attribute" ){
      columnXML1 := "<column><name>    </name><type>String</type>";
      columnXML1 := "<column><name>@EMPTY@</name><type>String</type>";
      traverse ( cells, Elements, cell ) {
        cellXML := '<cell value="' + cell.LocalRow().Name() + '"/>'
        columnXML1 := columnXML1 + cellXML;

 _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 );