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

互感器总补丁_重新出部分_未修改代码

This commit is contained in:
李正@用友 2025-06-26 13:53:55 +08:00 committed by mzr
parent 0ff6e2e449
commit f015b4e319
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ic/src/private/nc/bs/ic/m4c/sign/SignBP.java
View File

@ -50,7 +50,7 @@ public class SignBP implements ISignBP<SaleOutVO>, ISignRuleProvider<SaleOutVO>
processor.addAfterRule(new ArsubToVoucherRule()); processor.addAfterRule(new ArsubToVoucherRule());
processor.addAfterRule(new SaleOutProceedsRuleCG()); processor.addAfterRule(new SaleOutProceedsRuleCG());
processor.addAfterRule(new MobAfterSignMessageRule()); processor.addAfterRule(new MobAfterSignMessageRule());
// 销售出库 多一个步骤 先提交销售交货单 与同步销售出库单的orderNo一致 // 销售出库 多一个步骤先提交销售交货单 与同步销售出库单的orderNo一致
// processor.addAfterRule(new SalesDeliveryOrderRuleMES()); // processor.addAfterRule(new SalesDeliveryOrderRuleMES());
// 销售出库 签字后 同步到MES金思维系统 // 销售出库 签字后 同步到MES金思维系统
// processor.addAfterRule(new AfterSigningSynchronizeRuleMES()); // processor.addAfterRule(new AfterSigningSynchronizeRuleMES());

2
ic/src/private/nccloud/api/impl/ic/m47/fill/SubcontInSaveFillValue.java
View File

@ -19,7 +19,7 @@ import nccloud.api.impl.ic.m47.rule.Choose47DefaultFillRule;
* @Description TODO * @Description TODO
* @Version 1.0.0 * @Version 1.0.0
* @Date 2025/5/15 10:10 * @Date 2025/5/15 10:10
* @Created by ame * @Created by sdlizheng
*/ */
public class SubcontInSaveFillValue { public class SubcontInSaveFillValue {
public void setDefaultValue(SubcontInVO[] vos) { public void setDefaultValue(SubcontInVO[] vos) {

2
ic/src/public/nccloud/openapi/ic/m47/SubcontInResource.java
View File

@ -30,7 +30,7 @@ public class SubcontInResource extends NCCPubRestResource {
private static String BODYTABLE = "ic_subcontin_b"; private static String BODYTABLE = "ic_subcontin_b";
/** /**
* 保存操作信息 *保存操作信息
* *
* 该方法通过POST请求接收JSON格式的参数，处理后返回JSON格式的结果 * 该方法通过POST请求接收JSON格式的参数，处理后返回JSON格式的结果
* 主要用于保存单个操作的信息，将接收到的参数封装成列表的形式， * 主要用于保存单个操作的信息，将接收到的参数封装成列表的形式，

2
ic/src/public/nccloud/openapi/ic/m4c/SaleOutResource.java
View File

@ -84,7 +84,7 @@ public class SaleOutResource extends NCCPubRestResource {
return ResultMessageUtil.exceptionToJSON("传入参数为空,请检查", APIErrCodeEnum.BUSINESSEXCCODE.getCode()); return ResultMessageUtil.exceptionToJSON("传入参数为空,请检查", APIErrCodeEnum.BUSINESSEXCCODE.getCode());
} }
try { try {
// 调用查询接口 //调用查询接口
IAPISaleOutQuery query = IAPISaleOutQuery query =
NCLocator.getInstance().lookup(IAPISaleOutQuery.class); NCLocator.getInstance().lookup(IAPISaleOutQuery.class);
SaleOutVO[] saleOutVOs = query.queryVOByScheme(paramMap); SaleOutVO[] saleOutVOs = query.queryVOByScheme(paramMap);

2
mmpac/src/private/nc/bs/mmpac/wr/bp/WrAutoProdInFilterBP.java
View File

@ -30,7 +30,7 @@ public class WrAutoProdInFilterBP {
public AggWrVO[] filter(AggWrVO[] aggWrVOs) { public AggWrVO[] filter(AggWrVO[] aggWrVOs) {
// 过滤交易类型是否勾选了自动入库 //过滤交易类型是否勾选了自动入库
List<String> transIDs = new ArrayList<String>(); List<String> transIDs = new ArrayList<String>();
for (AggWrVO aggvo : aggWrVOs) { for (AggWrVO aggvo : aggWrVOs) {
if (!WrBillStatusEnum.COMMITE.equalsValue(aggvo.getParentVO().getFbillstatus())) { if (!WrBillStatusEnum.COMMITE.equalsValue(aggvo.getParentVO().getFbillstatus())) {

2
mmpac/src/private/nc/bs/mmpac/wr/rule/prodin/WrProdInSetInStockOrgRule.java
View File

@ -21,7 +21,7 @@ public class WrProdInSetInStockOrgRule implements IRule<AggWrVO> {
@Override @Override
public void process(AggWrVO[] vos) { public void process(AggWrVO[] vos) {
// ΕΠΏΥ //ΕΠΏΥ
if (MMValueCheck.isEmpty(vos)) { if (MMValueCheck.isEmpty(vos)) {
return; return;
} }

2
mmpac/src/public/nccloud/openapi/mmpac/wr/WrResource.java
View File

@ -130,7 +130,7 @@ public class WrResource extends AbstractNCCRestResource {
voList.add(vo); voList.add(vo);
IAPIWrMaintain server = NCLocator.getInstance().lookup(IAPIWrMaintain.class); IAPIWrMaintain server = NCLocator.getInstance().lookup(IAPIWrMaintain.class);
List<AggWrVO> aggWrVOS = TransferCodeToPKTool.transferAggVO(voList); List<AggWrVO> aggWrVOS = TransferCodeToPKTool.transferAggVO(voList);
//翻译报告类型 // 翻译报告类型
BaseDAO baseDAO = new BaseDAO(); BaseDAO baseDAO = new BaseDAO();
for (AggWrVO aggWrVO : aggWrVOS) { for (AggWrVO aggWrVO : aggWrVOS) {
List<BilltypeVO> collection = (List<BilltypeVO>) baseDAO.retrieveByClause(BilltypeVO.class, " pk_billtypecode='" + aggWrVO.getParentVO().getVtrantypecode() + "'"); List<BilltypeVO> collection = (List<BilltypeVO>) baseDAO.retrieveByClause(BilltypeVO.class, " pk_billtypecode='" + aggWrVO.getParentVO().getVtrantypecode() + "'");

2
sc/src/private/nc/impl/sc/m61/action/approve/SCOrderApproveAction.java
View File

@ -45,7 +45,7 @@ public class SCOrderApproveAction {
prcr.addAfterRule(new ApproveSupplyRule()); prcr.addAfterRule(new ApproveSupplyRule());
prcr.addAfterRule(new SCOrderApprovePMSupplyRule()); prcr.addAfterRule(new SCOrderApprovePMSupplyRule());
//2025年5月18日15点12分--互感器委外订单审批推送锐制系统 //2025年5月18日15点12分-- 互感器委外订单审批推送锐制系统
prcr.addAfterRule(new AfterApproceRuleSyncRZWMSProcess()); prcr.addAfterRule(new AfterApproceRuleSyncRZWMSProcess());
} }