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

Merge remote-tracking branch 'origin/main'

This commit is contained in:
mzr 2025-09-17 10:53:25 +08:00
parent 0c44a83335 149d810332
commit 51fbed7ed5
2 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,13 +53,15 @@ public class PickmToBuyingreqAction implements ICommonAction {
PickmQueryInfoDTO paramDTO = json.fromJson(read, PickmQueryInfoDTO.class); PickmQueryInfoDTO paramDTO = json.fromJson(read, PickmQueryInfoDTO.class);
// »ñÈ¡Ö÷¼ü // »ñÈ¡Ö÷¼ü
String[] cpickmids = paramDTO.getCpickmids(); String[] cpickmids = paramDTO.getCpickmids();
// String[] cpickmbids = paramDTO.getCpickmbids(); String[] cpickmbids = paramDTO.getCpickmbids();
// if (MMValueCheck.isEmpty(cpickmids) && (null == cpickmbids || cpickmbids.length == 0)) { // if (MMValueCheck.isEmpty(cpickmids) && (null == cpickmbids || cpickmbids.length == 0)) {
// return null; // return null;
// } // }
AggPickmVO[] aggVOs = null; AggPickmVO[] aggVOs = null;
IPickmQueryService service = ServiceLocator.find(IPickmQueryService.class); IPickmQueryService service = ServiceLocator.find(IPickmQueryService.class);
if (MMValueCheck.isNotEmpty(cpickmids)) { if (MMValueCheck.isNotEmpty(cpickmbids)) {
aggVOs = service.queryAggPickmVObyBid(cpickmbids);
} else if (MMValueCheck.isNotEmpty(cpickmids)) {
aggVOs = service.queryBillsByPks(cpickmids); aggVOs = service.queryBillsByPks(cpickmids);
} }
if (MMValueCheck.isEmpty(aggVOs)) { if (MMValueCheck.isEmpty(aggVOs)) {

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

@ -47,13 +47,15 @@ public class PickmToPmo implements ICommonAction {
PickmQueryInfoDTO paramDTO = json.fromJson(read, PickmQueryInfoDTO.class); PickmQueryInfoDTO paramDTO = json.fromJson(read, PickmQueryInfoDTO.class);
// »ñÈ¡Ö÷¼ü // »ñÈ¡Ö÷¼ü
String[] cpickmids = paramDTO.getCpickmids(); String[] cpickmids = paramDTO.getCpickmids();
// String[] cpickmbids = paramDTO.getCpickmbids(); String[] cpickmbids = paramDTO.getCpickmbids();
// if (MMValueCheck.isEmpty(cpickmids) && (null == cpickmbids || cpickmbids.length == 0)) { // if (MMValueCheck.isEmpty(cpickmids) && (null == cpickmbids || cpickmbids.length == 0)) {
// return null; // return null;
// } // }
AggPickmVO[] aggVOs = null; AggPickmVO[] aggVOs = null;
IPickmQueryService service = ServiceLocator.find(IPickmQueryService.class); IPickmQueryService service = ServiceLocator.find(IPickmQueryService.class);
if (MMValueCheck.isNotEmpty(cpickmids)) { if (MMValueCheck.isNotEmpty(cpickmbids)) {
aggVOs = service.queryAggPickmVObyBid(cpickmbids);
} else if (MMValueCheck.isNotEmpty(cpickmids)) {
aggVOs = service.queryBillsByPks(cpickmids); aggVOs = service.queryBillsByPks(cpickmids);
} }
if (MMValueCheck.isEmpty(aggVOs)) { if (MMValueCheck.isEmpty(aggVOs)) {
@ -169,21 +171,39 @@ public class PickmToPmo implements ICommonAction {
for (PMOItemVO itemVO: inVO.getChildrenVO()){ for (PMOItemVO itemVO: inVO.getChildrenVO()){
// itemVO.setTplanendtime(); // itemVO.setTplanendtime();
for(AggPickmVO aggPickmVO:sourceBillVOs){ for(AggPickmVO aggPickmVO:sourceBillVOs){
if(itemVO.getVsrcid().equals(aggPickmVO.getParentVO().getCpickmid())){ // if(itemVO.getVsrcid().equals(aggPickmVO.getParentVO().getCpickmid())){
String[] ids = new String[1];
ids[0] = aggPickmVO.getParentVO().getVfirstmoid();
PMOAggVO[] rvo = query.queryByPks(ids); if(null!=aggPickmVO.getParentVO().getVfirstbilltype() &&aggPickmVO.getParentVO().getVfirstbilltype().equals("55A2") ){
if(null == rvo || rvo.length == 0){ String[] ids = new String[1];
continue; ids[0] = aggPickmVO.getParentVO().getVfirstmoid();
}
for (PMOItemVO ritem: rvo[0].getChildrenVO()){
if(ritem.getVrowno().equals(aggPickmVO.getParentVO().getVfirstbillrowno())){
itemVO.setTplanendtime(ritem.getTplanendtime());
PMOAggVO[] rvo = query.queryByPks(ids);
if(null == rvo || rvo.length == 0){
continue;
}
for (PMOItemVO ritem: rvo[0].getChildrenVO()){
if(ritem.getVrowno().equals(aggPickmVO.getParentVO().getVfirstbillrowno())){
itemVO.setTplanendtime(ritem.getTplanendtime());
}
} }
} }
}
if(null!=aggPickmVO.getParentVO().getVsourcebilltype() &&aggPickmVO.getParentVO().getVsourcebilltype().equals("55A2") ){
String[] ids = new String[1];
ids[0] = aggPickmVO.getParentVO().getVsourcemoid();
PMOAggVO[] rvo = query.queryByPks(ids);
if(null == rvo || rvo.length == 0){
continue;
}
for (PMOItemVO ritem: rvo[0].getChildrenVO()){
if(ritem.getVrowno().equals(aggPickmVO.getParentVO().getVsourcebillrowno())){
itemVO.setTplanendtime(ritem.getTplanendtime());
}
}
}
// }
} }
if(null !=itemVO.getCprojectid() && null!=itemVO.getCmaterialvid()){ if(null !=itemVO.getCprojectid() && null!=itemVO.getCmaterialvid()){