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-08-14 19:13:58 +08:00
parent 2f5c017297
commit 6f184e5acd
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java
View File

@ -442,6 +442,21 @@ public class EmisSettleSubBillController extends EmisBaseController
for(int i=0;i<ids.length;i++){ for(int i=0;i<ids.length;i++){
try { try {
long id=ids[i]; long id=ids[i];
// 如果财务已确认，则不允许不出账
EmisSettleSubBill oldSubBill = emisSettleSubBillService.selectEmisSettleSubBillById(id);
if(oldSubBill==null){
return AjaxResult.error("账单不存在!");
}
if("1".equals(oldSubBill.getBlConfirmCenter())){
return AjaxResult.error("财务已确认!");
}
// 如果已合账，也不允许不出账
EmisSettleSubBill emisSettleSubBill = new EmisSettleSubBill(); EmisSettleSubBill emisSettleSubBill = new EmisSettleSubBill();
emisSettleSubBill.setConfirmSiteManCode(getLoginUser().getUser().getEmpCode()); emisSettleSubBill.setConfirmSiteManCode(getLoginUser().getUser().getEmpCode());
emisSettleSubBill.setConfirmSiteCode(getLoginUser().getUser().getOwnerSiteCode()); emisSettleSubBill.setConfirmSiteCode(getLoginUser().getUser().getOwnerSiteCode());

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

@ -1152,6 +1152,7 @@ public class EmisBaseService {
// 旧账单，只允许调整 // 旧账单，只允许调整
emisSettleSubBill.setId(oldSubBillList.get(0).getId()); emisSettleSubBill.setId(oldSubBillList.get(0).getId());
emisSettleSubBillMapper.updateEmisSettleSubBill(emisSettleSubBill); emisSettleSubBillMapper.updateEmisSettleSubBill(emisSettleSubBill);
} }
// 新费用 // 新费用
@ -1316,7 +1317,6 @@ public class EmisBaseService {
} }
log.error("===>End 运单出账"); log.error("===>End 运单出账");
} }
@ -2512,7 +2512,11 @@ public class EmisBaseService {
EmisRegion emisRegion = new EmisRegion(); EmisRegion emisRegion = new EmisRegion();
emisRegion.setRegionName(name); emisRegion.setRegionName(name);
emisRegion.setParentCode(parentCode); emisRegion.setParentCode(parentCode);
emisRegion.setCountryCode(countryCode);
// 非身份则需要判断国家
if(StringUtils.isEmpty(parentCode)){
emisRegion.setCountryCode(countryCode);
}
List<EmisRegion> list=emisRegionMapper.selectEmisRegionList(emisRegion); List<EmisRegion> list=emisRegionMapper.selectEmisRegionList(emisRegion);
if(!CollectionUtils.isEmpty(list)) { if(!CollectionUtils.isEmpty(list)) {
return list.get(0); return list.get(0);