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

md

Browse Source
This commit is contained in:
linfso 2024-12-13 11:52:07 +08:00
parent 085838f21b
commit 8d40e2f417
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
View File

@ -124,15 +124,20 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
public int updatePrintStatus(EmisWaybill emisWaybill); public int updatePrintStatus(EmisWaybill emisWaybill);
// 接单-确认订单 // 接单-确认订单
@DataAuditLog(operateType= OperateType.UPDATE,serviceClass=EmisWaybillServiceImpl.class)
public int confirmOrder(EmisWaybill emisWaybill); public int confirmOrder(EmisWaybill emisWaybill);
// 分配业务员-取件员 // 分配业务员-取件员
@DataAuditLog(operateType= OperateType.UPDATE,serviceClass=EmisWaybillServiceImpl.class)
public int assignTakeMan(EmisWaybill emisWaybill); public int assignTakeMan(EmisWaybill emisWaybill);
// 分配网点 // 分配网点
@DataAuditLog(operateType= OperateType.UPDATE,serviceClass=EmisWaybillServiceImpl.class)
public int assignSendSite(EmisWaybill emisWaybill); public int assignSendSite(EmisWaybill emisWaybill);
// 取消订单 // 取消订单
@DataAuditLog(operateType= OperateType.UPDATE,serviceClass=EmisWaybillServiceImpl.class)
public int cancelOrder(EmisWaybill emisWaybill); public int cancelOrder(EmisWaybill emisWaybill);
// 更新派件状态 // 更新派件状态

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

@ -1113,6 +1113,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
throw new EmisBizError(EmisBizErrorType.FAIL,"已揽收，不允许取消"); throw new EmisBizError(EmisBizErrorType.FAIL,"已揽收，不允许取消");
} }
emisWaybill.setBillCode(emisWaybillOld.getBillCode());
return emisWaybillMapper.cancelOrder(emisWaybill); return emisWaybillMapper.cancelOrder(emisWaybill);
} }
@ -1148,6 +1149,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
} }
emisWaybillSave.setId(oldEmisWaybill.getId()); emisWaybillSave.setId(oldEmisWaybill.getId());
emisWaybillSave.setBillCode(oldEmisWaybill.getBillCode());
// 公共计算部分 // 公共计算部分
calcWayBillCommonInfo(emisWaybillSave,oldEmisWaybill,true); calcWayBillCommonInfo(emisWaybillSave,oldEmisWaybill,true);
@ -1301,6 +1303,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
if(!"2".equals(emisWaybillOld.getPickupMethod()) ){ if(!"2".equals(emisWaybillOld.getPickupMethod()) ){
throw new EmisBizError(EmisBizErrorType.FAIL,"非上门取件不需要指派取件员"); throw new EmisBizError(EmisBizErrorType.FAIL,"非上门取件不需要指派取件员");
} }
emisWaybill.setBillCode(emisWaybillOld.getBillCode());
return emisWaybillMapper.assignTakeMan(emisWaybill); return emisWaybillMapper.assignTakeMan(emisWaybill);
} }
@ -1328,6 +1331,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
throw new EmisBizError(EmisBizErrorType.FAIL,"订单已取消"); throw new EmisBizError(EmisBizErrorType.FAIL,"订单已取消");
} }
emisWaybill.setBillCode(emisWaybillOld.getBillCode());
return emisWaybillMapper.assignSendSite(emisWaybill); return emisWaybillMapper.assignSendSite(emisWaybill);
} }