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-07-28 21:47:59 +08:00
parent f39dec00b8
commit f3dd65a002
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
View File

@ -393,7 +393,7 @@ public class EmisSettleBillController extends BaseController
} }
} }
} }
return AjaxResult.success("确认成功"); return AjaxResult.success("删除成功");
} }

8
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
View File

@ -367,7 +367,7 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
// 获取 // 获取
EmisSettleBill bill = selectEmisSettleBillById(id); EmisSettleBill bill = selectEmisSettleBillById(id);
if(!"0".equals(bill.getPaymentStatus())){ if(!"0".equals(bill.getPaymentStatus())){
throw new EmisBizError(EmisBizErrorType.FAIL,"已收款不允许删除"); throw new EmisBizError(EmisBizErrorType.FAIL,"已存在收款不允许删除");
} }
if(!"0".equals(bill.getBlConfirmSite())){ if(!"0".equals(bill.getBlConfirmSite())){
@ -375,7 +375,11 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
} }
if(!"0".equals(bill.getOpenBillStatus())){ if(!"0".equals(bill.getOpenBillStatus())){
throw new EmisBizError(EmisBizErrorType.FAIL,"已开票已确认不允许删除"); throw new EmisBizError(EmisBizErrorType.FAIL,"已存在开票不允许删除");
}
if(!"0".equals(bill.getChargeStatus()) ){
throw new EmisBizError(EmisBizErrorType.FAIL,"已核销不允许删除");
} }
// 清除子账单关联 // 清除子账单关联

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

@ -864,6 +864,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
dispatchOrSendManCode=emisWaybillSave.getTakePieceEmployeeCode(); dispatchOrSendManCode=emisWaybillSave.getTakePieceEmployeeCode();
} }
// 做订单接单确认
emisWaybillMapper.confirmOrder(emisWaybillSave);
// 增加扫描记录
Map<String,Object> scanDateItem = new HashMap<>(); Map<String,Object> scanDateItem = new HashMap<>();
scanDateItem.put("billCode",emisWaybillSave.getBillCode()); scanDateItem.put("billCode",emisWaybillSave.getBillCode());
scanDateItem.put("dispatchOrSendManCode",dispatchOrSendManCode); scanDateItem.put("dispatchOrSendManCode",dispatchOrSendManCode);