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 2025-03-25 16:29:38 +08:00
parent 436e57f726
commit 29324868b2
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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