diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java index 1a80163fb..b1aaf6326 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java @@ -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); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 0538c8dba..e295c2bba 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -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 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 batchList = emisTmsSiteBatchMapper.selectEmisTmsSiteBatchListByBillCodes( +// Lists.newArrayList(Collections.singleton(emisWaybillSave.getBillCode()))); +// if (CollectionUtil.isNotEmpty(batchList)) { +// throw new EmisBizError(EmisBizErrorType.FAIL, "该单号已经录入批次,请先在组批次中剔除该运单"); +// } +// } // 公共计算部分 emisWaybillSave.setId(oldEmisWaybill.getId());