From 3731882c3d9fa47ae97a677417bcc0d89d0a805d 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: Tue, 24 Jun 2025 14:48:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=92=E6=84=9F=E5=99=A8=E6=80=BB=E8=A1=A5?= =?UTF-8?q?=E4=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ic/META-INF/OpenAPI_SCM_IC_INBOUND_EJB60.upm | 4 +-- .../private/nc/bs/ic/m4c/insert/InsertBP.java | 2 +- ic/src/private/nc/bs/ic/m4c/sign/SignBP.java | 4 +-- .../rule/AfterSigningSynchronizeRuleRZ.java | 2 +- .../impl/ic/m47/APISubcontInMaintainImpl.java | 2 +- .../check/CheckSubcontInSaveValidator.java | 5 +-- .../ic/m47/fill/SubcontInSaveFillValue.java | 2 +- .../ic/m47/rule/Choose47DefaultFillRule.java | 4 +-- .../impl/ic/m4c/APISaleOutMaintainImpl.java | 2 +- .../ic/m4d/APIMaterialOutMaintainImpl.java | 2 +- .../impl/ic/onhand/APIOnhandQueryIpml.java | 2 +- .../api/ic/m47/IAPISubcontInMaintain.java | 6 ++++ .../api/ic/m4c/IAPISaleOutMaintain.java | 2 +- .../api/ic/onhand/IAPIOnhandQuery.java | 18 ++++++++++- .../openapi/ic/m47/SubcontInResource.java | 32 ++++++++++++++++--- .../openapi/ic/m4c/SaleOutResource.java | 2 +- .../openapi/ic/onhand/OnhandResource.java | 2 +- .../nc/bs/mmpac/pickm/bp/PickmApproveBP.java | 1 + .../bp/rule/AfterApproveRuleSyncRZWMS.java | 26 +++++++-------- .../bs/mmpac/pmo/pac0002/bp/PMOApproveBP.java | 4 +-- .../rule/AfterApprovingSynchronizeRuleRZ.java | 2 +- .../bs/mmpac/wr/bp/WrAutoProdInFilterBP.java | 2 +- .../prodin/WrProdInSetInStockOrgRule.java | 2 +- .../nccloud/openapi/mmpac/wr/WrResource.java | 4 +-- .../AfterApprovingSynchronizeRuleRZ.java | 2 +- .../pu/m21/action/OrderApproveAction.java | 2 +- .../pm/AfterApproceRuleSyncRZWMSProcess.java | 2 +- .../action/approve/SCOrderApproveAction.java | 2 +- uapbd/META-INF/querySync.rest | 1 + .../uapbd/util/ThirdPartyPostRequestUtil.java | 2 +- .../public/nccloud/api/uapbd/QuerySync.java | 2 +- .../nccloud/api/uapbd/QuerySyncSqlUtils.java | 2 +- 32 files changed, 96 insertions(+), 53 deletions(-) diff --git a/ic/META-INF/OpenAPI_SCM_IC_INBOUND_EJB60.upm b/ic/META-INF/OpenAPI_SCM_IC_INBOUND_EJB60.upm index 94a2918..7525bcc 100644 --- a/ic/META-INF/OpenAPI_SCM_IC_INBOUND_EJB60.upm +++ b/ic/META-INF/OpenAPI_SCM_IC_INBOUND_EJB60.upm @@ -141,12 +141,12 @@ nccloud.api.impl.ic.atp.ATPQueryIpml - + nccloud.api.ic.m47.IAPISubcontInMaintain nccloud.api.impl.ic.m47.APISubcontInMaintainImpl - + diff --git a/ic/src/private/nc/bs/ic/m4c/insert/InsertBP.java b/ic/src/private/nc/bs/ic/m4c/insert/InsertBP.java index e5f6e41..30d6504 100644 --- a/ic/src/private/nc/bs/ic/m4c/insert/InsertBP.java +++ b/ic/src/private/nc/bs/ic/m4c/insert/InsertBP.java @@ -95,7 +95,7 @@ public class InsertBP implements IInsertBP, // 2020年3月2日 新增保存移动业务消息 processor.addAfterRule(new MobAfterSaveMessageRule()); - //2025年5月27日 新增保存推送锐制 + //2025年5月27日新增保存推送锐制 processor.addAfterFinalRule(new AfterSigningSynchronizeRuleRZ()); } diff --git a/ic/src/private/nc/bs/ic/m4c/sign/SignBP.java b/ic/src/private/nc/bs/ic/m4c/sign/SignBP.java index 6a067ff..6a1c246 100644 --- a/ic/src/private/nc/bs/ic/m4c/sign/SignBP.java +++ b/ic/src/private/nc/bs/ic/m4c/sign/SignBP.java @@ -51,9 +51,9 @@ public class SignBP implements ISignBP, ISignRuleProvider processor.addAfterRule(new SaleOutProceedsRuleCG()); processor.addAfterRule(new MobAfterSignMessageRule()); // 销售出库 多一个步骤 先提交销售交货单 与同步销售出库单的orderNo一致 - processor.addAfterRule(new SalesDeliveryOrderRuleMES()); +// processor.addAfterRule(new SalesDeliveryOrderRuleMES()); // 销售出库 签字后 同步到MES金思维系统 - processor.addAfterRule(new AfterSigningSynchronizeRuleMES()); +// processor.addAfterRule(new AfterSigningSynchronizeRuleMES()); // 盘点（审批后传MES） } diff --git a/ic/src/private/nc/bs/ic/m4c/sign/rule/AfterSigningSynchronizeRuleRZ.java b/ic/src/private/nc/bs/ic/m4c/sign/rule/AfterSigningSynchronizeRuleRZ.java index d66feb9..925fafd 100644 --- a/ic/src/private/nc/bs/ic/m4c/sign/rule/AfterSigningSynchronizeRuleRZ.java +++ b/ic/src/private/nc/bs/ic/m4c/sign/rule/AfterSigningSynchronizeRuleRZ.java @@ -32,7 +32,7 @@ import java.util.List; * @Description TODO * @Version 1.0.0 * @Date 2025/5/16 9:01 - * @Created by ame + * @Created by sdlizheng */ public class AfterSigningSynchronizeRuleRZ implements IRule { private static Log log = Log.getInstance("rzmomlog"); diff --git a/ic/src/private/nccloud/api/impl/ic/m47/APISubcontInMaintainImpl.java b/ic/src/private/nccloud/api/impl/ic/m47/APISubcontInMaintainImpl.java index ee042be..7b38c14 100644 --- a/ic/src/private/nccloud/api/impl/ic/m47/APISubcontInMaintainImpl.java +++ b/ic/src/private/nccloud/api/impl/ic/m47/APISubcontInMaintainImpl.java @@ -35,7 +35,7 @@ public class APISubcontInMaintainImpl implements IAPISubcontInMaintain { checker.check(vos); // 2、编码翻译成pk aggVOList = TransferCodeToPKTool.transferAggVO(aggVOList); - // 翻译货位 + // 3、翻译货位 ICAPILocationVOUtils.translate(vos); new SubcontInSaveFillValue().setDefaultValue(vos); diff --git a/ic/src/private/nccloud/api/impl/ic/m47/check/CheckSubcontInSaveValidator.java b/ic/src/private/nccloud/api/impl/ic/m47/check/CheckSubcontInSaveValidator.java index bf58986..e6d096c 100644 --- a/ic/src/private/nccloud/api/impl/ic/m47/check/CheckSubcontInSaveValidator.java +++ b/ic/src/private/nccloud/api/impl/ic/m47/check/CheckSubcontInSaveValidator.java @@ -25,10 +25,7 @@ public class CheckSubcontInSaveValidator extends VONullValidate { public String[] getHeadNotNullFields() { // TODO Auto-generated method stub //组织，仓库，出入库类型编码 - String[] headnames = - { - ICPubMetaNameConst.PK_ORG, ICPubMetaNameConst.CWAREHOUSEID, ICPubMetaNameConst.VTRANTYPECODE - }; + String[] headnames ={ICPubMetaNameConst.PK_ORG, ICPubMetaNameConst.CWAREHOUSEID, ICPubMetaNameConst.VTRANTYPECODE}; return headnames; } diff --git a/ic/src/private/nccloud/api/impl/ic/m47/fill/SubcontInSaveFillValue.java b/ic/src/private/nccloud/api/impl/ic/m47/fill/SubcontInSaveFillValue.java index 35b277f..d81f4dd 100644 --- a/ic/src/private/nccloud/api/impl/ic/m47/fill/SubcontInSaveFillValue.java +++ b/ic/src/private/nccloud/api/impl/ic/m47/fill/SubcontInSaveFillValue.java @@ -61,7 +61,7 @@ public class SubcontInSaveFillValue { // 数量，金额，汇率，税率处理 rule = new ICBodyNshouldassistnumCal(); processer.addFillvalueRule(rule); - + //执行 processer.fillvalue(vos); } diff --git a/ic/src/private/nccloud/api/impl/ic/m47/rule/Choose47DefaultFillRule.java b/ic/src/private/nccloud/api/impl/ic/m47/rule/Choose47DefaultFillRule.java index feaac16..f51883f 100644 --- a/ic/src/private/nccloud/api/impl/ic/m47/rule/Choose47DefaultFillRule.java +++ b/ic/src/private/nccloud/api/impl/ic/m47/rule/Choose47DefaultFillRule.java @@ -25,9 +25,9 @@ public class Choose47DefaultFillRule extends ICRule { @Override public void process(E[] vos) { for (E billvo : vos) { - // 填充默认值 + //填充默认值 setDefultInfo(billvo); - // 设置财务组织,币种 + //设置财务组织,币种 setFanaceorgValue(billvo); } } diff --git a/ic/src/private/nccloud/api/impl/ic/m4c/APISaleOutMaintainImpl.java b/ic/src/private/nccloud/api/impl/ic/m4c/APISaleOutMaintainImpl.java index 5b2246b..47d29bf 100644 --- a/ic/src/private/nccloud/api/impl/ic/m4c/APISaleOutMaintainImpl.java +++ b/ic/src/private/nccloud/api/impl/ic/m4c/APISaleOutMaintainImpl.java @@ -63,7 +63,7 @@ public class APISaleOutMaintainImpl implements IAPISaleOutMaintain { aggVOList = TransferCodeToPKTool.transferAggVO(aggVOList); // 翻译货位 ICAPILocationVOUtils.translate(vos); - // 其他数据填充 + //其他数据填充 new SaleOutSaveFillValue().setDefaultValue(vos); return (SaleOutVO[]) PfServiceScmUtil.processBatch("WRITE", "4C", vos, null, diff --git a/ic/src/private/nccloud/api/impl/ic/m4d/APIMaterialOutMaintainImpl.java b/ic/src/private/nccloud/api/impl/ic/m4d/APIMaterialOutMaintainImpl.java index 2c1455a..6cc454d 100644 --- a/ic/src/private/nccloud/api/impl/ic/m4d/APIMaterialOutMaintainImpl.java +++ b/ic/src/private/nccloud/api/impl/ic/m4d/APIMaterialOutMaintainImpl.java @@ -79,7 +79,7 @@ public class APIMaterialOutMaintainImpl implements IAPIMaterialOutMaintain{ new MaterialOutSaveFillValue().setDefaultValue(vos); IMaterialOutMaintainAPI materialOut = NCLocator.getInstance().lookup(IMaterialOutMaintainAPI.class); - //设置每行行号 + // 设置每行行号 setMaterialOutRowNum(vos); return materialOut.insertBills(vos); } diff --git a/ic/src/private/nccloud/api/impl/ic/onhand/APIOnhandQueryIpml.java b/ic/src/private/nccloud/api/impl/ic/onhand/APIOnhandQueryIpml.java index d89ad72..2319f05 100644 --- a/ic/src/private/nccloud/api/impl/ic/onhand/APIOnhandQueryIpml.java +++ b/ic/src/private/nccloud/api/impl/ic/onhand/APIOnhandQueryIpml.java @@ -78,7 +78,7 @@ public class APIOnhandQueryIpml implements IAPIOnhandQuery { } } - //必输项校验 + // 必输项校验 private void requiredFieldCheck(String[] requiredField, Map paramMap) { for (String field : requiredField) { Object keyValue = paramMap.get(field); diff --git a/ic/src/public/nccloud/api/ic/m47/IAPISubcontInMaintain.java b/ic/src/public/nccloud/api/ic/m47/IAPISubcontInMaintain.java index b6a5d73..2786e19 100644 --- a/ic/src/public/nccloud/api/ic/m47/IAPISubcontInMaintain.java +++ b/ic/src/public/nccloud/api/ic/m47/IAPISubcontInMaintain.java @@ -14,5 +14,11 @@ import java.util.Map; */ public interface IAPISubcontInMaintain { + /** + * + * @param subcontInVOList + * @return + * @throws Exception + */ SubcontInVO[] save(List> subcontInVOList) throws Exception; } diff --git a/ic/src/public/nccloud/api/ic/m4c/IAPISaleOutMaintain.java b/ic/src/public/nccloud/api/ic/m4c/IAPISaleOutMaintain.java index 35e9c50..aa16729 100644 --- a/ic/src/public/nccloud/api/ic/m4c/IAPISaleOutMaintain.java +++ b/ic/src/public/nccloud/api/ic/m4c/IAPISaleOutMaintain.java @@ -74,7 +74,7 @@ public interface IAPISaleOutMaintain { public SaleOutVO[] saveRefSaleOrder(List> paramMapList) throws BusinessException; /** - * 根据发货单生成销售出库单 + * 根据发货单生成销售出库单 * @param vos * @return * @throws BusinessException diff --git a/ic/src/public/nccloud/api/ic/onhand/IAPIOnhandQuery.java b/ic/src/public/nccloud/api/ic/onhand/IAPIOnhandQuery.java index 727c564..c5c935e 100644 --- a/ic/src/public/nccloud/api/ic/onhand/IAPIOnhandQuery.java +++ b/ic/src/public/nccloud/api/ic/onhand/IAPIOnhandQuery.java @@ -16,7 +16,23 @@ import nc.vo.pub.BusinessException; */ public interface IAPIOnhandQuery { + /** + * 根据维度查询现存量信息 + * 此方法接收一个参数映射，用于指定查询条件，如仓库、物料等 + * + * @param paramMap 参数映射，包含查询条件 + * @return OnhandVO[] 查询到的现存量信息数组 + * @throws BusinessException 当查询操作失败时抛出的业务异常 + */ OnhandVO[] queryOnhandVOByDims(Map paramMap) throws BusinessException; - OnhandVO[] queryOnhandVOByDims(List> paramMap)throws Exception; + /** + * 根据多个维度查询现存量信息 + * 此方法接收一个参数映射列表，每个映射包含一组查询条件，用于批量查询 + * + * @param paramMap 参数映射列表，每个映射包含一组查询条件 + * @return OnhandVO[] 查询到的现存量信息数组 + * @throws Exception 当查询操作失败时抛出的异常 + */ + OnhandVO[] queryOnhandVOByDims(List> paramMap) throws Exception; } diff --git a/ic/src/public/nccloud/openapi/ic/m47/SubcontInResource.java b/ic/src/public/nccloud/openapi/ic/m47/SubcontInResource.java index c24fd95..d37c8fa 100644 --- a/ic/src/public/nccloud/openapi/ic/m47/SubcontInResource.java +++ b/ic/src/public/nccloud/openapi/ic/m47/SubcontInResource.java @@ -2,13 +2,10 @@ package nccloud.openapi.ic.m47; import nc.bs.framework.common.NCLocator; import nc.vo.ic.m47.entity.SubcontInVO; -import nc.vo.scmpub.res.billtype.ICBillType; import nc.ws.opm.pub.utils.result.APIErrCodeEnum; import nccloud.api.ic.m47.IAPISubcontInMaintain; import nccloud.api.rest.utils.ResultMessageUtil; -import nccloud.openapi.ic.util.ICAPILocationVOUtils; import nccloud.openapi.scmpub.pub.NCCPubRestResource; -import nccloud.openapi.scmpub.pub.TransferMapToVOTool; import org.json.JSONString; import javax.ws.rs.Consumes; @@ -32,32 +29,57 @@ public class SubcontInResource extends NCCPubRestResource { private static String HEADTABLE = "ic_subcontin_h"; private static String BODYTABLE = "ic_subcontin_b"; + /** + * 保存操作信息 + * + * 该方法通过POST请求接收JSON格式的参数，处理后返回JSON格式的结果 + * 主要用于保存单个操作的信息，将接收到的参数封装成列表的形式， + * 调用另一个save方法进行实际的保存操作 + * + * @param param 包含操作信息的键值对参数 + * @return 返回保存操作的结果，格式为JSON字符串 + */ @POST @Path("operation/save") @Consumes({"application/json"}) @Produces({"application/json"}) public JSONString save(Map param) { + // 将接收到的参数封装成列表，以便调用实际的保存方法 List> paramList = new ArrayList(); paramList.add(param); + + // 调用实际的保存方法，并返回保存结果 JSONString result = this.save(paramList); return result; } + /** + * 保存数据接口 + * 该方法接收一个包含表头和表体信息的JSON数组，尝试将其保存到数据库中 + * 如果传入的数据格式不正确（不包含表头或表体信息），则返回错误信息 + * 如果保存过程中发生异常，则返回异常信息 + * + * @param paramList 一个包含多个数据项的列表，每个数据项是一个Map对象，必须包含表头和表体信息 + * @return 返回一个JSON字符串，包含保存结果或错误信息 + */ @POST @Path("save") @Consumes({"application/json"}) @Produces({"application/json"}) public JSONString save(List> paramList){ try { + // 遍历传入的参数列表，检查每个Map对象是否包含表头和表体信息 for (Map map : paramList) { if (!map.containsKey(HEADTABLE) || !map.containsKey(BODYTABLE)) { + // 如果任一数据项不包含表头或表体信息，返回错误信息 return ResultMessageUtil.exceptionToJSON("传入数据异常，参数要包含表头信息和表体信息", APIErrCodeEnum.BUSINESSEXCCODE.getCode()); } } + // 调用服务接口保存数据，并返回保存结果 SubcontInVO[] save = NCLocator.getInstance().lookup(IAPISubcontInMaintain.class).save(paramList); return ResultMessageUtil.toJSON(save, "保存成功"); - }catch (Exception e){ + } catch (Exception e) { + // 如果保存过程中发生异常，返回异常信息 return ResultMessageUtil.exceptionToJSON(e); } - } } diff --git a/ic/src/public/nccloud/openapi/ic/m4c/SaleOutResource.java b/ic/src/public/nccloud/openapi/ic/m4c/SaleOutResource.java index 7ebf9c5..2745843 100644 --- a/ic/src/public/nccloud/openapi/ic/m4c/SaleOutResource.java +++ b/ic/src/public/nccloud/openapi/ic/m4c/SaleOutResource.java @@ -143,7 +143,7 @@ public class SaleOutResource extends NCCPubRestResource { nc.vo.ml.NCLangRes4VoTransl.getNCLangRes().getStrByID("4008027_0", "04008027-0464")/* @res "销售出库单修改签字成功" */); }else{ - // 修改 + //修改 SaleOutVO[] updateVO = NCLocator.getInstance().lookup(IAPISaleOutMaintain.class) .update(paramMapList); diff --git a/ic/src/public/nccloud/openapi/ic/onhand/OnhandResource.java b/ic/src/public/nccloud/openapi/ic/onhand/OnhandResource.java index 3ed56e3..2d4cd80 100644 --- a/ic/src/public/nccloud/openapi/ic/onhand/OnhandResource.java +++ b/ic/src/public/nccloud/openapi/ic/onhand/OnhandResource.java @@ -136,7 +136,7 @@ public class OnhandResource { if (remain == null || remain.isEmpty()) { return null; } - // 转换为 pk 和 code 的映射 + // 转换为 pk和 code 的映射 Map pkCodeMap = new HashMap<>(); for (Map row : remain) { if (row != null) { diff --git a/mmpac/src/private/nc/bs/mmpac/pickm/bp/PickmApproveBP.java b/mmpac/src/private/nc/bs/mmpac/pickm/bp/PickmApproveBP.java index 6475bb4..1641bbf 100644 --- a/mmpac/src/private/nc/bs/mmpac/pickm/bp/PickmApproveBP.java +++ b/mmpac/src/private/nc/bs/mmpac/pickm/bp/PickmApproveBP.java @@ -21,6 +21,7 @@ import nc.vo.mmpac.pickm.enumeration.FbillstatusEnum; public class PickmApproveBP { private void addAfterRule(CompareAroundProcesser processer) { + //备料计划审批推送锐制 IRule pickmstatusFilterRule = new AfterApproveRuleSyncRZWMS(); processer.addAfterRule(pickmstatusFilterRule); } diff --git a/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleSyncRZWMS.java b/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleSyncRZWMS.java index b65ae8e..e0ab532 100644 --- a/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleSyncRZWMS.java +++ b/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleSyncRZWMS.java @@ -9,6 +9,7 @@ import nc.bs.uapbd.util.ThirdPartyPostRequestUtil; import nc.impl.pubapp.pattern.rule.IRule; import nc.jdbc.framework.processor.ColumnProcessor; import nc.pubitf.para.SysInitQuery; +import nc.vo.bd.defdoc.DefdocVO; import nc.vo.bd.material.MaterialVO; import nc.vo.bd.rt.rt0004.entity.RcVO; import nc.vo.bd.stordoc.StordocVO; @@ -19,6 +20,7 @@ import nc.vo.mmpac.pickm.entity.PickmItemVO; import nc.vo.org.OrgVO; import nc.vo.pub.BusinessException; import nc.vo.pub.lang.UFBoolean; +import nc.vo.pub.lang.UFDouble; import nc.vo.pubapp.pattern.exception.ExceptionUtils; import nc.vo.pubapp.pattern.pub.SqlBuilder; import nc.vo.scmpub.util.ArrayUtil; @@ -154,31 +156,29 @@ public class AfterApproveRuleSyncRZWMS implements IRule { singleObj.put("djxh", body.getVrowno()); //djrq datetime 单据日期 必填 - singleObj.put("djrq", head.getDmakedate()); + singleObj.put("djrq", head.getDmakedate().toString()); //wlbm_wbid varchar(100) 第三方系统物料名称id 必填 物料编码的后台ID singleObj.put("wlbm_wbid", wlbm_wbid); - //scjh_wbid varchar(100) 第三方系统生产计划ID 必填 生产计划号外部ID，一般ERP系统的生产订单号。 - singleObj.put("scjh_wbid", head.getCsourcebillid()); - - //jhxh numeric(5) 计划序号 -生产订单行号 - singleObj.put("jhxh", head.getVsourcebillrowno()); - //djsl numeric(18,3) 单据数量 必填 - singleObj.put("djsl", body.getNpscnum().getDouble()); + UFDouble djsl = body.getNplanoutastnum() == null ? UFDouble.ZERO_DBL : body.getNplanoutastnum(); + singleObj.put("djsl", djsl.getDouble()); - //sddd varchar(510) 送达地点 必填 传仓库名称，要求上位ERP仓库名称不重复。 - singleObj.put("sddd", transferCodeByPk(StordocVO.getDefaultTableName(), StordocVO.NAME, StordocVO.PK_STORDOC, body.getCoutstockid())); + //sddd varchar(510)送达地点 必填 传仓库名称，要求上位ERP仓库名称不重复。 +// singleObj.put("sddd", transferCodeByPk(StordocVO.getDefaultTableName(), StordocVO.NAME, StordocVO.PK_STORDOC, body.getCoutstockid())); //ckbh_wbid varchar(100) 第三方系统仓库id 必填 储区根据仓库默认，同仓库多储区时，两者必填； - singleObj.put("ckbh_wbid",transferCodeByPk(StordocVO.getDefaultTableName(), StordocVO.CODE, StordocVO.PK_STORDOC, body.getCoutstockid())); +// singleObj.put("ckbh_wbid",body.getCoutstockid()); //qfbj int 签发标记 必填 默认1；上位系统审核传至MOM 1 singleObj.put("qfbj", 1); - //cght_wbid varchar(100) 第三方系统合同id 必填 委外订单 - singleObj.put("cght_wbid", head.getVfirstbillcode()); + //cght_wbid varchar(100) 第三方系统合同id 必填 委外订单主键ID + singleObj.put("cght_wbid",head.getCfirstbillid()); + + //cght_wbid varchar(100) 第三方系统合同id 必填 +// singleObj.put("cght_wbid", transferCodeByPk("bd_defdoc", DefdocVO.CODE, DefdocVO.PK_DEFDOC, body.getVbdef5())); details.add(singleObj); } diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/PMOApproveBP.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/PMOApproveBP.java index 97eb00a..6767417 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/PMOApproveBP.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/PMOApproveBP.java @@ -51,10 +51,10 @@ public class PMOApproveBP { processer.addAfterRule(new PMOCreatePSCPlanRule()); ICompareRule auditSupplyRule = new PMOApproveAuditSupplyRule(); processer.addAfterRule(auditSupplyRule); - // 审批后推送到RZ系统 + // 审批后推送到锐制系统 processer.addAfterRule(new AfterApprovingSynchronizeRuleRZ(true)); // 审批后推送流程生产订单到MES - processer.addAfterRule(new AfterApproveRuleSyncMes()); +// processer.addAfterRule(new AfterApproveRuleSyncMes()); } diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApprovingSynchronizeRuleRZ.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApprovingSynchronizeRuleRZ.java index 16f608b..58448c2 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApprovingSynchronizeRuleRZ.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApprovingSynchronizeRuleRZ.java @@ -52,7 +52,7 @@ public class AfterApprovingSynchronizeRuleRZ implements IRule { return; } - // 推送到RZ系统 + // 推送到锐制系统 pushToRZMOM(filteredOrders.toArray(new PMOAggVO[0])); } catch (Exception e) { log.error("同步生产订单到RZ系统失败: " + e.getMessage()); diff --git a/mmpac/src/private/nc/bs/mmpac/wr/bp/WrAutoProdInFilterBP.java b/mmpac/src/private/nc/bs/mmpac/wr/bp/WrAutoProdInFilterBP.java index 95d9f8f..c07fd23 100644 --- a/mmpac/src/private/nc/bs/mmpac/wr/bp/WrAutoProdInFilterBP.java +++ b/mmpac/src/private/nc/bs/mmpac/wr/bp/WrAutoProdInFilterBP.java @@ -96,7 +96,7 @@ public class WrAutoProdInFilterBP { // 设置库存组织和仓库 IRule wrProdInSetInStockOrgRule = new WrProdInSetInStockOrgRule(); wrProdInSetInStockOrgRule.process(filterVOs); - //2025年5月30日08点45分 --外部系统推送接口时填了仓库，此处不清空 + //2025年5月30日08点45分 -- 外部系统推送接口时填了仓库，此处不清空 String userCode = InvocationInfoProxy.getInstance().getUserCode(); if("rzmes".equals(userCode)||"MES".equals(userCode)){ diff --git a/mmpac/src/private/nc/bs/mmpac/wr/rule/prodin/WrProdInSetInStockOrgRule.java b/mmpac/src/private/nc/bs/mmpac/wr/rule/prodin/WrProdInSetInStockOrgRule.java index f0b1255..9ccdcfd 100644 --- a/mmpac/src/private/nc/bs/mmpac/wr/rule/prodin/WrProdInSetInStockOrgRule.java +++ b/mmpac/src/private/nc/bs/mmpac/wr/rule/prodin/WrProdInSetInStockOrgRule.java @@ -122,7 +122,7 @@ public class WrProdInSetInStockOrgRule implements IRule { } - //2025年5月30日08点45分 --外部系统推送接口时填了仓库，此处不清空 + //2025年5月30日08点45分 --外部系统推送接口时填了仓库， 此处不清空 if("rzmes".equals(userCode)||"MES".equals(userCode)){ }else{ diff --git a/mmpac/src/public/nccloud/openapi/mmpac/wr/WrResource.java b/mmpac/src/public/nccloud/openapi/mmpac/wr/WrResource.java index 7e640e9..4c9110b 100644 --- a/mmpac/src/public/nccloud/openapi/mmpac/wr/WrResource.java +++ b/mmpac/src/public/nccloud/openapi/mmpac/wr/WrResource.java @@ -609,7 +609,7 @@ public class WrResource extends AbstractNCCRestResource { */ private void processMESFields(Map itemMap, BaseDAO baseDAO) throws BusinessException { - // 检查是否需要处理MES字段 + //检查是否需要处理MES字段 // 这里可以通过上下文、用户信息或其他标识来判断 // 暂时通过检查是否存在特定字段来判断是MES用户 boolean isMESUser = isMESUser(itemMap); @@ -619,7 +619,7 @@ public class WrResource extends AbstractNCCRestResource { } try { - // 设置cbmoid保持和vbsrcid一致 + //设置cbmoid保持和vbsrcid一致 if (itemMap.containsKey("vbsrcid") && MMValueCheck.isNotEmpty(itemMap.get("vbsrcid"))) { itemMap.put("cbmoid", itemMap.get("vbsrcid")); } diff --git a/pu/src/private/nc/bs/pu/m21/action/rule/approve/AfterApprovingSynchronizeRuleRZ.java b/pu/src/private/nc/bs/pu/m21/action/rule/approve/AfterApprovingSynchronizeRuleRZ.java index 379de08..8bef2c0 100644 --- a/pu/src/private/nc/bs/pu/m21/action/rule/approve/AfterApprovingSynchronizeRuleRZ.java +++ b/pu/src/private/nc/bs/pu/m21/action/rule/approve/AfterApprovingSynchronizeRuleRZ.java @@ -52,7 +52,7 @@ public class AfterApprovingSynchronizeRuleRZ implements IRule { if (newOrderVOS.isEmpty()) { return; } - // 推送到睿智系统 + //推送到锐制系统 pushToRZMOM(newOrderVOS.toArray(new OrderVO[0])); } catch (Exception e) { log.error("同步采购订单到锐制系统失败: " + e.getMessage()); diff --git a/pu/src/private/nc/impl/pu/m21/action/OrderApproveAction.java b/pu/src/private/nc/impl/pu/m21/action/OrderApproveAction.java index dafa051..06f5369 100644 --- a/pu/src/private/nc/impl/pu/m21/action/OrderApproveAction.java +++ b/pu/src/private/nc/impl/pu/m21/action/OrderApproveAction.java @@ -111,7 +111,7 @@ public class OrderApproveAction { processer.addAfterRule(new OrderRewritePMStartDateRule(true)); processer.addAfterRule(new OrderApprovePMSupplyRule()); - // 采购订单审批后同步到锐制MES系统 + // 采购订单审批后同步到锐制系统 processer.addAfterRule(new AfterApprovingSynchronizeRuleRZ()); } diff --git a/sc/src/private/nc/bs/sc/m61/referred/rule/pm/AfterApproceRuleSyncRZWMSProcess.java b/sc/src/private/nc/bs/sc/m61/referred/rule/pm/AfterApproceRuleSyncRZWMSProcess.java index c0fc732..a91a946 100644 --- a/sc/src/private/nc/bs/sc/m61/referred/rule/pm/AfterApproceRuleSyncRZWMSProcess.java +++ b/sc/src/private/nc/bs/sc/m61/referred/rule/pm/AfterApproceRuleSyncRZWMSProcess.java @@ -91,7 +91,7 @@ public class AfterApproceRuleSyncRZWMSProcess implements IRule { // 第三方系统厂商id singleObj.put("zbxx_gycs_wbid", head.getPk_supplier()); - //zbxx_cgy_wbid varchar(100) 第三方系统采购员id + //zbxx_cgy_wbid varchar(100)第三方系统采购员id singleObj.put("zbxx_cgy_wbid", head.getCemployeeid()); // 交货日期 diff --git a/sc/src/private/nc/impl/sc/m61/action/approve/SCOrderApproveAction.java b/sc/src/private/nc/impl/sc/m61/action/approve/SCOrderApproveAction.java index b50f9e6..955f4b3 100644 --- a/sc/src/private/nc/impl/sc/m61/action/approve/SCOrderApproveAction.java +++ b/sc/src/private/nc/impl/sc/m61/action/approve/SCOrderApproveAction.java @@ -45,7 +45,7 @@ public class SCOrderApproveAction { prcr.addAfterRule(new ApproveSupplyRule()); prcr.addAfterRule(new SCOrderApprovePMSupplyRule()); - //2025年5月18日15点12分-- 互感器委外订单审批推送锐制系统 + //2025年5月18日15点12分--互感器委外订单审批推送锐制系统 prcr.addAfterRule(new AfterApproceRuleSyncRZWMSProcess()); } diff --git a/uapbd/META-INF/querySync.rest b/uapbd/META-INF/querySync.rest index 558ec97..0bf26b5 100644 --- a/uapbd/META-INF/querySync.rest +++ b/uapbd/META-INF/querySync.rest @@ -3,4 +3,5 @@ + \ No newline at end of file diff --git a/uapbd/src/public/nc/bs/uapbd/util/ThirdPartyPostRequestUtil.java b/uapbd/src/public/nc/bs/uapbd/util/ThirdPartyPostRequestUtil.java index bb3db58..fbf16dd 100644 --- a/uapbd/src/public/nc/bs/uapbd/util/ThirdPartyPostRequestUtil.java +++ b/uapbd/src/public/nc/bs/uapbd/util/ThirdPartyPostRequestUtil.java @@ -39,7 +39,7 @@ public class ThirdPartyPostRequestUtil { connection.setReadTimeout(DEFAULT_READ_TIMEOUT); // 设置读取超时时间 connection.setRequestProperty("Content-Type", "application/json"); // 设置请求头 - // 发送请求体 + //发送请求体 try (OutputStream os = connection.getOutputStream()) { byte[] input = requestBody.getBytes("utf-8"); os.write(input, 0, input.length); diff --git a/uapbd/src/public/nccloud/api/uapbd/QuerySync.java b/uapbd/src/public/nccloud/api/uapbd/QuerySync.java index cd34e69..6d57800 100644 --- a/uapbd/src/public/nccloud/api/uapbd/QuerySync.java +++ b/uapbd/src/public/nccloud/api/uapbd/QuerySync.java @@ -39,7 +39,7 @@ public class QuerySync extends AbstractNCCRestResource { Calendar calendar = Calendar.getInstance(); calendar.setTime(date); calendar.add(Calendar.HOUR_OF_DAY, -3); // 减去 3 小时 - //提前三小时，防止ts与现实时间差别 + //提前三小时防止ts与现实时间差别 UFDate adjustedUfDate = new UFDate(calendar.getTimeInMillis()); if (!ts.contains(",")) { // 单个时间戳 tsCondition = "ts >= '" + adjustedUfDate + "' AND ts <= '" + new UFDate(new Date()) + "'"; diff --git a/uapbd/src/public/nccloud/api/uapbd/QuerySyncSqlUtils.java b/uapbd/src/public/nccloud/api/uapbd/QuerySyncSqlUtils.java index b914dad..d029214 100644 --- a/uapbd/src/public/nccloud/api/uapbd/QuerySyncSqlUtils.java +++ b/uapbd/src/public/nccloud/api/uapbd/QuerySyncSqlUtils.java @@ -15,7 +15,7 @@ public class QuerySyncSqlUtils { * 此方法假定传入的 `values` 列表是非空的（由调用方 `buildUniversalCondition` 保证）。 * * @param fieldName 字段名 - * @param values 值的列表 (来自非空数组或List) + * @param values 值的列表 (来自非空数组或List) * @return 构建好的IN子句字符串 */ private static String buildInClause(String fieldName, List values) {