From d2a7f661a0b69b7ec9eb2195b573d5eaff1ca2cb Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 7 Jun 2024 15:17:17 +0800 Subject: [PATCH] =?UTF-8?q?6/7=20=E5=8D=95=E6=8D=AE=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/req/basic/BasicUnitMaintainFilterRequest.java | 2 ++ .../glxp/api/req/inout/FilterOrderDetailResultRequest.java | 1 + .../java/com/glxp/api/req/inout/FilterOrderRequest.java | 2 +- .../com/glxp/api/res/inout/IoOrderDetailResultResponse.java | 2 ++ src/main/resources/mybatis/mapper/inout/IoOrderDao.xml | 4 ++++ .../mybatis/mapper/inout/IoOrderDetailResultDao.xml | 5 ++++- src/main/resources/schemas/schema_v2.4.sql | 6 ++++++ 7 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java index d9b3db6e0..70f736495 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java @@ -16,6 +16,8 @@ public class BasicUnitMaintainFilterRequest extends ListPageRequest { private String thirdSys; private String thirdSysFk; + private String customerId; + private String thirdId; private String thirdId1; private String thirdId2; diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java index eb2c06bf8..ee46b3c3f 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java @@ -60,4 +60,5 @@ public class FilterOrderDetailResultRequest extends ListPageRequest { private String locInvName; private String confirmStarTime; //发票确认起始日期 private String confirmEndTime; //发票确认结束日期 + private String corpName;//供应商名字 } diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java index 3966a88e5..a4c7659ca 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java @@ -193,7 +193,7 @@ public class FilterOrderRequest extends ListPageRequest { private String orderBy; private String uploadKey; - private String invoiceEncode; + private String invoiceEncode;//发票号 //联合备注字段查询 private String unionRemark; diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java index 183fb4329..63fc2d379 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java @@ -214,6 +214,8 @@ public class IoOrderDetailResultResponse { @ExcelProperty(value = "发票确认时间", index = 12) private Date confirmTime; + private String corpName; + public String getFromName() { if (StrUtil.isNotEmpty(fromCorpName)) diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index 5a3627059..0dae4e934 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -17,6 +17,7 @@ from io_order as io left join auth_warehouse aw on aw.code = io.fromInvCode left join basic_corp bc on bc.erpId = io.fromCorp + left join io_order_invoice ioi on ioi.orderIdFk = io.billNo INNER JOIN io_unit_maintain_platform a2 on io.action = a2.sourceAction AND io.fromCorp = a2.unitId @@ -51,6 +52,9 @@ AND io.fromCorp = #{fromCorp} + + AND ioi.invoiceEncode = #{invoiceEncode} + AND ( bc.name like concat('%', #{keyWord}, '%') diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml index 869e70f04..f4533d696 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml @@ -28,7 +28,7 @@ a1.mainAction, a1.confirmTime as confirmTime, a1.auditTime, - b1.NAME AS fromCorpName, + b1.NAME AS corpName, (select name from auth_warehouse aw where aw.code = a1.fromInvCode) as fromInvName, (SELECT NAME FROM basic_bussiness_type bus WHERE bus.action = a1.action) billTypeName FROM io_order_detail_result a2 @@ -75,6 +75,9 @@ AND a2.certCode like concat('%', #{zczbhhzbapzbh}, '%') + + AND b1.name like concat('%', #{corpName}, '%') + AND date_format(a1.auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and date_format(#{endAduditTime}, '%Y-%m-%d') diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 0c7cde721..4eb5a20be 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -3695,3 +3695,9 @@ INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'requireScanCode', 'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''是否需要扫码 1是；0否''', 1); + + +INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (41782, 68, '2', 1, 'invoiceEncode', '发票号', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + +INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (41780, 94, '2', 1, 'corpName', '供应商', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (41781, 94, '1', 1, 'corpName', '供应商', 'text', NULL, NULL, NULL, 160, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);