生单优化

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

@@ -71,9 +71,11 @@ public class PushOtherInAction extends AbstractAction{
 				icheadvo.setCoperatorid(PubEnv.getPk_user());
 				//仓库ID
 				if("工装".equals(billtype)) {
-					icheadvo.setCwarehouseid("1001V51000000000039Z");//仓库必填
+				//	icheadvo.setCwarehouseid("1001V51000000000039Z");//仓库必填
+					icheadvo.setCwarehouseid("1001F81000000000025M");//仓库必填新环境
 				}else if("家装".equals(billtype)) {
-					icheadvo.setCwarehouseid("1001V5100000000003A0");//仓库必填
+				//	icheadvo.setCwarehouseid("1001V5100000000003A0");//仓库必填
+					icheadvo.setCwarehouseid("1001F810000000000DW1");//仓库必填新环境
 				}
 				icheadvo.setBoutretflag(UFBoolean.FALSE);//是否退回 
 				icheadvo.setBsalecooppur(UFBoolean.FALSE); // 销售出是否已协同生成采购入 
@@ -88,8 +90,7 @@ public class PushOtherInAction extends AbstractAction{
 				//项目名称pk_defdoc10
 				icheadvo.setAttributeValue("pk_defdoc10", prjcode);
 				//加工单号pk_defdoc2
-				icheadvo.setAttributeValue("pk_defdoc2", headvo.getDef2());
-				
+				icheadvo.setAttributeValue("pk_defdoc2", headvo.getDef1());
 				aggvo.setParentVO(icheadvo);
 				GeneralBillItemVO[] itemvos = new GeneralBillItemVO[invos.length];
 //				List<GeneralBillItemVO> lisbillvos=new ArrayList<GeneralBillItemVO>();
@@ -138,9 +139,11 @@ public class PushOtherInAction extends AbstractAction{
 					itemvo.setCbodybilltypecode("4A");
 					//itemvo.setCbodywarehouseid("1001V5100000000003A1");
 					if("工装".equals(billtype)) {
-						itemvo.setCbodywarehouseid("1001V51000000000039Z");//仓库必填
+					//	icheadvo.setCwarehouseid("1001V51000000000039Z");//仓库必填
+						icheadvo.setCwarehouseid("1001F81000000000025M");//仓库必填新环境
 					}else if("家装".equals(billtype)) {
-						itemvo.setCbodywarehouseid("1001V5100000000003A0");//仓库必填
+					//	icheadvo.setCwarehouseid("1001V5100000000003A0");//仓库必填
+						icheadvo.setCwarehouseid("1001F810000000000DW1");//仓库必填新环境
 					}
 					itemvo.setCfirstbillhid(pk_order);
 					itemvo.setCfirstbillbid(invo.getPrimaryKey());
@@ -190,7 +193,6 @@ public class PushOtherInAction extends AbstractAction{
 					itemvos[i] = itemvo;
 //					lisbillvos.add(itemvo);
 				}
-				
 //				if(null!=lisbillvos && lisbillvos.size()>0) {
 					aggvo.setChildrenVO(itemvos);
 					aggvos[0] = aggvo;
@@ -200,7 +202,6 @@ public class PushOtherInAction extends AbstractAction{
 					UpdateIssue(invos);
 					//回写已执行数量
 					UpdateExecnum(invos);
-					
 					MessageDialog.showHintDlg(frameUI, "成功", "其他入库单"+resvo.getVBillCode()+"新增成功");
 //				}else {
 //					

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

@@ -67,9 +67,11 @@ public class PushOtherOutAction extends AbstractAction{
 	//			icheadvo.setCwarehouseid("1001V5100000000003A1");//仓库必填
 				//仓库ID
 				if("工装".equals(billtype)) {
-					icheadvo.setCwarehouseid("1001V51000000000039Z");//仓库必填
+				//	icheadvo.setCwarehouseid("1001V51000000000039Z");//仓库必填
+					icheadvo.setCwarehouseid("1001F81000000000025M");//仓库必填新环境
 				}else if("家装".equals(billtype)) {
-					icheadvo.setCwarehouseid("1001V5100000000003A0");//仓库必填
+				//	icheadvo.setCwarehouseid("1001V5100000000003A0");//仓库必填
+					icheadvo.setCwarehouseid("1001F810000000000DW1");//仓库必填新环境
 				}
 				
 				icheadvo.setBoutretflag(UFBoolean.FALSE);//是否退回 
@@ -86,8 +88,7 @@ public class PushOtherOutAction extends AbstractAction{
 				//项目名称pk_defdoc10
 				icheadvo.setAttributeValue("pk_defdoc10", prjcode);
 				//加工单号pk_defdoc2
-				icheadvo.setAttributeValue("pk_defdoc2", headvo.getDef2());
-				
+				icheadvo.setAttributeValue("pk_defdoc2", headvo.getDef1());
 				aggvo.setParentVO(icheadvo);
 				GeneralBillItemVO[] itemvos = new GeneralBillItemVO[outvos.length];
 				for(int i = 0;i < outvos.length;i++) {
@@ -119,7 +120,6 @@ public class PushOtherOutAction extends AbstractAction{
 //					}
 					
 					String cprojectid=prjcode;
-					
 					InvmandocVO invmanvo = GetBaseDAOUtil.getInvmanVO(pk_invbasdoc);
 					String pk_invmandoc = invmanvo.getPrimaryKey();
 					itemvo.setCprojectid(cprojectid);
@@ -137,9 +137,11 @@ public class PushOtherOutAction extends AbstractAction{
 	//				itemvo.setCbodywarehouseid("1001V5100000000003A1");
 					//仓库ID
 					if("工装".equals(billtype)) {
-						itemvo.setCbodywarehouseid("1001V51000000000039Z");//仓库必填
+					//	icheadvo.setCwarehouseid("1001V51000000000039Z");//仓库必填
+						icheadvo.setCwarehouseid("1001F81000000000025M");//仓库必填新环境
 					}else if("家装".equals(billtype)) {
-						itemvo.setCbodywarehouseid("1001V5100000000003A0");//仓库必填
+					//	icheadvo.setCwarehouseid("1001V5100000000003A0");//仓库必填
+						icheadvo.setCwarehouseid("1001F810000000000DW1");//仓库必填新环境
 					}
 					itemvo.setCfirstbillhid(pk_order);
 					itemvo.setCfirstbillbid(outvo.getPrimaryKey());
@@ -193,7 +195,6 @@ public class PushOtherOutAction extends AbstractAction{
 				GeneralBillVO resvo = res[0];
 				//回写已执行数量
 				UpdateExecnum(outvos);
-				
 				MessageDialog.showHintDlg(frameUI, "成功", "其他出库单"+resvo.getVBillCode()+"新增成功");
 			}
 			else {

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

@@ -212,7 +212,7 @@ public class ToMaterialOutDialog extends UIDialog implements ActionListener,Bill
 			mainpanel.setOrientation(JSplitPane.VERTICAL_SPLIT);
 			mainpanel.setTopComponent(getJlcardPanel());
 			mainpanel.setBottomComponent(getJlbtnpanel());
-			mainpanel.setDividerLocation(750);//分割位置
+			mainpanel.setDividerLocation(700);//分割位置
 			mainpanel.setOneTouchExpandable(true);
 			mainpanel.setDividerSize(8);
 		}
@@ -406,6 +406,8 @@ public class ToMaterialOutDialog extends UIDialog implements ActionListener,Bill
 				String pk_order = headvo.getPk_order();
 				//业务类型
 				String billtype=headvo.getBusitype();
+				//项目主键
+				String prjcode = headvo.getProjectid();
 				GeneralBillVO[] aggvos = new GeneralBillVO[1];
 				GeneralBillVO aggvo = new GeneralBillVO();
 				GeneralBillHeaderVO icheadvo = new GeneralBillHeaderVO();
@@ -413,11 +415,19 @@ public class ToMaterialOutDialog extends UIDialog implements ActionListener,Bill
 				icheadvo.setPk_calbody(GetBaseDAOUtil.getcalpk(pk_corp));
 				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());
 				//仓库ID
 				if("工装".equals(billtype)) {
-					icheadvo.setCwarehouseid("1001V51000000000039Z");//仓库必填
+				//	icheadvo.setCwarehouseid("1001V51000000000039Z");//仓库必填
+					icheadvo.setCwarehouseid("1001F81000000000025M");//仓库必填新环境
 				}else if("家装".equals(billtype)) {
-					icheadvo.setCwarehouseid("1001V5100000000003A0");//仓库必填
+				//	icheadvo.setCwarehouseid("1001V5100000000003A0");//仓库必填
+					icheadvo.setCwarehouseid("1001F810000000000DW1");//仓库必填新环境
 				}
 				icheadvo.setBoutretflag(UFBoolean.FALSE);//是否退回 
 				icheadvo.setBsalecooppur(UFBoolean.FALSE); // 销售出是否已协同生成采购入 
@@ -442,14 +452,16 @@ public class ToMaterialOutDialog extends UIDialog implements ActionListener,Bill
 							InvbasdocVO invbasvo  = GetBaseDAOUtil.getInvVO(cmaterialcode);
 							pk_invbasdoc = invbasvo.getPrimaryKey();
 						}
-						String prjcode = vector.get(2).toString();
-						String cprojectid = "";
-						if(prjcode.startsWith("1001")) {
-							cprojectid = prjcode;
-						}
-						else {
-							cprojectid = GetBaseDAOUtil.getprojectid(prjcode);
-						}
+//						String prjcode = vector.get(2).toString();
+//						String cprojectid = "";
+//						if(prjcode.startsWith("1001")) {
+//							cprojectid = prjcode;
+//						}
+//						else {
+//							cprojectid = GetBaseDAOUtil.getprojectid(prjcode);
+//						}
+						String cprojectid=prjcode;
+						
 						InvmandocVO invmanvo = GetBaseDAOUtil.getInvmanVO(pk_invbasdoc);
 						String pk_invmandoc = invmanvo.getPrimaryKey();
 						itemvo.setBbarcodeclose(UFBoolean.FALSE);
@@ -462,16 +474,18 @@ public class ToMaterialOutDialog extends UIDialog implements ActionListener,Bill
 						itemvo.setCbodybilltypecode("4D");
 					//	itemvo.setCbodywarehouseid("1001V5100000000003GB");
 						if("工装".equals(billtype)) {
-							itemvo.setCbodywarehouseid("1001V51000000000039Z");//仓库必填
+						//	itemvo.setCbodywarehouseid("1001V51000000000039Z");//仓库必填
+							icheadvo.setCwarehouseid("1001F81000000000025M");//仓库必填新环境
 						}else if("家装".equals(billtype)) {
-							itemvo.setCbodywarehouseid("1001V5100000000003A0");//仓库必填
+						//	itemvo.setCbodywarehouseid("1001V5100000000003A0");//仓库必填
+							icheadvo.setCwarehouseid("1001F810000000000DW1");//仓库必填新环境
 						}
 						itemvo.setCfirstbillhid(pk_order);
 						itemvo.setCfirstbillbid(vector.get(51).toString());
 						itemvo.setCfirsttype("55A2");
 						itemvo.setCinvbasid(pk_invbasdoc);
 						itemvo.setCinventoryid(pk_invmandoc);
-						icheadvo.setCinventoryid(pk_invmandoc);
+	//					icheadvo.setCinventoryid(pk_invmandoc);
 						itemvo.setCprojectid(cprojectid);
 						itemvo.setCrowno(Integer.toString((k+1)*10));
 						itemvo.setCsourcebillhid(pk_order);
@@ -520,6 +534,8 @@ public class ToMaterialOutDialog extends UIDialog implements ActionListener,Bill
 						itemvo.setAttributeValue("pk_defdoc12",vector.get(19)==null?null:vector.get(19).toString());//高度
 						itemvo.setAttributeValue("pk_defdoc13",vector.get(43)==null?null:vector.get(43).toString());//系列
 						itemvo.setAttributeValue("pk_defdoc14",vector.get(44)==null?null:vector.get(44).toString());//玻璃编号
+						
+						
 						//回写数量
 						UFDouble updatenum =  new UFDouble(vector.get(29)==null?"0":vector.get(29).toString()).add(new UFDouble(vector.get(1)==null?"0":vector.get(1).toString()));
 						updatemap.put(vector.get(51).toString(), updatenum);