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

Merge remote-tracking branch 'origin/main' 

# Conflicts:
#	ic/src/private/nc/bs/ic/m4c/sign/SignBP.java
This commit is contained in:
张明 2025-05-21 12:46:47 +08:00
parent ea487a89a7 71aaa1d2dc
commit 5b29eedb44
5 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,9 @@ public class SignBP implements ISignBP<SaleOutVO>, ISignRuleProvider<SaleOutVO>
processor.addAfterRule(new SalesDeliveryOrderRuleMES());
// 销售出库 签字后 同步到MES金思维系统
processor.addAfterRule(new AfterSigningSynchronizeRuleMES());
// 销售出库 签字后 同步到锐制
// 盘点（审批后传MES）
// 销售出库签字后 同步到锐制
processor.addAfterRule(new AfterSigningSynchronizeRuleRZ());
}

1
ic/src/private/nc/bs/ic/m4c/sign/rule/AfterSigningSynchronizeRuleRZ.java
View File

@ -50,6 +50,7 @@ public class AfterSigningSynchronizeRuleRZ implements IRule<SaleOutVO> {
}
pushToRZMOM(newSaleOutVOS.toArray(new SaleOutVO[0]));
}catch (Exception e){
log.error("同步销售出库到锐制系统失败: " + e.getMessage(), e);
ExceptionUtils.wrappException(e);
}
}

2
mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/PMOApproveBP.java
View File

@ -49,7 +49,7 @@ public class PMOApproveBP {
processer.addAfterRule(new PMOCreatePSCPlanRule());
ICompareRule<PMOAggVO> auditSupplyRule = new PMOApproveAuditSupplyRule();
processer.addAfterRule(auditSupplyRule);
// 审批后推送到RZ系统
// 审批后推送到RZ系统
processer.addAfterRule(new AfterApprovingSynchronizeRuleRZ());
}

22
mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApprovingSynchronizeRuleRZ.java
View File

@ -47,7 +47,7 @@ public class AfterApprovingSynchronizeRuleRZ implements IRule<PMOAggVO> {
// 推送到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<PMOAggVO> {
List<PMOAggVO> 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<PMOAggVO> {
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<PMOAggVO> {
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);
}
}

4
uapbd/src/public/nc/bs/uapbd/util/ThirdPartyPostRequestUtil.java
View File

@ -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 状态码返回数据