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-05-28 10:36:55 +08:00
parent cfe5bdecf7
commit 032d2559a9
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicPagApplyController.java
View File

@ -184,6 +184,16 @@ public class EmisElectronicPagApplyController extends BaseController
@RequestMapping("/cancelApply") @RequestMapping("/cancelApply")
public AjaxResult cancelApply(@RequestBody EmisElectronicPagApply emisElectronicPagApply) public AjaxResult cancelApply(@RequestBody EmisElectronicPagApply emisElectronicPagApply)
{ {
EmisElectronicPagApply old = emisElectronicPagApplyService.selectEmisElectronicPagApplyById(emisElectronicPagApply.getId());
if("1".equals(old.getBlCancel())){
return AjaxResult.error("申请单已取消，不允许再次操作！");
}
if("1".equals(old.getBlSend())){
return AjaxResult.error("申请单已发放，不能取消！");
}
emisElectronicPagApply.setCancelDate(new Date()); emisElectronicPagApply.setCancelDate(new Date());
emisElectronicPagApply.setCancelManCode(getLoginUser().getUser().getEmpCode()); emisElectronicPagApply.setCancelManCode(getLoginUser().getUser().getEmpCode());
emisElectronicPagApply.setCancelSiteCode(getLoginUser().getUser().getOwnerSiteCode()); emisElectronicPagApply.setCancelSiteCode(getLoginUser().getUser().getOwnerSiteCode());

3
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -392,8 +392,11 @@ public class EmisBaseService {
String mainBillCode=waybill.getBillCode(); String mainBillCode=waybill.getBillCode();
String shortLogisticNo=mainBillCode.substring(mainBillCode.length() - 6); String shortLogisticNo=mainBillCode.substring(mainBillCode.length() - 6);
String shortLogisticNo4Number=mainBillCode.substring(mainBillCode.length() - 4);
// 短号,运单号后6位 // 短号,运单号后6位
order.put("shortLogisticNo", shortLogisticNo); order.put("shortLogisticNo", shortLogisticNo);
// 短号,运单号后4位
order.put("shortLogisticNo4Number", shortLogisticNo4Number);
String dispatchType="派送"; String dispatchType="派送";
if("2".equals(waybill.getDispatchMethod())){ if("2".equals(waybill.getDispatchMethod())){

1
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java
View File

@ -89,7 +89,6 @@ public class EmisElectronicPagServiceImpl extends EmisBaseService implements IEm
if("1".equals(emisElectronicPagApply.getBlSend()) if("1".equals(emisElectronicPagApply.getBlSend())
){ ){
throw new EmisBizError(EmisBizErrorType.NOT_EXISTS,"已发放，不能重复发放"); throw new EmisBizError(EmisBizErrorType.NOT_EXISTS,"已发放，不能重复发放");
} }
if("1".equals(emisElectronicPagApply.getBlCancel()) if("1".equals(emisElectronicPagApply.getBlCancel())