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 bb0636e..f93fa3a 100644 --- a/ic/src/private/nc/bs/ic/m4c/sign/SignBP.java +++ b/ic/src/private/nc/bs/ic/m4c/sign/SignBP.java @@ -54,7 +54,9 @@ public class SignBP implements ISignBP, ISignRuleProvider processor.addAfterRule(new SalesDeliveryOrderRuleMES()); // 销售出库 签字后 同步到MES金思维系统 processor.addAfterRule(new AfterSigningSynchronizeRuleMES()); - // 销售出库 签字后 同步到锐制 + // 盘点（审批后传MES） + + // 销售出库签字后 同步到锐制 processor.addAfterRule(new AfterSigningSynchronizeRuleRZ()); } 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 52aad8a..60937a5 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 @@ -50,6 +50,7 @@ public class AfterSigningSynchronizeRuleRZ implements IRule { } pushToRZMOM(newSaleOutVOS.toArray(new SaleOutVO[0])); }catch (Exception e){ + log.error("同步销售出库到锐制系统失败: " + e.getMessage(), e); ExceptionUtils.wrappException(e); } } 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 943304d..108cdeb 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 @@ -49,7 +49,7 @@ public class PMOApproveBP { processer.addAfterRule(new PMOCreatePSCPlanRule()); ICompareRule auditSupplyRule = new PMOApproveAuditSupplyRule(); processer.addAfterRule(auditSupplyRule); - // 审批后推送到RZ系统 + // 审批后推送到RZ系统 processer.addAfterRule(new AfterApprovingSynchronizeRuleRZ()); } 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 90ae7a7..6befb6f 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 @@ -47,7 +47,7 @@ public class AfterApprovingSynchronizeRuleRZ implements IRule { // 推送到RZ系统 pushToRZMOM(filteredOrders.toArray(new PMOAggVO[0])); } catch (Exception e) { - log.error("同步生产订单到RZ系统失败: " + e.getMessage(), e); + log.error("同步生产订单到RZ系统失败: " + e.getMessage()); ExceptionUtils.wrappException(e); } } @@ -59,8 +59,9 @@ public class AfterApprovingSynchronizeRuleRZ implements IRule { List aggvoList = new ArrayList<>(); for (PMOAggVO aggvo : pmoAggVOS) { String pkOrg = aggvo.getParentVO().getPk_org(); + Integer fbillstatus = aggvo.getParentVO().getFbillstatus(); String orgCode = transferCodeByPk(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg); - if ("30401".equals(orgCode)) { + if ("30401".equals(orgCode)&&1==fbillstatus) { aggvoList.add(aggvo); } } @@ -110,17 +111,22 @@ public class AfterApprovingSynchronizeRuleRZ implements IRule { for (PMOItemVO body : bodys) { JSONObject detailItem = new JSONObject(); +// jhmx_wbid varchar(100) 第三方系统主键id 必填 上位系统后台唯一ID + detailItem.put("jhmx_wbid", head.getCpmohid()); // 第三方系统计划类别id detailItem.put("jhlb_wbid", head.getVtrantypecode()); // 第三方系统产品ID 物料ID detailItem.put("wlbm_wbid", transferCodeByPk(MaterialVO.getDefaultTableName(), MaterialVO.CODE, MaterialVO.PK_MATERIAL, body.getCmaterialvid())); // 预计开工日期 - detailItem.put("sxrq", body.getTplanstarttime().toString()); + if(body.getTplanstarttime()!=null){ + detailItem.put("sxrq", body.getTplanstarttime().toString()); + } // 预计完工日期 - detailItem.put("wcrq", body.getTplanendtime().toString()); - detailItem.put("gdbj", body.getFitemstatus()); + if(body.getTplanendtime()!=null){ + detailItem.put("wcrq", body.getTplanendtime().toString()); + } // 计划产出数量 - detailItem.put("jhsl", body.getNmmastnum().doubleValue()); + detailItem.put("jhsl", body.getNmmastnum().getDouble()); // 入库仓库 detailItem.put("sdck", transferCodeByPk(StordocVO.getDefaultTableName(), StordocVO.CODE, StordocVO.PK_STORDOC, body.getCinwarehouseid())); detailItem.put("wlzdycs01", transferCodeByPk(StordocVO.getDefaultTableName(), StordocVO.CODE, StordocVO.PK_STORDOC, body.getCinwarehouseid())); @@ -130,11 +136,11 @@ public class AfterApprovingSynchronizeRuleRZ implements IRule { detailItem.put("ddbh", body.getVsalebillcode()); // 订单序号 detailItem.put("khddh", null); - detailItem.put("ddxh", null); + detailItem.put("ddxh", 1); // 备注说明 detailItem.put("bzsm", body.getVnote()); // 项目编号 - detailItem.put("htbz,wlzdycs06", body.getVdef1()); + detailItem.put("wlzdycs06", body.getVdef1()); details.add(detailItem); } } diff --git a/uapbd/src/public/nc/bs/uapbd/util/ThirdPartyPostRequestUtil.java b/uapbd/src/public/nc/bs/uapbd/util/ThirdPartyPostRequestUtil.java index 0828fe3..8ce69f7 100644 --- a/uapbd/src/public/nc/bs/uapbd/util/ThirdPartyPostRequestUtil.java +++ b/uapbd/src/public/nc/bs/uapbd/util/ThirdPartyPostRequestUtil.java @@ -17,8 +17,8 @@ import java.net.URL; */ public class ThirdPartyPostRequestUtil { - private static final int DEFAULT_CONNECT_TIMEOUT = 10000; - private static final int DEFAULT_READ_TIMEOUT = 10000; + private static final int DEFAULT_CONNECT_TIMEOUT = 20000; + private static final int DEFAULT_READ_TIMEOUT = 20000; /** * 向第三方系统发送 POST 请求，并根据 HTTP 状态码返回数据