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

Compare commits

base: yonyou:b1a623162e68697dc53225b54771cc047b8197cd
Branches Tags
yonyou:main
yonyou:dev
...
compare: yonyou:51d55b9d18c0ee108a03e4f3517bf3884b4c1e63
Branches Tags
yonyou:main
yonyou:dev

2 Commits
b1a623162e ... 51d55b9d18

Author SHA1 Message Date
lihao 51d55b9d18 Merge remote-tracking branch 'origin/main' 2025-09-11 08:42:39 +08:00
lihao 7df29da4d8 备料计划下达请购生产 2025-09-11 08:42:23 +08:00
4 changed files with 25 additions and 8 deletions
Show Stats Expand all files Collapse all files

4
mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToBuyingreqAction.java
View File

@ -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;

4
mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToPmo.java
View File

@ -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;

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

@ -83,7 +83,7 @@ public class WithUpdatePickmRule implements IRule<PMOAggVO> {
} 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);

23
pu/src/private/nc/bs/pu/m20/maintain/rule/delete/UpdatePickmRule.java
View File

@ -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<PraybillVO> {
}
}
private void updetaPmo(List<String> arrayList) throws DAOException {
private void updetaPmo(List<String> 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<PraybillVO> {
} 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<Map<String, Object>> updateList) throws DAOException {
private void updetaPmoNum(List<Map<String, Object>> updateList) throws DAOException, UifException {
BaseDAO dao = new BaseDAO();
for (Map<String, Object> 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);