diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/DriverServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/DriverServiceImpl.java index 0e27ced4..1e2e40d2 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/DriverServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/DriverServiceImpl.java @@ -195,6 +195,11 @@ public class DriverServiceImpl extends ServiceImpl i } + if(driverPagination.getExcludeIdList() != null && driverPagination.getExcludeIdList().size() > 0){ + driverNum++; + driverQueryWrapper.lambda().notIn(DriverEntity::getId,driverPagination.getExcludeIdList()); + } + if(ObjectUtil.isNotEmpty(driverPagination.getMobile())){ driverNum++; diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VehicleServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VehicleServiceImpl.java index bc91ee89..f69ecff7 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VehicleServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VehicleServiceImpl.java @@ -195,6 +195,11 @@ public class VehicleServiceImpl extends ServiceImpl 0){ + vehicleNum++; + vehicleQueryWrapper.lambda().notIn(VehicleEntity::getId,vehiclePagination.getExcludeIdList()); + } + if(ObjectUtil.isNotEmpty(vehiclePagination.getType())){ vehicleNum++; diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BaseUserEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BaseUserEntity.java index a51224ea..f337b8ac 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BaseUserEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BaseUserEntity.java @@ -134,6 +134,13 @@ public class BaseUserEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_HANDOVER_USERID") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BomEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BomEntity.java index 95e75810..d3aaed85 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BomEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BomEntity.java @@ -64,6 +64,9 @@ public class BomEntity { private String companyId; @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; + @TableField(exist = false) private String productName; diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BomItemEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BomItemEntity.java index 0241d954..74fb0c41 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BomItemEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BomItemEntity.java @@ -20,20 +20,27 @@ public class BomItemEntity { private String bomId; @TableField(value = "PRODUCT_ID" , updateStrategy = FieldStrategy.IGNORED) private String productId; - @TableField(value = "F_CREATOR_TIME" , updateStrategy = FieldStrategy.IGNORED) + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField(value = "F_CREATOR_USER_ID" , updateStrategy = FieldStrategy.IGNORED) + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField(value = "F_LAST_MODIFY_TIME" , updateStrategy = FieldStrategy.IGNORED) + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField(value = "F_DELETE_MARK" , updateStrategy = FieldStrategy.IGNORED) + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BomItemValueEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BomItemValueEntity.java index 1b1df83b..c69987c4 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BomItemValueEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BomItemValueEntity.java @@ -24,20 +24,26 @@ public class BomItemValueEntity { private String unit; @TableField(value = "PROPORTION_NUM" , updateStrategy = FieldStrategy.IGNORED) private Integer proportionNum; - @TableField(value = "F_CREATOR_TIME" , updateStrategy = FieldStrategy.IGNORED) + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField(value = "F_CREATOR_USER_ID" , updateStrategy = FieldStrategy.IGNORED) + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField(value = "F_LAST_MODIFY_USER_ID" , updateStrategy = FieldStrategy.IGNORED) + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "F_DELETE_USER_ID" , updateStrategy = FieldStrategy.IGNORED) + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessAddressEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessAddressEntity.java index 853f7d23..a6d7f7de 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessAddressEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessAddressEntity.java @@ -42,6 +42,12 @@ public class BusinessAddressEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessCargoEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessCargoEntity.java index 5c2440d9..fffb88ed 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessCargoEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessCargoEntity.java @@ -44,6 +44,12 @@ public class BusinessCargoEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessContact1Entity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessContact1Entity.java index 8d56fa9d..8bfc05cb 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessContact1Entity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessContact1Entity.java @@ -44,4 +44,10 @@ public class BusinessContact1Entity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessContactEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessContactEntity.java index 93656c06..23f1daac 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessContactEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessContactEntity.java @@ -44,6 +44,12 @@ public class BusinessContactEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessContactTeamEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessContactTeamEntity.java index eea98b91..79fb59bd 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessContactTeamEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessContactTeamEntity.java @@ -30,20 +30,26 @@ public class BusinessContactTeamEntity { private String email; @TableField(value = "FAX" , updateStrategy = FieldStrategy.IGNORED) private String fax; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField(value = "F_LAST_MODIFY_TIME" , updateStrategy = FieldStrategy.IGNORED) + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessEnterpriseRelationalEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessEnterpriseRelationalEntity.java index de2b9864..ea8d32d0 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessEnterpriseRelationalEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessEnterpriseRelationalEntity.java @@ -34,6 +34,12 @@ public class BusinessEnterpriseRelationalEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_VERSION") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessLine1Entity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessLine1Entity.java index a8816b4c..02cf8ae4 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessLine1Entity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessLine1Entity.java @@ -100,6 +100,12 @@ public class BusinessLine1Entity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_VERSION") @@ -108,10 +114,7 @@ public class BusinessLine1Entity { private String flowId; @TableField("F_FLOW_TASK_ID") private String flowTaskId; - @TableField("COMPANY_ID") - private String companyId; - @TableField("DEPARTMENT_ID") - private String departmentId; + @TableField(exist = false) private String workFactory; diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessLineConfigEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessLineConfigEntity.java index 0ad64dfa..6823285c 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessLineConfigEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessLineConfigEntity.java @@ -34,6 +34,12 @@ public class BusinessLineConfigEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_VERSION") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessLineEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessLineEntity.java index c1abb673..61ecb505 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessLineEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessLineEntity.java @@ -107,16 +107,19 @@ public class BusinessLineEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_VERSION") private Integer version; @TableField("F_FLOW_ID") private String flowId; - @TableField("COMPANY_ID") - private String companyId; - @TableField("DEPARTMENT_ID") - private String departmentId; + /** 子表数据 **/ @TableField(exist = false) diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessLineSonEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessLineSonEntity.java index d228bfbf..0365ed5f 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessLineSonEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessLineSonEntity.java @@ -96,6 +96,12 @@ public class BusinessLineSonEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_VERSION") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java index 6b0aa77f..0f3bc8e2 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java @@ -109,16 +109,19 @@ public class BusinessOrderEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_VERSION") private Integer version; @TableField("F_FLOW_ID") private String flowId; - @TableField("COMPANY_ID") - private String companyId; - @TableField("DEPARTMENT_ID") - private String departmentId; + @TableField("IS_TRANSFER") private String isTransfer; diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderProductRelationalEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderProductRelationalEntity.java index 31c2b894..72d0b531 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderProductRelationalEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderProductRelationalEntity.java @@ -42,6 +42,12 @@ public class BusinessOrderProductRelationalEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("NAME") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessUserRelationalEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessUserRelationalEntity.java index 39b28d12..d41f00ae 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessUserRelationalEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessUserRelationalEntity.java @@ -34,6 +34,12 @@ public class BusinessUserRelationalEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_VERSION") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassPlanEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassPlanEntity.java index 9bf0bf02..20c5b86b 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassPlanEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassPlanEntity.java @@ -56,10 +56,7 @@ public class ClassPlanEntity { private Integer version; - @TableField(value = "company_id" , fill = FieldFill.INSERT) - private String companyId; - @TableField(value = "department_id" , fill = FieldFill.INSERT) - private String departmentId; + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) @@ -76,6 +73,12 @@ public class ClassPlanEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; /** 班组名称 */ diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassPlanItemEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassPlanItemEntity.java index 9445b0d4..209d41e4 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassPlanItemEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassPlanItemEntity.java @@ -36,6 +36,12 @@ public class ClassPlanItemEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassPlanTeamEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassPlanTeamEntity.java index fdccfa20..0620bc97 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassPlanTeamEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassPlanTeamEntity.java @@ -36,6 +36,12 @@ public class ClassPlanTeamEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassTeamEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassTeamEntity.java index 991ccc46..6bdca461 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassTeamEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassTeamEntity.java @@ -68,11 +68,12 @@ public class ClassTeamEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField(exist = false) private Integer classTeamUseNum; diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassTeamUseEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassTeamUseEntity.java index b5d58223..d824e6cd 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassTeamUseEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassTeamUseEntity.java @@ -34,6 +34,12 @@ public class ClassTeamUseEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassTimeEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassTimeEntity.java index 014e3574..3e2ac13a 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassTimeEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ClassTimeEntity.java @@ -53,12 +53,6 @@ public class ClassTimeEntity { @TableField("F_FLOW_ID") private String flowId; - @TableField(value = "company_id" , fill = FieldFill.INSERT) - private String companyId; - @TableField(value = "department_id" , fill = FieldFill.INSERT) - private String departmentId; - - @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) @@ -73,4 +67,10 @@ public class ClassTimeEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContactsEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContactsEntity.java index 6bc0bc4b..c102d03f 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContactsEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContactsEntity.java @@ -42,20 +42,26 @@ public class ContactsEntity { private String address; @TableField(value = "ANNEX" , updateStrategy = FieldStrategy.IGNORED) private String annex; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_FLOW_ID") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractClauseEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractClauseEntity.java index 51647467..473aed69 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractClauseEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractClauseEntity.java @@ -32,30 +32,31 @@ public class ContractClauseEntity { private String remark; @TableField(value = "ATTACHMENT" , updateStrategy = FieldStrategy.IGNORED) private String attachment; - @TableField(value = "F_CREATOR_TIME", fill = FieldFill.INSERT) + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField(value = "F_CREATOR_USER_ID", fill = FieldFill.INSERT) + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField(value = "F_LAST_MODIFY_TIME", fill = FieldFill.INSERT_UPDATE) + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField(value = "F_LAST_MODIFY_USER_ID", fill = FieldFill.INSERT_UPDATE) + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField(value = "F_DELETE_TIME", fill = FieldFill.UPDATE) + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "F_DELETE_USER_ID", fill = FieldFill.UPDATE) + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_FLOW_ID") private String flowId; @TableField("F_VERSION") private Integer version; - @TableField(value = "COMPANY_ID" , fill = FieldFill.INSERT) - private String companyId; - @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT) - private String departmentId; - @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT) - private String organizeJsonId; + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractClauseFieldsEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractClauseFieldsEntity.java index 243de62e..79c44637 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractClauseFieldsEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractClauseFieldsEntity.java @@ -24,20 +24,26 @@ public class ContractClauseFieldsEntity { private Integer sort; @TableField("CONTRACT_CLAUSE_ID") private String contractClauseId; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_FLOW_ID") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLCommodityEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLCommodityEntity.java index f5ce05c0..18629574 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLCommodityEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLCommodityEntity.java @@ -44,20 +44,26 @@ public class ContractLCommodityEntity { private BigDecimal priceRate; @TableField(value = "TOTAL_RATE" , updateStrategy = FieldStrategy.IGNORED) private BigDecimal totalRate; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLEntity.java index 4962ea64..8c2ae501 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLEntity.java @@ -103,20 +103,26 @@ public class ContractLEntity { private String extendedField; @TableField("BIDDING") private String bidding; - @TableField(value = "F_CREATOR_TIME" , fill = FieldFill.INSERT) + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField(value = "F_CREATOR_USER_ID" , fill = FieldFill.INSERT) + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField(value = "F_LAST_MODIFY_TIME", fill = FieldFill.INSERT_UPDATE) + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField(value = "F_LAST_MODIFY_USER_ID", fill = FieldFill.INSERT_UPDATE) + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField(value = "F_DELETE_TIME", fill = FieldFill.UPDATE) + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "F_DELETE_USER_ID", fill = FieldFill.UPDATE) + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_FLOW_ID") @@ -147,10 +153,5 @@ public class ContractLEntity { private List subjectbasicEntityList; @TableField(exist = false) private List productByContractModelList; - @TableField(value = "COMPANY_ID" , fill = FieldFill.INSERT) - private String companyId; - @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT) - private String departmentId; - @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT) - private String organizeJsonId; + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLFeeClauseEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLFeeClauseEntity.java index dcd66c8e..a234abc3 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLFeeClauseEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLFeeClauseEntity.java @@ -25,20 +25,26 @@ public class ContractLFeeClauseEntity { private BigDecimal price; @TableField(value = "REMARK" , updateStrategy = FieldStrategy.IGNORED) private String remark; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLPaymentEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLPaymentEntity.java index befe0e9c..4b2b4f51 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLPaymentEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLPaymentEntity.java @@ -29,20 +29,26 @@ public class ContractLPaymentEntity { private BigDecimal price; @TableField(value = "REMARK" , updateStrategy = FieldStrategy.IGNORED) private String remark; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLPriceFormulaEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLPriceFormulaEntity.java index 72a0be86..25558398 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLPriceFormulaEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLPriceFormulaEntity.java @@ -76,20 +76,26 @@ public class ContractLPriceFormulaEntity { private BigDecimal taxRateInvoicingCompany; @TableField(value = "FUND_RATE" , updateStrategy = FieldStrategy.IGNORED) private BigDecimal fundRate; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractSetPriceFormulaEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractSetPriceFormulaEntity.java index 589eb866..7bc5d9d4 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractSetPriceFormulaEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractSetPriceFormulaEntity.java @@ -76,20 +76,26 @@ public class ContractSetPriceFormulaEntity { private BigDecimal taxRateInvoicingCompany; @TableField(value = "FUND_RATE" , updateStrategy = FieldStrategy.IGNORED) private BigDecimal fundRate; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_FLOW_ID") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractTemplateClauseEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractTemplateClauseEntity.java index 16db9c58..89b9b638 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractTemplateClauseEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractTemplateClauseEntity.java @@ -22,20 +22,26 @@ public class ContractTemplateClauseEntity { private String templateId; @TableField(value = "SORT" , updateStrategy = FieldStrategy.IGNORED) private Integer sort; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractTemplateEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractTemplateEntity.java index 243e9611..fb135eb7 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractTemplateEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractTemplateEntity.java @@ -56,30 +56,30 @@ public class ContractTemplateEntity { private String openSignTimeB; @TableField(value = "OPEN_SIGNED_AT_B" , updateStrategy = FieldStrategy.IGNORED) private String openSignedAtB; - @TableField(value = "F_CREATOR_TIME" , fill = FieldFill.INSERT) + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField(value = "F_CREATOR_USER_ID" , fill = FieldFill.INSERT) + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField(value = "F_LAST_MODIFY_TIME", fill = FieldFill.INSERT_UPDATE) + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField(value = "F_LAST_MODIFY_USER_ID", fill = FieldFill.INSERT_UPDATE) + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField(value = "F_DELETE_TIME", fill = FieldFill.UPDATE) + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "F_DELETE_USER_ID", fill = FieldFill.UPDATE) + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_FLOW_ID") private String flowId; @TableField("F_VERSION") private Integer version; - @TableField(value = "COMPANY_ID" , fill = FieldFill.INSERT) - private String companyId; - @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT) - private String departmentId; - @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT) - private String organizeJsonId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractsEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractsEntity.java index 82535919..e92e9c83 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractsEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractsEntity.java @@ -101,20 +101,26 @@ public class ContractsEntity { private String extendedField; @TableField("BIDDING") private String bidding; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryOrderEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryOrderEntity.java index 27c05f01..7e96b6b6 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryOrderEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryOrderEntity.java @@ -72,6 +72,12 @@ public class DeliveryOrderEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_FLOW_TASK_ID") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryProductRelationEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryProductRelationEntity.java index 383fb2b8..68331f3f 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryProductRelationEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryProductRelationEntity.java @@ -78,6 +78,12 @@ public class DeliveryProductRelationEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryVoucherRelationEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryVoucherRelationEntity.java index c11e0266..a53bc416 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryVoucherRelationEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DeliveryVoucherRelationEntity.java @@ -68,6 +68,12 @@ public class DeliveryVoucherRelationEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DriverEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DriverEntity.java index 7c41a970..9e4e9574 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DriverEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DriverEntity.java @@ -42,12 +42,15 @@ public class DriverEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField("F_TENANT_ID") - private String tenantId; - @TableField("COMPANY_ID") + @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; - @TableField("DEPARTMENT_ID") + @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; + @TableField("F_TENANT_ID") + private String tenantId; + @TableField("F_FLOW_ID") private String flowId; @TableField("F_VERSION") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DriverVehicleEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DriverVehicleEntity.java index 1108193d..598c5c40 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DriverVehicleEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/DriverVehicleEntity.java @@ -20,24 +20,26 @@ public class DriverVehicleEntity { private String driverId; @TableField(value = "VEHICLE_ID" , updateStrategy = FieldStrategy.IGNORED) private String vehicleId; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField("F_TENANT_ID") - private String tenantId; - @TableField("COMPANY_ID") + @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; - @TableField("DEPARTMENT_ID") + @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; + @TableField("F_TENANT_ID") + private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/EnergyConsumptionEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/EnergyConsumptionEntity.java index ab60dca2..abbd9891 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/EnergyConsumptionEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/EnergyConsumptionEntity.java @@ -38,11 +38,6 @@ public class EnergyConsumptionEntity { @TableField("F_FLOW_ID") private String flowId; - @TableField(value = "company_id" , fill = FieldFill.INSERT) - private String companyId; - @TableField(value = "department_id" , fill = FieldFill.INSERT) - private String departmentId; - @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; @@ -58,4 +53,10 @@ public class EnergyConsumptionEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProcessClassificationEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProcessClassificationEntity.java index 72c421aa..8cfe7bb4 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProcessClassificationEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProcessClassificationEntity.java @@ -59,9 +59,10 @@ public class ProcessClassificationEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProcessClassificationtitemEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProcessClassificationtitemEntity.java index ff921516..f2bf3ab4 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProcessClassificationtitemEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProcessClassificationtitemEntity.java @@ -22,20 +22,26 @@ public class ProcessClassificationtitemEntity { private String categoryName; @TableField("CATEGORY_DESCRIPTION") private String categoryDescription; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_VERSION") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductBrandEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductBrandEntity.java index 3087f009..13286034 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductBrandEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductBrandEntity.java @@ -28,30 +28,31 @@ public class ProductBrandEntity { private String brandStatus; @TableField(value = "SOURCE" , updateStrategy = FieldStrategy.IGNORED) private String source; - @TableField(value = "F_CREATOR_TIME" , fill = FieldFill.INSERT) + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField(value = "F_CREATOR_USER_ID" , fill = FieldFill.INSERT) + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField(value = "F_LAST_MODIFY_TIME", fill = FieldFill.INSERT_UPDATE) + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField(value = "F_LAST_MODIFY_USER_ID", fill = FieldFill.INSERT_UPDATE) + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField(value = "F_DELETE_TIME", fill = FieldFill.UPDATE) + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "F_DELETE_USER_ID", fill = FieldFill.UPDATE) + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_FLOW_ID") private String flowId; @TableField("F_VERSION") private Integer version; - @TableField(value = "COMPANY_ID" , fill = FieldFill.INSERT) - private String companyId; - @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT) - private String departmentId; - @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT) - private String organizeJsonId; + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductBusinessEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductBusinessEntity.java index 7c1a4747..952b3c13 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductBusinessEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductBusinessEntity.java @@ -20,20 +20,26 @@ public class ProductBusinessEntity { private String productId; @TableField(value = "BUSINESS_LINE_ID" , updateStrategy = FieldStrategy.IGNORED) private String businessLineId; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductCategoryEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductCategoryEntity.java index b3ba2daa..97120021 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductCategoryEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductCategoryEntity.java @@ -30,30 +30,31 @@ public class ProductCategoryEntity { private String pid; @TableField(value = "SORT" , updateStrategy = FieldStrategy.IGNORED) private Integer sort; - @TableField(value = "F_CREATOR_TIME" , fill = FieldFill.INSERT) + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField(value = "F_CREATOR_USER_ID" , fill = FieldFill.INSERT) + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField(value = "F_LAST_MODIFY_TIME", fill = FieldFill.INSERT_UPDATE) + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField(value = "F_LAST_MODIFY_USER_ID", fill = FieldFill.INSERT_UPDATE) + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField(value = "F_DELETE_TIME", fill = FieldFill.UPDATE) + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "F_DELETE_USER_ID", fill = FieldFill.UPDATE) + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_FLOW_ID") private String flowId; @TableField("F_VERSION") private Integer version; - @TableField(value = "COMPANY_ID" , fill = FieldFill.INSERT) - private String companyId; - @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT) - private String departmentId; - @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT) - private String organizeJsonId; + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductUnitEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductUnitEntity.java index 93f3d87b..7a94fff2 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductUnitEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductUnitEntity.java @@ -72,20 +72,26 @@ public class ProductUnitEntity { private BigDecimal costPrice; @TableField("CURRENCY_ID4") private String currencyId4; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductUnitwarehouseEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductUnitwarehouseEntity.java index 902df767..990610ea 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductUnitwarehouseEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductUnitwarehouseEntity.java @@ -26,20 +26,21 @@ public class ProductUnitwarehouseEntity { private String remark; @TableField(value = "STATUS" , updateStrategy = FieldStrategy.IGNORED) private String status; - @TableField(value = "F_CREATOR_TIME" , fill = FieldFill.INSERT) + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField(value = "F_CREATOR_USER_ID" , fill = FieldFill.INSERT) + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField(value = "F_LAST_MODIFY_TIME", fill = FieldFill.INSERT_UPDATE) + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField(value = "F_LAST_MODIFY_USER_ID", fill = FieldFill.INSERT_UPDATE) + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField(value = "F_DELETE_TIME", fill = FieldFill.UPDATE) + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField(value = "F_DELETE_USER_ID", fill = FieldFill.UPDATE) + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField("F_TENANT_ID") private String tenantId; @TableField("F_VERSION") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java index a97a2efb..0f4f2dbb 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java @@ -198,20 +198,26 @@ public class ProductWarehouseEntity { private String reservedFields5; @TableField("RESERVED_FIELDS6") private String reservedFields6; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_FLOW_ID") @@ -244,10 +250,5 @@ public class ProductWarehouseEntity { private String operateUnitIds; @TableField(exist = false) private String orderMainUnitIds; - @TableField(value = "COMPANY_ID" , fill = FieldFill.INSERT) - private String companyId; - @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT) - private String departmentId; - @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT) - private String organizeJsonId; + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductionProcessesEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductionProcessesEntity.java index 5501bc2a..1403fb18 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductionProcessesEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductionProcessesEntity.java @@ -34,20 +34,6 @@ public class ProductionProcessesEntity { private String otherDocuments; @TableField(value = "STATUS" , updateStrategy = FieldStrategy.IGNORED) private String status; -// @TableField("F_CREATOR_TIME") -// private Date creatorTime; -// @TableField("F_CREATOR_USER_ID") -// private String creatorUserId; -// @TableField("F_LAST_MODIFY_TIME") -// private Date lastModifyTime; -// @TableField("F_LAST_MODIFY_USER_ID") -// private String lastModifyUserId; -// @TableField("F_DELETE_TIME") -// private Date deleteTime; -// @TableField("F_DELETE_USER_ID") -// private String deleteUserId; -// @TableField("F_DELETE_MARK") -// private Integer deleteMark; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_FLOW_ID") @@ -70,10 +56,11 @@ public class ProductionProcessesEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ReceiptOrderEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ReceiptOrderEntity.java index 5ae2220a..7f180b28 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ReceiptOrderEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ReceiptOrderEntity.java @@ -74,6 +74,12 @@ public class ReceiptOrderEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_VERSION") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RedeliveryOrderEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RedeliveryOrderEntity.java index f888f979..d05413fb 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RedeliveryOrderEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RedeliveryOrderEntity.java @@ -38,12 +38,15 @@ public class RedeliveryOrderEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField("F_TENANT_ID") - private String tenantId; - @TableField("COMPANY_ID") + @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; - @TableField("DEPARTMENT_ID") + @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; + @TableField("F_TENANT_ID") + private String tenantId; + @TableField("F_FLOW_TASK_ID") private String flowTaskId; @TableField("F_FLOW_ID") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RedeliveryOriginalorderRelationEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RedeliveryOriginalorderRelationEntity.java index dbaca8ac..314a1bc9 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RedeliveryOriginalorderRelationEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RedeliveryOriginalorderRelationEntity.java @@ -52,6 +52,12 @@ public class RedeliveryOriginalorderRelationEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RedeliveryProductRelationEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RedeliveryProductRelationEntity.java index 49799c44..88cf6da7 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RedeliveryProductRelationEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RedeliveryProductRelationEntity.java @@ -60,6 +60,12 @@ public class RedeliveryProductRelationEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ReturnCargoOrderEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ReturnCargoOrderEntity.java index bd130dc4..11fd4e9a 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ReturnCargoOrderEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ReturnCargoOrderEntity.java @@ -78,6 +78,12 @@ public class ReturnCargoOrderEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_VERSION") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SettlementInfoEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SettlementInfoEntity.java index 1fe09d24..3838a4f8 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SettlementInfoEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SettlementInfoEntity.java @@ -41,6 +41,12 @@ public class SettlementInfoEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField(value = "PAYMENT_METHOD" , updateStrategy = FieldStrategy.IGNORED) diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectaccountperiodrulesEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectaccountperiodrulesEntity.java index 5323384f..4ac530a6 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectaccountperiodrulesEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectaccountperiodrulesEntity.java @@ -60,12 +60,13 @@ public class SubjectaccountperiodrulesEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField("F_TENANT_ID") - private String tenantId; - @TableField(value = "COMPANY_ID" , fill = FieldFill.INSERT) + @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; - @TableField(value = "DEPARTMENT_ID" , fill = FieldFill.INSERT) + @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; - @TableField(value = "ORGANIZE_JSON_ID" , fill = FieldFill.INSERT) + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) private String organizeJsonId; + @TableField("F_TENANT_ID") + private String tenantId; + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectbusinesslineEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectbusinesslineEntity.java index 704f9db7..f1335765 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectbusinesslineEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectbusinesslineEntity.java @@ -24,20 +24,26 @@ public class SubjectbusinesslineEntity { private String busunessLineCode; @TableField("BUSUNESS_LINE_NAME") private String busunessLineName; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectcontactsEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectcontactsEntity.java index 0e72c893..5f50e3d3 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectcontactsEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectcontactsEntity.java @@ -42,20 +42,26 @@ public class SubjectcontactsEntity { private String address; @TableField(value = "ANNEX" , updateStrategy = FieldStrategy.IGNORED) private String annex; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_FLOW_ID") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectfollowmanagementEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectfollowmanagementEntity.java index 8ace769c..eced3b96 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectfollowmanagementEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectfollowmanagementEntity.java @@ -44,20 +44,26 @@ public class SubjectfollowmanagementEntity { private String description; @TableField(value = "ANNEX" , updateStrategy = FieldStrategy.IGNORED) private String annex; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_FLOW_TASK_ID") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectfollowreportEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectfollowreportEntity.java index e462a98b..d833f17d 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectfollowreportEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectfollowreportEntity.java @@ -32,20 +32,26 @@ public class SubjectfollowreportEntity { private String readOverUser; @TableField("MAKE_COPY_USER") private String makeCopyUser; - @TableField(value = "F_CREATOR_TIME" , updateStrategy = FieldStrategy.IGNORED) + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_FLOW_TASK_ID") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectproductblacklistEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectproductblacklistEntity.java index 13c90714..feb5acd5 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectproductblacklistEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectproductblacklistEntity.java @@ -40,20 +40,26 @@ public class SubjectproductblacklistEntity { private Date startTime; @TableField("END_TIME") private Date endTime; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectrepresentativeEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectrepresentativeEntity.java index d6fcca0e..987b187b 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectrepresentativeEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectrepresentativeEntity.java @@ -42,20 +42,26 @@ public class SubjectrepresentativeEntity { private Integer enabledMark; @TableField("F_SORT_CODE") private Long sortCode; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VehicleDriverEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VehicleDriverEntity.java index c33d4eb6..9d08288c 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VehicleDriverEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VehicleDriverEntity.java @@ -24,24 +24,27 @@ public class VehicleDriverEntity { private String name; @TableField("MOBILE") private String mobile; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField("F_TENANT_ID") - private String tenantId; - @TableField("COMPANY_ID") + @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; - @TableField("DEPARTMENT_ID") + @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; + @TableField("F_TENANT_ID") + private String tenantId; + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VehicleEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VehicleEntity.java index 3ac84367..8b530d5c 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VehicleEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VehicleEntity.java @@ -52,16 +52,15 @@ public class VehicleEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; -// @TableField("F_DELETE_USER_ID") -// private String deleteUserId; -// @TableField("F_DELETE_MARK") -// private Integer deleteMark; - @TableField("F_TENANT_ID") - private String tenantId; - @TableField("COMPANY_ID") + @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; - @TableField("DEPARTMENT_ID") + @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; + @TableField("F_TENANT_ID") + private String tenantId; + @TableField("F_VERSION") private Integer version; @TableField("F_FLOW_ID") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherEntity.java index 6a11b3b5..870ffe34 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherEntity.java @@ -118,6 +118,12 @@ public class VoucherEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_FLOW_TASK_ID") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherProductEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherProductEntity.java index fd7623d6..39d52f33 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherProductEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherProductEntity.java @@ -54,6 +54,12 @@ public class VoucherProductEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("RECEIPT_UNIT") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherVehicleEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherVehicleEntity.java index 627c3243..c6778871 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherVehicleEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherVehicleEntity.java @@ -40,6 +40,12 @@ public class VoucherVehicleEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInspectionConclusionEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInspectionConclusionEntity.java index eeebfcde..7ba7e1f7 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInspectionConclusionEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInspectionConclusionEntity.java @@ -36,24 +36,27 @@ public class WarehousingInspectionConclusionEntity { private String reduceLevel; @TableField(value = "GRADE" , updateStrategy = FieldStrategy.IGNORED) private String grade; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField(value = "F_CREATOR_USER_ID" , updateStrategy = FieldStrategy.IGNORED) + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField("F_TENANT_ID") - private String tenantId; - @TableField("COMPANY_ID") + @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; - @TableField("DEPARTMENT_ID") + @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; + @TableField("F_TENANT_ID") + private String tenantId; + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInspectionEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInspectionEntity.java index 667bc1fd..fbf73aa6 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInspectionEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInspectionEntity.java @@ -34,26 +34,29 @@ public class WarehousingInspectionEntity { private String conclusionType; @TableField(value = "CONCLUSION_REMARK" , updateStrategy = FieldStrategy.IGNORED) private String conclusionRemark; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField("F_TENANT_ID") - private String tenantId; - @TableField("COMPANY_ID") + @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; - @TableField("DEPARTMENT_ID") + @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; + @TableField("F_TENANT_ID") + private String tenantId; + @TableField("F_VERSION") private Integer version; @TableField("F_FLOW_TASK_ID") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInspectionProductEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInspectionProductEntity.java index 50ce1acf..d9b99769 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInspectionProductEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInspectionProductEntity.java @@ -22,24 +22,27 @@ public class WarehousingInspectionProductEntity { private String voucheId; @TableField(value = "PRODUCT_ID" , updateStrategy = FieldStrategy.IGNORED) private String productId; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField("F_TENANT_ID") - private String tenantId; - @TableField("COMPANY_ID") + @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; - @TableField("DEPARTMENT_ID") + @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; + @TableField("F_TENANT_ID") + private String tenantId; + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInspectionVoucherEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInspectionVoucherEntity.java index 6ea4ddf5..53a5dea7 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInspectionVoucherEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInspectionVoucherEntity.java @@ -20,24 +20,27 @@ public class WarehousingInspectionVoucherEntity { private String inspectionId; @TableField(value = "VOUCHE_ID" , updateStrategy = FieldStrategy.IGNORED) private String voucheId; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField("F_TENANT_ID") - private String tenantId; - @TableField("COMPANY_ID") + @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; - @TableField("DEPARTMENT_ID") + @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; + @TableField("F_TENANT_ID") + private String tenantId; + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInventoryEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInventoryEntity.java index 0393accf..bfc2d2f0 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInventoryEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInventoryEntity.java @@ -48,12 +48,15 @@ public class WarehousingInventoryEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField("F_TENANT_ID") - private String tenantId; - @TableField("COMPANY_ID") + @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; - @TableField("DEPARTMENT_ID") + @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; + @TableField("F_TENANT_ID") + private String tenantId; + @TableField("F_VERSION") private Integer version; @TableField("F_FLOW_TASK_ID") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInventoryProductEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInventoryProductEntity.java index 9ebe95ff..81eb5e0a 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInventoryProductEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInventoryProductEntity.java @@ -37,21 +37,6 @@ public class WarehousingInventoryProductEntity { private Date expirationDate; @TableField("REMARK") private String remark; -// @TableField("F_CREATOR_TIME") -// private Date creatorTime; -// @TableField("F_CREATOR_USER_ID") -// private String creatorUserId; -// @TableField("F_LAST_MODIFY_TIME") -// private Date lastModifyTime; -// @TableField("F_LAST_MODIFY_USER_ID") -// private String lastModifyUserId; -// @TableField("F_DELETE_TIME") -// private Date deleteTime; -// @TableField("F_DELETE_USER_ID") -// private String deleteUserId; -// @TableField("F_DELETE_MARK") -// private Integer deleteMark; - @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) @@ -66,12 +51,15 @@ public class WarehousingInventoryProductEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField("F_TENANT_ID") - private String tenantId; - @TableField("COMPANY_ID") + @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; - @TableField("DEPARTMENT_ID") + @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; + @TableField("F_TENANT_ID") + private String tenantId; + @TableField(value = "CARGO_ID" , updateStrategy = FieldStrategy.IGNORED) private String cargoId; diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingNotificationEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingNotificationEntity.java index e52a9c4f..22b5e6fb 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingNotificationEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingNotificationEntity.java @@ -62,21 +62,6 @@ public class WarehousingNotificationEntity { private String remark2; @TableField("REMARK3") private String remark3; -// @TableField("F_CREATOR_TIME") -// private Date creatorTime; -// @TableField("F_CREATOR_USER_ID") -// private String creatorUserId; -// @TableField("F_LAST_MODIFY_TIME") -// private Date lastModifyTime; -// @TableField("F_LAST_MODIFY_USER_ID") -// private String lastModifyUserId; -// @TableField("F_DELETE_TIME") -// private Date deleteTime; -// @TableField("F_DELETE_USER_ID") -// private String deleteUserId; -// @TableField("F_DELETE_MARK") -// private Integer deleteMark; - @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) @@ -91,14 +76,17 @@ public class WarehousingNotificationEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_FLOW_ID") private String flowId; - @TableField("COMPANY_ID") - private String companyId; - @TableField("DEPARTMENT_ID") - private String departmentId; + @TableField("F_FLOW_TASK_ID") private String flowTaskId; @TableField("F_VERSION") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingOutboundEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingOutboundEntity.java index 0b0163ad..7b6b2a9b 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingOutboundEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingOutboundEntity.java @@ -32,21 +32,6 @@ public class WarehousingOutboundEntity { private String outboundReason; @TableField(value = "REMARK" , updateStrategy = FieldStrategy.IGNORED) private String remark; -// @TableField("F_CREATOR_TIME") -// private Date creatorTime; -// @TableField("F_CREATOR_USER_ID") -// private String creatorUserId; -// @TableField("F_LAST_MODIFY_TIME") -// private Date lastModifyTime; -// @TableField("F_LAST_MODIFY_USER_ID") -// private String lastModifyUserId; -// @TableField("F_DELETE_TIME") -// private Date deleteTime; -// @TableField("F_DELETE_USER_ID") -// private String deleteUserId; -// @TableField("F_DELETE_MARK") -// private Integer deleteMark; - @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) @@ -61,12 +46,14 @@ public class WarehousingOutboundEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField("F_TENANT_ID") - private String tenantId; - @TableField("COMPANY_ID") + @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; - @TableField("DEPARTMENT_ID") + @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; + @TableField("F_TENANT_ID") + private String tenantId; @TableField("F_FLOW_ID") private String flowId; @TableField("F_VERSION") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingOutboundPoundlistEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingOutboundPoundlistEntity.java index 8152ed6a..1b83dace 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingOutboundPoundlistEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingOutboundPoundlistEntity.java @@ -22,21 +22,6 @@ public class WarehousingOutboundPoundlistEntity { private String voucherId; @TableField("REMARK") private String remark; -// @TableField("F_CREATOR_TIME") -// private Date creatorTime; -// @TableField("F_CREATOR_USER_ID") -// private String creatorUserId; -// @TableField("F_LAST_MODIFY_TIME") -// private Date lastModifyTime; -// @TableField("F_LAST_MODIFY_USER_ID") -// private String lastModifyUserId; -// @TableField("F_DELETE_TIME") -// private Date deleteTime; -// @TableField("F_DELETE_USER_ID") -// private String deleteUserId; -// @TableField("F_DELETE_MARK") -// private Integer deleteMark; - @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) @@ -51,10 +36,13 @@ public class WarehousingOutboundPoundlistEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField("F_TENANT_ID") - private String tenantId; - @TableField("COMPANY_ID") + @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; - @TableField("DEPARTMENT_ID") + @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; + @TableField("F_TENANT_ID") + private String tenantId; + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingOutboundProductEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingOutboundProductEntity.java index c9965a5a..4c940e92 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingOutboundProductEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingOutboundProductEntity.java @@ -42,22 +42,8 @@ public class WarehousingOutboundProductEntity { private String batchNumber; @TableField(value = "DATE_MANUFACTURE" , updateStrategy = FieldStrategy.IGNORED) private Date dateManufacture; -// @TableField("F_CREATOR_TIME") -// private Date creatorTime; -// @TableField("F_CREATOR_USER_ID") -// private String creatorUserId; -// @TableField("F_LAST_MODIFY_TIME") -// private Date lastModifyTime; -// @TableField("F_LAST_MODIFY_USER_ID") -// private String lastModifyUserId; -// @TableField("F_DELETE_TIME") -// private Date deleteTime; -// @TableField("F_DELETE_USER_ID") -// private String deleteUserId; -// @TableField("F_DELETE_MARK") -// private Integer deleteMark; -@TableField(value = "f_creator_time" , fill = FieldFill.INSERT) -private Date creatorTime; + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) + private Date creatorTime; @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) @@ -70,10 +56,13 @@ private Date creatorTime; private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField("F_TENANT_ID") - private String tenantId; - @TableField("COMPANY_ID") + @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; - @TableField("DEPARTMENT_ID") + @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; + @TableField("F_TENANT_ID") + private String tenantId; + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingProductEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingProductEntity.java index 05540b77..abdbf448 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingProductEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingProductEntity.java @@ -51,26 +51,29 @@ public class WarehousingProductEntity { private String voucherId; @TableField("PURCHASE_ORDER_ID") private String purchaseOrderId; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField("F_TENANT_ID") - private String tenantId; - @TableField("COMPANY_ID") + @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; - @TableField("DEPARTMENT_ID") + @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; + @TableField("F_TENANT_ID") + private String tenantId; + @TableField("BAR_CODE") private String barCode; @TableField("BATCH_NO") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReceiveEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReceiveEntity.java index 4f7d22ab..8650e6c5 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReceiveEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReceiveEntity.java @@ -44,12 +44,15 @@ public class WarehousingReceiveEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField("F_TENANT_ID") - private String tenantId; - @TableField("COMPANY_ID") + @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; - @TableField("DEPARTMENT_ID") + @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; + @TableField("F_TENANT_ID") + private String tenantId; + @TableField("F_FLOW_ID") private String flowId; @TableField("F_VERSION") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReceiveProductEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReceiveProductEntity.java index b2112f0a..9cb06fec 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReceiveProductEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReceiveProductEntity.java @@ -47,12 +47,15 @@ public class WarehousingReceiveProductEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField("F_TENANT_ID") - private String tenantId; - @TableField("COMPANY_ID") + @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; - @TableField("DEPARTMENT_ID") + @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; + @TableField("F_TENANT_ID") + private String tenantId; + @TableField(value = "CARGO_ID" , updateStrategy = FieldStrategy.IGNORED) private String cargoId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReportlossEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReportlossEntity.java index 30ef18ce..f55f31be 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReportlossEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReportlossEntity.java @@ -44,12 +44,15 @@ public class WarehousingReportlossEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField("F_TENANT_ID") - private String tenantId; - @TableField("COMPANY_ID") + @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; - @TableField("DEPARTMENT_ID") + @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; + @TableField("F_TENANT_ID") + private String tenantId; + @TableField("F_FLOW_ID") private String flowId; @TableField("F_VERSION") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReportlossProductEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReportlossProductEntity.java index 8eec6cff..533b6ac7 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReportlossProductEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReportlossProductEntity.java @@ -45,12 +45,15 @@ public class WarehousingReportlossProductEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField("F_TENANT_ID") - private String tenantId; - @TableField("COMPANY_ID") + @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; - @TableField("DEPARTMENT_ID") + @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; + @TableField("F_TENANT_ID") + private String tenantId; + @TableField(value = "CARGO_ID" , updateStrategy = FieldStrategy.IGNORED) private String cargoId; diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReturnEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReturnEntity.java index fc88a367..d8be8215 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReturnEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReturnEntity.java @@ -44,12 +44,15 @@ public class WarehousingReturnEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField("F_TENANT_ID") - private String tenantId; - @TableField("COMPANY_ID") + @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; - @TableField("DEPARTMENT_ID") + @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; + @TableField("F_TENANT_ID") + private String tenantId; + @TableField("F_VERSION") private Integer version; @TableField("F_FLOW_ID") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReturnProductEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReturnProductEntity.java index 54a6958f..9d078406 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReturnProductEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReturnProductEntity.java @@ -33,26 +33,29 @@ public class WarehousingReturnProductEntity { private BigDecimal returnNumber; @TableField(value = "BATCH_NUMBER" , updateStrategy = FieldStrategy.IGNORED) private String batchNumber; - @TableField("F_CREATOR_TIME") + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; - @TableField("F_CREATOR_USER_ID") + @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; - @TableField("F_LAST_MODIFY_TIME") + @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) private Date lastModifyTime; - @TableField("F_LAST_MODIFY_USER_ID") + @TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE) private String lastModifyUserId; - @TableField("F_DELETE_TIME") + @TableField(value = "f_delete_time" , fill = FieldFill.UPDATE) private Date deleteTime; - @TableField("F_DELETE_USER_ID") + @TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE) private String deleteUserId; - @TableField("F_DELETE_MARK") + @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField("F_TENANT_ID") - private String tenantId; - @TableField("COMPANY_ID") + @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; - @TableField("DEPARTMENT_ID") + @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; + @TableField("F_TENANT_ID") + private String tenantId; + @TableField(value = "CARGO_ID" , updateStrategy = FieldStrategy.IGNORED) private String cargoId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStorageEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStorageEntity.java index 9920ce09..9b4b4f2c 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStorageEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStorageEntity.java @@ -30,21 +30,6 @@ public class WarehousingStorageEntity { private Date warehousingTime; @TableField(value = "REMARK" , updateStrategy = FieldStrategy.IGNORED) private String remark; -// @TableField("F_CREATOR_TIME") -// private Date creatorTime; -// @TableField("F_CREATOR_USER_ID") -// private String creatorUserId; -// @TableField("F_LAST_MODIFY_TIME") -// private Date lastModifyTime; -// @TableField("F_LAST_MODIFY_USER_ID") -// private String lastModifyUserId; -// @TableField("F_DELETE_TIME") -// private Date deleteTime; -// @TableField("F_DELETE_USER_ID") -// private String deleteUserId; -// @TableField("F_DELETE_MARK") -// private Integer deleteMark; - @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) @@ -59,13 +44,16 @@ public class WarehousingStorageEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; - @TableField("COMPANY_ID") - private String companyId; - @TableField("DEPARTMENT_ID") - private String departmentId; + @TableField("F_FLOW_ID") private String flowId; @TableField("F_VERSION") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStoragePoundlistEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStoragePoundlistEntity.java index 48800cef..d7b45eb6 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStoragePoundlistEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStoragePoundlistEntity.java @@ -22,22 +22,8 @@ public class WarehousingStoragePoundlistEntity { private String voucherId; @TableField("REMARK") private String remark; -// @TableField("F_CREATOR_TIME") -// private Date creatorTime; -// @TableField("F_CREATOR_USER_ID") -// private String creatorUserId; -// @TableField("F_LAST_MODIFY_TIME") -// private Date lastModifyTime; -// @TableField("F_LAST_MODIFY_USER_ID") -// private String lastModifyUserId; -// @TableField("F_DELETE_TIME") -// private Date deleteTime; -// @TableField("F_DELETE_USER_ID") -// private String deleteUserId; -// @TableField("F_DELETE_MARK") -// private Integer deleteMark; -@TableField(value = "f_creator_time" , fill = FieldFill.INSERT) -private Date creatorTime; + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) + private Date creatorTime; @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) @@ -50,10 +36,13 @@ private Date creatorTime; private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField("F_TENANT_ID") - private String tenantId; - @TableField("COMPANY_ID") + @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; - @TableField("DEPARTMENT_ID") + @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; + @TableField("F_TENANT_ID") + private String tenantId; + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStorageProductEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStorageProductEntity.java index 609afde2..eaa14d0f 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStorageProductEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStorageProductEntity.java @@ -42,22 +42,8 @@ public class WarehousingStorageProductEntity { private String batchNumber; @TableField(value = "DATE_MANUFACTURE" , updateStrategy = FieldStrategy.IGNORED) private Date dateManufacture; -// @TableField("F_CREATOR_TIME") -// private Date creatorTime; -// @TableField("F_CREATOR_USER_ID") -// private String creatorUserId; -// @TableField("F_LAST_MODIFY_TIME") -// private Date lastModifyTime; -// @TableField("F_LAST_MODIFY_USER_ID") -// private String lastModifyUserId; -// @TableField("F_DELETE_TIME") -// private Date deleteTime; -// @TableField("F_DELETE_USER_ID") -// private String deleteUserId; -// @TableField("F_DELETE_MARK") -// private Integer deleteMark; -@TableField(value = "f_creator_time" , fill = FieldFill.INSERT) -private Date creatorTime; + @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) + private Date creatorTime; @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) private String creatorUserId; @TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE) @@ -70,10 +56,13 @@ private Date creatorTime; private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; - @TableField("F_TENANT_ID") - private String tenantId; - @TableField("COMPANY_ID") + @TableField(value = "company_id" , fill = FieldFill.INSERT) private String companyId; - @TableField("DEPARTMENT_ID") + @TableField(value = "department_id" , fill = FieldFill.INSERT) private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; + @TableField("F_TENANT_ID") + private String tenantId; + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderEntity.java index 8467cd48..648c8439 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderEntity.java @@ -32,32 +32,12 @@ public class WorkOrderEntity { private String teamId; @TableField(value = "REMARK" , updateStrategy = FieldStrategy.IGNORED) private String remark; -// @TableField("F_CREATOR_TIME") -// private Date creatorTime; -// @TableField("F_CREATOR_USER_ID") -// private String creatorUserId; -// @TableField("F_LAST_MODIFY_TIME") -// private Date lastModifyTime; -// @TableField("F_LAST_MODIFY_USER_ID") -// private String lastModifyUserId; -// @TableField("F_DELETE_TIME") -// private Date deleteTime; -// @TableField("F_DELETE_USER_ID") -// private String deleteUserId; -// @TableField("F_DELETE_MARK") -// private Integer deleteMark; @TableField("F_TENANT_ID") private String tenantId; @TableField("F_FLOW_ID") private String flowId; @TableField("F_VERSION") private Integer version; - @TableField("COMPANY_ID") - private String companyId; - @TableField("DEPARTMENT_ID") - private String departmentId; - - @TableField(value = "f_creator_time" , fill = FieldFill.INSERT) private Date creatorTime; @TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT) @@ -72,6 +52,12 @@ public class WorkOrderEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField(value = "WAREHOUSE_ID" , updateStrategy = FieldStrategy.IGNORED) private String warehouseId; diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderPrimaryEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderPrimaryEntity.java index a2d6bb4d..a713450a 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderPrimaryEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderPrimaryEntity.java @@ -38,6 +38,12 @@ public class WorkOrderPrimaryEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("WORK_ID") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderProductEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderProductEntity.java index fd24466f..e6ac851c 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderProductEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderProductEntity.java @@ -43,6 +43,12 @@ public class WorkOrderProductEntity { private String deleteUserId; @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "company_id" , fill = FieldFill.INSERT) + private String companyId; + @TableField(value = "department_id" , fill = FieldFill.INSERT) + private String departmentId; + @TableField(value = "organize_json_id" , fill = FieldFill.INSERT) + private String organizeJsonId; @TableField("F_TENANT_ID") private String tenantId; @TableField("WORK_ID") diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/driver/DriverPagination.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/driver/DriverPagination.java index 0cc76157..4915bf7d 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/driver/DriverPagination.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/driver/DriverPagination.java @@ -42,4 +42,7 @@ public class DriverPagination extends Pagination { /** 性别 */ @JsonProperty("sex") private Object sex; + + @JsonProperty("excludeIdList") + private List excludeIdList; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/vehicle/VehiclePagination.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/vehicle/VehiclePagination.java index 9efa1848..c18e1550 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/vehicle/VehiclePagination.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/vehicle/VehiclePagination.java @@ -39,4 +39,7 @@ public class VehiclePagination extends Pagination { /** 承运商 */ @JsonProperty("carrier") private Object carrier; + + @JsonProperty("excludeIdList") + private List excludeIdList; } diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/driver/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/driver/form.vue index 08c4f0be..44ddefe4 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/driver/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/driver/form.vue @@ -1,67 +1,59 @@ - - - - - @@ -123,9 +114,11 @@ import { getDefaultCurrentValueUserId } from '@/api/permission/user' import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize' import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js' import { thousandsFormat } from "@/components/Generator/utils/index" +import VehicleGoodsBox from '@/views/scm/publicPopup/VehicleGoodsBox' + export default { mixins: [comMixin], - components: {}, + components: { VehicleGoodsBox }, props: [], data() { return { @@ -141,6 +134,7 @@ export default { formRef: 'formRef', setting: {}, eventType: '', + VehicleGoodsBoxVisible: false, userBoxVisible: false, selectDialogVisible: false, currTableConf: {}, @@ -327,6 +321,31 @@ export default { clearData() { this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll)) }, + + choice() { + this.VehicleGoodsBoxVisible = true + let excludeIdList = []; + for (let i = 0; i < this.dataForm.driverVehicleList.length; i++) { + excludeIdList.push(this.dataForm.driverVehicleList[i].vehicleId); + } + this.$nextTick(() => { + this.$refs.VehicleGoodsBox.init(excludeIdList) + }) + }, + initList(list) { + for (let i = 0; i < list.length; i++) { + const e = list[i]; + let item = { + vehicleId: e.id, + vehicleCode: e.vehicle_code, + mobile: e.type, + vehicleNumber: e.vehicle_number, + photo: e.photo, + } + this.dataForm.driverVehicleList.push(item) + } + }, + //初始化默认数据 initDefaultData() { diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/driver/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/driver/index.vue index e1752eb1..b18c9c3b 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/driver/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/driver/index.vue @@ -1,10 +1,3 @@ - - - - - - -