From 2faebed078ca276d14cfeb57ea553a8d1aad15ab Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 25 Mar 2024 15:37:11 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=AD=97=E6=AE=B5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=9B=B4=E6=96=B0-Long=20->=20String?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../database/dao/StIvtBsrealstorattr.java | 14 +++++----- .../database/dao/StIvtSectattr.java | 10 +++---- .../database/dao/StIvtStructattr.java | 18 ++++++------- .../database/dao/StIvtUserstor.java | 4 +-- .../iostorInv/IStIvtIostorinvdtlService.java | 2 +- .../service/iostorInv/dao/StIvtIostorinv.java | 26 +++++++++---------- .../iostorInv/dao/StIvtIostorinvdis.java | 22 ++++++++-------- .../iostorInv/dao/StIvtIostorinvdtl.java | 14 +++++----- .../impl/StIvtIostorinvOutServiceImpl.java | 26 +++++++++---------- .../impl/StIvtIostorinvServiceImpl.java | 22 ++++++++-------- .../impl/StIvtIostorinvdisServiceImpl.java | 18 ++++++------- .../impl/StIvtIostorinvdtlServiceImpl.java | 12 ++++----- 12 files changed, 94 insertions(+), 94 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dao/StIvtBsrealstorattr.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dao/StIvtBsrealstorattr.java index 62a3f21..f2d2dd2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dao/StIvtBsrealstorattr.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dao/StIvtBsrealstorattr.java @@ -23,13 +23,13 @@ import java.math.BigDecimal; @TableName("st_ivt_bsrealstorattr") public class StIvtBsrealstorattr implements Serializable { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * 仓库标识 */ @TableId - private Long stor_id; + private String stor_id; /** * 仓库编码 @@ -154,7 +154,7 @@ public class StIvtBsrealstorattr implements Serializable { /** * 创建人 */ - private Long create_id; + private String create_id; /** * 创建人姓名 @@ -169,7 +169,7 @@ public class StIvtBsrealstorattr implements Serializable { /** * 修改人 */ - private Long update_optid; + private String update_optid; /** * 修改人姓名 @@ -184,17 +184,17 @@ public class StIvtBsrealstorattr implements Serializable { /** * 拥有者ID */ - private Long sysownerid; + private String sysownerid; /** * 部门ID */ - private Long sysdeptid; + private String sysdeptid; /** * 公司ID */ - private Long syscompanyid; + private String syscompanyid; /** * 是否删除 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dao/StIvtSectattr.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dao/StIvtSectattr.java index 2f05e52..bd9d037 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dao/StIvtSectattr.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dao/StIvtSectattr.java @@ -23,13 +23,13 @@ import lombok.experimental.Accessors; @TableName("st_ivt_sectattr") public class StIvtSectattr implements Serializable { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * 库区标识 */ @TableId - private Long sect_id; + private String sect_id; /** * 库区编码 @@ -54,7 +54,7 @@ public class StIvtSectattr implements Serializable { /** * 仓库标识 */ - private Long stor_id; + private String stor_id; /** * 仓库类型 @@ -114,7 +114,7 @@ public class StIvtSectattr implements Serializable { /** * 创建人 */ - private Long create_id; + private String create_id; /** * 创建人姓名 @@ -129,7 +129,7 @@ public class StIvtSectattr implements Serializable { /** * 修改人 */ - private Long update_optid; + private String update_optid; /** * 修改人姓名 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dao/StIvtStructattr.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dao/StIvtStructattr.java index 541f04b..7db9f1e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dao/StIvtStructattr.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dao/StIvtStructattr.java @@ -23,13 +23,13 @@ import lombok.experimental.Accessors; @TableName("st_ivt_structattr") public class StIvtStructattr implements Serializable { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * 仓位标识 */ @TableId - private Long struct_id; + private String struct_id; /** * 仓位编码 @@ -49,7 +49,7 @@ public class StIvtStructattr implements Serializable { /** * 区域标识 */ - private Long sect_id; + private String sect_id; /** * 区域编码 @@ -64,7 +64,7 @@ public class StIvtStructattr implements Serializable { /** * 仓库标识 */ - private Long stor_id; + private String stor_id; /** * 仓库编码 @@ -174,7 +174,7 @@ public class StIvtStructattr implements Serializable { /** * 创建人 */ - private Long create_id; + private String create_id; /** * 创建人姓名 @@ -189,7 +189,7 @@ public class StIvtStructattr implements Serializable { /** * 修改人 */ - private Long update_optid; + private String update_optid; /** * 修改人姓名 @@ -239,7 +239,7 @@ public class StIvtStructattr implements Serializable { /** * 存储载具标识 */ - private Long storagevehicle_id; + private String storagevehicle_id; /** * 存储载具号 @@ -269,7 +269,7 @@ public class StIvtStructattr implements Serializable { /** * 锁定任务明细标识 */ - private Long taskdtl_id; + private String taskdtl_id; /** * 锁定任务编码 @@ -284,7 +284,7 @@ public class StIvtStructattr implements Serializable { /** * 锁定单据标识 */ - private Long inv_id; + private String inv_id; /** * 锁定单据编码 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dao/StIvtUserstor.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dao/StIvtUserstor.java index d253dd6..ac10fbf 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dao/StIvtUserstor.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/database/dao/StIvtUserstor.java @@ -28,12 +28,12 @@ public class StIvtUserstor implements Serializable { * 仓库标识 */ @TableId - private Long stor_id; + private String stor_id; /** * 人员标识 */ - private Long user_id; + private String user_id; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdtlService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdtlService.java index 720c0d1..28f52d8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdtlService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdtlService.java @@ -25,7 +25,7 @@ public interface IStIvtIostorinvdtlService extends IService { * @param tableDataList 、 * @return 、 */ - ArrayList insertDtl(Long iostorinv_id, List tableDataList); + ArrayList insertDtl(String iostorinv_id, List tableDataList); /** * 获取单据明细 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinv.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinv.java index 06dc2fb..95fe43a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinv.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinv.java @@ -24,13 +24,13 @@ import java.math.BigDecimal; public class StIvtIostorinv implements Serializable { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * 出入单标识 */ @TableId - private Long iostorinv_id; + private String iostorinv_id; /** * 单据编号 @@ -60,7 +60,7 @@ public class StIvtIostorinv implements Serializable { /** * 仓库标识 */ - private Long stor_id; + private String stor_id; /** * 仓库编码 @@ -75,7 +75,7 @@ public class StIvtIostorinv implements Serializable { /** * 来源方标识 */ - private Long source_id; + private String source_id; /** * 来源方名称 @@ -120,7 +120,7 @@ public class StIvtIostorinv implements Serializable { /** * 制单人 */ - private Long input_optid; + private String input_optid; /** * 制单人姓名 @@ -135,7 +135,7 @@ public class StIvtIostorinv implements Serializable { /** * 修改人 */ - private Long update_optid; + private String update_optid; /** * 修改人姓名 @@ -150,7 +150,7 @@ public class StIvtIostorinv implements Serializable { /** * 分配人 */ - private Long dis_optid; + private String dis_optid; /** * 分配人姓名 @@ -165,7 +165,7 @@ public class StIvtIostorinv implements Serializable { /** * 确认人 */ - private Long confirm_optid; + private String confirm_optid; /** * 确认人姓名 @@ -180,12 +180,12 @@ public class StIvtIostorinv implements Serializable { /** * 部门ID */ - private Long sysdeptid; + private String sysdeptid; /** * 公司ID */ - private Long syscompanyid; + private String syscompanyid; /** * 是否删除 @@ -200,7 +200,7 @@ public class StIvtIostorinv implements Serializable { /** * 回传人 */ - private Long upload_optid; + private String upload_optid; /** * 回传时间 @@ -215,7 +215,7 @@ public class StIvtIostorinv implements Serializable { /** * 冲销人 */ - private Long writeoff_optid; + private String writeoff_optid; /** * 冲销时间 @@ -305,7 +305,7 @@ public class StIvtIostorinv implements Serializable { /** * 移入仓库标识 */ - private Long out_stor_id; + private String out_stor_id; /** * 回传MES diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdis.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdis.java index 3b2f2d1..cc1e212 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdis.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdis.java @@ -23,23 +23,23 @@ import java.math.BigDecimal; @Builder public class StIvtIostorinvdis implements Serializable { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * 出入单分配标识 */ @TableId - private Long iostorinvdis_id; + private String iostorinvdis_id; /** * 出入单标识 */ - private Long iostorinv_id; + private String iostorinv_id; /** * 出入单明细标识 */ - private Long iostorinvdtl_id; + private String iostorinvdtl_id; /** * 明细序号 @@ -49,7 +49,7 @@ public class StIvtIostorinvdis implements Serializable { /** * 库区标识 */ - private Long sect_id; + private String sect_id; /** * 库区编码 @@ -64,7 +64,7 @@ public class StIvtIostorinvdis implements Serializable { /** * 仓位标识 */ - private Long struct_id; + private String struct_id; /** * 仓位编码 @@ -79,7 +79,7 @@ public class StIvtIostorinvdis implements Serializable { /** * 物料标识 */ - private Long material_id; + private String material_id; /** * 批次 @@ -99,12 +99,12 @@ public class StIvtIostorinvdis implements Serializable { /** * 任务标识 */ - private Long task_id; + private String task_id; /** * 存储载具标识 */ - private Long storagevehicle_id; + private String storagevehicle_id; /** * 存储载具编码 @@ -119,7 +119,7 @@ public class StIvtIostorinvdis implements Serializable { /** * 数量计量单位标识 */ - private Long qty_unit_id; + private String qty_unit_id; /** * 数量计量单位名称 @@ -139,7 +139,7 @@ public class StIvtIostorinvdis implements Serializable { /** * 出入点位标识 */ - private Long point_id; + private String point_id; /** * 箱号 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdtl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdtl.java index 904642d..2bbca0d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdtl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdtl.java @@ -23,18 +23,18 @@ import java.math.BigDecimal; @TableName("st_ivt_iostorinvdtl") public class StIvtIostorinvdtl implements Serializable { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * 出入单明细标识 */ @TableId - private Long iostorinvdtl_id; + private String iostorinvdtl_id; /** * 出入单标识 */ - private Long iostorinv_id; + private String iostorinv_id; /** * 明细序号 @@ -44,7 +44,7 @@ public class StIvtIostorinvdtl implements Serializable { /** * 物料标识 */ - private Long material_id; + private String material_id; /** * 批次 @@ -64,7 +64,7 @@ public class StIvtIostorinvdtl implements Serializable { /** * 数量计量单位标识 */ - private Long qty_unit_id; + private String qty_unit_id; /** * 数量计量单位名称 @@ -84,7 +84,7 @@ public class StIvtIostorinvdtl implements Serializable { /** * 来源单据明细标识 */ - private Long source_billdtl_id; + private String source_billdtl_id; /** * 来源单据类型 @@ -104,7 +104,7 @@ public class StIvtIostorinvdtl implements Serializable { /** * 基础单据明细标识 */ - private Long base_billdtl_id; + private String base_billdtl_id; /** * 基础单据类型 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java index 1cbd9ee..dbc9bdb 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java @@ -123,12 +123,12 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl paramList = new ArrayList<>(); @@ -428,7 +428,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl paramList = new ArrayList<>(); @@ -535,7 +535,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl insertDtl(Long iostorinv_id, List tableDataList) { + public ArrayList insertDtl(String iostorinv_id, List tableDataList) { // 查询所有对应物料集合 List materialList = iMdBaseMaterialService.list( @@ -87,21 +87,21 @@ public class StIvtIostorinvdtlServiceImpl extends ServiceImpl