From 3599feef955e2dcf974ecefeaeb7b28cacb97a73 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期六, 19 四月 2025 08:55:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms
---
src/main/java/com/zy/asrs/mapper/OrderMapper.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/OrderMapper.java b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
index 2e52b23..5500ade 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
@@ -1,8 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.Order;
import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.Order;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -15,4 +14,13 @@
int updateSettle(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("userId")Long userId);
+ List<Order> selectComplete();
+ List<Order> selectComplete8();
+
+ int addToLogTable(Order order);
+
+ List<Order> selectorderNoL(@Param("orderNo")String orderNo);
+
+ Order selectOrderMoveStatus();
+ Order selectOrderMoveStatusInitial();
}
--
Gitblit v1.9.1