diff --git a/src/main/java/com/glxp/api/dao/collect/IoCollectOrderMapper.java b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderMapper.java index 15790b418..8f568209d 100644 --- a/src/main/java/com/glxp/api/dao/collect/IoCollectOrderMapper.java +++ b/src/main/java/com/glxp/api/dao/collect/IoCollectOrderMapper.java @@ -16,5 +16,5 @@ public interface IoCollectOrderMapper extends BaseMapper { void clearOrder(); - void updateInvAlert(@Param("id")Integer id,@Param("invAlert") Integer invAlert); + void updateInvAlert(@Param("id")Long id,@Param("invAlert") Integer invAlert); } diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java index c4731b2b3..a250d322b 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java @@ -29,7 +29,7 @@ import lombok.NoArgsConstructor; public class IoCollectOrder implements Serializable { @TableId(value = "id", type = IdType.INPUT) @ApiModelProperty(value = "") - private Integer id; + private Long id; /** diff --git a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java index e9cf29a32..074f54eec 100644 --- a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java +++ b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java @@ -10,7 +10,7 @@ import java.util.Date; @Data public class IoCollectOrderResponse { - private Integer id; + private Long id; /** * 单据号 diff --git a/src/main/java/com/glxp/api/service/basic/BasicCollectUserService.java b/src/main/java/com/glxp/api/service/basic/BasicCollectUserService.java index 2f1bff410..fadb8125f 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicCollectUserService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicCollectUserService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.basic; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.pagehelper.PageHelper; import com.glxp.api.req.basic.BasicCollectUserRequest; import com.glxp.api.res.basic.UserWorkResponse; import org.aspectj.weaver.ast.Var; @@ -10,6 +11,7 @@ import com.glxp.api.dao.basic.BasicCollectUserMapper; import com.glxp.api.entity.basic.BasicCollectUserEntity; import javax.annotation.Resource; +import java.util.Collections; import java.util.Date; import java.util.List; @@ -20,6 +22,12 @@ public class BasicCollectUserService extends ServiceImpl filterList(BasicCollectUserRequest request) { + if (null == request) { + return Collections.emptyList(); + } + if (null != request.getPage() && null != request.getLimit()) { + PageHelper.offsetPage((request.getPage() - 1) * request.getLimit(), request.getLimit()); + } List list = basicCollectUserMapper.filterList(request); return list; } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java index b646f0fee..2c4a81a38 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java @@ -191,6 +191,7 @@ public class IoCollectOriginService { ioCollectOrder.setUpdateTime(new Date()); ioCollectOrder.setSplitStatus(0); ioCollectOrder.setTagStatus(1); + ioCollectOrder.setId(IdUtil.getSnowflakeNextId()); collectOrderService.save(ioCollectOrder); } diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java index 85313ec8a..9a8940a28 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java @@ -81,7 +81,7 @@ public class IoSplitFifoInvService extends ServiceImpl sysWorkplacePutRels = sysWorkplacePutRelService.selectByWorkPutCode(workPlaceCode); @@ -179,7 +179,7 @@ public class IoSplitFifoInvService extends ServiceImpl() .eq(IoSplitFifoInv::getRelId, ioSplitFifoCodeEntity.getRelId()) .eq(IoSplitFifoInv::getWorkPlaceCode, ioSplitFifoCodeEntity.getWorkPlaceCode()) diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 7902d6047..0d4a9b298 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -2004,8 +2004,7 @@ CALL Pro_Temp_ColumnWork('thr_inv_order', 'sickerCode', CALL Pro_Temp_ColumnWork('thr_inv_order', 'sickerName', ' varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''患者名称''', 1); -CALL Pro_Temp_ColumnWork('thr_inv_order', 'chargeTime', - ' datetime(0) NULL DEFAULT NULL COMMENT''收费时间''', +CALL Pro_Temp_ColumnWork('thr_inv_order', 'chargeTime', ' datetime(0) NULL DEFAULT NULL COMMENT''收费时间''', 1); CALL Pro_Temp_ColumnWork('thr_inv_order', 'chargeUser', ' varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''收费人员''', @@ -4504,3 +4503,15 @@ CREATE TABLE IF NOT EXISTS `io_split_fifo_inv_rel` CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '工位库存关联业务类型' ROW_FORMAT = Dynamic; + + +CALL Pro_Temp_ColumnWork('io_split_code', 'unpackTime', + ' datetime NULL DEFAULT NULL COMMENT ''拆包后可用时长(小时)''', + 1); + +CALL Pro_Temp_ColumnWork('basic_udirel', 'unpackTime', + ' datetime NULL DEFAULT NULL COMMENT ''拆包后可用时长(小时)''', + 1); + + +