no message

cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/controller/AgvTaskController.java

@@ -208,7 +208,7 @@ public class AgvTaskController extends JeecgController<AgvTask, IAgvTaskService>
             entityList.add(new ExcelExportEntity("顶升时间", "顶升时间", 20));
             entityList.add(new ExcelExportEntity("顶升耗时", "顶升耗时", 20));
 
-            Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(null, "TES任务信息"), entityList, dataList);
+            Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(null, "数据"), entityList, dataList);
         /*    // 自动调整列宽
             Sheet sheet = workbook.getSheetAt(0);
             for (int i = 0; i < entityList.size(); i++) {

cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/agvTask/mapper/xml/AgvTaskMapper.xml

@@ -35,16 +35,13 @@
                 AND agv.id = #{agvTask.id}
             </if>
 
-            <if test="agvTask.carrierCode != null">
+            <if test="agvTask.carrierCode != null and agvTask.carrierCode != ''">
                 AND agv.carrier_code = #{agvTask.carrierCode}
             </if>
 
             <if test="agvTask.status_MultiString != null and agvTask.status_MultiString != ''">
                 AND agv.status IN
-                <foreach collection="agvTask.status_MultiString.split(',')"
-                         item="status"
-                         open="("
-                         separator=","
+                <foreach collection="agvTask.status_MultiString.split(',')" item="status" open="(" separator=","
                          close=")">
                     #{status}
                 </foreach>
@@ -52,16 +49,16 @@
 
             <if test="agvTask.type_MultiString != null and agvTask.type_MultiString != ''">
                 AND agv.type IN
-                <foreach collection="agvTask.type_MultiString.split(',')"
-                         item="type"
-                         open="("
-                         separator=","
+                <foreach collection="agvTask.type_MultiString.split(',')" item="type" open="(" separator=","
                          close=")">
                     #{type}
                 </foreach>
             </if>
-            <if test="agvTask.createTime != null">
-                AND agv.create_time >= #{agvTask.createTime}
+            <if test="agvTask.createTime_begin != null">
+                AND agv.create_time &gt;= CONCAT(#{agvTask.createTime_begin}, ' 00:00:00')
+            </if>
+            <if test="agvTask.createTime_end != null">
+                AND agv.create_time &lt;= CONCAT(#{agvTask.createTime_end}, ' 23:59:59')
             </if>
         </where>
         order by agv.id
@@ -76,7 +73,7 @@
         LIMIT 1)
         UNION ALL
         (SELECT * FROM data_agv_task
-        WHERE end_code =  #{endCode}
+        WHERE end_code = #{endCode}
         AND type ='OUTBOUND'
         AND agv_vendor = 'TES'
         ORDER BY create_time DESC
@@ -144,9 +141,9 @@
         FROM base_point bp
         INNER JOIN data_agv_task agv ON agv.start_code = bp.point_code
         WHERE agv.type = 'OUTBOUND'
-          AND agv.status IN (1, 2)
-          AND agv.agv_vendor = 'TES'
-          AND bp.iz_active = 1
+        AND agv.status IN (1, 2)
+        AND agv.agv_vendor = 'TES'
+        AND bp.iz_active = 1
         ORDER BY bp.col_num
     </select>
 </mapper>

cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/shipping/entity/Pick.java

@@ -96,6 +96,14 @@ public class Pick implements Serializable {
     @Schema(description = "订单状态")
     @Dict(dicCode = "pick_status")
     private java.lang.Integer status;
+
+    /**
+     * 优先级
+     * 0:普通 1:加急 2:紧急
+     */
+    @Schema(description = "优先级")
+    private java.lang.Integer priority;
+
     /**
      * 需求数量
      */

cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/shipping/mapper/xml/PickDetailMapper.xml

@@ -32,6 +32,8 @@
         JOIN data_pick_detail pd ON pd.pick_id=p.id
         WHERE p.`status` in (1,2,4)
         AND pd.order_qty-pd.allocated_qty>0
-        ORDER BY p.id,pd.id
+        ORDER BY
+        p.priority DESC,
+        p.id, pd.id
     </select>
 </mapper>

cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/shipping/service/impl/PickDetailServiceImpl.java

@@ -53,6 +53,7 @@ public class PickDetailServiceImpl extends ServiceImpl<PickDetailMapper, PickDet
                 .customerCode(outboundRequest.getCustomerCode())
                 .orderType(outboundRequest.getType())
                 .status(PickStatusEnum.CREATED.getValue())
+                .priority(0)
                 .orderDate(new Date())
                 .build();
     }

cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/shipping/vo/PickPage.java

@@ -78,6 +78,14 @@ public class PickPage {
     @Excel(name = "订单状态", width = 15)
     @Schema(description = "订单状态")
     private java.lang.Integer status;
+
+    /**
+     * 优先级
+     * 0:普通 1:加急 2:紧急
+     */
+    @Schema(description = "优先级")
+    private java.lang.Integer priority;
+
     /**
      * 需求数量
      */