diff --git a/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java b/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java index 5fe43bd3..50dfdb12 100644 --- a/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java +++ b/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java @@ -80,29 +80,11 @@ public class MybatisPlusMetaObjectHandler implements MetaObjectHandler { this.setFieldValByName("deleteTime", DateUtil.getNowDate(), metaObject); - this.setFieldValByName("deleteUserId", userInfo.getUserId(), metaObject); this.setFieldValByName("deleteUserName", userInfo.getUserName(), metaObject); - - this.setFieldValByName("lastmodifytime", DateUtil.getNowDate(), metaObject); - - - this.setFieldValByName("lastmodifyuserid", userInfo.getUserId(), metaObject); - - this.setFieldValByName("lastmodifyusername", userInfo.getUserName(), metaObject); - - - this.setFieldValByName("deletetime", DateUtil.getNowDate(), metaObject); - - - this.setFieldValByName("deleteuserid", userInfo.getUserId(), metaObject); - - this.setFieldValByName("deleteusername", userInfo.getUserName(), metaObject); - - } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/CollectionEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/CollectionEntity.java index db0d7249..34efc4bc 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/CollectionEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/CollectionEntity.java @@ -3,6 +3,7 @@ package jnpf.collection.entity; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -108,6 +109,7 @@ public class CollectionEntity { private Date deleteTime; @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField("CUSTOMER_ID") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/Collection_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/Collection_item0Entity.java index 9890dc6d..eca259d6 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/Collection_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/Collection_item0Entity.java @@ -3,6 +3,7 @@ package jnpf.collection.entity; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -54,6 +55,7 @@ public class Collection_item0Entity { private Date deleteTime; @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField("ORGNIZE_ID") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/entity/InvoicesEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/entity/InvoicesEntity.java index a796369c..d32b083b 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/entity/InvoicesEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/entity/InvoicesEntity.java @@ -1,10 +1,7 @@ package jnpf.invoices.entity; import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; @@ -57,7 +54,8 @@ public class InvoicesEntity { @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "DELETE_MARK",fill = FieldFill.UPDATE) + @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/entity/InvoicesItem0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/entity/InvoicesItem0Entity.java index ef4ccdca..a544612a 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/entity/InvoicesItem0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/entity/InvoicesItem0Entity.java @@ -2,10 +2,7 @@ package jnpf.invoices.entity; import cn.afterturn.easypoi.excel.annotation.Excel; import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; @@ -58,7 +55,8 @@ public class InvoicesItem0Entity { @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "DELETE_MARK",fill = FieldFill.UPDATE) + @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/entity/InvoicesItem1Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/entity/InvoicesItem1Entity.java index 71ccbef4..4db0f478 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/entity/InvoicesItem1Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/entity/InvoicesItem1Entity.java @@ -1,10 +1,7 @@ package jnpf.invoices.entity; import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; @@ -58,7 +55,8 @@ public class InvoicesItem1Entity { @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "DELETE_MARK",fill = FieldFill.UPDATE) + @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/entity/PaymentEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/entity/PaymentEntity.java index 26dc5fda..01977417 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/entity/PaymentEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/entity/PaymentEntity.java @@ -1,10 +1,7 @@ package jnpf.payment.entity; import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; @@ -55,7 +52,8 @@ public class PaymentEntity { @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "DELETE_MARK",fill = FieldFill.UPDATE) + @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/entity/Payment_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/entity/Payment_item0Entity.java index 6e846c58..3af94d24 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/entity/Payment_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/entity/Payment_item0Entity.java @@ -1,10 +1,7 @@ package jnpf.payment.entity; import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; @@ -54,7 +51,8 @@ public class Payment_item0Entity { @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "DELETE_MARK",fill = FieldFill.UPDATE) + @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocEntity.java index 8a94fcc1..90d099c3 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocEntity.java @@ -1,10 +1,7 @@ package jnpf.paymentdoc.entity; import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import jnpf.payment.entity.PaymentEntity; import lombok.Data; @@ -55,7 +52,8 @@ public class PaymentdocEntity { @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "DELETE_MARK",fill = FieldFill.UPDATE) + @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocItem0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocItem0Entity.java index cccbfd90..8e3b9a51 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocItem0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/entity/PaymentdocItem0Entity.java @@ -1,10 +1,7 @@ package jnpf.paymentdoc.entity; import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; @@ -52,7 +49,8 @@ public class PaymentdocItem0Entity { @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "DELETE_MARK",fill = FieldFill.UPDATE) + @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java index fe4f3f7f..86e865c5 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java @@ -1,10 +1,7 @@ package jnpf.poundlist.entity; import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; @@ -61,7 +58,8 @@ public class PoundlistEntity { @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "DELETE_MARK",fill = FieldFill.UPDATE) + @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistSEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistSEntity.java index c1461cde..0e9520fa 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistSEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistSEntity.java @@ -2,6 +2,7 @@ package jnpf.poundlist.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import jnpf.base.Pagination; import lombok.Data; @@ -41,6 +42,7 @@ public class PoundlistSEntity extends Pagination { private String deleteTime; @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField("ORGNIZE_ID") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchasebackEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchasebackEntity.java index 61e8c097..f70262d7 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchasebackEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchasebackEntity.java @@ -1,10 +1,7 @@ package jnpf.purchaseback.entity; import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; @@ -58,7 +55,8 @@ public class PurchasebackEntity { @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "DELETE_MARK",fill = FieldFill.UPDATE) + @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/Purchaseback_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/Purchaseback_item0Entity.java index 7ffc0244..c882a750 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/Purchaseback_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/Purchaseback_item0Entity.java @@ -1,10 +1,7 @@ package jnpf.purchaseback.entity; import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import jnpf.poundlist.entity.PoundlistEntity; import lombok.Data; @@ -58,7 +55,8 @@ public class Purchaseback_item0Entity { @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "DELETE_MARK",fill = FieldFill.UPDATE) + @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchaseorderEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchaseorderEntity.java index 9cb8c925..66bb8c80 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchaseorderEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchaseorderEntity.java @@ -1,10 +1,7 @@ package jnpf.purchaseback.entity; import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; @@ -63,7 +60,8 @@ public class PurchaseorderEntity { @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "DELETE_MARK",fill = FieldFill.UPDATE) + @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchasement/entity/PurchasementEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchasement/entity/PurchasementEntity.java index 1297f001..e1ad34df 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchasement/entity/PurchasementEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchasement/entity/PurchasementEntity.java @@ -1,10 +1,7 @@ package jnpf.purchasement.entity; import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; @@ -57,7 +54,8 @@ public class PurchasementEntity { @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private String deleteTime; - @TableField(value = "DELETE_MARK",fill = FieldFill.UPDATE) + @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchasement/entity/Purchasement_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchasement/entity/Purchasement_item0Entity.java index 45f86c65..5e0decf9 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchasement/entity/Purchasement_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchasement/entity/Purchasement_item0Entity.java @@ -1,10 +1,7 @@ package jnpf.purchasement.entity; import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; @@ -53,7 +50,8 @@ public class Purchasement_item0Entity { @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "DELETE_MARK",fill = FieldFill.UPDATE) + @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/CollectionpoEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/CollectionpoEntity.java index 1abed504..0793bb2b 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/CollectionpoEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/CollectionpoEntity.java @@ -1,10 +1,7 @@ package jnpf.purchaseorder.entity; import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; @@ -54,7 +51,8 @@ public class CollectionpoEntity { @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "DELETE_MARK",fill = FieldFill.UPDATE) + @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Invoices_item0itemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Invoices_item0itemEntity.java index 045fb4ea..79eff098 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Invoices_item0itemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Invoices_item0itemEntity.java @@ -1,10 +1,7 @@ package jnpf.purchaseorder.entity; import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; @@ -57,7 +54,8 @@ public class Invoices_item0itemEntity { @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "DELETE_MARK",fill = FieldFill.UPDATE) + @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/InvoicesitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/InvoicesitemEntity.java index 045b8b73..11532ba4 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/InvoicesitemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/InvoicesitemEntity.java @@ -1,9 +1,6 @@ package jnpf.purchaseorder.entity; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.math.BigDecimal; @@ -52,7 +49,8 @@ public class InvoicesitemEntity { @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "DELETE_MARK",fill = FieldFill.UPDATE) + @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PaymentdocpoEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PaymentdocpoEntity.java index 88daeceb..3bd03fc4 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PaymentdocpoEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PaymentdocpoEntity.java @@ -1,9 +1,6 @@ package jnpf.purchaseorder.entity; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.math.BigDecimal; @@ -52,7 +49,8 @@ public class PaymentdocpoEntity { @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "DELETE_MARK",fill = FieldFill.UPDATE) + @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PaymentitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PaymentitemEntity.java index d5d11175..e9b8b459 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PaymentitemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PaymentitemEntity.java @@ -1,10 +1,7 @@ package jnpf.purchaseorder.entity; import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; @@ -55,7 +52,8 @@ public class PaymentitemEntity { @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "DELETE_MARK",fill = FieldFill.UPDATE) + @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchasebackitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchasebackitemEntity.java index 2db8d5a2..acc12ec6 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchasebackitemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchasebackitemEntity.java @@ -1,10 +1,7 @@ package jnpf.purchaseorder.entity; import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; @@ -56,7 +53,8 @@ public class PurchasebackitemEntity { @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "DELETE_MARK",fill = FieldFill.UPDATE) + @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Purchaseorder_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Purchaseorder_item0Entity.java index 16ba2724..ce7c32e1 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Purchaseorder_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Purchaseorder_item0Entity.java @@ -1,10 +1,7 @@ package jnpf.purchaseorder.entity; import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; @@ -58,7 +55,8 @@ public class Purchaseorder_item0Entity { @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "DELETE_MARK",fill = FieldFill.UPDATE) + @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderitemEntity.java index e3b9b116..7f7da759 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderitemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderitemEntity.java @@ -1,10 +1,7 @@ package jnpf.purchaseorder.entity; import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import jnpf.paymentdoc.entity.PaymentdocEntity; import jnpf.poundlist.entity.PoundlistEntity; import lombok.Data; @@ -67,7 +64,8 @@ public class PurchaseorderitemEntity { @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "DELETE_MARK",fill = FieldFill.UPDATE) + @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/ReceiptinEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/ReceiptinEntity.java index 4a73cc0e..b5cc9c5c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/ReceiptinEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/ReceiptinEntity.java @@ -1,10 +1,7 @@ package jnpf.receiptin.entity; import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; @@ -57,7 +54,8 @@ public class ReceiptinEntity { @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "DELETE_MARK",fill = FieldFill.UPDATE) + @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/Receiptin_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/Receiptin_item0Entity.java index 780859de..e617f14b 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/Receiptin_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/Receiptin_item0Entity.java @@ -1,10 +1,7 @@ package jnpf.receiptin.entity; import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; @@ -57,7 +54,8 @@ public class Receiptin_item0Entity { @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "DELETE_MARK",fill = FieldFill.UPDATE) + @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java index 2fa2a7e8..30937a96 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/ReceiptoutEntity.java @@ -3,6 +3,7 @@ package jnpf.receiptout.entity; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -55,6 +56,7 @@ public class ReceiptoutEntity { private Date deleteTime; @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField("ORGNIZE_ID") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java index 481b259d..dc946297 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java @@ -3,6 +3,7 @@ package jnpf.receiptout.entity; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -57,6 +58,7 @@ public class Receiptout_item0Entity { private Date deleteTime; @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField("ORGNIZE_ID") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/entity/ReservoirareaEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/entity/ReservoirareaEntity.java index 5a21f3b9..47d04a7c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/entity/ReservoirareaEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/reservoirarea/entity/ReservoirareaEntity.java @@ -3,6 +3,7 @@ package jnpf.reservoirarea.entity; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -53,6 +54,7 @@ public class ReservoirareaEntity { private Date deleteTime; @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField("ORGNIZE_ID") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/Saleback_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/Saleback_item0Entity.java index 624e03c5..4e3b1524 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/Saleback_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/Saleback_item0Entity.java @@ -3,6 +3,7 @@ package jnpf.saleback.entity; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -58,7 +59,8 @@ public class Saleback_item0Entity { private Date deleteTime; @TableField("DELETE_MARK") - private String deleteMark; + @TableLogic + private String deletemark; @TableField("ORGNIZE_ID") private String orgnizeId; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/salesment/entity/Salesment_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/salesment/entity/Salesment_item0Entity.java index 10861fef..fe8d25be 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/salesment/entity/Salesment_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/salesment/entity/Salesment_item0Entity.java @@ -3,6 +3,7 @@ package jnpf.salesment.entity; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -53,7 +54,8 @@ public class Salesment_item0Entity { private Date deleteTime; @TableField("DELETE_MARK") - private String deleteMark; + @TableLogic + private String deletemark; @TableField("ORGNIZE_ID") private String orgnizeId; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/entity/TradeuploadEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/entity/TradeuploadEntity.java index 16d38c11..834ec501 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/entity/TradeuploadEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/entity/TradeuploadEntity.java @@ -1,10 +1,7 @@ package jnpf.tradeupload.entity; import com.alibaba.fastjson.annotation.JSONField; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; @@ -61,7 +58,8 @@ public class TradeuploadEntity { @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "DELETE_MARK",fill = FieldFill.UPDATE) + @TableField("DELETE_MARK") + @TableLogic private String deleteMark; @TableField(value = "ORGNIZE_ID",fill = FieldFill.INSERT) diff --git a/SC-web/src/utils/jnpf.js b/SC-web/src/utils/jnpf.js index 4fecd640..691c52d5 100644 --- a/SC-web/src/utils/jnpf.js +++ b/SC-web/src/utils/jnpf.js @@ -367,6 +367,87 @@ const jnpf = { }, isEmptyArray(data) { return Array.isArray(data) ? data.length === 0 : true - } + }, + /** + * 解决两个数相加精度丢失问题 + * @param a + * @param b + * @returns {Number} + */ + floatAdd(a, b) { + var c, d, e; + if(undefined==a||null==a||""==a||isNaN(a)){a=0;} + if(undefined==b||null==b||""==b||isNaN(b)){b=0;} + try { + c = a.toString().split(".")[1].length; + } catch (f) { + c = 0; + } + try { + d = b.toString().split(".")[1].length; + } catch (f) { + d = 0; + } + e = Math.pow(10, Math.max(c, d)); + return (this.floatMul(a, e) + this.floatMul(b, e)) / e; + }, + /** + * 解决两个数相减精度丢失问题 + * @param a + * @param b + * @returns {Number} + */ + floatSub(a, b) { + var c, d, e; + if(undefined==a||null==a||""==a||isNaN(a)){a=0;} + if(undefined==b||null==b||""==b||isNaN(b)){b=0;} + try { + c = a.toString().split(".")[1].length; + } catch (f) { + c = 0; + } + try { + d = b.toString().split(".")[1].length; + } catch (f) { + d = 0; + } + e = Math.pow(10, Math.max(c, d)); + return (this.floatMul(a, e) - this.floatMul(b, e)) / e; + }, + /** + * 解决两个数相乘精度丢失问题 + * @param a + * @param b + * @returns {Number} + */ + floatMul(a, b) { + var c = 0, + d = a.toString(), + e = b.toString(); + try { + c += d.split(".")[1].length; + } catch (f) {} + try { + c += e.split(".")[1].length; + } catch (f) {} + return Number(d.replace(".", "")) * Number(e.replace(".", "")) / Math.pow(10, c); + }, + /** + * 解决两个数相除精度丢失问题 + * @param a + * @param b + * @returns + */ + floatDiv(a, b) { + var c, d, e = 0, + f = 0; + try { + e = a.toString().split(".")[1].length; + } catch (g) {} + try { + f = b.toString().split(".")[1].length; + } catch (g) {} + return c = Number(a.toString().replace(".", "")), d = Number(b.toString().replace(".", "")), floatMul(c / d, Math.pow(10, f - e)); + }, } export default jnpf \ No newline at end of file diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue index c56676f8..95ba5c10 100644 --- a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue +++ b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue @@ -454,7 +454,8 @@ } }, grossWeightChange(e, f){ - this.dataForm.netWeight = this.dataForm.grossWeight - this.dataForm.tareWeight - this.dataForm.buckleWeight; + //this.dataForm.netWeight = this.dataForm.grossWeight - this.dataForm.tareWeight - this.dataForm.buckleWeight; + this.dataForm.netWeight = this.jnpf.floatSub(this.jnpf.floatSub(parseFloat(this.dataForm.grossWeight), parseFloat(this.dataForm.tareWeight)), parseFloat(this.dataForm.buckleWeight)) }, unitChange(e){ this.dataForm.unit = e; @@ -489,25 +490,9 @@ var grossWeight = this.dataForm.grossWeight;//毛重 var buckleWeight = this.dataForm.buckleWeight;//扣重 var netWeight = this.dataForm.netWeight;//净重 - if(grossWeight < tareWeight + buckleWeight + netWeight){ + if(grossWeight != this.jnpf.floatAdd(tareWeight, this.jnpf.floatAdd(buckleWeight, netWeight))){ this.$message({ - message: '毛重不得小于皮重+扣重+净重', - type: 'warning', - duration: 1000 - }) - return - } - if(buckleWeight >= netWeight){ - this.$message({ - message: '扣重不得大于净重', - type: 'warning', - duration: 1000 - }) - return - } - if(buckleWeight >= grossWeight){ - this.$message({ - message: '扣重不得大于毛重', + message: '毛重必须等于皮重+扣重+净重', type: 'warning', duration: 1000 }) @@ -580,33 +565,9 @@ this.dataForm.unit = this.dataForm.unit ? this.dataForm.unit : 0; this.dataForm.transportType = this.dataForm.transportType ? this.dataForm.transportType : 0; this.dataForm.advance = this.dataForm.advance ? this.dataForm.advance : 0; - if(grossWeight < tareWeight + buckleWeight + netWeight){ - this.$message({ - message: '毛重不得小于皮重+扣重+净重', - type: 'error', - duration: 1000 - }) - return - } - if(buckleWeight >= netWeight){ - this.$message({ - message: '扣重不得大于净重', - type: 'error', - duration: 1000 - }) - return - } - if(buckleWeight >= grossWeight){ - this.$message({ - message: '扣重不得大于毛重', - type: 'error', - duration: 1000 - }) - return - } - if(netWeight <= 0){ + if(grossWeight != this.jnpf.floatAdd(tareWeight, this.jnpf.floatAdd(buckleWeight, netWeight))){ this.$message({ - message: '净重必须大于0', + message: '毛重必须等于皮重+扣重+净重', type: 'error', duration: 1000 })