yonyou
/
taikai2312
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://172.168.16.71:7070/taikai/taikai2312.git into main

This commit is contained in:
zhangxinah@yonyou.com 2025-04-11 16:46:58 +08:00
parent 7794da1f6e 9b39e57150
commit f4f73a0bfc
4 changed files with 23 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mmpub/src/private/nc/bs/mmpub/setanalysis/bp/SetAnalysisBP.java
View File

@ -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) {

110
pu/src/client/yyconfig/modules/ic/outbound/config/action/sapplybill.xml
View File

@ -1,110 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actions>
<action>
<name>ic.sapplybill.query</name>
<label>出库申请单查询</label>
<clazz>nccloud.web.ic.outbound.sapplybill.action.SapplyBillQueryAction</clazz>
</action>
<action>
<name>ic.sapplybill.queryPage</name>
<label>出库申请单查询</label>
<clazz>nccloud.web.ic.outbound.sapplybill.action.SapplyBillPageQueryAction</clazz>
</action>
<action>
<name>ic.sapplybill.maintain</name>
<label>出库申请单删除、提交、收回</label>
<clazz>nccloud.web.ic.outbound.sapplybill.action.SapplyBillMaintainAction</clazz>
<btncode>Commit,UnCommit,Delete</btncode>
</action>
<action>
<name>ic.sapplybill.save</name>
<label>出库申请单保存</label>
<clazz>nccloud.web.ic.outbound.sapplybill.action.SapplyBillSaveAction</clazz>
<btncode>Save</btncode>
</action>
<action>
<name>ic.sapplybill.saveAndCommit</name>
<label>出库申请单保存提交</label>
<clazz>nccloud.web.ic.outbound.sapplybill.action.SapplyBillSaveCommitAction</clazz>
<btncode>SaveCommit, Commit</btncode>
</action>
<action>
<name>ic.sapplybill.canbecopy</name>
<label>出库申请单查询是否可以复制</label>
<clazz>nccloud.web.ic.outbound.sapplybill.action.SapplyBillBeforeCopyAction</clazz>
</action>
<action>
<name>ic.sapplybill.copy</name>
<label>出库申请单复制</label>
<clazz>nccloud.web.ic.outbound.sapplybill.action.SapplyBillCopyAction</clazz>
<btncode>Copy</btncode>
</action>
<action>
<name>ic.sapplybill.cardquery</name>
<label>出库申请单卡片态查询</label>
<clazz>nccloud.web.ic.outbound.sapplybill.action.SapplyBillQueryCardAction</clazz>
</action>
<action>
<name>ic.sapplybill.query422x</name>
<label>拉单物资需求申请单查询</label>
<clazz>nccloud.web.ic.outbound.sapplybill.action.Query422XFor4455Action</clazz>
</action>
<action>
<name>ic.sapplybill.transfervo</name>
<label>物资需求申请单-转单</label>
<clazz>nccloud.web.ic.outbound.sapplybill.action.TransToSapplyBillAction</clazz>
</action>
<action>
<name>ic.sapplybill.queryPickm</name>
<label>拉单备料计划查询</label>
<clazz>nccloud.web.ic.outbound.sapplybill.action.QueryPickmFor4455Action</clazz>
</action>
<action>
<name>ic.sapplybill.transfervo1</name>
<label>备料计划申请单-转单</label>
<clazz>nccloud.web.ic.outbound.sapplybill.action.TransToSapplyBill1Action</clazz>
</action>
<action>
<name>ic.sapplybill.print</name>
<label>出库申请单打印</label>
<clazz>nccloud.web.ic.outbound.sapplybill.action.SapplyBillPrintAction</clazz>
<btncode>Print,output,Print_list</btncode>
</action>
<action>
<name>ic.sapplybill.combine</name>
<label>出库申请单合并显示</label>
<clazz>nccloud.web.ic.outbound.sapplybill.action.SapplyBillCombineAction</clazz>
<btncode>CombinePrint</btncode>
</action>
<action>
<name>ic.sapplybill.checkprem</name>
<label>出库申请单修改、打印校验权限</label>
<clazz>nccloud.web.ic.outbound.sapplybill.action.SapplyBillDataPermissionAction</clazz>
<btncode>Edit,Print</btncode>
</action>
<action>
<name>ic.sapplybill.headAfterEdit</name>
<label>出库申请单表头区域改变事件</label>
<clazz>nccloud.web.ic.outbound.sapplybill.events.SapplyBillHeadAfterEventAction</clazz>
</action>
<action>
<name>ic.sapplybill.bodyAfterEdit</name>
<label>出库申请单表体区域改变事件</label>
<clazz>nccloud.web.ic.outbound.sapplybill.events.SapplyBillBodyAfterEditAction</clazz>
</action>
<action>
<name>ic.sapplybill.rowOpenClose</name>
<label>出库申请单表体行打开关闭操作</label>
<clazz>nccloud.web.ic.outbound.sapplybill.action.SapplyBillRowOpenCloseAction</clazz>
</action>
<action>
<name>ic.sapplybill.billOpenClose</name>
<label>出库申请单整单打开关闭操作</label>
<clazz>nccloud.web.ic.outbound.sapplybill.action.SapplyBillOpenCloseAction</clazz>
</action>
<action>
<name>ic.sapplybill.ntpLinkList</name>
<label>预算联查出库申请列表数据加载</label>
<clazz>nccloud.web.ic.outbound.sapplybill.action.SapplyBillNtpLinkListAction</clazz>
</action>
</actions>

27
pu/src/client/yyconfig/modules/ic/outbound/config/authorize/sapplybill_authorize.xml
View File

@ -1,27 +0,0 @@
<authorizes>
<authorize>
<appcode>400801200,400801204</appcode>
<actions>
<action>ic.sapplybill.query</action>
<action>ic.sapplybill.queryPage</action>
<action>ic.sapplybill.maintain</action>
<action>ic.sapplybill.save</action>
<action>ic.sapplybill.saveAndCommit</action>
<action>ic.sapplybill.canbecopy</action>
<action>ic.sapplybill.copy</action>
<action>ic.sapplybill.cardquery</action>
<action>ic.sapplybill.query422x</action>
<action>ic.sapplybill.transfervo</action>
<action>ic.sapplybill.queryPickm</action>
<action>ic.sapplybill.transfervo1</action>
<action>ic.sapplybill.print</action>
<action>ic.sapplybill.combine</action>
<action>ic.sapplybill.checkprem</action>
<action>ic.sapplybill.headAfterEdit</action>
<action>ic.sapplybill.bodyAfterEdit</action>
<action>ic.sapplybill.rowOpenClose</action>
<action>ic.sapplybill.billOpenClose</action>
<action>ic.sapplybill.ntpLinkList</action>
</actions>
</authorize>
</authorizes>

26
uapbd/src/private/nccloud/api/impl/mmbd/bom/APIBomBusinessServiceImpl.java
View File

@ -110,8 +110,15 @@ public class APIBomBusinessServiceImpl implements IAPIBomBusinessService {
AggBomVO[] aggVOs = (AggBomVO[]) list.toArray(new AggBomVO[list.size()]);
BillFieldsCodeToPkUtil.doTranslateVOFields(aggVOs);
List<AggBomVO> commitAggvoList=new ArrayList<>();
List<AggBomVO> 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);