Merge branch 'master' of http://git.xdadan.loc/tanex/emis-service
This commit is contained in:
commit
00f3da9ac7
@ -5129,8 +5129,8 @@ public class EmisBaseService {
|
|||||||
emisWaybill.setVirtualRemark(virtualRemark);
|
emisWaybill.setVirtualRemark(virtualRemark);
|
||||||
emisWaybill.setId(masterWaybill.getId());
|
emisWaybill.setId(masterWaybill.getId());
|
||||||
emisWaybillMapper.updateEmisWaybill(emisWaybill);
|
emisWaybillMapper.updateEmisWaybill(emisWaybill);
|
||||||
if(StringUtil.isNotBlank(emisWaybillOld.getMasterBillCode())){
|
if (StringUtil.isNotBlank(emisWaybillOld.getMasterBillCode()) && !emisWaybillOld.getMasterBillCode().equals(emisWaybillSave.getMasterBillCode())) {
|
||||||
updateOldMasterBill(emisWaybillSave,emisWaybillOld.getMasterBillCode());
|
updateOldMasterBill(emisWaybillSave, emisWaybillOld.getMasterBillCode());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user