From 0b32274b65cf7d47f6e136783b2974360abd27f9 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 18 Sep 2024 10:48:51 +0800
Subject: [PATCH] =?UTF-8?q?9/18=20=E5=AD=97=E6=AE=B5=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/glxp/api/req/inout/IoSplitFifoInvRequest.java | 4 ++++
.../mybatis/mapper/collect/IoCollectOrderMapper.xml | 1 +
src/main/resources/mybatis/mapper/inout/IoOrderDao.xml | 1 +
.../mybatis/mapper/inout/IoSplitFifoInvMapper.xml | 8 ++++++++
4 files changed, 14 insertions(+)
diff --git a/src/main/java/com/glxp/api/req/inout/IoSplitFifoInvRequest.java b/src/main/java/com/glxp/api/req/inout/IoSplitFifoInvRequest.java
index 1ebfde69f..8be3a57aa 100644
--- a/src/main/java/com/glxp/api/req/inout/IoSplitFifoInvRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/IoSplitFifoInvRequest.java
@@ -121,6 +121,10 @@ public class IoSplitFifoInvRequest extends ListPageRequest {
private String remind;
private String cpmctymc;
+ //批准文号 || 注册备案证号
+ private String zczbhhzbapzbh;
+ //生产企业
+ private String ylqxzcrbarmc;
}
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
index dc00261e8..d24e4360a 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml
@@ -12,6 +12,7 @@
ico.orderCirType,
ico.createTime,
ico.workPlaceCode,
+ ico.shipperName,
ico.remark,
ico.createUser,
ico.updateTime,
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index 7e99b4b4b..8eb973720 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -196,6 +196,7 @@
or io.fromCorp like concat('%', #{keywords}, '%')
or io.workPlaceCode like concat('%', #{keywords}, '%')
or io.busType like concat('%', #{keywords}, '%')
+ or sw.workplaceName like concat('%', #{keywords}, '%')
or io.fromType like concat('%', #{keywords}, '%'))
diff --git a/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml b/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml
index d021ad79d..ab2aa8bf5 100644
--- a/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml
@@ -57,6 +57,14 @@
AND bp.nameCode = #{nameCode}
+
+ AND bp.zczbhhzbapzbh like concat('%', #{zczbhhzbapzbh}, '%')
+
+
+ AND (
+ bp.ylqxzcrbarmc like concat('%', #{ylqxzcrbarmc}, '%')
+ or bp.manufactory like concat('%', #{ylqxzcrbarmc}, '%'))
+
AND isfi.batchNo = #{batchNo}