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 28f52d8..720c0d1 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(String iostorinv_id, List tableDataList); + ArrayList insertDtl(Long 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 d8a266c..06dc2fb 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 @@ -30,7 +30,7 @@ public class StIvtIostorinv implements Serializable { * 出入单标识 */ @TableId - private String iostorinv_id; + private Long iostorinv_id; /** * 单据编号 @@ -60,7 +60,7 @@ public class StIvtIostorinv implements Serializable { /** * 仓库标识 */ - private String stor_id; + private Long stor_id; /** * 仓库编码 @@ -75,7 +75,7 @@ public class StIvtIostorinv implements Serializable { /** * 来源方标识 */ - private String source_id; + private Long source_id; /** * 来源方名称 @@ -120,7 +120,7 @@ public class StIvtIostorinv implements Serializable { /** * 制单人 */ - private String input_optid; + private Long input_optid; /** * 制单人姓名 @@ -135,7 +135,7 @@ public class StIvtIostorinv implements Serializable { /** * 修改人 */ - private String update_optid; + private Long update_optid; /** * 修改人姓名 @@ -150,7 +150,7 @@ public class StIvtIostorinv implements Serializable { /** * 分配人 */ - private String dis_optid; + private Long dis_optid; /** * 分配人姓名 @@ -165,7 +165,7 @@ public class StIvtIostorinv implements Serializable { /** * 确认人 */ - private String confirm_optid; + private Long confirm_optid; /** * 确认人姓名 @@ -180,27 +180,27 @@ public class StIvtIostorinv implements Serializable { /** * 部门ID */ - private String sysdeptid; + private Long sysdeptid; /** * 公司ID */ - private String syscompanyid; + private Long syscompanyid; /** * 是否删除 */ - private Boolean is_delete; + private String is_delete; /** * 是否已上传 */ - private Boolean is_upload; + private String is_upload; /** * 回传人 */ - private String upload_optid; + private Long upload_optid; /** * 回传时间 @@ -210,12 +210,12 @@ public class StIvtIostorinv implements Serializable { /** * 是否冲销 */ - private Boolean is_writeoff; + private String is_writeoff; /** * 冲销人 */ - private String writeoff_optid; + private Long writeoff_optid; /** * 冲销时间 @@ -305,17 +305,17 @@ public class StIvtIostorinv implements Serializable { /** * 移入仓库标识 */ - private String out_stor_id; + private Long out_stor_id; /** * 回传MES */ - private Boolean upload_mes; + private String upload_mes; /** * 回传SAP */ - private Boolean upload_sap; + private String upload_sap; /** * 运转费 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 e798133..3b2f2d1 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 @@ -29,17 +29,17 @@ public class StIvtIostorinvdis implements Serializable { * 出入单分配标识 */ @TableId - private String iostorinvdis_id; + private Long iostorinvdis_id; /** * 出入单标识 */ - private String iostorinv_id; + private Long iostorinv_id; /** * 出入单明细标识 */ - private String iostorinvdtl_id; + private Long iostorinvdtl_id; /** * 明细序号 @@ -49,7 +49,7 @@ public class StIvtIostorinvdis implements Serializable { /** * 库区标识 */ - private String sect_id; + private Long sect_id; /** * 库区编码 @@ -64,7 +64,7 @@ public class StIvtIostorinvdis implements Serializable { /** * 仓位标识 */ - private String struct_id; + private Long struct_id; /** * 仓位编码 @@ -79,7 +79,7 @@ public class StIvtIostorinvdis implements Serializable { /** * 物料标识 */ - private String material_id; + private Long material_id; /** * 批次 @@ -99,12 +99,12 @@ public class StIvtIostorinvdis implements Serializable { /** * 任务标识 */ - private String task_id; + private Long task_id; /** * 存储载具标识 */ - private String storagevehicle_id; + private Long storagevehicle_id; /** * 存储载具编码 @@ -114,12 +114,12 @@ public class StIvtIostorinvdis implements Serializable { /** * 是否已下发 */ - private Boolean is_issued; + private String is_issued; /** * 数量计量单位标识 */ - private String qty_unit_id; + private Long qty_unit_id; /** * 数量计量单位名称 @@ -139,12 +139,11 @@ public class StIvtIostorinvdis implements Serializable { /** * 出入点位标识 */ - private String point_id; + private Long point_id; /** * 箱号 */ private String box_no; - } 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 9b6e179..904642d 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 @@ -29,12 +29,12 @@ public class StIvtIostorinvdtl implements Serializable { * 出入单明细标识 */ @TableId - private String iostorinvdtl_id; + private Long iostorinvdtl_id; /** * 出入单标识 */ - private String iostorinv_id; + private Long iostorinv_id; /** * 明细序号 @@ -44,7 +44,7 @@ public class StIvtIostorinvdtl implements Serializable { /** * 物料标识 */ - private String material_id; + private Long material_id; /** * 批次 @@ -64,7 +64,7 @@ public class StIvtIostorinvdtl implements Serializable { /** * 数量计量单位标识 */ - private String qty_unit_id; + private Long qty_unit_id; /** * 数量计量单位名称 @@ -84,7 +84,7 @@ public class StIvtIostorinvdtl implements Serializable { /** * 来源单据明细标识 */ - private String source_billdtl_id; + private Long source_billdtl_id; /** * 来源单据类型 @@ -104,7 +104,7 @@ public class StIvtIostorinvdtl implements Serializable { /** * 基础单据明细标识 */ - private String base_billdtl_id; + private Long 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 6ce873d..1cbd9ee 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 row.getIostorinv_id().toString()) .collect(Collectors.joining("','")); List disDaoList = iStIvtIostorinvdisService.list( @@ -432,7 +432,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl { - row.setTask_id(""); row.setWork_status(IOSEnum.WORK_STATUS.code("生成")); }); iStIvtIostorinvdisService.updateBatchById(disDaoList); @@ -514,22 +513,22 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl paramList = new ArrayList<>(); @@ -347,7 +347,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl paramList = new ArrayList<>(); @@ -454,7 +454,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl insertDtl(String iostorinv_id, List tableDataList) { + public ArrayList insertDtl(Long iostorinv_id, List tableDataList) { // 查询所有对应物料集合 List materialList = iMdBaseMaterialService.list( @@ -87,21 +87,21 @@ public class StIvtIostorinvdtlServiceImpl extends ServiceImpl