Merge branch 'master' of http://139.196.39.194:9021/pancy/menchuang.git

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

@@ -70,13 +70,13 @@ public class PushOtherInAction extends AbstractAction{
 				icheadvo.setPk_calbody(GetBaseDAOUtil.getcalpk(pk_corp));
 				icheadvo.setDbilldate(PubEnv.getServerDate());
 				icheadvo.setCoperatorid(PubEnv.getPk_user());
+				//收发类别
+				icheadvo.setCdispatcherid(getpkrdcl("06"));
 				//仓库ID
 				if("工装".equals(billtype)) {
-				//	icheadvo.setCwarehouseid("1001V51000000000039Z");//仓库必填
-					icheadvo.setCwarehouseid("1001F81000000000025M");//仓库必填新环境
+					icheadvo.setCwarehouseid(GetBaseDAOUtil.getstordocpk("GZ001"));//仓库必填
 				}else if("家装".equals(billtype)) {
-				//	icheadvo.setCwarehouseid("1001V5100000000003A0");//仓库必填
-					icheadvo.setCwarehouseid("1001F810000000000DW1");//仓库必填新环境
+					icheadvo.setCwarehouseid(GetBaseDAOUtil.getstordocpk("JZ002"));//仓库必填
 				}
 				icheadvo.setBoutretflag(UFBoolean.FALSE);//是否退回 
 				icheadvo.setBsalecooppur(UFBoolean.FALSE); // 销售出是否已协同生成采购入 
@@ -90,7 +90,7 @@ public class PushOtherInAction extends AbstractAction{
 				icheadvo.setAttributeValue("pk_defdoc9", prjcode);
 				//项目名称pk_defdoc10
 				icheadvo.setAttributeValue("pk_defdoc10", prjcode);
-				//加工单号pk_defdoc2
+				//加工单号pk_defdoc1
 				icheadvo.setAttributeValue("pk_defdoc2", headvo.getDef1());
 				//收发类别
 				icheadvo.setCdispatcherid(getpkrdcl("06"));
@@ -141,12 +141,11 @@ public class PushOtherInAction extends AbstractAction{
 					itemvo.setBzgflag(UFBoolean.FALSE);
 					itemvo.setCbodybilltypecode("4A");
 					//itemvo.setCbodywarehouseid("1001V5100000000003A1");
+					//仓库ID
 					if("工装".equals(billtype)) {
-					//	icheadvo.setCwarehouseid("1001V51000000000039Z");//仓库必填
-						icheadvo.setCwarehouseid("1001F81000000000025M");//仓库必填新环境
+						icheadvo.setCwarehouseid(GetBaseDAOUtil.getstordocpk("GZ001"));//仓库必填
 					}else if("家装".equals(billtype)) {
-					//	icheadvo.setCwarehouseid("1001V5100000000003A0");//仓库必填
-						icheadvo.setCwarehouseid("1001F810000000000DW1");//仓库必填新环境
+						icheadvo.setCwarehouseid(GetBaseDAOUtil.getstordocpk("JZ002"));//仓库必填
 					}
 					itemvo.setCfirstbillhid(pk_order);
 					itemvo.setCfirstbillbid(invo.getPrimaryKey());
@@ -164,13 +163,11 @@ public class PushOtherInAction extends AbstractAction{
 					itemvo.setFlargess(UFBoolean.FALSE);
 					itemvo.setIsok(UFBoolean.FALSE);
 					itemvo.setNbarcodenum(new UFDouble(0));
-					itemvo.setNinnum(invo.getNum());
-					itemvo.setNplannedprice(invo.getNprice());
-					itemvo.setNplannedmny(invo.getNmny());
-					itemvo.setNprice(invo.getNprice());
-					itemvo.setNmny(invo.getNmny());
+					itemvo.setNinnum(invo.getNum());//实入数量
+					itemvo.setNshouldinnum(invo.getNum());//应入数量
+					itemvo.setCastunitid(invo.getCastunitid());//辅计量单位ID 
+					itemvo.setHsl(new UFDouble(invo.getBdef6()));//换算率
 					itemvo.setAttributeValue("processcost", invo.getNmny());
-					itemvo.setNshouldinnum(invo.getNum());
 					itemvo.setPk_calbody(icheadvo.getPk_calbody());
 					itemvo.setVbatchcode(invo.getVbatchcode()==null?"":invo.getVbatchcode());
 					itemvo.setVfirstbillcode(headvo.getVbillno());

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

@@ -68,13 +68,13 @@ public class PushOtherOutAction extends AbstractAction{
 				icheadvo.setDbilldate(PubEnv.getServerDate());
 				icheadvo.setCoperatorid(PubEnv.getPk_user());
 	//			icheadvo.setCwarehouseid("1001V5100000000003A1");//仓库必填
+				//收发类别
+				icheadvo.setCdispatcherid(getpkrdcl("07"));
 				//仓库ID
 				if("工装".equals(billtype)) {
-				//	icheadvo.setCwarehouseid("1001V51000000000039Z");//仓库必填
-					icheadvo.setCwarehouseid("1001F81000000000025M");//仓库必填新环境
+					icheadvo.setCwarehouseid(GetBaseDAOUtil.getstordocpk("GZ001"));//仓库必填
 				}else if("家装".equals(billtype)) {
-				//	icheadvo.setCwarehouseid("1001V5100000000003A0");//仓库必填
-					icheadvo.setCwarehouseid("1001F810000000000DW1");//仓库必填新环境
+					icheadvo.setCwarehouseid(GetBaseDAOUtil.getstordocpk("JZ002"));//仓库必填
 				}
 				
 				icheadvo.setBoutretflag(UFBoolean.FALSE);//是否退回 
@@ -92,7 +92,7 @@ public class PushOtherOutAction extends AbstractAction{
 				icheadvo.setAttributeValue("pk_defdoc9", prjcode);
 				//项目名称pk_defdoc10
 				icheadvo.setAttributeValue("pk_defdoc10", prjcode);
-				//加工单号pk_defdoc2
+				//加工单号pk_defdoc1
 				icheadvo.setAttributeValue("pk_defdoc2", headvo.getDef1());
 				aggvo.setParentVO(icheadvo);
 				GeneralBillItemVO[] itemvos = new GeneralBillItemVO[outvos.length];
@@ -142,11 +142,9 @@ public class PushOtherOutAction extends AbstractAction{
 	//				itemvo.setCbodywarehouseid("1001V5100000000003A1");
 					//仓库ID
 					if("工装".equals(billtype)) {
-					//	icheadvo.setCwarehouseid("1001V51000000000039Z");//仓库必填
-						icheadvo.setCwarehouseid("1001F81000000000025M");//仓库必填新环境
+						icheadvo.setCwarehouseid(GetBaseDAOUtil.getstordocpk("GZ001"));//仓库必填
 					}else if("家装".equals(billtype)) {
-					//	icheadvo.setCwarehouseid("1001V5100000000003A0");//仓库必填
-						icheadvo.setCwarehouseid("1001F810000000000DW1");//仓库必填新环境
+						icheadvo.setCwarehouseid(GetBaseDAOUtil.getstordocpk("JZ002"));//仓库必填
 					}
 					itemvo.setCfirstbillhid(pk_order);
 					itemvo.setCfirstbillbid(outvo.getPrimaryKey());
@@ -163,13 +161,18 @@ public class PushOtherOutAction extends AbstractAction{
 					itemvo.setFchecked(0);
 					itemvo.setFlargess(UFBoolean.FALSE);
 					itemvo.setIsok(UFBoolean.FALSE);
-					itemvo.setNbarcodenum(new UFDouble(0));
-					itemvo.setNoutnum(outvo.getNum());
-					itemvo.setNplannedprice(outvo.getNprice());
-					itemvo.setNplannedmny(outvo.getNmny());
-					itemvo.setNprice(outvo.getNprice());
-					itemvo.setNmny(outvo.getNmny());
-					itemvo.setNshouldoutnum(outvo.getNum());
+					
+					itemvo.setNbarcodenum(new UFDouble(0));//条码数量 
+					itemvo.setNoutnum(outvo.getNum());//实出数量
+					itemvo.setNshouldoutnum(outvo.getNum());//应出数量
+					itemvo.setHsl(new UFDouble(outvo.getBdef6()));//换算率	
+					itemvo.setNoutassistnum(outvo.getNastnum());//实出辅数量
+					itemvo.setNshouldoutassistnum(outvo.getNastnum());//应入辅数量 
+					
+					String castunitid=getpk(outvo.getCastunitid()==null?"":outvo.getCastunitid().toString());
+					itemvo.setCastunitid(castunitid);//辅计量单位ID 
+					itemvo.setCastunitname(castunitid==null?"":castunitid.toString());//辅计量单位名称
+					
 					itemvo.setPk_calbody(icheadvo.getPk_calbody());
 					itemvo.setVbatchcode(outvo.getVbatchcode()==null?"":outvo.getVbatchcode());
 					itemvo.setVfirstbillcode(headvo.getVbillno());
@@ -251,4 +254,17 @@ public class PushOtherOutAction extends AbstractAction{
       return pk_rdcl;
 		
 	}
+	
+	//计量单位 
+	private String getpk(String shortname) throws BusinessException {
+	  String sql="select pk_measdoc from bd_measdoc where measname='"+shortname+"'  ";
+	  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/ToMaterialOutDialog.java

@@ -425,12 +425,17 @@ public class ToMaterialOutDialog extends UIDialog implements ActionListener,Bill
 				icheadvo.setCdispatcherid(getpkrdcl("03"));
 //				icheadvo.setCdispatchername("");
 				//仓库ID
+//				if("工装".equals(billtype)) {
+//				//	icheadvo.setCwarehouseid("1001V51000000000039Z");//仓库必填
+//					icheadvo.setCwarehouseid("1001F81000000000025M");//仓库必填新环境
+//				}else if("家装".equals(billtype)) {
+//				//	icheadvo.setCwarehouseid("1001V5100000000003A0");//仓库必填
+//					icheadvo.setCwarehouseid("1001F810000000000DW1");//仓库必填新环境
+//				}
 				if("工装".equals(billtype)) {
-				//	icheadvo.setCwarehouseid("1001V51000000000039Z");//仓库必填
-					icheadvo.setCwarehouseid("1001F81000000000025M");//仓库必填新环境
+					icheadvo.setCwarehouseid(GetBaseDAOUtil.getstordocpk("GZ001"));//仓库必填
 				}else if("家装".equals(billtype)) {
-				//	icheadvo.setCwarehouseid("1001V5100000000003A0");//仓库必填
-					icheadvo.setCwarehouseid("1001F810000000000DW1");//仓库必填新环境
+					icheadvo.setCwarehouseid(GetBaseDAOUtil.getstordocpk("JZ002"));//仓库必填
 				}
 				icheadvo.setBoutretflag(UFBoolean.FALSE);//是否退回 
 				icheadvo.setBsalecooppur(UFBoolean.FALSE); // 销售出是否已协同生成采购入 
@@ -477,11 +482,9 @@ public class ToMaterialOutDialog extends UIDialog implements ActionListener,Bill
 						itemvo.setCbodybilltypecode("4D");
 					//	itemvo.setCbodywarehouseid("1001V5100000000003GB");
 						if("工装".equals(billtype)) {
-						//	itemvo.setCbodywarehouseid("1001V51000000000039Z");//仓库必填
-							icheadvo.setCwarehouseid("1001F81000000000025M");//仓库必填新环境
+							itemvo.setCbodywarehouseid(GetBaseDAOUtil.getstordocpk("GZ001"));//仓库必填
 						}else if("家装".equals(billtype)) {
-						//	itemvo.setCbodywarehouseid("1001V5100000000003A0");//仓库必填
-							icheadvo.setCwarehouseid("1001F810000000000DW1");//仓库必填新环境
+							itemvo.setCbodywarehouseid(GetBaseDAOUtil.getstordocpk("JZ002"));//仓库必填
 						}
 						itemvo.setCfirstbillhid(pk_order);
 						itemvo.setCfirstbillbid(vector.get(51).toString());
@@ -499,17 +502,20 @@ public class ToMaterialOutDialog extends UIDialog implements ActionListener,Bill
 						itemvo.setFchecked(0);
 						itemvo.setFlargess(UFBoolean.FALSE);
 						itemvo.setIsok(UFBoolean.FALSE);
-						itemvo.setNbarcodenum(new UFDouble(0));
-						itemvo.setNoutnum(new UFDouble(vector.get(1)==null?"0":vector.get(1).toString()));
-						itemvo.setNprice(new UFDouble(vector.get(26)==null?"0":vector.get(26).toString()));
-						itemvo.setNmny(itemvo.getNoutnum().multiply(itemvo.getNprice()));
-//						itemvo.setNquotentmny(new UFDouble(vector.get(24)==null?"0":vector.get(24).toString()));
-//						itemvo.setNquotentprice(new UFDouble(vector.get(26)==null?"0":vector.get(26).toString()));
-//						itemvo.setNsalemny(new UFDouble(vector.get(24)==null?"0":vector.get(24).toString()));
-//						itemvo.setNsaleprice(new UFDouble(vector.get(24)==null?"0":vector.get(26).toString()));
-						itemvo.setNshouldoutnum(new UFDouble(vector.get(1)==null?"0":vector.get(1).toString()));
-//						itemvo.setNtaxmny(new UFDouble(vector.get(23)==null?"0":vector.get(23).toString()));
-//						itemvo.setNtaxprice(new UFDouble(vector.get(22)==null?"0":vector.get(22).toString()));
+						itemvo.setNbarcodenum(new UFDouble(0));//条码数量
+						UFDouble ninnum = vector.get(1) == null ? null : new UFDouble(vector.get(1).toString());
+						itemvo.setNoutnum(ninnum);//实出数量 
+						itemvo.setNshouldoutnum(ninnum);//应出数量 
+						UFDouble Hsl = vector.get(45) == null ? null : new UFDouble(vector.get(45).toString());
+						//换算率						
+						itemvo.setHsl(Hsl);
+						//没有换算率则辅数量为空
+						if(Hsl != null) {
+							UFDouble ninassistnum = new UFDouble(ninnum.div(Hsl).toString(),2);
+							itemvo.setNoutassistnum(new UFDouble(ninassistnum));//实出辅数量
+							itemvo.setNshouldoutassistnum(ninassistnum);//应入辅数量 
+						}
+					
 						itemvo.setAttributeValue("processcost", new UFDouble(vector.get(24)==null?"0":vector.get(24).toString()));
 						itemvo.setPk_calbody(GetBaseDAOUtil.getcalpk(pk_corp));
 						itemvo.setVbatchcode(vector.get(6)==null?"":vector.get(6).toString());

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

@@ -25,6 +25,7 @@ import nc.itf.uap.IUAPQueryBS;
 import nc.itf.uap.pf.IPFBusiAction;
 import nc.itf.uap.pf.IplatFormEntry;
 import nc.jdbc.framework.processor.BeanListProcessor;
+import nc.jdbc.framework.processor.ColumnProcessor;
 import nc.ui.pub.ClientEnvironment;
 import nc.ui.pub.beans.MessageDialog;
 import nc.ui.pub.beans.UIButton;
@@ -424,6 +425,8 @@ public class ToSaleOutDialog extends UIDialog implements ActionListener,BillEdit
 				icheadvo.setPk_calbody(GetBaseDAOUtil.getcalpk(pk_corp));
 				icheadvo.setDbilldate(PubEnv.getServerDate());
 				icheadvo.setCoperatorid(PubEnv.getPk_user());
+				//收发类别
+				icheadvo.setCdispatcherid(getpkrdcl("02"));
 				//仓库ID
 				if("工装".equals(billtype)) {
 					icheadvo.setCwarehouseid(GetBaseDAOUtil.getstordocpk("GZ001"));//仓库必填
@@ -435,12 +438,12 @@ public class ToSaleOutDialog extends UIDialog implements ActionListener,BillEdit
 				icheadvo.setVnote("来源生产总订单");//备注
 				icheadvo.setCbilltypecode("4C");
 				icheadvo.setBassetcard(UFBoolean.FALSE);
-				icheadvo.setCbiztypeid("1001V51000000000002V");//业务流程
+		//		icheadvo.setCbiztypeid("1001V51000000000002V");//业务流程
 				String def1 = GetBaseDAOUtil.getJobbasfilDef1("prjcode");
 				icheadvo.setCcustomerid(def1);//客户
 				icheadvo.setCdptid(headvo.getPlandeptid());//部门
 				icheadvo.setFreplenishflag(UFBoolean.FALSE);
-				icheadvo.setPk_cubasdocC("0001V510000000000674");//客户基本档案
+				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());//开票类型
@@ -506,17 +509,21 @@ public class ToSaleOutDialog extends UIDialog implements ActionListener,BillEdit
 						itemvo.setFchecked(0);
 						itemvo.setFlargess(UFBoolean.FALSE);
 						itemvo.setIsok(UFBoolean.FALSE);
-						itemvo.setNbarcodenum(new UFDouble(0));
-						itemvo.setNoutnum(new UFDouble(vector.get(1)==null?"0":vector.get(1).toString()));
-//						itemvo.setNquotentprice(new UFDouble(vector.get(27)==null?"0":vector.get(27).toString()));//原币无税单价
-//						itemvo.setNquotentmny(itemvo.getNoutnum().multiply(itemvo.getNquotentprice()));//原币无税金额
-//						itemvo.setAttributeValue("nquoteprice", new UFDouble(vector.get(23)==null?"0":vector.get(23).toString()));//报价含税单价
-//						itemvo.setAttributeValue("nquotemny", itemvo.getNoutnum().multiply(new UFDouble(vector.get(23)==null?"0":vector.get(23).toString())));//报价含税金额
-//						itemvo.setNsaleprice(new UFDouble(vector.get(27)==null?"0":vector.get(27).toString()));//销售价格
-//						itemvo.setNsalemny(itemvo.getNoutnum().multiply(new UFDouble(vector.get(27)==null?"0":vector.get(27).toString())));//销售金额
-						itemvo.setNshouldoutnum(new UFDouble(vector.get(1)==null?"0":vector.get(1).toString()));
-//						itemvo.setNtaxprice(new UFDouble(vector.get(23)==null?"0":vector.get(23).toString()));
-//						itemvo.setNtaxmny(itemvo.getNoutnum().multiply(new UFDouble(vector.get(23)==null?"0":vector.get(23).toString())));
+						itemvo.setNbarcodenum(new UFDouble(0));//条码数量
+						UFDouble ninnum = vector.get(1) == null ? null : new UFDouble(vector.get(1).toString());
+						itemvo.setNoutnum(ninnum);//实出数量
+						itemvo.setNshouldoutnum(ninnum);//应出数量 
+						UFDouble Hsl = vector.get(49) == null ? null : new UFDouble(vector.get(49).toString());
+						//换算率						
+						itemvo.setHsl(Hsl);
+						//没有换算率则辅数量为空
+						if(Hsl != null) {
+							UFDouble ninassistnum = new UFDouble(ninnum.div(Hsl).toString(),2);
+							itemvo.setNoutassistnum(new UFDouble(ninassistnum));//实出辅数量
+							itemvo.setNshouldoutassistnum(ninassistnum);//应入辅数量 
+						}
+						//辅计量单位ID 
+						itemvo.setCastunitid(vector.get(28) == null ? null : GetBaseDAOUtil.getMeasidByNames(vector.get(28).toString()));	
 						
 						itemvo.setPk_bodycalbody(GetBaseDAOUtil.getcalpk(pk_corp));
 						itemvo.setPk_calbody(GetBaseDAOUtil.getcalpk(pk_corp));
@@ -529,10 +536,6 @@ public class ToSaleOutDialog extends UIDialog implements ActionListener,BillEdit
 						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.setAttributeValue("nquoteunitnum", new UFDouble(vector.get(1)==null?"0":vector.get(1).toString()));//报价计量单位数量
-//						itemvo.setAttributeValue("nquoteunitrate", 1);//报价计量单位换算率
-//						itemvo.setHsl(new UFDouble(1));//换算率
-//						itemvo.setCastunitid(GetBaseDAOUtil.getMeasid(vector.get(21).toString()));//辅计量单位
 						itemvo.setVsourcebillcode(headvo.getVbillno());
 						itemvo.setAttributeValue("pk_defdoc1", vector.get(37)==null?null:vector.get(37).toString());//楼号楼层
 						itemvo.setAttributeValue("pk_defdoc2", vector.get(38)==null?null:vector.get(38).toString());//樘数（数量）
@@ -641,5 +644,18 @@ public class ToSaleOutDialog extends UIDialog implements ActionListener,BillEdit
 		}
 	
 	}
+	
+	//收发类别
+	private String getpkrdcl(String rdcode ) throws BusinessException {
+	  String sql="select pk_rdcl from bd_rdcl where rdcode='"+rdcode+"'  ";
+	  IUAPQueryBS iuap=(IUAPQueryBS) NCLocator.getInstance().lookup(IUAPQueryBS.class.getName());
+	  
+	  String pk_rdcl = (String) iuap.executeQuery(sql, new ColumnProcessor());
+      if (pk_rdcl == null) {
+          return "";
+      }
+      return pk_rdcl;
+		
+	}
 
 }