From e27a4186c67c7087435c414a4338d2df48c81d63 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 28 十二月 2023 08:24:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/resources/mapper/LocDetlMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index c710f9a..fa37930 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -434,7 +434,7 @@
where 1=1
and b.loc_sts = 'F'
and a.matnr = #{matnr}
- and a.payment = 1
+
<!-- <choose>-->
<!-- <when test="batch != null and batch != ''">-->
<!-- and a.batch = #{batch}-->
@@ -454,7 +454,7 @@
</choose>
order by
- a.price asc,a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
+ a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
desc,
NEWID(),
case
@@ -645,7 +645,7 @@
where 1=1
and b.loc_sts = 'F'
and a.matnr = #{matnr}
- and a.payment = 1
+
<!-- <choose>-->
<!-- <when test="batch != null and batch != ''">-->
<!-- and a.batch = #{batch}-->
@@ -665,7 +665,7 @@
</choose>
order by
- a.price desc,a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
+ a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
desc,
NEWID(),
case
--
Gitblit v1.9.1