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

优化

This commit is contained in:
lihao 2025-08-21 16:40:34 +08:00
parent 117812ed26
commit 5596bef445
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,18 +198,31 @@ public class PickmToBuyingreqAction implements ICommonAction {
// PR=采购件; // PR=采购件;
if(null != bomcode && "2".equals(bomcode) ){ if(null != bomcode && "2".equals(bomcode) ){
sql = " select martype from bd_materialstock where pk_material='" + child.getCbmaterialvid() + "' and pk_org='"+child.getPk_org()+"' and dr=0"; // sql = " select martype from bd_materialstock where pk_material='" + child.getCbmaterialvid() + "' and pk_org='"+child.getPk_org()+"' and dr=0";
String matType = (String) dao.executeQuery(sql, new ColumnProcessor()); // String matType = (String) dao.executeQuery(sql, new ColumnProcessor());
if(null == matType || "PR".equals(matType) || "".equals(matType)){ // if(null == matType || "MR".equals(matType) || "".equals(matType)){
continue; // continue;
} // }
}else if(null != bomcode && "1".equals(bomcode)){ }else if(null != bomcode && "1".equals(bomcode)){
continue; continue;
}else{ }else{
sql = " select martype from bd_materialstock where pk_material='" + child.getCbmaterialvid() + "' and pk_org='"+child.getPk_org()+"' and dr=0";
String matType = (String) dao.executeQuery(sql, new ColumnProcessor());
if(null == matType || "MR".equals(matType) || "".equals(matType)){
continue;
}
}
}else {
String sql="SELECT\n" +
"\n" +
" bd_defdoc.code \n" +
"FROM\n" +
" bd_defdoc where bd_defdoc.bd_defdoc.pk_defdoc='" + materalType + "'";
BaseDAO dao = new BaseDAO();
String bomcode = (String) dao.executeQuery(sql, new ColumnProcessor());
if(null == bomcode || "1".equals(bomcode) || "".equals(bomcode) ){
continue; continue;
} }
}else if("2".equals(materalType)){
continue;
} }
//只合并项目专用料数据 //只合并项目专用料数据
if(child.getBprojectmaterial().booleanValue()){ if(child.getBprojectmaterial().booleanValue()){

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

@ -245,13 +245,15 @@ public class PickmToPmo implements ICommonAction {
// PR=²É¹º¼þ; // PR=²É¹º¼þ;
if(null != bomcode && "1".equals(bomcode) ){ if(null != bomcode && "1".equals(bomcode) ){
}else if(null != bomcode && "2".equals(bomcode)){
continue;
}else{
sql = " select martype from bd_materialstock where pk_material='" + child.getCbmaterialvid() + "' and pk_org='"+child.getPk_org()+"' and dr=0"; sql = " select martype from bd_materialstock where pk_material='" + child.getCbmaterialvid() + "' and pk_org='"+child.getPk_org()+"' and dr=0";
String matType = (String) dao.executeQuery(sql, new ColumnProcessor()); String matType = (String) dao.executeQuery(sql, new ColumnProcessor());
if(null == matType || "PR".equals(matType) || "".equals(matType)){ if(null == matType || "PR".equals(matType) || "".equals(matType)){
continue; continue;
} }
}else if(null != bomcode && "2".equals(bomcode)){
continue;
} }
}else { }else {
String sql="SELECT\n" + String sql="SELECT\n" +