From f85a5e0bbc3dd45fd2235ffa1ad14454835ffe77 Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 29 Jul 2024 00:23:20 +0800 Subject: [PATCH] md --- .../erp/web/emis/EmisWaybillController.java | 8 ++++++++ .../service/impl/EmisWaybillServiceImpl.java | 17 ++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) 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 656f902cc..3f8b3abf8 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 @@ -242,6 +242,10 @@ public class EmisWaybillController extends EmisBaseController return AjaxResult.error("订单号不能为空"); } + if(StringUtils.isEmpty(waybillOrder.getSendSiteCode()) ){ + return AjaxResult.error("指派网点不能为空"); + } + EmisWaybill emisWaybill = new EmisWaybill(); emisWaybill.setOrderSn(waybillOrder.getOrderSn()); emisWaybill.setSendSiteCode(waybillOrder.getSendSiteCode()); @@ -273,6 +277,10 @@ public class EmisWaybillController extends EmisBaseController return AjaxResult.error("订单号不能为空"); } + if(StringUtils.isEmpty(waybillOrder.getTakePieceEmployeeCode())){ + return AjaxResult.error("取件员不能为空"); + } + EmisWaybill emisWaybill = new EmisWaybill(); emisWaybill.setOrderSn(waybillOrder.getOrderSn()); emisWaybill.setTakePieceEmployeeCode(waybillOrder.getTakePieceEmployeeCode()); 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 35f170fc7..40892385f 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 @@ -912,10 +912,15 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb throw new EmisBizError(EmisBizErrorType.FAIL,"订单已取消"); } - if(StringUtils.isEmpty(emisWaybillOld.getTakePieceEmployeeCode())){ - throw new EmisBizError(EmisBizErrorType.FAIL,"取件员不能为空"); + + + if(!"2".emisWaybillOld.getPickupMethod()){ + throw new EmisBizError(EmisBizErrorType.FAIL,"非上门取件不需要指派取件员"); } + + + return emisWaybillMapper.assignTakeMan(emisWaybill); } @@ -934,13 +939,15 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb throw new EmisBizError(EmisBizErrorType.NOT_EXISTS,"订单不存在"); } + if(StringUtils.isEmpty(emisWaybill.getSendSiteCode())){ + throw new EmisBizError(EmisBizErrorType.FAIL,"指派网点不能为空"); + } + if(OrderStatus.CANCEL.statusCode.equals(emisWaybillOld.getOrderStatus())){ throw new EmisBizError(EmisBizErrorType.FAIL,"订单已取消"); } - if(StringUtils.isEmpty(emisWaybillOld.getSendSiteCode())){ - throw new EmisBizError(EmisBizErrorType.FAIL,"指派网点不能为空"); - } + return emisWaybillMapper.assignSendSite(emisWaybill); }