diff --git a/mmpub/src/private/nc/bs/mmpub/setanalysis/bp/SetAnalysisBP.java b/mmpub/src/private/nc/bs/mmpub/setanalysis/bp/SetAnalysisBP.java index 8d989d1..93129b2 100644 --- a/mmpub/src/private/nc/bs/mmpub/setanalysis/bp/SetAnalysisBP.java +++ b/mmpub/src/private/nc/bs/mmpub/setanalysis/bp/SetAnalysisBP.java @@ -47,7 +47,8 @@ public class SetAnalysisBP { SaLogger.debug("反算齐套结束,共耗时:" + SaLogger.getRunTime(tstarttime4)); SaMemoryBP.printMemory(); this.result(this.context.getAggs()); - this.analysisAfterCheckRule();// 分析后调用回写 + //分析后调用回写，齐套率计算方式已调整，此处不用，注释analysisAfterCheckRule + // this.analysisAfterCheckRule(); SaLogger.debug("齐套分析算法结束,共耗时:" + SaLogger.getRunTime(tstarttime1)); return this.context.getAggs(); } catch (BusinessException e) { diff --git a/pu/src/client/yyconfig/modules/ic/outbound/config/action/sapplybill.xml b/pu/src/client/yyconfig/modules/ic/outbound/config/action/sapplybill.xml deleted file mode 100644 index 47a6ba6..0000000 --- a/pu/src/client/yyconfig/modules/ic/outbound/config/action/sapplybill.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - ic.sapplybill.query - - nccloud.web.ic.outbound.sapplybill.action.SapplyBillQueryAction - - - ic.sapplybill.queryPage - - nccloud.web.ic.outbound.sapplybill.action.SapplyBillPageQueryAction - - - ic.sapplybill.maintain - - nccloud.web.ic.outbound.sapplybill.action.SapplyBillMaintainAction - Commit,UnCommit,Delete - - - ic.sapplybill.save - - nccloud.web.ic.outbound.sapplybill.action.SapplyBillSaveAction - Save - - - ic.sapplybill.saveAndCommit - - nccloud.web.ic.outbound.sapplybill.action.SapplyBillSaveCommitAction - SaveCommit, Commit - - - ic.sapplybill.canbecopy - - nccloud.web.ic.outbound.sapplybill.action.SapplyBillBeforeCopyAction - - - ic.sapplybill.copy - - nccloud.web.ic.outbound.sapplybill.action.SapplyBillCopyAction - Copy - - - ic.sapplybill.cardquery - - nccloud.web.ic.outbound.sapplybill.action.SapplyBillQueryCardAction - - - ic.sapplybill.query422x - - nccloud.web.ic.outbound.sapplybill.action.Query422XFor4455Action - - - ic.sapplybill.transfervo - - nccloud.web.ic.outbound.sapplybill.action.TransToSapplyBillAction - - - ic.sapplybill.queryPickm - - nccloud.web.ic.outbound.sapplybill.action.QueryPickmFor4455Action - - - ic.sapplybill.transfervo1 - - nccloud.web.ic.outbound.sapplybill.action.TransToSapplyBill1Action - - - ic.sapplybill.print - - nccloud.web.ic.outbound.sapplybill.action.SapplyBillPrintAction - Print,output,Print_list - - - ic.sapplybill.combine - - nccloud.web.ic.outbound.sapplybill.action.SapplyBillCombineAction - CombinePrint - - - ic.sapplybill.checkprem - - nccloud.web.ic.outbound.sapplybill.action.SapplyBillDataPermissionAction - Edit,Print - - - ic.sapplybill.headAfterEdit - - nccloud.web.ic.outbound.sapplybill.events.SapplyBillHeadAfterEventAction - - - ic.sapplybill.bodyAfterEdit - - nccloud.web.ic.outbound.sapplybill.events.SapplyBillBodyAfterEditAction - - - ic.sapplybill.rowOpenClose - - nccloud.web.ic.outbound.sapplybill.action.SapplyBillRowOpenCloseAction - - - ic.sapplybill.billOpenClose - - nccloud.web.ic.outbound.sapplybill.action.SapplyBillOpenCloseAction - - - ic.sapplybill.ntpLinkList - - nccloud.web.ic.outbound.sapplybill.action.SapplyBillNtpLinkListAction - - \ No newline at end of file diff --git a/pu/src/client/yyconfig/modules/ic/outbound/config/authorize/sapplybill_authorize.xml b/pu/src/client/yyconfig/modules/ic/outbound/config/authorize/sapplybill_authorize.xml deleted file mode 100644 index 4949b3b..0000000 --- a/pu/src/client/yyconfig/modules/ic/outbound/config/authorize/sapplybill_authorize.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - 400801200,400801204 - - ic.sapplybill.query - ic.sapplybill.queryPage - ic.sapplybill.maintain - ic.sapplybill.save - ic.sapplybill.saveAndCommit - ic.sapplybill.canbecopy - ic.sapplybill.copy - ic.sapplybill.cardquery - ic.sapplybill.query422x - ic.sapplybill.transfervo - ic.sapplybill.queryPickm - ic.sapplybill.transfervo1 - ic.sapplybill.print - ic.sapplybill.combine - ic.sapplybill.checkprem - ic.sapplybill.headAfterEdit - ic.sapplybill.bodyAfterEdit - ic.sapplybill.rowOpenClose - ic.sapplybill.billOpenClose - ic.sapplybill.ntpLinkList - - - diff --git a/uapbd/src/private/nccloud/api/impl/mmbd/bom/APIBomBusinessServiceImpl.java b/uapbd/src/private/nccloud/api/impl/mmbd/bom/APIBomBusinessServiceImpl.java index cd405bf..116da95 100644 --- a/uapbd/src/private/nccloud/api/impl/mmbd/bom/APIBomBusinessServiceImpl.java +++ b/uapbd/src/private/nccloud/api/impl/mmbd/bom/APIBomBusinessServiceImpl.java @@ -110,8 +110,15 @@ public class APIBomBusinessServiceImpl implements IAPIBomBusinessService { AggBomVO[] aggVOs = (AggBomVO[]) list.toArray(new AggBomVO[list.size()]); BillFieldsCodeToPkUtil.doTranslateVOFields(aggVOs); - + List commitAggvoList=new ArrayList<>(); + List addAggvoList=new ArrayList<>(); for (AggBomVO agg : aggVOs) { + Object fBillStatusFlag = agg.getParent().getAttributeValue("fbillstatus"); + if(fBillStatusFlag==null||"-1".equals(fBillStatusFlag.toString())){ + addAggvoList.add(agg); + }else if("1".equals(fBillStatusFlag.toString())){ + commitAggvoList.add(agg); + } // zhangxinah з dealWithMaterial(agg); dataSupplement(agg); @@ -120,16 +127,25 @@ public class APIBomBusinessServiceImpl implements IAPIBomBusinessService { if (UFBoolean.TRUE.equals(flag)) { UFBoolean bHasOtherDefaultVersion = getIsExistDefaultVersion(agg); if (bHasOtherDefaultVersion.equals(UFBoolean.TRUE)) { - ExceptionUtils.wrappBusinessException("hasOtherDefaultVersion"); + ExceptionUtils.wrappBusinessException("Ĭϰ汾飡"); } } - (new BomSavingValidation()).validate(agg); } mapClear(); - - AggBomVO[] result = service.insertBom((AggBomVO[]) list.toArray(new AggBomVO[0])); + //״̬ΪͨʱԶύ-- start + AggBomVO[] result=null; + if(commitAggvoList.isEmpty()&&addAggvoList.isEmpty()){ + return ResultMessageUtil.exceptionToJSON("BOMʧ,ڵ״̬Ϊ//ͨ","999"); + }else if(commitAggvoList.isEmpty()&&!addAggvoList.isEmpty()){ + result= service.insertBom((AggBomVO[]) list.toArray(new AggBomVO[0])); + }else if(!commitAggvoList.isEmpty()&&addAggvoList.isEmpty()){ + result = service.insertCommitBomWithParam((AggBomVO[]) list.toArray(new AggBomVO[0]),true,true); + }else{ + return ResultMessageUtil.exceptionToJSON("BOMʧ,״̬ɻ߿պͨͬʱ","999"); + } + //״̬ΪͨʱԶύ-- end return ResultMessageUtil.toJSON(result, "BOMɹ"); } catch (Exception e) { return ResultMessageUtil.exceptionToJSON(e);