自由项循序

mmpac/mmpac/src/client/u8c/ui/mmpac/action/PushOtherInAction.java

@@ -55,7 +55,6 @@ public class PushOtherInAction extends AbstractAction{
 				throw new ValidationException("非审批态单据不允许生成其他入库单");
 			}
 			
-			
 			String pk_corp = headvo.getPk_corp();
 			String pk_order = headvo.getPk_order();
 			String prjcode = headvo.getProjectid();//项目主键
@@ -140,7 +139,7 @@ public class PushOtherInAction extends AbstractAction{
 					itemvo.setBtransasset(UFBoolean.FALSE);
 					itemvo.setBzgflag(UFBoolean.FALSE);
 					itemvo.setCbodybilltypecode("4A");
-					//itemvo.setCbodywarehouseid("1001V5100000000003A1");
+		//			itemvo.setCbodywarehouseid("1001V5100000000003A1");
 					//仓库ID
 					if("工装".equals(billtype)) {
 						icheadvo.setCwarehouseid(GetBaseDAOUtil.getstordocpk("GZ001"));//仓库必填
@@ -167,16 +166,18 @@ public class PushOtherInAction extends AbstractAction{
 					itemvo.setNinassistnum (invo.getNastnum());//实入辅数量
 					itemvo.setNshouldinnum(invo.getNum());//应入数量
 					itemvo.setNneedinassistnum(invo.getNastnum());//应入辅数量
-					itemvo.setCastunitid(invo.getCastunitid());//辅计量单位ID 
+					String pkdw=getpkmeasdoc(invo.getCastunitid());
+					itemvo.setCastunitid(pkdw);//辅计量单位ID 
 					itemvo.setHsl(new UFDouble(invo.getBdef6()));//换算率
 					itemvo.setAttributeValue("processcost", invo.getNmny());
 					itemvo.setPk_calbody(icheadvo.getPk_calbody());
-					itemvo.setVbatchcode(invo.getVbatchcode()==null?"":invo.getVbatchcode());
+					String vbatcode=invo.getVbatchcode()==null?"":invo.getVbatchcode();
+					itemvo.setVbatchcode(vbatcode);
 					itemvo.setVfirstbillcode(headvo.getVbillno());
-					itemvo.setVfree1(invo.getColor());
-					itemvo.setVfree2(invo.getSizing());
-					itemvo.setVfree3(invo.getAlloy());
-					itemvo.setVfree4(invo.getStandard());
+					itemvo.setVfree1(invo.getColor());//颜色
+					itemvo.setVfree2(invo.getAlloy());//合金
+					itemvo.setVfree3(invo.getSizing());//定尺
+					itemvo.setVfree4(invo.getStandard());//标准
 					itemvo.setVsourcebillcode(headvo.getVbillno());
 					itemvo.setAttributeValue("pk_defdoc1", invo.getBdef11());//楼号楼层
 					itemvo.setAttributeValue("pk_defdoc2", invo.getBdef12());//樘数（数量）
@@ -288,5 +289,17 @@ public class PushOtherInAction extends AbstractAction{
       return pk_rdcl;
 		
 	}
+	 
+	 //计量单位
+	 private String getpkmeasdoc(String measname ) throws BusinessException {
+	    String sql="select pk_measdoc from bd_measdoc where measname='"+measname+"'  ";
+	    IUAPQueryBS iuap=(IUAPQueryBS) NCLocator.getInstance().lookup(IUAPQueryBS.class.getName());
+	    String pk_measdoc = (String) iuap.executeQuery(sql, new ColumnProcessor());
+        if (pk_measdoc == null) {
+          return "";
+        }
+        return pk_measdoc;
+		
+	}
 		
 }

mmpac/mmpac/src/client/u8c/ui/mmpac/action/PushOtherOutAction.java

@@ -149,9 +149,9 @@ public class PushOtherOutAction extends AbstractAction{
 					itemvo.setCfirstbillhid(pk_order);
 					itemvo.setCfirstbillbid(outvo.getPrimaryKey());
 					itemvo.setCfirsttype("55A2");
-					itemvo.setCinvbasid(pk_invbasdoc);
-					itemvo.setCinventoryid(pk_invmandoc);
-					icheadvo.setCinventoryid(pk_invmandoc);
+					itemvo.setCinvbasid(pk_invbasdoc);//存货基本ID 
+					itemvo.setCinventoryid(pk_invmandoc);//存货ID 
+	//				icheadvo.setCinventoryid(pk_invmandoc);
 					itemvo.setCrowno(Integer.toString((i+1)*10));
 					itemvo.setCsourcebillhid(pk_order);
 					itemvo.setCsourcebillbid(outvo.getPrimaryKey());
@@ -167,7 +167,7 @@ public class PushOtherOutAction extends AbstractAction{
 					itemvo.setNshouldoutnum(outvo.getNum());//应出数量
 					itemvo.setHsl(new UFDouble(outvo.getBdef6()));//换算率	
 					itemvo.setNoutassistnum(outvo.getNastnum());//实出辅数量
-					itemvo.setNshouldoutassistnum(outvo.getNastnum());//应入辅数量 
+					itemvo.setNshouldoutassistnum(outvo.getNastnum());//应出辅数量
 					
 					String castunitid=getpk(outvo.getCastunitid()==null?"":outvo.getCastunitid().toString());
 					itemvo.setCastunitid(castunitid);//辅计量单位ID 
@@ -176,10 +176,10 @@ public class PushOtherOutAction extends AbstractAction{
 					itemvo.setPk_calbody(icheadvo.getPk_calbody());
 					itemvo.setVbatchcode(outvo.getVbatchcode()==null?"":outvo.getVbatchcode());
 					itemvo.setVfirstbillcode(headvo.getVbillno());
-					itemvo.setVfree1(outvo.getColor());
-					itemvo.setVfree2(outvo.getSizing());
-					itemvo.setVfree3(outvo.getAlloy());
-					itemvo.setVfree4(outvo.getStandard());
+					itemvo.setVfree1(outvo.getColor());//颜色
+					itemvo.setVfree2(outvo.getAlloy());//合金
+					itemvo.setVfree3(outvo.getSizing());//定尺
+					itemvo.setVfree4(outvo.getStandard());//标准
 					itemvo.setVsourcebillcode(headvo.getVbillno());
 					itemvo.setAttributeValue("pk_defdoc1", outvo.getBdef11());//楼号楼层
 					itemvo.setAttributeValue("pk_defdoc2", outvo.getBdef12());//樘数（数量）

mmpac/mmpac/src/client/u8c/ui/mmpac/action/TOProductOutDialog.java

@@ -504,10 +504,10 @@ public class TOProductOutDialog extends UIDialog implements ActionListener,BillE
 						itemvo.setVsourcebillcode(headvo.getVbillno());
 						itemvo.setStatus(2);
 						listGeneralBillItemVO.add(itemvo);
-						itemvo.setVfree1(vector.get(12) == null ? null : vector.get(12).toString());
-						itemvo.setVfree2(vector.get(13) == null ? null : vector.get(13).toString());
-						itemvo.setVfree3(vector.get(14) == null ? null : vector.get(14).toString());
-						itemvo.setVfree4(vector.get(15) == null ? null : vector.get(15).toString());
+						itemvo.setVfree1(vector.get(12) == null ? null : vector.get(12).toString());//颜色
+						itemvo.setVfree2(vector.get(13) == null ? null : vector.get(14).toString());//合金
+						itemvo.setVfree3(vector.get(14) == null ? null : vector.get(13).toString());//定尺
+						itemvo.setVfree4(vector.get(15) == null ? null : vector.get(15).toString());//标准
 						UFDouble updatenum =  new UFDouble(vector.get(30)==null?"0":vector.get(30).toString()).add(new UFDouble(vector.get(1)==null?"0":vector.get(1).toString()));
 						updatemap.put(vector.get(34).toString(), updatenum);
 					}

mmpac/mmpac/src/client/u8c/ui/mmpac/action/ToSaleOutDialog.java

@@ -446,7 +446,7 @@ public class ToSaleOutDialog extends UIDialog implements ActionListener,BillEdit
 				icheadvo.setPk_cubasdocC(def1);//客户基本档案
 				icheadvo.setFbillflag(2);
 				icheadvo.setCoperatoridnow(PubEnv.getPk_user());//设置当前操作人
-				icheadvo.setAttributeValue("pk_defdoc1", vectors.get(0).get(2)==null?"":vectors.get(0).get(2).toString());//开票类型
+	//			icheadvo.setAttributeValue("pk_defdoc1", vectors.get(0).get(2)==null?"":vectors.get(0).get(2).toString());//开票类型
 				aggvo.setParentVO(icheadvo);
 				GeneralBillItemVO[] itemvos = new GeneralBillItemVO[execsize];
 				Map<String, UFDouble> updatemap = new HashMap<>();
@@ -530,10 +530,12 @@ public class ToSaleOutDialog extends UIDialog implements ActionListener,BillEdit
 						itemvo.setAttributeValue("pk_corp", pk_corp);
 						itemvo.setVbatchcode(vector.get(7)==null?"":vector.get(7).toString());
 						itemvo.setVfirstbillcode(headvo.getVbillno());
-						itemvo.setVfree1(vector.get(12)==null?null:vector.get(12).toString());
-						itemvo.setVfree2(vector.get(14)==null?null:vector.get(14).toString());
-						itemvo.setVfree3(vector.get(13)==null?null:vector.get(13).toString());
-						itemvo.setVfree4(vector.get(15)==null?null:vector.get(15).toString());
+						
+						itemvo.setVfree1(vector.get(12)==null?null:vector.get(12).toString());//颜色
+						itemvo.setVfree2(vector.get(14)==null?null:vector.get(14).toString());//合金
+						itemvo.setVfree3(vector.get(13)==null?null:vector.get(13).toString());//定尺
+						itemvo.setVfree4(vector.get(15)==null?null:vector.get(15).toString());//标准
+						
 						itemvo.setAttributeValue("cquoteunitid", GetBaseDAOUtil.getMeasidByName(vector.get(21).toString()));//报价计量单位
 						itemvo.setAttributeValue("cquotecurrency", "00010000000000000001");//报价币种
 						itemvo.setVsourcebillcode(headvo.getVbillno());
@@ -551,6 +553,7 @@ public class ToSaleOutDialog extends UIDialog implements ActionListener,BillEdit
 						itemvo.setAttributeValue("pk_defdoc12",vector.get(20)==null?null:vector.get(20).toString());//高度
 						itemvo.setAttributeValue("pk_defdoc13",vector.get(47)==null?null:vector.get(47).toString());//系列
 						itemvo.setAttributeValue("pk_defdoc14",vector.get(48)==null?null:vector.get(48).toString());//玻璃编号
+						itemvo.setAttributeValue("pk_defdoc20",vector.get(2)==null?null:vector.get(2).toString());//开票类型
 						//回写数量
 						UFDouble updatenum =  new UFDouble(vector.get(30)==null?"0":vector.get(30).toString()).add(new UFDouble(vector.get(1)==null?"0":vector.get(1).toString()));
 						updatemap.put(vector.get(34).toString(), updatenum);