From 6a37fede1f3e977a84801ded88d82588eacb92c8 Mon Sep 17 00:00:00 2001
From: zane <zane0312@foxmail.com>
Date: Mon, 26 Aug 2024 11:47:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=AE=E9=A1=B6=20=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderController.java        | 10 ++++++++++
 .../glxp/api/entity/collect/IoCollectOrder.java  |  7 +++++++
 .../api/res/collect/IoCollectOrderResponse.java  | 10 ++++++++++
 .../service/collect/IoCollectOrderService.java   | 16 ++++++++++++++++
 .../mapper/collect/IoCollectOrderMapper.xml      |  5 +++--
 src/main/resources/schemas/io_collect_order.sql  |  3 +++
 6 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 src/main/resources/schemas/io_collect_order.sql

diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
index 99a4f5dea..4ef0b4ede 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
@@ -292,5 +292,15 @@ public class IoCollectOrderController extends BaseController {
         return ResultVOUtils.success();
     }
 
+    /**
+     * 置顶
+     * @param collectOrderRequest
+     * @return
+     */
+    @PostMapping("/udiwms/basic/collect/order/orderTop")
+    public BaseResponse orderTop(@RequestBody CollectOrderRequest collectOrderRequest) {
+        collectOrderService.orderTop(collectOrderRequest);
+        return ResultVOUtils.success();
+    }
 
 }
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 3f9d41d1e..3a270a757 100644
--- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java
+++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java
@@ -201,5 +201,12 @@ public class IoCollectOrder implements Serializable {
     @ApiModelProperty(value = "单据备注6")
     private String backupOrderRemark6;
 
+    /**
+     * 排序时间
+     */
+    @TableField(value = "orderTime")
+    @ApiModelProperty(value = "排序时间")
+    private Date orderTime;
+
     private static final long serialVersionUID = 1L;
 }
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 8595c23cc..d49ef7208 100644
--- a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java
+++ b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java
@@ -138,6 +138,16 @@ public class IoCollectOrderResponse {
     private String backupOrderRemark6;
 
 
+    /**
+     * 排序时间
+     */
+    private Date orderTime;
+
+    /**
+     * 队列序号
+     */
+    private Integer orderSequence;
+
     public String getFromName() {
 
         if (StrUtil.isNotEmpty(fromCorpName))
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
index 087f7c540..05960f780 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -1,6 +1,7 @@
 package com.glxp.api.service.collect;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -426,4 +427,19 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
         }
 
     }
+
+    /**
+     * 更新排序时间
+     * @param collectOrderRequest
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void orderTop(CollectOrderRequest collectOrderRequest) {
+        Assert.notNull(collectOrderRequest.getId(),"id不能为空");
+        this.lambdaUpdate()
+                .set(IoCollectOrder::getUpdateTime, new Date())
+                .set(collectOrderRequest.getUpdateUser() != null,IoCollectOrder::getUpdateUser, collectOrderRequest.getUpdateUser())
+                .set(IoCollectOrder::getOrderTime, new Date())
+                .eq(IoCollectOrder::getId,collectOrderRequest.getId()).update();
+    }
+
 }
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
index 2b6375013..15a74dc04 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
@@ -10,7 +10,8 @@
         sys_workplace_document.busName busTypeName,
         bc.name fromCorpName,
         sw.workplaceId workPlaceCode,
-        sw.workplaceName,ico.id
+        sw.workplaceName,ico.id,ico.orderTime,
+        row_number() over ( order by ico.orderTime desc ) as orderSequence
         FROM io_collect_order ico
         left join sys_workplace_document on ico.busType = sys_workplace_document.documentTypeCode
         left join basic_corp bc on ico.fromCorp = bc.erpId
@@ -68,7 +69,7 @@
                 </foreach>
             </if>
         </where>
-        order by collectTime desc
+        order by orderTime desc
     </select>
 
 
diff --git a/src/main/resources/schemas/io_collect_order.sql b/src/main/resources/schemas/io_collect_order.sql
new file mode 100644
index 000000000..5e1807f9e
--- /dev/null
+++ b/src/main/resources/schemas/io_collect_order.sql
@@ -0,0 +1,3 @@
+-- 新增排序时间字段
+ALTER TABLE `udi_wms_ct`.`io_collect_order`
+    ADD COLUMN `orderTime` datetime(0) NULL COMMENT '排序时间' AFTER `remark8`;