生单修改

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

@@ -340,11 +340,19 @@ public class TOProductOutDialog extends UIDialog implements ActionListener,BillE
 				icheadvo.setDbilldate(dbilldate);
 				//制单人
 				icheadvo.setCoperatorid(PubEnv.getPk_user());
+				//项目编码 pk_defdoc9
+				icheadvo.setAttributeValue("pk_defdoc9", prjcode);
+				//项目名称pk_defdoc10
+				icheadvo.setAttributeValue("pk_defdoc10", prjcode);
+				//加工单号pk_defdoc2
+				icheadvo.setAttributeValue("pk_defdoc2", headvo.getDef1());
+				//收发类别
+				icheadvo.setCdispatcherid(GetBaseDAOUtil.getpkrdcl("08"));
 				//仓库ID
 				if("工装".equals(billtype)) {
-					icheadvo.setCwarehouseid("1001V51000000000039Z");//仓库必填
+					icheadvo.setCwarehouseid(GetBaseDAOUtil.getstordocpk("GZ001"));//仓库必填
 				}else if("家装".equals(billtype)) {
-					icheadvo.setCwarehouseid("1001V5100000000003A0");//仓库必填
+					icheadvo.setCwarehouseid(GetBaseDAOUtil.getstordocpk("JZ002"));//仓库必填
 				}
 				//业务员
 				icheadvo.setCbizid(workmanid);
@@ -399,11 +407,10 @@ public class TOProductOutDialog extends UIDialog implements ActionListener,BillE
 						//单据类型
 						itemvo.setCbodybilltypecode("46");
 						//库存仓库
-//						itemvo.setCbodywarehouseid("1001V5100000000003GB");
 						if("工装".equals(billtype)) {
-							itemvo.setCbodywarehouseid("1001V51000000000039Z");//仓库必填
+							itemvo.setCbodywarehouseid(GetBaseDAOUtil.getstordocpk("GZ001"));//仓库必填
 						}else if("家装".equals(billtype)) {
-							itemvo.setCbodywarehouseid("1001V5100000000003A0");//仓库必填
+							itemvo.setCbodywarehouseid(GetBaseDAOUtil.getstordocpk("JZ002"));//仓库必填
 						}
 						//存货基本ID
 						itemvo.setCinvbasid(pk_invbasdoc);
@@ -423,10 +430,25 @@ public class TOProductOutDialog extends UIDialog implements ActionListener,BillE
 						itemvo.setIsok(UFBoolean.FALSE);
 						//条码数量
 						itemvo.setNbarcodenum(new UFDouble(0));
+						UFDouble ninnum = vector.get(1) == null ? null : new UFDouble(vector.get(1).toString());
 						//实入数量
-						itemvo.setNinnum(vector.get(1) == null ? null : new UFDouble(vector.get(1).toString()));
+						itemvo.setNinnum(ninnum);
 						//应入数量
-						itemvo.setNshouldinnum(vector.get(1) == null ? null : new UFDouble(vector.get(1).toString()));
+						itemvo.setNshouldinnum(ninnum);
+						//辅计量单位ID 
+						itemvo.setCastunitid(vector.get(28) == null ? null : GetBaseDAOUtil.getMeasidByNames(vector.get(28).toString()));	
+						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.setNinassistnum(ninassistnum);
+							//应入辅数量 
+							itemvo.setNneedinassistnum(ninassistnum);
+						}
 //						//金额
 //						itemvo.setNmny(vector.get(25)== null ? null : new UFDouble(vector.get(25).toString()));
 //						//单价

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

@@ -379,7 +379,6 @@ public class ToSaleOutDialog extends UIDialog implements ActionListener,BillEdit
 
 	@Override
 	public void actionPerformed(ActionEvent e) {
-
 		//保存按钮
 		if(e.getSource() == getSaveCardBtn()){
 			Vector<Vector<Object>> vectors= getJlcardPanel().getBillModel().getDataVector();
@@ -427,9 +426,9 @@ public class ToSaleOutDialog extends UIDialog implements ActionListener,BillEdit
 				icheadvo.setCoperatorid(PubEnv.getPk_user());
 				//仓库ID
 				if("工装".equals(billtype)) {
-					icheadvo.setCwarehouseid("1001V51000000000039Z");//仓库必填
+					icheadvo.setCwarehouseid(GetBaseDAOUtil.getstordocpk("GZ001"));//仓库必填
 				}else if("家装".equals(billtype)) {
-					icheadvo.setCwarehouseid("1001V5100000000003A0");//仓库必填
+					icheadvo.setCwarehouseid(GetBaseDAOUtil.getstordocpk("JZ002"));//仓库必填
 				}
 				icheadvo.setBoutretflag(UFBoolean.FALSE);//是否退回 
 				icheadvo.setBsalecooppur(UFBoolean.FALSE); // 销售出是否已协同生成采购入 
@@ -437,7 +436,8 @@ public class ToSaleOutDialog extends UIDialog implements ActionListener,BillEdit
 				icheadvo.setCbilltypecode("4C");
 				icheadvo.setBassetcard(UFBoolean.FALSE);
 				icheadvo.setCbiztypeid("1001V51000000000002V");//业务流程
-				icheadvo.setCcustomerid("0001V510000000000AJH");//客户
+				String def1 = GetBaseDAOUtil.getJobbasfilDef1("prjcode");
+				icheadvo.setCcustomerid(def1);//客户
 				icheadvo.setCdptid(headvo.getPlandeptid());//部门
 				icheadvo.setFreplenishflag(UFBoolean.FALSE);
 				icheadvo.setPk_cubasdocC("0001V510000000000674");//客户基本档案
@@ -447,7 +447,6 @@ public class ToSaleOutDialog extends UIDialog implements ActionListener,BillEdit
 				aggvo.setParentVO(icheadvo);
 				GeneralBillItemVO[] itemvos = new GeneralBillItemVO[execsize];
 				Map<String, UFDouble> updatemap = new HashMap<>();
-
 				int k = 0;
 				for(int j = 0; j < vectors.size(); j++) {
 					Vector<Object> vector = (Vector<Object>)vectors.get(j);
@@ -482,11 +481,10 @@ public class ToSaleOutDialog extends UIDialog implements ActionListener,BillEdit
 						itemvo.setBtransasset(UFBoolean.FALSE);
 						itemvo.setBzgflag(UFBoolean.FALSE);
 						itemvo.setCbodybilltypecode("4C");
-				//		itemvo.setCbodywarehouseid("1001V5100000000003A1");
 						if("工装".equals(billtype)) {
-							itemvo.setCbodywarehouseid("1001V51000000000039Z");//仓库必填
+							itemvo.setCbodywarehouseid(GetBaseDAOUtil.getstordocpk("GZ001"));//仓库必填
 						}else if("家装".equals(billtype)) {
-							itemvo.setCbodywarehouseid("1001V5100000000003A0");//仓库必填
+							itemvo.setCbodywarehouseid(GetBaseDAOUtil.getstordocpk("JZ002"));//仓库必填
 						}
 						itemvo.setCfirstbillhid(pk_order);
 						itemvo.setCfirstbillbid(vector.get(34).toString());
@@ -496,7 +494,7 @@ public class ToSaleOutDialog extends UIDialog implements ActionListener,BillEdit
 //						icheadvo.setCinventoryid(pk_invmandoc);
 						itemvo.setCinventorycode(cmaterialcode);
 						itemvo.setCprojectid(cprojectid);
-						itemvo.setCreceieveid("0001V510000000000AJH");//收货单位
+						itemvo.setCreceieveid(def1);//收货单位
 						itemvo.setCrowno(Integer.toString((k+1)*10));
 						itemvo.setCsourcebillhid(pk_order);
 						itemvo.setCsourcebillbid(vector.get(34).toString());

mmpac/mmpac/src/public/u8c/bs/servlet/service/GetBaseDAOUtil.java

@@ -201,6 +201,11 @@ public class GetBaseDAOUtil {
         }
         return pk_measdoc;
     }
+    //根据计量单位名称获取主键
+    public static String getMeasidByNames(String measname) throws Exception {
+        String sql = "select pk_measdoc from bd_measdoc where isnull(dr,0) = 0 and measname = '"+measname+"'";
+        return (String) iuap.executeQuery(sql, new ColumnProcessor());
+    }
     
     //税率
     public static Object getTaxRate(String ctaxitemid) throws BusinessException {
@@ -343,4 +348,31 @@ public class GetBaseDAOUtil {
     	String sql = "select pk_corp from bd_corp where dr = 0";
 		return (List<Map<String, String>>) iuap.executeQuery(sql, new MapListProcessor());
     }
+    
+    public static String getstordocpk(String storcode)throws Exception{
+    	String sql = "select pk_stordoc from bd_stordoc where storcode = '"+storcode+"'";
+    	String pk_stordoc = (String) iuap.executeQuery(sql, new ColumnProcessor());
+    	if(pk_stordoc == null) {
+    		throw new Exception("仓库"+storcode+"未查到，请检查");
+    	}
+    	return pk_stordoc;
+    }
+    
+    //收发类别
+  	public static String getpkrdcl(String rdcode) throws Exception {
+  	  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 null;
+        }
+        return pk_rdcl;
+  	}
+  	
+  	//查询项目对应的客户
+  	public static String getJobbasfilDef1(String pk_jobbasfil) throws Exception {
+  		String sql = "select def1 from bd_jobbasfil where pk_jobbasfil = '"+pk_jobbasfil+"'";
+  		return (String) iuap.executeQuery(sql, new ColumnProcessor());
+  	}
 }