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

优化逻辑

This commit is contained in:
张明 2025-05-21 17:14:42 +08:00
parent a1b5f52ae8
commit aee3473bbd
6 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ic/src/private/nc/bs/ic/m45/sign/rule/AfterSigningSynchronizeRuleMES.java
View File

@ -41,16 +41,18 @@ public class AfterSigningSynchronizeRuleMES implements IRule<PurchaseInVO> {
@Override @Override
public void process(PurchaseInVO[] purchaseInVOs) { public void process(PurchaseInVO[] purchaseInVOs) {
try { try {
// 初始化HTTP请求工具类
IHttpPostOtherSys httpPostOtherSys = NCLocator.getInstance().lookup(IHttpPostOtherSys.class);
if (purchaseInVOs == null || purchaseInVOs.length == 0) { if (purchaseInVOs == null || purchaseInVOs.length == 0) {
obmlog.debug("AfterSigningSynchronizeRuleMES-采购入库同步MES-无采购入库单");
return; return;
} }
// 检查并筛选组织为电缆的采购入库单 // 检查并筛选组织为电缆的采购入库单
List<PurchaseInVO> filteredPurchaseInVOS = checkAndFilterBills(purchaseInVOs); List<PurchaseInVO> filteredPurchaseInVOS = checkAndFilterBills(purchaseInVOs);
if (filteredPurchaseInVOS.isEmpty()) { if (filteredPurchaseInVOS.isEmpty()) {
obmlog.debug("AfterSigningSynchronizeRuleMES-无组织为电缆的需要同步的采购入库单");
return; return;
} }
// 놓迦뺏HTTP헝헹묏야잚
IHttpPostOtherSys httpPostOtherSys = NCLocator.getInstance().lookup(IHttpPostOtherSys.class);
for (PurchaseInVO purchaseInVO : filteredPurchaseInVOS) { for (PurchaseInVO purchaseInVO : filteredPurchaseInVOS) {
PurchaseInHeadVO hvo = (PurchaseInHeadVO) purchaseInVO.getParentVO(); PurchaseInHeadVO hvo = (PurchaseInHeadVO) purchaseInVO.getParentVO();
PurchaseInBodyVO[] bvos = (PurchaseInBodyVO[]) purchaseInVO.getChildrenVO(); PurchaseInBodyVO[] bvos = (PurchaseInBodyVO[]) purchaseInVO.getChildrenVO();

2
ic/src/private/nc/bs/ic/m45/sign/rule/PurchaseReceiptRuleMES.java
View File

@ -45,11 +45,13 @@ public class PurchaseReceiptRuleMES implements IRule<PurchaseInVO> {
// 初始化HTTP请求工具类 // 初始化HTTP请求工具类
IHttpPostOtherSys httpPostOtherSys = NCLocator.getInstance().lookup(IHttpPostOtherSys.class); IHttpPostOtherSys httpPostOtherSys = NCLocator.getInstance().lookup(IHttpPostOtherSys.class);
if (purchaseInVOS == null || purchaseInVOS.length == 0) { if (purchaseInVOS == null || purchaseInVOS.length == 0) {
obmlog.debug("AfterSigningSynchronizeRuleMES-没有需要处理的采购收货单");
return; return;
} }
// 检查并筛选组织为电缆的采购收货单 // 检查并筛选组织为电缆的采购收货单
List<PurchaseInVO> filteredPurchaseInVOS = checkAndFilterBills(purchaseInVOS); List<PurchaseInVO> filteredPurchaseInVOS = checkAndFilterBills(purchaseInVOS);
if (filteredPurchaseInVOS.isEmpty()) { if (filteredPurchaseInVOS.isEmpty()) {
obmlog.debug("AfterSigningSynchronizeRuleMES-没有需要处理的需要同步的组织为电缆的采购收货单");
return; return;
} }
// 处理每个采购收货单 // 处理每个采购收货单

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

@ -52,11 +52,13 @@ public class AfterSigningSynchronizeRuleMES implements IRule<SaleOutVO> {
// 初始化HTTP请求工具类 // 初始化HTTP请求工具类
IHttpPostOtherSys httpPostOtherSys = NCLocator.getInstance().lookup(IHttpPostOtherSys.class); IHttpPostOtherSys httpPostOtherSys = NCLocator.getInstance().lookup(IHttpPostOtherSys.class);
if (saleOutVOS == null || saleOutVOS.length == 0) { if (saleOutVOS == null || saleOutVOS.length == 0) {
obmlog.debug("AfterSigningSynchronizeRule-没有需要处理的销售出库单");
return; return;
} }
// 检查并筛选组织为电缆的销售出库单 // 检查并筛选组织为电缆的销售出库单
List<SaleOutVO> filteredSaleOutVOS = checkAndFilterBills(saleOutVOS); List<SaleOutVO> filteredSaleOutVOS = checkAndFilterBills(saleOutVOS);
if (filteredSaleOutVOS.isEmpty()) { if (filteredSaleOutVOS.isEmpty()) {
obmlog.debug("AfterSigningSynchronizeRule-没有需要处理的组织为电缆的需要同步的销售出库单");
return; return;
} }
// 处理每个销售出库单 // 处理每个销售出库单

9
ic/src/private/nc/bs/ic/m4c/sign/rule/SalesDeliveryOrderRuleMES.java
View File

@ -46,11 +46,13 @@ public class SalesDeliveryOrderRuleMES implements IRule<SaleOutVO> {
// 初始化HTTP请求工具类 // 初始化HTTP请求工具类
IHttpPostOtherSys httpPostOtherSys = NCLocator.getInstance().lookup(IHttpPostOtherSys.class); IHttpPostOtherSys httpPostOtherSys = NCLocator.getInstance().lookup(IHttpPostOtherSys.class);
if (saleOutVOS == null || saleOutVOS.length == 0) { if (saleOutVOS == null || saleOutVOS.length == 0) {
obmlog.info("SalesDeliveryOrderRuleMES-没有要进行处理的销售交货单");
return; return;
} }
// 检查并筛选组织为电缆的采购收货单 // 检查并筛选组织为电缆的采购收货单
List<SaleOutVO> filteredSaleOutVOS = checkAndFilterBills(saleOutVOS); List<SaleOutVO> filteredSaleOutVOS = checkAndFilterBills(saleOutVOS);
if (filteredSaleOutVOS.isEmpty()) { if (filteredSaleOutVOS.isEmpty()) {
obmlog.debug("SalesDeliveryOrderRuleMES-没有要进行处理的组织为电缆的需要同步的销售交货单");
return; return;
} }
// 处理每个销售交货单 // 处理每个销售交货单
@ -79,13 +81,6 @@ public class SalesDeliveryOrderRuleMES implements IRule<SaleOutVO> {
*/ */
private JSONObject buildSyncData(SaleOutHeadVO hvo, SaleOutBodyVO[] bvos) throws BusinessException { private JSONObject buildSyncData(SaleOutHeadVO hvo, SaleOutBodyVO[] bvos) throws BusinessException {
obmlog.debug("SalesDeliveryOrderRuleMES-开始处理销售交货单: " + hvo.getVbillcode()); obmlog.debug("SalesDeliveryOrderRuleMES-开始处理销售交货单: " + hvo.getVbillcode());
// 检查组织是否符合条件
// if (!hvo.getPk_org().equals("0001A110000000000677")) {
// obmlog.debug("SalesDeliveryOrderRuleMES-跳过处理销售交货单,因为此单据组织非电缆: " + hvo.getVbillcode());
// return null;
// }
JSONObject requestData = new JSONObject(); JSONObject requestData = new JSONObject();
JSONObject info = new JSONObject(); JSONObject info = new JSONObject();
// 主表数据 - 所有字段处理 // 主表数据 - 所有字段处理

2
ic/src/private/nc/bs/ic/m4r/approve/rule/AfterApprovingSynchronizeRuleMES.java
View File

@ -48,11 +48,13 @@ public class AfterApprovingSynchronizeRuleMES implements IRule<InvCountBillVO> {
// 初始化HTTP请求工具类 // 初始化HTTP请求工具类
IHttpPostOtherSys httpPostOtherSys = NCLocator.getInstance().lookup(IHttpPostOtherSys.class); IHttpPostOtherSys httpPostOtherSys = NCLocator.getInstance().lookup(IHttpPostOtherSys.class);
if (invCountBillVOs == null || invCountBillVOs.length == 0) { if (invCountBillVOs == null || invCountBillVOs.length == 0) {
obmlog.debug("AfterApprovingSynchronizeRule-没有要处理的盘点");
return; return;
} }
// 筛选需要处理的单据 // 筛选需要处理的单据
List<InvCountBillVO> filteredBillVOS = checkAndFilterBills(invCountBillVOs); List<InvCountBillVO> filteredBillVOS = checkAndFilterBills(invCountBillVOs);
if (filteredBillVOS.isEmpty()) { if (filteredBillVOS.isEmpty()) {
obmlog.debug("AfterApprovingSynchronizeRule-没有要处理的组织为电缆的需要同步的盘点");
return; return;
} }
// 处理每个盘点单 // 处理每个盘点单

6
so/src/private/nc/bs/so/m30/rule/approve/AfterApprovingSynchronizeRuleMES.java
View File

@ -26,7 +26,6 @@ import nc.vo.so.m30.entity.SaleOrderVO;
import nc.vo.so.m30.entity.SaleOrderHVO; import nc.vo.so.m30.entity.SaleOrderHVO;
import nc.vo.so.m30.entity.SaleOrderBVO; import nc.vo.so.m30.entity.SaleOrderBVO;
import nc.vo.vorg.DeptVersionVO; import nc.vo.vorg.DeptVersionVO;
import nccloud.bs.sc.scadjust.beforeedit.rule.head.Psndoc;
import nccloud.pubift.commen.itf.utils.IHttpPostOtherSys; import nccloud.pubift.commen.itf.utils.IHttpPostOtherSys;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -53,10 +52,15 @@ public class AfterApprovingSynchronizeRuleMES implements IRule<SaleOrderVO> {
// 初始化HTTP请求工具类 // 初始化HTTP请求工具类
IHttpPostOtherSys httpPostOtherSys = NCLocator.getInstance().lookup(IHttpPostOtherSys.class); IHttpPostOtherSys httpPostOtherSys = NCLocator.getInstance().lookup(IHttpPostOtherSys.class);
if (saleOrderVOs == null || saleOrderVOs.length == 0) { if (saleOrderVOs == null || saleOrderVOs.length == 0) {
obmlog.debug("AfterApprovingSynchronizeRuleMES-没有需要处理的销售订单");
return; return;
} }
// 筛选组织为电缆的销售订单 // 筛选组织为电缆的销售订单
List<SaleOrderVO> filteredSaleOrderVOS = checkAndFilterBills(saleOrderVOs); List<SaleOrderVO> filteredSaleOrderVOS = checkAndFilterBills(saleOrderVOs);
if (filteredSaleOrderVOS.isEmpty()) {
obmlog.debug("AfterApprovingSynchronizeRuleMES-没有需要处理的组织为电缆的需要同步的销售订单");
return;
}
// 处理每个销售订单 // 处理每个销售订单
for (SaleOrderVO saleOrderVO : filteredSaleOrderVOS) { for (SaleOrderVO saleOrderVO : filteredSaleOrderVOS) {
SaleOrderHVO head = saleOrderVO.getParentVO(); SaleOrderHVO head = saleOrderVO.getParentVO();