From 41b6587e235b97cf070585fc3f7eedd131d2ee63 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 7 Mar 2025 17:15:08 +0800
Subject: [PATCH] =?UTF-8?q?3/7=20=E4=BC=98=E5=8C=962.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mybatis/mapper/inv/InvPlaceOrderDao.xml | 75 +++++++------
.../mapper/inv/InvPlaceOrderDetailDao.xml | 5 +-
.../mapper/inv/InvPreInProductDetailDao.xml | 83 ++++++++------
.../mapper/inv/InvPreProductDetailDao.xml | 83 ++++++++------
.../mybatis/mapper/inv/InvPreinOrderDao.xml | 48 ++++++---
.../mybatis/mapper/inv/InvProductNewDao.xml | 102 ++++++++----------
.../mybatis/mapper/inv/InvRemindMsgDao.xml | 9 +-
.../mybatis/mapper/inv/InvRemindSetDao.xml | 50 +++++----
8 files changed, 262 insertions(+), 193 deletions(-)
diff --git a/src/main/resources/mybatis/mapper/inv/InvPlaceOrderDao.xml b/src/main/resources/mybatis/mapper/inv/InvPlaceOrderDao.xml
index 4166ee3e3..58878286e 100644
--- a/src/main/resources/mybatis/mapper/inv/InvPlaceOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/InvPlaceOrderDao.xml
@@ -2,36 +2,51 @@
-
\ No newline at end of file
+
diff --git a/src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml
index ecdbcdf51..51e44f431 100644
--- a/src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml
@@ -151,17 +151,24 @@
diff --git a/src/main/resources/mybatis/mapper/inv/InvPreProductDetailDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreProductDetailDao.xml
index 4a2c893ea..598f8de56 100644
--- a/src/main/resources/mybatis/mapper/inv/InvPreProductDetailDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/InvPreProductDetailDao.xml
@@ -173,17 +173,24 @@
diff --git a/src/main/resources/mybatis/mapper/inv/InvPreinOrderDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreinOrderDao.xml
index 4bd97c9da..bafd18897 100644
--- a/src/main/resources/mybatis/mapper/inv/InvPreinOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/InvPreinOrderDao.xml
@@ -3,32 +3,50 @@
diff --git a/src/main/resources/mybatis/mapper/inv/InvProductNewDao.xml b/src/main/resources/mybatis/mapper/inv/InvProductNewDao.xml
index 9fc65ff02..b4d2c8d9c 100644
--- a/src/main/resources/mybatis/mapper/inv/InvProductNewDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/InvProductNewDao.xml
@@ -131,15 +131,6 @@
select *
from inv_product
-
-
-
-
-
-
-
-
-
and supId = #{supId}
@@ -149,9 +140,6 @@
AND nameCode like concat('%', #{nameCode}, '%')
-
-
-
AND deptCode = #{deptCode}
@@ -300,17 +288,24 @@
@@ -372,9 +370,6 @@
AND invCode = #{invCode}
-
-
-
AND batchNo = #{batchNo}
@@ -395,9 +390,6 @@
AND invCode = #{invCode}
-
-
-
AND batchNo = #{batchNo}
@@ -424,9 +416,6 @@
AND inBatchNo = #{inBatchNo}
-
-
-
AND batchNo = #{batchNo}
@@ -448,9 +437,6 @@
AND invCode = #{invCode}
-
-
-
AND batchNo = #{batchNo}
diff --git a/src/main/resources/mybatis/mapper/inv/InvRemindMsgDao.xml b/src/main/resources/mybatis/mapper/inv/InvRemindMsgDao.xml
index 690058706..be9d4b0f2 100644
--- a/src/main/resources/mybatis/mapper/inv/InvRemindMsgDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/InvRemindMsgDao.xml
@@ -23,12 +23,15 @@
bp.manufactory,
bp.zczbhhzbapzbh,
bp.cpmctymc productName,
- (select `name` from auth_warehouse where `code` = irm.invCode) invName,
- (select `name` from auth_space where `code` = irm.invSpaceCode and invCode = irm.invCode) invSpaceName,
- (select `name` from basic_corp where erpId = irm.supId) supName
+ aw.name invName,
+ asp.name invSpaceName,
+ bc.name supName
from inv_remind_msg irm
left join basic_udirel bu on bu.id = irm.relId
left join basic_products bp on bp.uuid = bu.uuid
+ left join auth_warehouse aw on aw.code = irm.invCode
+ left join auth_space asp on asp.code = irm.invSpaceCode and asp.invCode = irm.invCode
+ left join basic_corp bc on bc.erpId = irm.supId
AND irm.relId = #{relId}
diff --git a/src/main/resources/mybatis/mapper/inv/InvRemindSetDao.xml b/src/main/resources/mybatis/mapper/inv/InvRemindSetDao.xml
index ac2484459..8ca228cc9 100644
--- a/src/main/resources/mybatis/mapper/inv/InvRemindSetDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/InvRemindSetDao.xml
@@ -20,11 +20,13 @@
bu.isDateBy,
bp.cpmctymc productName,
bp.ggxh,
- (select `name` from auth_warehouse where `code` = irs.invCode) invName,
- (select `name` from auth_space where `code` = irs.invSpaceCode and invCode = irs.invCode) invSpaceName
+ aw.name invName,
+ asp.name invSpaceName
from inv_remind_set irs
left join basic_udirel bu on bu.id = irs.relId
left join basic_products bp on bp.uuid = bu.uuid
+ left join auth_warehouse aw on aw.code = irs.invCode
+ left join auth_space asp on asp.code = irs.invSpaceCode and asp.invCode = irs.invCode
AND irs.relId = #{relId}
@@ -50,24 +52,30 @@