diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java index 1a1f80046..122d01dea 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java @@ -124,15 +124,20 @@ public interface EmisWaybillMapper extends BaseMapper public int updatePrintStatus(EmisWaybill emisWaybill); // 接单-确认订单 + @DataAuditLog(operateType= OperateType.UPDATE,serviceClass=EmisWaybillServiceImpl.class) public int confirmOrder(EmisWaybill emisWaybill); // 分配业务员-取件员 + @DataAuditLog(operateType= OperateType.UPDATE,serviceClass=EmisWaybillServiceImpl.class) public int assignTakeMan(EmisWaybill emisWaybill); // 分配网点 + + @DataAuditLog(operateType= OperateType.UPDATE,serviceClass=EmisWaybillServiceImpl.class) public int assignSendSite(EmisWaybill emisWaybill); // 取消订单 + @DataAuditLog(operateType= OperateType.UPDATE,serviceClass=EmisWaybillServiceImpl.class) public int cancelOrder(EmisWaybill 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 bda1fdfe3..608e0c7fa 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 @@ -1113,6 +1113,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb throw new EmisBizError(EmisBizErrorType.FAIL,"已揽收,不允许取消"); } + emisWaybill.setBillCode(emisWaybillOld.getBillCode()); return emisWaybillMapper.cancelOrder(emisWaybill); } @@ -1148,6 +1149,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb } emisWaybillSave.setId(oldEmisWaybill.getId()); + emisWaybillSave.setBillCode(oldEmisWaybill.getBillCode()); // 公共计算部分 calcWayBillCommonInfo(emisWaybillSave,oldEmisWaybill,true); @@ -1301,6 +1303,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb if(!"2".equals(emisWaybillOld.getPickupMethod()) ){ throw new EmisBizError(EmisBizErrorType.FAIL,"非上门取件不需要指派取件员"); } + emisWaybill.setBillCode(emisWaybillOld.getBillCode()); return emisWaybillMapper.assignTakeMan(emisWaybill); } @@ -1328,6 +1331,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb throw new EmisBizError(EmisBizErrorType.FAIL,"订单已取消"); } + emisWaybill.setBillCode(emisWaybillOld.getBillCode()); + return emisWaybillMapper.assignSendSite(emisWaybill); }