aike/emis-api-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-08-31 05:40:11 +08:00
parent c05d9bfa04
commit 31106fa246
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
emis-api-web/src/main/java/com/xdadan/erp/apiweb/WarehouseInController.java
View File

@ -12,6 +12,7 @@
package com.xdadan.erp.apiweb; package com.xdadan.erp.apiweb;
import com.xdadan.erp.common.annotation.Log; 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.controller.BaseController;
import com.xdadan.erp.common.core.domain.AjaxResult; import com.xdadan.erp.common.core.domain.AjaxResult;
import com.xdadan.erp.common.core.page.TableDataInfo; import com.xdadan.erp.common.core.page.TableDataInfo;
@ -64,7 +65,6 @@ public class WarehouseInController extends BaseController
} }
} }
if(!StringUtils.isEmpty(emisWarehouseIn.getInNo())){ if(!StringUtils.isEmpty(emisWarehouseIn.getInNo())){
emisWarehouseIn.setInNo(WaybillHelper.formatQueryValue(emisWarehouseIn.getInNo())); emisWarehouseIn.setInNo(WaybillHelper.formatQueryValue(emisWarehouseIn.getInNo()));
String[] inNoSortList = emisWarehouseIn.getInNo().split(","); String[] inNoSortList = emisWarehouseIn.getInNo().split(",");
@ -77,7 +77,32 @@ public class WarehouseInController extends BaseController
return getDataTable(list); 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") @GetMapping("/listSimple")
public TableDataInfo listSimple(EmisWarehouseIn emisWarehouseIn) public TableDataInfo listSimple(EmisWarehouseIn emisWarehouseIn)
{ {