9/9 业务类型增加顺序号

src/main/java/com/glxp/api/dao/basic/SysWorkplaceDocumentDao.java

@@ -20,6 +20,8 @@ import java.util.List;
 public interface SysWorkplaceDocumentDao extends BaseMapperPlus<SysWorkplaceDocumentDao, SysWorkplaceDocumentEntity, SysWorkplaceDocumentEntity>{
 
     List<SysWorkplaceDocumentResponse> filterList(WorkBindBusTypeRequest request);
+
+    Integer findMaxNumberByWorkplaceCode(Long workplaceCode);
 }
 
 

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

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;
 

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() {

src/main/java/com/glxp/api/service/basic/SysWorkplaceDocumentService.java

@@ -94,6 +94,13 @@ public class SysWorkplaceDocumentService extends ServiceImpl<SysWorkplaceDocumen
         if (entity.getInvCode() == null){
             entity.setInvCode(0);
         }
+        Integer number = sysWorkplaceDocumentDao.findMaxNumberByWorkplaceCode(entity.getWorkplaceCode());
+        if (number == null){
+            //为空 默认1
+            entity.setNumber(1);
+        }else {
+            entity.setNumber(number + 1);
+        }
         int insert = sysWorkplaceDocumentDao.insert(entity);
         if (insert == 0) {
             return false;

src/main/resources/mybatis/mapper/basic/SysWorkplaceDocumentDao.xml

@@ -24,5 +24,16 @@
                     )
             </if>
         </where>
+        ORDER BY
+        CASE
+        WHEN sys_workplace_document.number IS NOT NULL THEN 1
+        ELSE 2
+        END,
+        sys_workplace_document.number
+    </select>
+    <select id="findMaxNumberByWorkplaceCode" resultType="java.lang.Integer">
+        SELECT MAX(number) AS maxNumber
+        FROM sys_workplace_document
+        WHERE workplaceCode = #{workplaceCode}
     </select>
 </mapper>

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);