From acd85dd4454db200080e1f9879d839099c956c02 Mon Sep 17 00:00:00 2001 From: mzr Date: Fri, 11 Apr 2025 08:47:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ic/outbound/config/action/sapplybill.xml | 110 ------------------ .../config/authorize/sapplybill_authorize.xml | 27 ----- 2 files changed, 137 deletions(-) delete mode 100644 pu/src/client/yyconfig/modules/ic/outbound/config/action/sapplybill.xml delete mode 100644 pu/src/client/yyconfig/modules/ic/outbound/config/authorize/sapplybill_authorize.xml 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 - - - From 6c42d69ccae8d2d4e0ab16f89f622d06d887fc18 Mon Sep 17 00:00:00 2001 From: mzr Date: Fri, 11 Apr 2025 08:56:04 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E5=88=86=E6=9E=90?= =?UTF-8?q?=E5=90=8E=E5=9B=9E=E5=86=99=E9=80=BB=E8=BE=91=EF=BC=8C=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E9=BD=90=E5=A5=97=E7=8E=87=E8=AE=A1=E7=AE=97=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/private/nc/bs/mmpub/setanalysis/bp/SetAnalysisBP.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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) { From 38660ff131ba929b636048c8ee4534e09b36846f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=AD=A3=40=E7=94=A8=E5=8F=8B?= Date: Fri, 11 Apr 2025 10:10:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?uapbd=5Fbom=E6=96=B0=E5=A2=9E=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=A0=B9=E6=8D=AE=E5=8D=95=E6=8D=AE=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=8A=A8=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mmbd/bom/APIBomBusinessServiceImpl.java | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) 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..68c727b 100644 --- a/uapbd/src/private/nccloud/api/impl/mmbd/bom/APIBomBusinessServiceImpl.java +++ b/uapbd/src/private/nccloud/api/impl/mmbd/bom/APIBomBusinessServiceImpl.java @@ -110,26 +110,44 @@ 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) { // zhangxinah з dealWithMaterial(agg); dataSupplement(agg); UFBoolean flag = (UFBoolean) agg.getParent().getAttributeValue("hbdefault"); + Object fBillStatusFlag = agg.getParent().getAttributeValue("fbillstatus"); + if (UFBoolean.TRUE.equals(flag)) { UFBoolean bHasOtherDefaultVersion = getIsExistDefaultVersion(agg); if (bHasOtherDefaultVersion.equals(UFBoolean.TRUE)) { - ExceptionUtils.wrappBusinessException("hasOtherDefaultVersion"); + ExceptionUtils.wrappBusinessException("Ĭϰ汾飡"); } } - (new BomSavingValidation()).validate(agg); + if(fBillStatusFlag==null||"-1".equals(fBillStatusFlag.toString())){ + addAggvoList.add(agg); + } + if(fBillStatusFlag !=null && "1".equals(fBillStatusFlag.toString())){ + commitAggvoList.add(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); From 9b39e571508fff8f09d6ea2f3e514817fa2446b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=AD=A3=40=E7=94=A8=E5=8F=8B?= Date: Fri, 11 Apr 2025 11:08:31 +0800 Subject: [PATCH 4/4] =?UTF-8?q?uapbd=5Fbom=E6=96=B0=E5=A2=9E=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=A0=B9=E6=8D=AE=E5=8D=95=E6=8D=AE=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=8A=A8=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/mmbd/bom/APIBomBusinessServiceImpl.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) 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 68c727b..116da95 100644 --- a/uapbd/src/private/nccloud/api/impl/mmbd/bom/APIBomBusinessServiceImpl.java +++ b/uapbd/src/private/nccloud/api/impl/mmbd/bom/APIBomBusinessServiceImpl.java @@ -113,13 +113,17 @@ public class APIBomBusinessServiceImpl implements IAPIBomBusinessService { 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); UFBoolean flag = (UFBoolean) agg.getParent().getAttributeValue("hbdefault"); - Object fBillStatusFlag = agg.getParent().getAttributeValue("fbillstatus"); - if (UFBoolean.TRUE.equals(flag)) { UFBoolean bHasOtherDefaultVersion = getIsExistDefaultVersion(agg); if (bHasOtherDefaultVersion.equals(UFBoolean.TRUE)) { @@ -127,12 +131,6 @@ public class APIBomBusinessServiceImpl implements IAPIBomBusinessService { } } (new BomSavingValidation()).validate(agg); - if(fBillStatusFlag==null||"-1".equals(fBillStatusFlag.toString())){ - addAggvoList.add(agg); - } - if(fBillStatusFlag !=null && "1".equals(fBillStatusFlag.toString())){ - commitAggvoList.add(agg); - } } mapClear();