|
@@ -2,10 +2,10 @@ package u8c.bs.mmpac.bp;
|
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
|
+import nc.bs.framework.common.InvocationInfoProxy;
|
|
|
import nc.bs.framework.common.NCLocator;
|
|
|
import nc.itf.uap.IUAPQueryBS;
|
|
|
import nc.itf.uap.bd.def.IDefdoc;
|
|
|
-import nc.itf.uap.bd.item.IJobmanagedoc;
|
|
|
import nc.jdbc.framework.processor.ColumnProcessor;
|
|
|
import nc.jdbc.framework.processor.MapProcessor;
|
|
|
import nc.vo.bd.def.DefdocVO;
|
|
@@ -25,6 +25,7 @@ public class SpecialDataRule implements IRule<ExAggOrderMainVO>{
|
|
|
private IUAPQueryBS iuap = NCLocator.getInstance().lookup(IUAPQueryBS.class);
|
|
|
@Override
|
|
|
public void process(ExAggOrderMainVO[] vos) throws BusinessException {
|
|
|
+ String w = InvocationInfoProxy.getInstance().getLangCode();
|
|
|
for(int i = 0; i < vos.length; i++) {
|
|
|
OrderMainVO headvo = (OrderMainVO) vos[i].getParentVO();
|
|
|
Map<String,String> JobbasfilMap = getJobbasfil(headvo.getProjectid());
|
|
@@ -50,6 +51,8 @@ public class SpecialDataRule implements IRule<ExAggOrderMainVO>{
|
|
|
orderInVO.setModel(invbasdocMap.get("invtype"));
|
|
|
//计量单位
|
|
|
orderInVO.setUnitid(invbasdocMap.get("measname"));
|
|
|
+ //辅单位
|
|
|
+ orderInVO.setCastunitid(invbasdocMap.get("measnames"));
|
|
|
disposeDefdoc("YS(颜色)", orderInVO.getColor());
|
|
|
disposeDefdoc("DC(定尺)", orderInVO.getSizing());
|
|
|
}
|
|
@@ -78,10 +81,13 @@ public class SpecialDataRule implements IRule<ExAggOrderMainVO>{
|
|
|
sql.append(" bd_invbasdoc.invname as invname,");
|
|
|
sql.append(" bd_invbasdoc.invspec as invspec,");
|
|
|
sql.append(" bd_invbasdoc.invtype as invtype,");
|
|
|
- sql.append(" bd_measdoc.measname as measname");
|
|
|
+ sql.append(" bd_measdoc.measname as measname,");
|
|
|
+ sql.append(" bd_measdocs.measname as measnames");
|
|
|
sql.append(" FROM");
|
|
|
sql.append(" bd_invbasdoc bd_invbasdoc");
|
|
|
sql.append(" left join bd_measdoc bd_measdoc on bd_invbasdoc.pk_measdoc = bd_measdoc.pk_measdoc");
|
|
|
+ sql.append(" left join bd_convert bd_convert on bd_invbasdoc.pk_invbasdoc = bd_convert.pk_invbasdoc");
|
|
|
+ sql.append(" left join bd_measdoc bd_measdocs on bd_convert.pk_measdoc = bd_measdocs.pk_measdoc");
|
|
|
sql.append(" WHERE");
|
|
|
sql.append(" bd_invbasdoc.invcode = '"+code+"'");
|
|
|
sql.append(" and bd_invbasdoc.dr = 0");
|
|
@@ -108,7 +114,7 @@ public class SpecialDataRule implements IRule<ExAggOrderMainVO>{
|
|
|
//无数据新增档案
|
|
|
if (pk_defdoc == null) {
|
|
|
DefdocVO defdocVO = new DefdocVO();
|
|
|
- //公司
|
|
|
+ //公司
|
|
|
defdocVO.setPk_corp("0001");
|
|
|
//档案编码
|
|
|
defdocVO.setDoccode(docname);
|