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

Merge pull request 'demand: OMS系统-对货管理 -进仓对货 - 查询支持根据运单号/进仓单号/创建时间/确认状态/进仓状态查询' (#2) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-api-service/pulls/2
This commit is contained in:
heyu 2025-12-09 14:14:17 +08:00
commit 0ff7d44f8f
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,11 @@
/** /**
* @Project: emis * @Project: emis
* @Title: EmisWarehouseInController.java * @Title: EmisWarehouseInController.java
* @author linfso * @author linfso
* @date 2024-05-22 00:20:31 * @date 2024-05-22 00:20:31
* @Copyright: ShangHai Duta 2022 All rights reserved. * @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0 * @version v1.0
* @Description: <p> 进仓单 控制器 </p> * @Description: <p> 进仓单 控制器 </p>
*/ */
@ -37,7 +37,7 @@ import java.util.List;
/** /**
* 进仓单Controller * 进仓单Controller
* *
* @author linfso * @author linfso
* @date 2024-05-22 00:20:31 * @date 2024-05-22 00:20:31
*/ */
@ -113,12 +113,25 @@ public class WarehouseInController extends BaseController
"waybillDetail" "waybillDetail"
},value= EmisWarehouseIn.class,type= JacksonFilter.JscksonFilterType.RESPONSE) },value= EmisWarehouseIn.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@GetMapping("/listSimpleByOms") @GetMapping("/listSimpleByOms")
public TableDataInfo listSimpleByOms(EmisWarehouseIn emisWarehouseIn,String queryStatusType) public TableDataInfo listSimpleByOms(EmisWarehouseIn emisWarehouseIn)
{ {
startPage(); startPage();
emisWarehouseIn.getParams().put("queryStatusType",queryStatusType); if(!StringUtils.isEmpty(emisWarehouseIn.getBillCode())){
emisWarehouseIn.setBillCode( WaybillHelper.formatQueryValue(emisWarehouseIn.getBillCode()));
String[] billCodeSortList = emisWarehouseIn.getBillCode().split(",");
if(billCodeSortList.length>1){
emisWarehouseIn.getParams().put("billCodeSortList", Arrays.asList(billCodeSortList));
}
}
if(!StringUtils.isEmpty(emisWarehouseIn.getInNo())){
emisWarehouseIn.setInNo(WaybillHelper.formatQueryValue(emisWarehouseIn.getInNo()));
String[] inNoSortList = emisWarehouseIn.getInNo().split(",");
if(inNoSortList.length>1){
emisWarehouseIn.getParams().put("inNoSortList",Arrays.asList(inNoSortList));
}
}
List<EmisWarehouseIn> list = emisWarehouseInService.selectEmisWarehouseInListByOms(emisWarehouseIn); List<EmisWarehouseIn> list = emisWarehouseInService.selectEmisWarehouseInListByOms(emisWarehouseIn);
return getDataTable(list); return getDataTable(list);
} }