From 31106fa246ecd876ff6b256b2d54b148dbb1ed0e Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 31 Aug 2024 05:40:11 +0800
Subject: [PATCH] md

---
 .../erp/apiweb/WarehouseInController.java     | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WarehouseInController.java b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WarehouseInController.java
index 559d6ec..fc62ee1 100644
--- a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WarehouseInController.java
+++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WarehouseInController.java
@@ -12,6 +12,7 @@
 package com.xdadan.erp.apiweb;
 
 import com.xdadan.erp.common.annotation.Log;
+import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
 import com.xdadan.erp.common.core.controller.BaseController;
 import com.xdadan.erp.common.core.domain.AjaxResult;
 import com.xdadan.erp.common.core.page.TableDataInfo;
@@ -64,7 +65,6 @@ public class WarehouseInController extends BaseController
             }
         }
 
-
         if(!StringUtils.isEmpty(emisWarehouseIn.getInNo())){
             emisWarehouseIn.setInNo(WaybillHelper.formatQueryValue(emisWarehouseIn.getInNo()));
             String[] inNoSortList = emisWarehouseIn.getInNo().split(",");
@@ -77,7 +77,32 @@ public class WarehouseInController extends BaseController
         return getDataTable(list);
     }
 
-//    @JacksonFilter(include= {"id","inNo","customerCode","customerName","entryDate"},value= EmisWarehouseIn.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
+
+    @JacksonFilter(include= {
+            "inNo",
+            "orderSn",
+            "billCode",
+            "createTime",
+            "entryDate",
+            "confirmStatus",
+            "confirmDate",
+            "usedStatus",
+            "status",
+            "waybillDetail.intoWarehouseCode",
+            "waybillDetail.intoWarehouseName",
+            "waybillDetail.intoWarehouseAddress",
+            "waybillDetail.intoWarehouseContact",
+            "waybillDetail.intoWarehousePhone",
+            "waybillDetail.goodsInfo",
+            "waybillDetail.receiveCountryName",
+            "waybillDetail.receiveProvinceName",
+            "waybillDetail.sendCountryName",
+            "waybillDetail.sendProvinceName",
+            "waybillDetail.transLineTypeName",
+            "waybillDetail.productTypeName",
+            "waybillDetail.sendSiteName",
+            "waybillDetail.dispatchUnderlingSiteName"
+    },value= EmisWarehouseIn.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
     @GetMapping("/listSimple")
     public TableDataInfo listSimple(EmisWarehouseIn emisWarehouseIn)
     {