From 7df29da4d8425af30c055a55f1cc96113f24b128 Mon Sep 17 00:00:00 2001 From: lihao Date: Thu, 11 Sep 2025 08:42:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92=E4=B8=8B?= =?UTF-8?q?=E8=BE=BE=E8=AF=B7=E8=B4=AD=E7=94=9F=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pickm/action/PickmToBuyingreqAction.java | 4 ++-- .../web/mmpac/pickm/action/PickmToPmo.java | 4 ++-- .../pac0002/bp/rule/WithUpdatePickmRule.java | 2 +- .../maintain/rule/delete/UpdatePickmRule.java | 23 ++++++++++++++++--- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToBuyingreqAction.java b/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToBuyingreqAction.java index 095b19b..d056fa8 100644 --- a/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToBuyingreqAction.java +++ b/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToBuyingreqAction.java @@ -182,7 +182,7 @@ public class PickmToBuyingreqAction implements ICommonAction { } else { result = "'" + (String) arrayList.get(0) + "'"; } - String sql = " update mm_pickm_b set vbdef13='Y' where mm_pickm_b.cpickm_bid in(" + result + ")"; + String sql = " update mm_pickm_b set vbdef30='Y' where mm_pickm_b.cpickm_bid in(" + result + ")"; BaseDAO dao = new BaseDAO(); dao.executeUpdate(sql); @@ -209,7 +209,7 @@ public class PickmToBuyingreqAction implements ICommonAction { if (items != null) { for (PickmItemVO child : items) { // 未下达子表 切 若物料类型为“采购件”，则备料计划中所有采购件生成一张请购单 - if(null != child.getVbdef13() && child.getVbdef13().equals("Y") ){ + if(null != child.getAttributeValue("vbdef30") && child.getAttributeValue("vbdef30").equals("Y") ){ // 如果已经下达数量 大于等于 需要下达数量 则不可继续下达 if(null==child.getVbdef16() || (new UFDouble(child.getVbdef16()).compareTo(child.getNplanoutnum().sub(null!=child.getNaccoutastnum() ?child.getNaccoutastnum():UFDouble.ZERO_DBL)) >=0)){ continue; diff --git a/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToPmo.java b/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToPmo.java index 1cd251e..b755903 100644 --- a/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToPmo.java +++ b/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToPmo.java @@ -137,7 +137,7 @@ public class PickmToPmo implements ICommonAction { } else { result = "'" + (String) arrayList.get(0) + "'"; } - String sql = " update mm_pickm_b set vbdef13='Y' where mm_pickm_b.cpickm_bid in(" + result + ")"; + String sql = " update mm_pickm_b set vbdef30='Y' where mm_pickm_b.cpickm_bid in(" + result + ")"; BaseDAO dao = new BaseDAO(); dao.executeUpdate(sql); @@ -251,7 +251,7 @@ public class PickmToPmo implements ICommonAction { for (PickmItemVO child : items) { // 未下达子表 切 若物料类型为“制造件”，则备料计划中所有制造件件生成一张开立状态的流程生产订单 - if(null != child.getVbdef13() && child.getVbdef13().equals("Y") ){ + if(null != child.getAttributeValue("vbdef30") && child.getAttributeValue("vbdef30").equals("Y") ){ // continue; if(null==child.getVbdef16() || (new UFDouble(child.getVbdef16()).compareTo(child.getNplanoutnum().sub(null!=child.getNaccoutastnum() ?child.getNaccoutastnum():UFDouble.ZERO_DBL)) >=0)){ continue; diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/WithUpdatePickmRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/WithUpdatePickmRule.java index 52fe97c..945447c 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/WithUpdatePickmRule.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/WithUpdatePickmRule.java @@ -83,7 +83,7 @@ public class WithUpdatePickmRule implements IRule { } else { result = "'" + (String) arrayList.get(0) + "'"; } - String sql = " update mm_pickm_b set vbdef13='N' where mm_pickm_b.cpickm_bid in(" + result + ") and mm_pickm_b.vbdef16='0' "; + String sql = " update mm_pickm_b set vbdef30='N' where mm_pickm_b.cpickm_bid in(" + result + ") and mm_pickm_b.vbdef16='0' "; BaseDAO dao = new BaseDAO(); dao.executeUpdate(sql); diff --git a/pu/src/private/nc/bs/pu/m20/maintain/rule/delete/UpdatePickmRule.java b/pu/src/private/nc/bs/pu/m20/maintain/rule/delete/UpdatePickmRule.java index 4092075..78afc2c 100644 --- a/pu/src/private/nc/bs/pu/m20/maintain/rule/delete/UpdatePickmRule.java +++ b/pu/src/private/nc/bs/pu/m20/maintain/rule/delete/UpdatePickmRule.java @@ -9,7 +9,9 @@ import nc.bs.businessevent.BusinessEvent; import nc.bs.businessevent.EventDispatcher; import nc.bs.dao.BaseDAO; import nc.bs.dao.DAOException; +import nc.bs.trade.business.HYPubBO; import nc.impl.pubapp.pattern.rule.IRule; +import nc.uif.pub.exception.UifException; import nc.vo.pu.m20.entity.PraybillItemVO; import nc.vo.pu.m20.entity.PraybillVO; import nc.vo.pu.pub.constant.PUMDValue; @@ -68,13 +70,20 @@ public class UpdatePickmRule implements IRule { } } - private void updetaPmo(List arrayList) throws DAOException { + private void updetaPmo(List arrayList) throws DAOException, UifException { String result = ""; + HYPubBO hy = new HYPubBO(); StringBuilder sb = new StringBuilder(); if (arrayList.size() > 1) { for (int i = 0; i < arrayList.size(); i++) { +// OrgVO orgvo = (OrgVO)hy.queryByPrimaryKey(OrgVO.class, ); + + Object cpickm_bid = hy.findColValue("mm_pickm_b", "cpickmid", "cpickm_bid = '"+arrayList.get(i)+"' "); + if(null == cpickm_bid){ + continue; + } sb.append("'").append(arrayList.get(i)).append("'"); if (i < arrayList.size() - 1) { sb.append(","); @@ -85,14 +94,22 @@ public class UpdatePickmRule implements IRule { } else { result = "'" + (String) arrayList.get(0) + "'"; } - String sql = " update mm_pickm_b set vbdef13='N' where mm_pickm_b.cpickm_bid in(" + result + ") and mm_pickm_b.vbdef16='0' "; + String sql = " update mm_pickm_b set vbdef30='N' where mm_pickm_b.cpickm_bid in(" + result + ") and mm_pickm_b.vbdef16='0' "; BaseDAO dao = new BaseDAO(); dao.executeUpdate(sql); } - private void updetaPmoNum(List> updateList) throws DAOException { + private void updetaPmoNum(List> updateList) throws DAOException, UifException { BaseDAO dao = new BaseDAO(); for (Map updateMap : updateList) { + HYPubBO hy = new HYPubBO(); +// OrgVO orgvo = (OrgVO)hy.queryByPrimaryKey(OrgVO.class, ); + + Object cpickm_bid = hy.findColValue("mm_pickm_b", "cpickmid", "cpickm_bid = '"+updateMap.get("pk")+"' "); + if(null == cpickm_bid){ + continue; + } + String sql = " update mm_pickm_b set vbdef16 = TO_CHAR(TO_NUMBER(vbdef16) -TO_NUMBER('"+((UFDouble)updateMap.get("num")).toString()+"')) where mm_pickm_b.cpickm_bid ='" + updateMap.get("pk") + "'"; dao.executeUpdate(sql);