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

demand: TMS-运单管理-所有运单查询分页逻辑修改

Browse Source
This commit is contained in:
aike 2025-12-05 17:25:13 +08:00
parent 1d250d0e8f
commit 98a30eb37c
2 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
View File

@ -621,11 +621,10 @@ public class EmisWaybillController extends EmisBaseController
*/
@PreAuthorize("@ss.hasPermi('emis:emisWaybill:list')")
@GetMapping("/getQueryStatInfoMap")
@WaybillLightCount
public AjaxResult getQueryStatInfoMap(EmisWaybill emisWaybill)
{
// startPage();
startPage();
setPrivParams(emisWaybill);
@ -654,10 +653,9 @@ public class EmisWaybillController extends EmisBaseController
*/
@PreAuthorize("@ss.hasPermi('emis:app:op:bizStatList')")
@GetMapping("/getMyBizStatInfo")
@WaybillLightCount
public AjaxResult getMyBizStatInfo(EmisWaybill emisWaybill)
{
// startPage();
startPage();
setPrivParams(emisWaybill);
String empName = getLoginUser().getUser().getEmpName();
emisWaybill.setSalesmen(empName);
@ -734,10 +732,9 @@ public class EmisWaybillController extends EmisBaseController
"intoWarehouseBillCode"
},value= EmisWaybill.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@GetMapping("/listSimple")
@WaybillLightCount
public TableDataInfo listSimple(EmisWaybill emisWaybill)
{
// startPage();
startPage();
// 设置通用权限查询参数
setPrivParams(emisWaybill);
@ -798,10 +795,9 @@ public class EmisWaybillController extends EmisBaseController
* @return
*/
@GetMapping("/getSiteSendStatInfoMap")
@WaybillLightCount
public TableDataInfo getSiteSendStatInfoMap(EmisWaybill emisWaybill)
{
// startPage();
startPage();
// 设置通用权限查询参数
setPrivParams(emisWaybill);
@ -816,10 +812,9 @@ public class EmisWaybillController extends EmisBaseController
* @return
*/
@GetMapping("/getSiteDestStatInfoMap")
@WaybillLightCount
public TableDataInfo getSiteDestStatInfoMap(EmisWaybill emisWaybill)
{
// startPage();
startPage();
// 设置通用权限查询参数
setPrivParams(emisWaybill);
@ -834,10 +829,9 @@ public class EmisWaybillController extends EmisBaseController
* @return
*/
@GetMapping("/queryScanStatInfoDtlList")
@WaybillLightCount
public TableDataInfo queryScanStatInfoDtlList(EmisWaybill emisWaybill)
{
// startPage();
startPage();
// 设置通用权限查询参数
setPrivParams(emisWaybill);
@ -870,10 +864,9 @@ public class EmisWaybillController extends EmisBaseController
@GetMapping("/selectEmisWaybillByMutiBillCode")
@WaybillLightCount
public TableDataInfo selectEmisWaybillByMutiBillCode(EmisWaybill emisWaybill)
{
// startPage();
startPage();
// 设置通用权限查询参数
setPrivParams(emisWaybill);

14
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -3815,13 +3815,13 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
@Override
public void reUpdateWayBill(EmisWaybill oldEmisWaybill,EmisWaybill emisWaybillSave,Boolean needUpdateAttach,Boolean isForce) throws EmisBizError {
if(!emisWaybillSave.getProductType().equals(oldEmisWaybill.getProductType())){
List<EmisTmsSiteBatch> batchList = emisTmsSiteBatchMapper.selectEmisTmsSiteBatchListByBillCodes(
Lists.newArrayList(Collections.singleton(emisWaybillSave.getBillCode())));
if (CollectionUtil.isNotEmpty(batchList)) {
throw new EmisBizError(EmisBizErrorType.FAIL, "该单号已经录入批次，请先在组批次中剔除该运单");
}
}
// if(!emisWaybillSave.getProductType().equals(oldEmisWaybill.getProductType())){
// List<EmisTmsSiteBatch> batchList = emisTmsSiteBatchMapper.selectEmisTmsSiteBatchListByBillCodes(
// Lists.newArrayList(Collections.singleton(emisWaybillSave.getBillCode())));
// if (CollectionUtil.isNotEmpty(batchList)) {
// throw new EmisBizError(EmisBizErrorType.FAIL, "该单号已经录入批次，请先在组批次中剔除该运单");
// }
// }
// 公共计算部分
emisWaybillSave.setId(oldEmisWaybill.getId());