申购修改

src/main/java/com/glxp/api/dao/purchase/PurApplyDao.java

@@ -17,8 +17,6 @@ public interface PurApplyDao extends BaseMapperPlus<PurApplyDao, PurApplyEntity,
 
     List<PurApplyResponse> queryPageList(PurApplyRequest purApplyRequest);
 
-    int insert(PurApplyEntity purApplyRequest);
-
     Boolean update(PurApplyEntity purApplyRequest);
 
     Boolean deleteByIds(@Param("ids") List<Long> ids);

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";
-}
+}

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<String, List<IoCodeTempEntity>> stringListMap = null;
         if (CollUtil.isNotEmpty(filteredAndSorted)) {
             stringListMap = filteredAndSorted.stream()

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: