From 450dcbf2a28f1a8ee445171e961fd5b1b4b9290f Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 31 Oct 2023 13:56:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=B4=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/dao/purchase/PurApplyDao.java | 2 -- .../java/com/glxp/api/entity/purchase/PurApplyEntity.java | 4 ++-- .../java/com/glxp/api/service/inout/IoAddInoutService.java | 3 +-- src/main/resources/application-dev.yml | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/glxp/api/dao/purchase/PurApplyDao.java b/src/main/java/com/glxp/api/dao/purchase/PurApplyDao.java index 50825f040..c4a0ee47f 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurApplyDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurApplyDao.java @@ -17,8 +17,6 @@ public interface PurApplyDao extends BaseMapperPlus queryPageList(PurApplyRequest purApplyRequest); - int insert(PurApplyEntity purApplyRequest); - Boolean update(PurApplyEntity purApplyRequest); Boolean deleteByIds(@Param("ids") List ids); diff --git a/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java index ac0f3cbb7..4741e25b3 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java @@ -10,7 +10,7 @@ import lombok.Data; @Data @TableName(value = "pur_apply") public class PurApplyEntity { - @TableId(value = "id", type = IdType.INPUT) + @TableId(value = "id", type = IdType.AUTO) private Long id; /** @@ -168,4 +168,4 @@ public class PurApplyEntity { public static final String COL_PLANBILLNO = "planBillNo"; public static final String COL_GENERATEPLAN = "generatePlan"; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index 27a4f326d..f1d5f1b12 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -1099,9 +1099,8 @@ public class IoAddInoutService { .filter(person -> IntUtil.value(person.getRelId()) == IntUtil.value(codeTempEntity.getRelId()) && StrUtil.trimToEmpty(person.getBatchNo()).equals(StrUtil.trimToEmpty(codeTempEntity.getBatchNo())) ) - .sorted(Comparator.comparing(IoCodeTempEntity::getInBatchNo)) + .sorted(Comparator.comparing(IoCodeTempEntity::getInBatchNo, Comparator.nullsLast(Comparator.naturalOrder()))) .collect(Collectors.toList()); - Map> stringListMap = null; if (CollUtil.isNotEmpty(filteredAndSorted)) { stringListMap = filteredAndSorted.stream() diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index b2df4abe2..e7acbb9df 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ph?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: