移动端提交

product
17602169347 2 years ago
parent 08ad5539ae
commit 375f4ee674

@ -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);
}

@ -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")

@ -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")

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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")

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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)

@ -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")

@ -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")

@ -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")

@ -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;

@ -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;

@ -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)

@ -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

@ -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
})

Loading…
Cancel
Save