diff --git a/src/main/java/com/glxp/api/dao/basic/SysWorkplaceDocumentDao.java b/src/main/java/com/glxp/api/dao/basic/SysWorkplaceDocumentDao.java index 10240c4a1..97876baeb 100644 --- a/src/main/java/com/glxp/api/dao/basic/SysWorkplaceDocumentDao.java +++ b/src/main/java/com/glxp/api/dao/basic/SysWorkplaceDocumentDao.java @@ -20,6 +20,8 @@ import java.util.List; public interface SysWorkplaceDocumentDao extends BaseMapperPlus{ List filterList(WorkBindBusTypeRequest request); + + Integer findMaxNumberByWorkplaceCode(Long workplaceCode); } diff --git a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java index abe07846b..1c560840a 100644 --- a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java @@ -153,6 +153,13 @@ public class SysWorkplaceDocumentEntity { @TableField(value = "orderFinishVerify") private Integer orderFinishVerify; + /** + * 顺序号 + */ + @TableField(value = "number") + private Integer number; + + } diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java index 12e73bf9d..46ddfc6f8 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.util.Date; diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java index 06f102614..e964ece7a 100644 --- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java @@ -136,6 +136,7 @@ public class SysWorkplaceDocumentResponse { private Integer monopoly; private Integer orderFinishVerify; + private Integer number; public String getThrBusName() { diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceDocumentService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceDocumentService.java index a12c1a20c..21dc52567 100644 --- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceDocumentService.java +++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceDocumentService.java @@ -94,6 +94,13 @@ public class SysWorkplaceDocumentService extends ServiceImpl + ORDER BY + CASE + WHEN sys_workplace_document.number IS NOT NULL THEN 1 + ELSE 2 + END, + sys_workplace_document.number + + diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index cc4baedbd..67fed57d4 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -4361,3 +4361,8 @@ CALL Pro_Temp_ColumnWork('io_collect_order', 'errorMsg', CALL Pro_Temp_ColumnWork('sys_workplace_document', 'orderFinishVerify', ' tinyint NULL DEFAULT NULL COMMENT ''单据完成校验: 0:完全赋码 ; 1:部分赋码''', 1); + + +CALL Pro_Temp_ColumnWork('sys_workplace_document', 'number', + 'int NULL DEFAULT NULL COMMENT ''顺序号''', + 1);