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-24 13:08:14 +08:00
parent 1bc637aa40
commit 436e57f726
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3693,8 +3693,9 @@ public class EmisBaseService {
String kdQueryChannelJsonStr="{\n" +
"\"doora\":{\"chId\":\"17track\",\"comId\":\"100702\"},\n" +
"\"Vietelpost\":{\"chId\":\"17track\",\"comId\":\"100611\"}\n" +
"\"Viettelpost\":{\"chId\":\"17track\",\"comId\":\"100611\"}\n" +
"}";
JSONObject jobjKdQ = JSONObject.parseObject(kdQueryChannelJsonStr);
JSONObject kdQObj = jobjKdQ.getJSONObject("Vietelpost");

7
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java
View File

@ -244,10 +244,13 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
}
// bug: 1412 月结客户发生改变，都需要从账单中移除
if( !oldCustNo.equals(newCustNo)){
throw new EmisBizError(EmisBizErrorType.FAIL,"已定制账单，月结客户发生改变，请从原账单移除，单号:"+emisSettleSubBill.getBillNo());
if(!StringUtils.isEmpty(newCustNo)){
if( !newCustNo.equals(oldCustNo)){
throw new EmisBizError(EmisBizErrorType.FAIL,"已定制账单，月结客户发生改变，请从原账单移除，单号:"+emisSettleSubBill.getBillNo());
}
}
}
}