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 101caf9db..448190c93 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 @@ -1620,17 +1620,17 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // 公共计算部分 calcWayBillCommonInfo(emisWaybillSave,oldEmisWaybill,true); - emisWaybillSave.preUpdate(); // 变为已接单 - emisWaybillSave.setOrderStatus("1"); +// emisWaybillSave.setOrderStatus("1"); String goodsPicsStr=emisWaybillSave.getGoodsPics(); if(!StringUtils.isEmpty(goodsPicsStr)) { emisWaybillSave.setGoodsPics("1"); } - + // 检查信用额度 + checkUseQuotaCredit(null,emisWaybillSave); // 基础信息更新 emisWaybillMapper.updateEmisWaybill(emisWaybillSave); @@ -1716,8 +1716,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb dispatchOrSendManCode=emisWaybillSave.getTakePieceEmployeeCode(); } - // 检查信用额度 - checkUseQuotaCredit(null,emisWaybillSave); + // 做订单接单确认 emisWaybillMapper.confirmOrder(emisWaybillSave); @@ -1749,8 +1748,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb ex.printStackTrace(); } - - // 生成寄件底单联 try { this.genWaybillOrigAttach(emisWaybillSave.getBillCode()); @@ -2309,10 +2306,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // 判断客户额度,现金判断现金客户,月结判断月结客户额度 // 获取月结客户现金额度 - - - - // -------------------------- // 登记网点 if(isNew) {