取消自动开票
This commit is contained in:
parent
65ad8f4cf4
commit
5d24e2bf9a
|
@ -117,13 +117,13 @@ public class ApplicationSplitMergeMakeInvoiceAction implements ICommonAction {
|
||||||
|
|
||||||
for(IVApplicationAggVO appVo : appVos) {
|
for(IVApplicationAggVO appVo : appVos) {
|
||||||
IVApplicationBodyVO[] bodyVos = appVo.getBodyVOs();
|
IVApplicationBodyVO[] bodyVos = appVo.getBodyVOs();
|
||||||
if (appVo.getParentVO().getKpfs() != null && appVo.getParentVO().getKpfs() != IVAplocationKPFS.ZLKP.toIntValue() && bodyVos[0].getPk_ivappdetail().length() > 20) {
|
// if (appVo.getParentVO().getKpfs() != null && appVo.getParentVO().getKpfs() != IVAplocationKPFS.ZLKP.toIntValue() && bodyVos[0].getPk_ivappdetail().length() > 20) {
|
||||||
Map<String, String> failMap = new HashMap();
|
// Map<String, String> failMap = new HashMap();
|
||||||
failMap.put("billNo", appVo.getParentVO().getBillno());
|
// failMap.put("billNo", appVo.getParentVO().getBillno());
|
||||||
failMap.put("msg", NCLangRes4VoTransl.getNCLangRes().getStrByID("1058sal_0", "01058sal-0106"));
|
// failMap.put("msg", NCLangRes4VoTransl.getNCLangRes().getStrByID("1058sal_0", "01058sal-0106"));
|
||||||
failMapList.add(failMap);
|
// failMapList.add(failMap);
|
||||||
++failNum;
|
// ++failNum;
|
||||||
} else {
|
// } else {
|
||||||
if (bodyVos[0].getPk_ivappdetail().length() > 20) {
|
if (bodyVos[0].getPk_ivappdetail().length() > 20) {
|
||||||
for(IVApplicationBodyVO bodyVo : bodyVos) {
|
for(IVApplicationBodyVO bodyVo : bodyVos) {
|
||||||
String detailpk = bodyVo.getPk_ivappdetail();
|
String detailpk = bodyVo.getPk_ivappdetail();
|
||||||
|
@ -140,7 +140,7 @@ public class ApplicationSplitMergeMakeInvoiceAction implements ICommonAction {
|
||||||
|
|
||||||
newAppVos.add(appVo);
|
newAppVos.add(appVo);
|
||||||
}
|
}
|
||||||
}
|
// }
|
||||||
|
|
||||||
if (appIds.size() == 0) {
|
if (appIds.size() == 0) {
|
||||||
return (IVApplicationAggVO[])newAppVos.toArray(new IVApplicationAggVO[0]);
|
return (IVApplicationAggVO[])newAppVos.toArray(new IVApplicationAggVO[0]);
|
||||||
|
|
|
@ -282,7 +282,7 @@ public abstract class CommonProcessor {
|
||||||
//ÐéÄâÖ÷¼ü
|
//ÐéÄâÖ÷¼ü
|
||||||
headVo.setPk_ivapplication(new SequenceGenerator().generate());
|
headVo.setPk_ivapplication(new SequenceGenerator().generate());
|
||||||
//ĬÈÏÖ±Áª
|
//ĬÈÏÖ±Áª
|
||||||
headVo.setKpfs(IVAplocationKPFS.ZLKP.toIntValue());
|
// headVo.setKpfs(IVAplocationKPFS.ZLKP.toIntValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
return appVos;
|
return appVos;
|
||||||
|
|
Loading…
Reference in New Issue