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

Merge pull request 'demand: TMS系统 - 运输管理 -货物组批次-查询批次明细、查询批次配置列表时校验批次号为空直接返回' (#208) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/208
This commit is contained in:
heyu 2025-10-22 17:56:48 +08:00
commit 886fadcf29
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchDtlController.java
View File

@ -12,10 +12,12 @@
package com.xdadan.erp.web.emis; package com.xdadan.erp.web.emis;
import java.util.List; import java.util.List;
import java.util.Objects;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.exception.EmisBizError;
import jodd.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DuplicateKeyException; import org.springframework.dao.DuplicateKeyException;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
@ -60,6 +62,12 @@ public class EmisTmsSiteBatchDtlController extends EmisBaseController
public TableDataInfo list(EmisTmsSiteBatchDtl emisTmsSiteBatchDtl) public TableDataInfo list(EmisTmsSiteBatchDtl emisTmsSiteBatchDtl)
{ {
startPage(); startPage();
if(Objects.isNull(emisTmsSiteBatchDtl)){
return new TableDataInfo();
}
if(StringUtil.isBlank(emisTmsSiteBatchDtl.getBatchNo())){
return new TableDataInfo();
}
// 设置通用权限查询参数 // 设置通用权限查询参数
// setPrivParams(emisTmsSiteBatchDtl); // setPrivParams(emisTmsSiteBatchDtl);

15
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchLoadingController.java
View File

@ -1,18 +1,21 @@
/** /**
* @Project: emis * @Project: emis
* @Title: EmisTmsSiteBatchLoadingController.java * @Title: EmisTmsSiteBatchLoadingController.java
* @author linfso * @author linfso
* @date 2024-03-01 06:38:50 * @date 2024-03-01 06:38:50
* @Copyright: ShangHai Duta 2022 All rights reserved. * @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0 * @version v1.0
* @Description: <p> 一级网点TMS组批次配置 控制器 </p> * @Description: <p> 一级网点TMS组批次配置 控制器 </p>
*/ */
package com.xdadan.erp.web.emis; package com.xdadan.erp.web.emis;
import java.util.List; import java.util.List;
import java.util.Objects;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import jodd.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@ -37,7 +40,7 @@ import com.xdadan.erp.emis.service.IEmisTmsSiteBatchLoadingService;
/** /**
* 一级网点TMS组批次配置Controller * 一级网点TMS组批次配置Controller
* *
* @author linfso * @author linfso
* @date 2024-03-01 06:38:50 * @date 2024-03-01 06:38:50
*/ */
@ -56,6 +59,12 @@ public class EmisTmsSiteBatchLoadingController extends EmisBaseController
public TableDataInfo list(EmisTmsSiteBatchLoading emisTmsSiteBatchLoading) public TableDataInfo list(EmisTmsSiteBatchLoading emisTmsSiteBatchLoading)
{ {
startPage(); startPage();
if(Objects.isNull(emisTmsSiteBatchLoading)){
return new TableDataInfo();
}
if(StringUtil.isBlank(emisTmsSiteBatchLoading.getBatchNo())){
return new TableDataInfo();
}
List<EmisTmsSiteBatchLoading> list = emisTmsSiteBatchLoadingService.selectEmisTmsSiteBatchLoadingList(emisTmsSiteBatchLoading); List<EmisTmsSiteBatchLoading> list = emisTmsSiteBatchLoadingService.selectEmisTmsSiteBatchLoadingList(emisTmsSiteBatchLoading);
return getDataTable(list); return getDataTable(list);
} }