From 38282debf788f06dc5aa63fb76173a7102461a52 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Fri, 12 Aug 2022 10:24:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E9=80=9A=E5=88=86=E5=BA=93=E4=B8=8D?=
=?UTF-8?q?=E9=80=9A=E7=94=A8=E6=88=B7=E5=AF=B9=E5=BA=94=E5=8D=95=E6=8D=AE?=
=?UTF-8?q?=E7=B1=BB=E5=9E=8B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../inout/StockOrderController.java | 4 ++--
.../req/inout/StockOrderFilterRequest.java | 2 +-
.../mapper/basic/BussinessLocalTypeDao.xml | 2 +-
.../mybatis/mapper/basic/BussinessTypeDao.xml | 6 +++---
.../mybatis/mapper/inout/OrderDao.xml | 14 +++++++------
.../mybatis/mapper/inout/StockOrderDao.xml | 20 +++++++++++--------
6 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java
index 30fe362..e407c67 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java
@@ -281,7 +281,7 @@ public class StockOrderController {
CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(stockOrderFilterRequest.getCorpId()));
if (companyEntity.getUnitIdFk().equals("110")) {
stockOrderFilterRequest.setUnitIdFk(null);
- stockOrderFilterRequest.setUserId(customerService.getUserId());
+ stockOrderFilterRequest.setUserId(customerService.getUserId() + "");
} else {
stockOrderFilterRequest.setUnitIdFk(companyEntity.getUnitIdFk());
}
@@ -322,7 +322,7 @@ public class StockOrderController {
if (customerId.equals(Constant.SYSTEM_CUSTOMER_ID)) {
Integer userId = customerService.getUserId();
stockOrderFilterRequest.setUnitIdFk(null);
- stockOrderFilterRequest.setUserId(userId);
+ stockOrderFilterRequest.setUserId(userId + "");
} else {
CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(customerId));
stockOrderFilterRequest.setUnitIdFk(companyEntity.getUnitIdFk());
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java
index c419e31..c365478 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java
@@ -33,7 +33,7 @@ public class StockOrderFilterRequest extends ListPageRequest {
private String invWarehouseCode;
private Integer createUser;
private Integer reviewUser;
- private Integer userId;
+ private String userId;
private Integer unionUser;
private String entrustUser;
private boolean entrustEnd;
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml
index 40b2c65..841f7b2 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml
@@ -118,7 +118,7 @@
AND inv_warehouse_user.`code` = #{code}
- AND inv_warehouse_user.`userId` = #{userId}
+ AND inv_bustype_user.`userId` = #{userId}
group by basic_bussiness_type.action
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
index 1da2028..26c67b9 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
@@ -142,6 +142,7 @@
INNER JOIN inv_warehouse_sub on inv_warehouse_sub.`code` = inv_warehouse_bussiness_type.code
INNER JOIN inv_warehouse on inv_warehouse_sub.parentId = inv_warehouse.`code`
INNER JOIN inv_warehouse_user on inv_warehouse_sub.`code` =inv_warehouse_user.`code`
+ INNER JOIN inv_bustype_user on inv_warehouse_bussiness_type.action = inv_bustype_user.scAction
AND basic_bussiness_type.name LIKE concat('%',#{name},'%')
@@ -168,9 +169,8 @@
AND inv_warehouse_sub.`code` =#{locSubInvCode}
-
-
- AND inv_warehouse_user.userId = #{userId}
+
+ AND inv_bustype_user.`userId` = #{userId}
diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
index 16480d0..909eaf6 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
@@ -275,12 +275,14 @@
and invWarehouseCode =#{invWarehouseCode}
- and
- io_order.action in
- (select basic_bussiness_type.action from inv_bustype_user INNER JOIN basic_bussiness_type on
- inv_bustype_user.scAction = basic_bussiness_type.action
- WHERE userId =#{userId} and invWarehouseCode =#{invWarehouseCode}
- GROUP BY inv_bustype_user.id)
+
+ and
+ io_order.action in
+ (select basic_bussiness_type.action from inv_bustype_user INNER JOIN basic_bussiness_type on
+ inv_bustype_user.scAction = basic_bussiness_type.action
+ WHERE userId =#{userId} and invWarehouseCode =#{invWarehouseCode}
+ GROUP BY inv_bustype_user.id)
+
diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml
index 91925e2..d1e49f9 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml
@@ -158,7 +158,7 @@
and billType = #{localAction}
-
+
and (invWarehouseCode in (select code from inv_warehouse_user WHERE userId =#{userId}) or
invWarehouseCode is null or invWarehouseCode='')
@@ -180,12 +180,15 @@
and invWarehouseCode = #{invWarehouseCode}
- and
- stock_order.billType in
- (select basic_bussiness_type.localAction from inv_bustype_user INNER JOIN basic_bussiness_type on
- inv_bustype_user.scAction = basic_bussiness_type.action
- WHERE userId =#{userId} and invWarehouseCode =#{invWarehouseCode}
- GROUP BY inv_bustype_user.id)
+
+
+ and
+ stock_order.billType in
+ (select basic_bussiness_type.localAction from inv_bustype_user INNER JOIN basic_bussiness_type on
+ inv_bustype_user.scAction = basic_bussiness_type.action
+ WHERE userId =#{userId} and invWarehouseCode =#{invWarehouseCode}
+ GROUP BY inv_bustype_user.id)
+
and createUser = #{createUser}
@@ -309,7 +312,8 @@
select io_codes.code udiCode,basic_udirel.id productId,basic_products.cpmctymc productName,basic_products.ggxh
spec,io_codes.batchNo,io_codes.produceDate productDate,io_codes.expireDate ,io_codes.serialNo,io_codes.count,
basic_products.ylqxzcrbarmc,basic_udirel.manufactory,basic_udirel.measname,basic_products.zczbhhzbapzbh,
- inv_warehouse.name locInv, inv_warehouse_sub.name subInv, basic_products.spmc, basic_products.cpms,io_codes.nameCode,io_codes.relId
+ inv_warehouse.name locInv, inv_warehouse_sub.name subInv, basic_products.spmc,
+ basic_products.cpms,io_codes.nameCode,io_codes.relId
from io_codes
INNER JOIN basic_udirel on io_codes.relId = basic_udirel.id
INNER JOIN basic_products on basic_products.uuid = basic_udirel.uuid