6/7 单据搜索

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;

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;//供应商名字
 }

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;

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))

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
 
         <if test="uploadKey != null and uploadKey != ''">
             INNER JOIN io_unit_maintain_platform a2 on io.action = a2.sourceAction AND io.fromCorp = a2.unitId
@@ -51,6 +52,9 @@
             <if test="fromCorp != null and fromCorp != ''">
                 AND io.fromCorp = #{fromCorp}
             </if>
+            <if test="invoiceEncode != null and invoiceEncode != ''">
+                AND ioi.invoiceEncode = #{invoiceEncode}
+            </if>
             <if test="keyWord != null and keyWord != ''">
                 AND (
                         bc.name like concat('%', #{keyWord}, '%')

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 @@
             <if test="zczbhhzbapzbh != null and zczbhhzbapzbh != ''">
                 AND a2.certCode like concat('%', #{zczbhhzbapzbh}, '%')
             </if>
+            <if test="corpName != null and corpName != ''">
+                AND b1.name like concat('%', #{corpName}, '%')
+            </if>
             <if test="startAduditTime != null and startAduditTime != '' and endAduditTime != null and endAduditTime != ''">
                 AND date_format(a1.auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and date_format(#{endAduditTime}, '%Y-%m-%d')
             </if>

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);