MainModule/Model/ScXMLPort.pas

@@ -2102,7 +2102,7 @@ var sSQL: string;
 begin
   // 运杂清单（起讫地点）
   sSQL :=
-    'Select Locations,Length,UnitPrice,ZXCount,ZXPrice,OtherPrice,SumRate,Price,T.ID,C.Name ' +
+    'Select Locations,Length,UnitPrice,ZXCount,ZXPrice,OtherPrice,SumRate,CalculateType,MaterialType,Price,T.ID,C.Name ' +
     'from MaterialTransPrice as T left join MaterialConveyance as C on T.Conveyance = C.ID where OwnerID = ' + IntToStr(AMaterialID);
   FQuery3.Close;
   FQuery3.SQL.Text := sSQL;
@@ -2123,6 +2123,8 @@ begin
       vTransFees.AttributeAddUTF8('OtherCost', FQuery3.FieldByName('OtherPrice').AsString);
       vTransFees.AttributeAddUTF8('Ratio', FQuery3.FieldByName('SumRate').AsString);
       vTransFees.AttributeAddUTF8('Freight', FQuery3.FieldByName('Price').AsString);
+      vTransFees.AttributeAddUTF8('CalculationMethod', FQuery3.FieldByName('CalculateType').AsString);  // 全国0，内蒙1。
+      vTransFees.AttributeAddUTF8('MaterialCategory', FQuery3.FieldByName('MaterialType').AsString);    // 地方材料，外购材料，沥青、燃料等
 
       iBillID := FQuery3.FieldByName('ID').AsInteger;
       AddMCRations(vTransFees, 0, AMaterialID, iBillID);