2025年3月4日11:38:40

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjBrandFiles.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.salesPart.entity;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -114,7 +115,7 @@ public class PjBrandFiles implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-
+		@TableLogic(value = "0", delval = "1")
 		private Integer isDeleted;
 	/**
 	* 分类（1 主表  2 明细）

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsAddr.java

@@ -17,6 +17,7 @@
 package org.springblade.salesPart.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -83,7 +84,7 @@ public class PjCorpsAddr implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-
+		@TableLogic(value = "0", delval = "1")
 		private Integer isDeleted;
 	/**
 	* 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsAttn.java

@@ -17,6 +17,7 @@
 package org.springblade.salesPart.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -83,6 +84,7 @@ public class PjCorpsAttn implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
+		@TableLogic(value = "0", delval = "1")
 		private Integer isDeleted;
 	/**
 	* 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsFiles.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.salesPart.entity;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -112,7 +113,7 @@ public class PjCorpsFiles implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-
+		@TableLogic(value = "0", delval = "1")
 		private Integer isDeleted;
 	/**
 	* 分类（1 主表  2 明细）

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsType.java

@@ -16,10 +16,7 @@
  */
 package org.springblade.salesPart.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -123,7 +120,7 @@ public class PjCorpsType implements Serializable {
 	 */
 	//@TableLogic
 	@ApiModelProperty(value = "是否已删除")
-
+	@TableLogic(value = "0", delval = "1")
 	private Integer isDeleted;
 	/**
 	 * 父级名称

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjGoodsFiles.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.salesPart.entity;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -114,7 +115,7 @@ public class PjGoodsFiles implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-
+		@TableLogic(value = "0", delval = "1")
 		private Integer isDeleted;
 	/**
 	* 分类（1 主表  2 明细）

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjHistory.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.salesPart.entity;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -79,7 +80,7 @@ public class PjHistory implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-
+		@TableLogic(value = "0", delval = "1")
 		private Integer isDeleted;
 	/**
 	* 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjPayment.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.salesPart.entity;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -80,7 +81,7 @@ public class PjPayment implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-
+		@TableLogic(value = "0", delval = "1")
 		private Integer isDeleted;
 	/**
 	* 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjProductLaunchFiles.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.salesPart.entity;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -114,7 +115,7 @@ public class PjProductLaunchFiles implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
-
+		@TableLogic(value = "0", delval = "1")
 		private Integer isDeleted;
 	/**
 	* 分类（1 主表  2 明细）

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjShoppingCart.java

@@ -17,6 +17,7 @@
 package org.springblade.salesPart.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -95,6 +96,7 @@ public class PjShoppingCart implements Serializable {
 	* 是否已删除（0 否 1是）
 	*/
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
+		@TableLogic(value = "0", delval = "1")
 		private Integer isDeleted;
 	/**
 	* 备注

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjpfFiles.java

@@ -1,5 +1,7 @@
 package org.springblade.salesPart.entity;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -82,6 +84,7 @@ public class PjpfFiles implements Serializable {
     /**
      * 是否已删除（0 否 1是）
      */
+	@TableLogic(value = "0", delval = "1")
     private Integer isDeleted;
 
     /**

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/settlement/service/impl/SettlementServiceImpl.java

@@ -370,11 +370,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, PjSettl
 
 				pjOrder.setUpdateTime(new Date());
 				pjOrder.setUpdateUser(AuthUtil.getUserId());
-				if (pjOrder.getInvoiceAmount().subtract(item.getInvoiceAmount()).compareTo(pjOrder.getTotalMoney()) < 0) {
-					throw new RuntimeException("销售单据已开发票金额不能小于零");
-				} else {
-					pjOrder.setInvoiceAmount(pjOrder.getInvoiceAmount().subtract(item.getInvoiceAmount()));
-				}
+				pjOrder.setInvoiceAmount(pjOrder.getInvoiceAmount().subtract(item.getInvoiceAmount()));
 				orderArrayList.add(pjOrder);
 			}
 			corpsDescService.updateBatchById(pjCorpsDescs);