diff --git a/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToGeneralInAction.java b/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToGeneralInAction.java index 360d01d..1adf1bc 100644 --- a/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToGeneralInAction.java +++ b/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToGeneralInAction.java @@ -10,6 +10,7 @@ import nc.jdbc.framework.processor.ColumnProcessor; import nc.pubitf.para.SysInitQuery; import nc.util.mmf.busi.service.PFPubService; import nc.util.mmf.framework.base.MMValueCheck; +import nc.vo.bc.pmpub.project.ProjectHeadVO; import nc.vo.bd.stordoc.StordocVO; import nc.vo.fi.pub.SqlUtils; import nc.vo.ic.m4a.entity.GeneralInBodyVO; @@ -154,19 +155,20 @@ public class PickmToGeneralInAction implements ICommonAction { head.setCtrantypeid(pk_billtypeid); head.setVtrantypecode(typeCode); head.setCwarehouseid(warehouseId); - /*GeneralInBodyVO[] bodys = inVO.getBodys(); + GeneralInBodyVO[] bodys = inVO.getBodys(); if (bodys != null) { for (GeneralInBodyVO body : bodys) { - String cpickmId=body.getCunitid(); + String csourcebillhid = body.getCsourcebillhid(); IPickmQueryService service = ServiceLocator.find(IPickmQueryService.class); - AggPickmVO[] vos = service.queryBillsByPks(new String[]{cpickmId}); - if (vos != null && vos.length > 0) { - HYPubBO hybo = new HYPubBO(); - Object cmaterialvidDef261 = hybo.findColValue("bd_material", "def26", "pk_material = '"+vos[0].getParentVO().getCmaterialvid()+"' "); - body.setVnotebody((String) cmaterialvidDef261); - } + AggPickmVO[] vos = service.queryBillsByPks(new String[]{csourcebillhid}); + if (vos != null && vos.length > 0) { + HYPubBO hybo = new HYPubBO(); + String cprojectid = vos[0].getParentVO().getCprojectid(); + String projectName = (String) hybo.findColValue(ProjectHeadVO.getDefaultTableName(), ProjectHeadVO.PROJECT_NAME, "pk_project = '" + cprojectid + "' "); + body.setVnotebody(projectName); + } } - }*/ + } } return inVOS; }