Merge branch '10.1.0' of http://192.168.1.41:3000/SmartCost/SmartCost into 10.1.0

MainModule/Model/ScPriceMinusTaxDm.dfm

@@ -12,6 +12,7 @@ object PriceMinusTaxData: TPriceMinusTaxData
     Active = True
     Filtered = False
     Provider = smpPriceMinusTax
+    UseSavePoint = False
     OnGetRecordClass = sddPriceMinusTaxGetRecordClass
     Left = 48
     Top = 72

MainModule/Model/ScPriceMinusTaxDm.pas

@@ -223,8 +223,9 @@ begin
     begin
       ProjectGLJRec.BeginUpdate;
       try
-        ProjectGLJRec.LoadedTax.AsBoolean := AConfirm and (Rec.TaxFeeRate.AsFloat > 0);;
-        ProjectGLJRec.IsPriceMinusTax.AsBoolean := AConfirm and (Rec.TaxFeeRate.AsFloat > 0);
+        ProjectGLJRec.LoadedTax.AsBoolean := AConfirm and (Rec.TaxFeeRate.AsFloat > 0);
+        // 2026-08-11 是否除税字段，只要选择除税就打勾，不管税率是否为0.
+        ProjectGLJRec.IsPriceMinusTax.AsBoolean := AConfirm;// and (Rec.TaxFeeRate.AsFloat > 0);
         ProjectGLJRec.DutiablePrice.AsCurrency := Rec.DutiablePrice.AsCurrency;
         ProjectGLJRec.TaxFeeRate.AsFloat := Rec.TaxFeeRate.AsFloat;
         ProjectGLJRec.TaxMemoStr.AsString := Rec.TaxMemoStr.AsString;

MainModule/Model/ScUpdateDataBase.pas

@@ -218,6 +218,7 @@ begin
       Updater.AddTableDef(SRationCalcList, @tdRationCalcList, Length(tdRationCalcList), False, False);
       Updater.AddTableDef(SGLJList, @tdGLJList, Length(tdGLJList), False, True);
       Updater.AddTableDef(SMachinePrice, @tdMachinePrice, Length(tdMachinePrice), False, True);
+      Updater.AddTableDef(SMachineDetail, @tdMachineDetail, Length(tdMachineDetail), False, True);
       Updater.AddTableDef(SMaterialPrice, @tdMaterialPrice, Length(tdMaterialPrice), False, True);
       Updater.AddTableDef(SMaterialTransPrice, @tdMaterialTransPrice, Length(tdMaterialTransPrice), False, False);
       Updater.AddTableDef(SMaterialOrgPrice, @tdMaterialOrgPrice, Length(tdMaterialOrgPrice), False, False);
@@ -376,6 +377,7 @@ begin
     begin
       Updater.AddTableDef(SUGLJList, @tdUGLJList, Length(tdUGLJList), False, True);
       Updater.AddTableDef(SUMachinePrice, @tdUMachinePrice, Length(tdUMachinePrice), False, True);
+      Updater.AddTableDef(SUMachineDetail, @tdUMachineDetail, Length(tdUMachineDetail), False, True);
       Updater.AddTableDef(SMachineLabours, @tdMachineLabours, Length(tdMachineLabours), False, False);
       Updater.AddTableDef(SUMaterialPrice, @tdUMaterialPrice, Length(tdUMaterialPrice), False, True);
       Updater.AddTableDef(SUMaterialTransPrice, @tdUMaterialTransPrice, Length(tdUMaterialTransPrice), False, False);