优化

mm/mm/src/client/u8c/ui/mm/action/MRPDialogdura.java

@@ -24,6 +24,7 @@ public class MRPDialogdura extends UIDialog implements ActionListener {
 	private String ret_pub;
 	private String ret_pubn_b;
 	private String ret_pubn_c;
+	private String ret_pubn_d;	
 	public Boolean dg_iscancel;
 	private final String pk_user_pub;
 	private final String pk_corp_pub;
@@ -58,6 +59,12 @@ public class MRPDialogdura extends UIDialog implements ActionListener {
 	}
 	
 	
+	public String getChfl() {
+//		ArrayList<Object> arr = new ArrayList<Object>();
+//		arr.add(ret_pub);
+//		arr.add(ret_pubn_e);
+		return ret_pubn_d;
+	}
 	
 	private void initialize() throws BusinessException {
 		setTitle("MRP运算");
@@ -203,15 +210,24 @@ public class MRPDialogdura extends UIDialog implements ActionListener {
 			String butype = getBillSclPan().getHeadItem("butype").getValue();//业务类型
 			String xcname = getBillSclPan().getHeadItem("xmname").getValue();//项目名称
 			String gdcode= getBillSclPan().getHeadItem("xmcode").getValue();//工单号
+			String hcfl= getBillSclPan().getHeadItem("hcfl").getValue();//存货分类
 			if (butype != null && !"".equals(butype)) {
 				if(butype.equals("工装") && (xcname == null
 						||  "".equals(xcname))) {
 					MessageDialog.showHintDlg(this, "提示", "请输入项目！");	
 					return;
 				}
+				
+				if(butype.equals("工装") && (gdcode == null
+						||  "".equals(gdcode))) {
+					MessageDialog.showHintDlg(this, "提示", "请输入工单号！");	
+					return;
+				}
+				
 				ret_pub = butype;
 				ret_pubn_b =xcname;
 				ret_pubn_c =gdcode;
+				ret_pubn_d =hcfl;
 				setResult(UIDialog.ID_OK);
 				dg_iscancel=Boolean.TRUE;
 				destroy();

mm/mm/src/client/u8c/ui/mm/action/YsAction.java

@@ -30,6 +30,7 @@ import nc.ui.pub.beans.MessageDialog;
 import nc.ui.pub.beans.UIDialog;
 import nc.vo.AqkcVO;
 import nc.vo.DemandUAPBVO;
+import nc.vo.MRPDemandVO;
 import nc.vo.OnhandunmUAPVO;
 import nc.vo.OperationBalanceVO;
 import nc.vo.OperationDemandVO;
@@ -99,7 +100,7 @@ public class YsAction extends YsQuseryAction{
 				String sqlmmpac="select a.dbilldate demanddate ,b.* from  mmpac_order_issue b "
 						+ "inner join mmpac_order_main a on  a.pk_order=b.pk_order "
 						+ "and isnull(a.dr,0)=0 and isnull(b.dr,0)=0 and isnull(b.bdef5,'N')='N' "
-						+ "and a.projectid='" + xmname + "' and a.busitype='" + butype + "' and a.billstatus='1' and a. def1='"+xmcode+"' ";
+						+ "and a.projectid='" + xmname + "' and a.busitype='" + butype + "' and a.billstatus='1' and a. def1='"+xmcode+"' and 1=2 ";
 				
 				List<OrderIssueUAPVO> lisvos= (List<OrderIssueUAPVO>) iuap.executeQuery(sqlmmpac, new BeanListProcessor(OrderIssueUAPVO.class));
 				
@@ -107,12 +108,20 @@ public class YsAction extends YsQuseryAction{
 				String sqlxc="select  a.dbilldate demanddate,a.vdef1 gdcode ,b.* from  po_demand_b b "
 						+ "inner join po_demand a on  a.pk_demand=b.pk_demand "
 						+ "and isnull(a.dr,0)=0 and isnull(b.dr,0)=0  "
-						+ "and a.projectid='" + xmname + "' and a.vdef30='" + butype + "' and a.billstatus='1' and a.billstatus<>'9' and a.vdef1='"+xmcode+"' ";
+						+ "and a.projectid='" + xmname + "' and a.vdef30='" + butype + "' and a.billstatus='1' and a.billstatus<>'9' and  a.billstatus<>'10'  and a.vdef1='"+xmcode+"' ";
+				
+				
+				//查询 材料采购单的单据号，用于回写标识
+				String sqlcode="select a.vbillcode  from  po_demand a "
+						+ "where isnull(a.dr,0)=0  "
+						+ "and a.projectid='" + xmname + "' and a.vdef30='" + butype + "' "
+						+ "and a.billstatus='1' and a.billstatus<>'9' and  a.billstatus<>'10'  and a.vdef1='"+xmcode+"' ";
+				
 				
 				List<DemandUAPBVO> lisdemvos= (List<DemandUAPBVO>) iuap.executeQuery(sqlxc, new BeanListProcessor(DemandUAPBVO.class));
 				String vbillcode=new BillcodeGenerater().getBillCode("MM01", PubEnv.getPk_corp(), null, null);
 				List<OperationDemandVO> demandvos=new ArrayList<OperationDemandVO>();
-				
+				List<String> liscodes=new ArrayList<String>();//读取的材料采购单，单据号
 				if((null!=lisvos && lisvos.size()>0) || (null!=lisdemvos && lisdemvos.size()>0)) {
 					OperationMainVO opmainvo=new OperationMainVO();
 					opmainvo.setBillmaker(ClientEnvironment.getInstance().getUser().getPrimaryKey());
@@ -122,7 +131,9 @@ public class YsAction extends YsQuseryAction{
 					opmainvo.setPk_corp(PubEnv.getCorpCode());
 					opmainvo.setProjectid(xmname);
 					opmainvo.setVbillcode(vbillcode);
+					opmainvo.setVdef28(xmcode);//工单号            
 					pk_operation=ivo.insertVO(opmainvo);
+					liscodes= (List<String>) iuap.executeQuery(sqlcode, new ColumnListProcessor());
 					
 					/********************************生成【需求】页签数据-begin*********************************************/
 
@@ -244,12 +255,12 @@ public class YsAction extends YsQuseryAction{
 				}
 				
 				
-				//工装：2.公共库查询：没有项目的，根据物料去查询
+				//工装：2.公共库查询：没有项目的，根据物料去查询 + 公共批次号条件
 				
 				SqlBuilder sqlbuild=new SqlBuilder();
 				String sqlonhandnum="select  vlot,cwarehouseid,cinventoryid,cinvbasid,vfree1,vfree2,vfree3,vfree4,nonhandnum "
 						+ "from  ic_onhandnum  where cwarehouseid= (select pk_stordoc  from  bd_stordoc "
-						+ "where storcode='GG003') and  nonhandnum>0 and  ";
+						+ "where storcode='GG003') and  nonhandnum>0  and vlot='公共' and ";
 				sqlbuild.append(sqlonhandnum);
 				sqlbuild.append("cinvbasid", pkwls.toArray(new String[pkwls.size()]));
 				
@@ -310,14 +321,31 @@ public class YsAction extends YsQuseryAction{
 					}
 					
 					bancevos.add(bancevo);
-					//供应数据--查询供应页签数据库数据
-					String gysqlw="select * from mm_operation_supply where pk_operation='"+pk_operation+"' and isnull(dr,0)=0 and cmaterialcode='"+bancevo.getCmaterialcode()+"' ";
-					List<OperationSupplyVO> lissupplyvos=(List<OperationSupplyVO>) iuap.executeQuery(gysqlw, new BeanListProcessor(OperationSupplyVO.class));
+					//供应数据--查询供应页签数据库数据+自由项
+					StringBuffer sbf=new StringBuffer();
+					String gysqlw="select * from mm_operation_supply where pk_operation='"+pk_operation+"' "
+							+ "and isnull(dr,0)=0 and cmaterialcode='"+bancevo.getCmaterialcode()+"' ";
+					
+					sbf.append(gysqlw);		
+					if(null!=bancevo.getColor() && !"".equals(bancevo.getColor())) {
+						sbf.append( " and color='"+bancevo.getColor()+"' ");
+					}
+					if(null!=bancevo.getSizing() && !"".equals(bancevo.getSizing())) {
+						sbf.append( " and  sizing='"+bancevo.getSizing()+"' ");
+					}
+					if(null!=bancevo.getAlloy() && !"".equals(bancevo.getAlloy())) {
+						sbf.append( " and alloy='"+bancevo.getAlloy()+"' ");
+					}
+					if(null!=bancevo.getStandard() && !"".equals(bancevo.getStandard())) {
+						sbf.append( " and standard='"+bancevo.getStandard()+"' ");
+					}
+					
+					List<OperationSupplyVO> lissupplyvos=(List<OperationSupplyVO>) iuap.executeQuery(sbf.toString(), new BeanListProcessor(OperationSupplyVO.class));
 					if(null!=lissupplyvos && lissupplyvos.size()>0) {
 						OperationBalanceVO bancevo113=new OperationBalanceVO();//公共库VO
 						OperationBalanceVO bancevo11=new OperationBalanceVO();//工装库VO
 						OperationBalanceVO bancevo1144=new OperationBalanceVO();//公共库VO_还需采购
-						//判断存货公共库和工装库是否都有
+						//判断存货公共库和工装库是否都有 +//现存量+自由项
 						Map<String,List<OperationSupplyVO>> map=new HashMap<String,List<OperationSupplyVO>>();
 						for(OperationSupplyVO opersuplyvo:lissupplyvos) {
 							if(null!=map.get(opersuplyvo.getSupplytype())&&map.get(opersuplyvo.getSupplytype()).size()>0) {
@@ -337,9 +365,16 @@ public class YsAction extends YsQuseryAction{
 								bancevo11.setWarehouse("工装库");//仓库
 								UFDouble gysx=UFDouble.ZERO_DBL;
 								List<OperationSupplyVO> lisgzvos=map.get("库存量_工装库");
+								
+								//现存量+自由项
+								
+								
 								for(OperationSupplyVO gzvo:lisgzvos) {
 									gysx=gysx.add(gzvo.getNum());//供应数量
 								}
+								
+								
+								
 								bancevo11.setNum(gysx);//主数量
 								if (bancevo.getNum().sub(gysx).compareTo(UFDouble.ZERO_DBL)<=0) {
 									//需求数量-供应数量<0
@@ -480,6 +515,28 @@ public class YsAction extends YsQuseryAction{
 									bancevo113.setVbatchcode(bancevo.getVbatchcode());//批次
 									bancevo113.setVdef25(bancevo.getVdef25());
 									bancevo113.setProexecute("转库");//建议执行
+									
+									bancevo113.setVdef1(bancevo.getVdef1());
+									bancevo113.setVdef2(bancevo.getVdef2());
+									bancevo113.setVdef3(bancevo.getVdef3());
+									bancevo113.setVdef4(bancevo.getVdef4());
+									bancevo113.setVdef5(bancevo.getVdef5());
+									bancevo113.setVdef6(bancevo.getVdef6());
+									bancevo113.setVdef7(bancevo.getVdef7());
+									bancevo113.setVdef8(bancevo.getVdef8());
+									bancevo113.setVdef9(bancevo.getVdef9());
+									bancevo113.setVdef10(bancevo.getVdef10());
+									bancevo113.setVdef11(bancevo.getVdef11());
+									bancevo113.setVdef12(bancevo.getVdef12());
+									bancevo113.setVdef13(bancevo.getVdef13());
+									bancevo113.setVdef14(bancevo.getVdef14());
+									bancevo113.setVdef15(bancevo.getVdef15());
+									bancevo113.setVdef16(bancevo.getVdef16());
+									bancevo113.setVdef17(bancevo.getVdef17());
+									bancevo113.setVdef18(bancevo.getVdef18());
+									bancevo113.setVdef19(bancevo.getVdef19());
+									bancevo113.setVdef20(bancevo.getVdef20());
+									
 									bancevosdbdd.add(bancevo113);
 									bancevo11.setSupplytype("库存量_工装库");//供应类型
 									bancevo11.setWarehouse("工装库");//仓库
@@ -513,6 +570,28 @@ public class YsAction extends YsQuseryAction{
 									String swid=UUID.randomUUID().toString();
 									bancevo113.setVdef25(swid);
 									bancevo113.setProexecute("转库");//建议执行
+									
+									bancevo113.setVdef1(bancevo.getVdef1());
+									bancevo113.setVdef2(bancevo.getVdef2());
+									bancevo113.setVdef3(bancevo.getVdef3());
+									bancevo113.setVdef4(bancevo.getVdef4());
+									bancevo113.setVdef5(bancevo.getVdef5());
+									bancevo113.setVdef6(bancevo.getVdef6());
+									bancevo113.setVdef7(bancevo.getVdef7());
+									bancevo113.setVdef8(bancevo.getVdef8());
+									bancevo113.setVdef9(bancevo.getVdef9());
+									bancevo113.setVdef10(bancevo.getVdef10());
+									bancevo113.setVdef11(bancevo.getVdef11());
+									bancevo113.setVdef12(bancevo.getVdef12());
+									bancevo113.setVdef13(bancevo.getVdef13());
+									bancevo113.setVdef14(bancevo.getVdef14());
+									bancevo113.setVdef15(bancevo.getVdef15());
+									bancevo113.setVdef16(bancevo.getVdef16());
+									bancevo113.setVdef17(bancevo.getVdef17());
+									bancevo113.setVdef18(bancevo.getVdef18());
+									bancevo113.setVdef19(bancevo.getVdef19());
+									bancevo113.setVdef20(bancevo.getVdef20());
+									
 									bancevosdbdd.add(bancevo113);
 									bancevo11.setSupplytype("库存量_工装库");//供应类型
 									bancevo11.setWarehouse("工装库");//仓库
@@ -657,6 +736,28 @@ public class YsAction extends YsQuseryAction{
 									bancevo113.setVbatchcode(bancevo.getVbatchcode());//批次
 									bancevo113.setVdef25(bancevo.getVdef25());
 									bancevo113.setProexecute("转库");//建议执行
+									
+									bancevo113.setVdef1(bancevo.getVdef1());
+									bancevo113.setVdef2(bancevo.getVdef2());
+									bancevo113.setVdef3(bancevo.getVdef3());
+									bancevo113.setVdef4(bancevo.getVdef4());
+									bancevo113.setVdef5(bancevo.getVdef5());
+									bancevo113.setVdef6(bancevo.getVdef6());
+									bancevo113.setVdef7(bancevo.getVdef7());
+									bancevo113.setVdef8(bancevo.getVdef8());
+									bancevo113.setVdef9(bancevo.getVdef9());
+									bancevo113.setVdef10(bancevo.getVdef10());
+									bancevo113.setVdef11(bancevo.getVdef11());
+									bancevo113.setVdef12(bancevo.getVdef12());
+									bancevo113.setVdef13(bancevo.getVdef13());
+									bancevo113.setVdef14(bancevo.getVdef14());
+									bancevo113.setVdef15(bancevo.getVdef15());
+									bancevo113.setVdef16(bancevo.getVdef16());
+									bancevo113.setVdef17(bancevo.getVdef17());
+									bancevo113.setVdef18(bancevo.getVdef18());
+									bancevo113.setVdef19(bancevo.getVdef19());
+									bancevo113.setVdef20(bancevo.getVdef20());
+									
 									bancevosdbdd.add(bancevo113);
 									bancevo113.setSupplytype("库存量_公共库");//供应类型
 									bancevo113.setWarehouse("公共库");//仓库
@@ -682,6 +783,28 @@ public class YsAction extends YsQuseryAction{
 									bancevo113.setProexecute("转库");//建议执行
 									String swid=UUID.randomUUID().toString();
 									bancevo113.setVdef25(swid);
+									
+									bancevo113.setVdef1(bancevo.getVdef1());
+									bancevo113.setVdef2(bancevo.getVdef2());
+									bancevo113.setVdef3(bancevo.getVdef3());
+									bancevo113.setVdef4(bancevo.getVdef4());
+									bancevo113.setVdef5(bancevo.getVdef5());
+									bancevo113.setVdef6(bancevo.getVdef6());
+									bancevo113.setVdef7(bancevo.getVdef7());
+									bancevo113.setVdef8(bancevo.getVdef8());
+									bancevo113.setVdef9(bancevo.getVdef9());
+									bancevo113.setVdef10(bancevo.getVdef10());
+									bancevo113.setVdef11(bancevo.getVdef11());
+									bancevo113.setVdef12(bancevo.getVdef12());
+									bancevo113.setVdef13(bancevo.getVdef13());
+									bancevo113.setVdef14(bancevo.getVdef14());
+									bancevo113.setVdef15(bancevo.getVdef15());
+									bancevo113.setVdef16(bancevo.getVdef16());
+									bancevo113.setVdef17(bancevo.getVdef17());
+									bancevo113.setVdef18(bancevo.getVdef18());
+									bancevo113.setVdef19(bancevo.getVdef19());
+									bancevo113.setVdef20(bancevo.getVdef20());
+									
 									bancevosdbdd.add(bancevo113);
 									bancevo113.setSupplytype("库存量_公共库");//供应类型
 									bancevo113.setWarehouse("公共库");//仓库
@@ -858,6 +981,8 @@ public class YsAction extends YsQuseryAction{
 					int flg=0;
 					for(OperationBalanceVO cgdd : bancevoscgdd) {
 						OperationPurchaseVO vo=new OperationPurchaseVO();
+						vo.setUnitid(cgdd.getUnitid());//计量单位
+						vo.setCastunitid(cgdd.getCastunitid());//辅助计量单位
 						vo.setPrjcode(cgdd.getPrjcode());
 						vo.setPrjname(cgdd.getPrjname());
 						vo.setPrjtypecode(cgdd.getPrjtypecode());
@@ -879,7 +1004,7 @@ public class YsAction extends YsQuseryAction{
 						vo.setNmny(cgdd.getNmny());
 				//		vo.setPk_operation(pk_operation);//主表主键
 						vo.setCastunitid(cgdd.getCastunitid());	
-						vo.setNastnum(cgdd.getNastnum());
+						vo.setNastnum(cgdd.getNastnum());//辅数量
 						vo.setVdef1(cgdd.getVdef1());
 						vo.setVdef2(cgdd.getVdef2());
 						vo.setVdef3(cgdd.getVdef3());
@@ -892,7 +1017,7 @@ public class YsAction extends YsQuseryAction{
 						vo.setVdef10(cgdd.getVdef10());
 						vo.setVdef11(cgdd.getVdef11());
 						vo.setVdef12(cgdd.getVdef12());
-						vo.setVdef13(cgdd.getVdef13());
+						vo.setVdef13(cgdd.getVdef13());//换算率
 						vo.setVdef14(cgdd.getVdef14());
 						vo.setVdef15(cgdd.getVdef15());
 						vo.setVdef16(cgdd.getVdef16());
@@ -906,8 +1031,10 @@ public class YsAction extends YsQuseryAction{
 						vo.setVdef24(cgdd.getVdef24());
 						vo.setVdef25(cgdd.getVdef25());
 						vo.setVdef26(cgdd.getProexecutenum());//本次采购数量
+						vo.setVdef21(new UFDouble(cgdd.getProexecutenum()).div
+								(new UFDouble(cgdd.getVdef28()).div(cgdd.getNastnum())).setScale(2,UFDouble.ROUND_HALF_UP ).toString());//本次采购辅数量
 						vo.setVdef27(pk_operation);//保存主表主键
-						vo.setVdef28(cgdd.getVdef28());//采购数量
+						vo.setVdef28(cgdd.getVdef28());//材料采购单数量
 						vo.setVdef29(cgdd.getVdef29());//工单号
 						vo.setVdef30(cgdd.getVdef30());//来源单据主表主键--材料采购单
 						purchasevos[flg]=vo;
@@ -985,6 +1112,8 @@ public class YsAction extends YsQuseryAction{
 					int flgzk=0;
 					for(OperationBalanceVO cgdd : bancevosdbdd) {
 						OperationTransferVO vozk=new OperationTransferVO();
+						vozk.setUnitid(cgdd.getUnitid());//计量单位
+						vozk.setCastunitid(cgdd.getCastunitid());//辅助计量单位
 						vozk.setOutprjcode(cgdd.getPrjcode());
 						vozk.setOutprjname(cgdd.getPrjname());
 						vozk.setOutprjtypecode(cgdd.getPrjtypecode());
@@ -1004,7 +1133,8 @@ public class YsAction extends YsQuseryAction{
 						vozk.setWeight(cgdd.getWeight());
 						vozk.setNum(new UFDouble(cgdd.getProexecutenum()));
 						vozk.setNprice(cgdd.getNprice());
-						vozk.setNmny(cgdd.getNmny());
+						vozk.setNmny(cgdd.getNmny());//数量
+						vozk.setNastnum(cgdd.getNastnum());//辅数量
 						vozk.setPk_operation(pk_operation);
 						vozk.setVdef1(cgdd.getVdef1());
 						vozk.setVdef2(cgdd.getVdef2());
@@ -1018,7 +1148,7 @@ public class YsAction extends YsQuseryAction{
 						vozk.setVdef10(cgdd.getVdef10());
 						vozk.setVdef11(cgdd.getVdef11());
 						vozk.setVdef12(cgdd.getVdef12());
-						vozk.setVdef13(cgdd.getVdef13());
+						vozk.setVdef13(cgdd.getVdef13());//换算率
 						vozk.setVdef14(cgdd.getVdef14());
 						vozk.setVdef15(cgdd.getVdef15());
 						vozk.setVdef16(cgdd.getVdef16());
@@ -1063,6 +1193,18 @@ public class YsAction extends YsQuseryAction{
 				throw new  ValidationException(e.getMessage());
 			}	
 			
+			//回写状态到材料采购单
+			if(null!=liscodes && liscodes.size()>0) {
+				SqlBuilder sqlbuf=new SqlBuilder();
+				sqlbuf.append(" select * from  po_demand where ");
+				sqlbuf.append("vbillcode", liscodes.toArray(new String[0]));
+				List<MRPDemandVO> lisdemandvos=(List<MRPDemandVO>) iuap.executeQuery(sqlbuf.toString(), new BeanListProcessor(MRPDemandVO.class));
+				for(MRPDemandVO andvo:lisdemandvos) {
+					andvo.setBillstatus(10);
+				}
+				ivo.updateVOList(lisdemandvos);
+			}
+			
 			getDataModel().setExtraCondition(" and pk_corp = '" + Global.getCorpPK() + "'"+" and pk_operation=  '" + pk_operation + "'"   );
 	
 			}else {

mm/mm/src/public/nc/vo/AqkcVO.java

@@ -0,0 +1,80 @@
+package nc.vo;
+
+import nc.vo.pub.SuperVO;
+
+public class AqkcVO extends SuperVO{
+	
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private String cmaterialcode;
+	private String color; // 子表主键
+	private String sizing; // 主表主键
+	private String alloy; // 项目编码
+	private String standard; // 项目名称
+	
+	
+
+	public String getCmaterialcode() {
+		return cmaterialcode;
+	}
+
+	public void setCmaterialcode(String cmaterialcode) {
+		this.cmaterialcode = cmaterialcode;
+	}
+
+	public String getColor() {
+		return color;
+	}
+
+	public void setColor(String color) {
+		this.color = color;
+	}
+
+	public String getSizing() {
+		return sizing;
+	}
+
+	public void setSizing(String sizing) {
+		this.sizing = sizing;
+	}
+
+	public String getAlloy() {
+		return alloy;
+	}
+
+	public void setAlloy(String alloy) {
+		this.alloy = alloy;
+	}
+
+	public String getStandard() {
+		return standard;
+	}
+
+	public void setStandard(String standard) {
+		this.standard = standard;
+	}
+
+	@Override
+	public String getPKFieldName() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getParentPKFieldName() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getTableName() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	
+
+}

mm/mm/src/public/nc/vo/MRPDemandVO.java

@@ -0,0 +1,938 @@
+package nc.vo;
+	
+import nc.vo.pub.*;
+import nc.vo.pub.lang.*;
+	
+/**
+ * <b> 在此处简要描述此类的功能 </b>
+ * <p>
+ *     在此处添加此类的描述信息
+ * </p>
+ * 创建日期:2023-10-20 16:00:43
+ * @author Administrator
+ * @version NCPrj 1.0
+ */
+@SuppressWarnings("serial")
+public class MRPDemandVO extends SuperVO {
+	private String pk_demand; // 主表主键
+	private String pk_corp; //采购组织
+	private String vbillcode; // 单据号
+	private UFDate dbilldate; // 单据日期
+	private Integer billstatus; // 单据状态
+	private String workmanid; // 业务员
+	private String plandeptid; // 采购部门
+	private String projectid; // 项目
+	private String vnote; // 备注
+	private String billmaker; // 制单人
+	private UFDate makedate; // 制单日期
+	private String checker; // 审核人
+	private String approve; // 审批人
+	private UFDateTime approvedate; // 审批日期
+	private String approvenote; // 审批意见
+	private String modifier; // 最后修改人
+	private UFDateTime modifiedtime; // 最后修改时间
+	private UFDateTime ts; // 时间戳
+	private Integer dr; // 删除标志
+	private String vdef1;
+	private String vdef2;
+	private String vdef3;
+	private String vdef4;
+	private String vdef5;
+	private String vdef6;
+	private String vdef7;
+	private String vdef8;
+	private String vdef9;
+	private String vdef10;
+	private String vdef11;
+	private String vdef12;
+	private String vdef13;
+	private String vdef14;
+	private String vdef15;
+	private String vdef16;
+	private String vdef17;
+	private String vdef18;
+	private String vdef19;
+	private String vdef20;
+	private String vdef21;
+	private String vdef22;
+	private String vdef23;
+	private String vdef24;
+	private String vdef25;
+	private String vdef26;
+	private String vdef27;
+	private String vdef28;
+	private String vdef29;
+	private String vdef30;
+
+	public static final String MODIFIER = "modifier";
+	public static final String CHECKER = "checker";
+	public static final String APPROVEDATE = "approvedate";
+	public static final String PLANDEPTID = "plandeptid";
+	public static final String VDEF10 = "vdef10";
+	public static final String VDEF11 = "vdef11";
+	public static final String BILLMAKER = "billmaker";
+	public static final String WORKMANID = "workmanid";
+	public static final String VDEF16 = "vdef16";
+	public static final String VDEF17 = "vdef17";
+	public static final String VDEF18 = "vdef18";
+	public static final String VDEF19 = "vdef19";
+	public static final String VDEF12 = "vdef12";
+	public static final String VDEF13 = "vdef13";
+	public static final String VDEF14 = "vdef14";
+	public static final String BILLSTATUS = "billstatus";
+	public static final String VDEF15 = "vdef15";
+	public static final String VDEF20 = "vdef20";
+	public static final String VDEF21 = "vdef21";
+	public static final String VDEF22 = "vdef22";
+	public static final String APPROVENOTE = "approvenote";
+	public static final String DBILLDATE = "dbilldate";
+	public static final String MODIFIEDTIME = "modifiedtime";
+	public static final String PK_CORP = "pk_corp";
+	public static final String VDEF27 = "vdef27";
+	public static final String VDEF28 = "vdef28";
+	public static final String VNOTE = "vnote";
+	public static final String VDEF29 = "vdef29";
+	public static final String VDEF23 = "vdef23";
+	public static final String PROJECTID = "projectid";
+	public static final String VDEF24 = "vdef24";
+	public static final String VDEF25 = "vdef25";
+	public static final String VDEF26 = "vdef26";
+	public static final String VDEF30 = "vdef30";
+	public static final String VDEF8 = "vdef8";
+	public static final String VDEF7 = "vdef7";
+	public static final String VDEF9 = "vdef9";
+	public static final String VDEF4 = "vdef4";
+	public static final String VDEF3 = "vdef3";
+	public static final String PK_DEMAND = "pk_demand";
+	public static final String VDEF6 = "vdef6";
+	public static final String VDEF5 = "vdef5";
+	public static final String MAKEDATE = "makedate";
+	public static final String VDEF2 = "vdef2";
+	public static final String VDEF1 = "vdef1";
+	public static final String VBILLCODE = "vbillcode";
+	public static final String APPROVE = "approve";
+			
+	/**
+	 * 属性modifier的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getModifier () {
+		return modifier;
+	}   
+	/**
+	 * 属性modifier的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newModifier String
+	 */
+	public void setModifier (String newModifier ) {
+	 	this.modifier = newModifier;
+	} 	  
+	/**
+	 * 属性checker的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getChecker () {
+		return checker;
+	}   
+	/**
+	 * 属性checker的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newChecker String
+	 */
+	public void setChecker (String newChecker ) {
+	 	this.checker = newChecker;
+	} 	  
+	/**
+	 * 属性dr的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return Integer
+	 */
+	public Integer getDr () {
+		return dr;
+	}   
+	/**
+	 * 属性dr的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newDr Integer
+	 */
+	public void setDr (Integer newDr ) {
+	 	this.dr = newDr;
+	} 	  
+	/**
+	 * 属性approvedate的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public UFDateTime getApprovedate () {
+		return approvedate;
+	}   
+	/**
+	 * 属性approvedate的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newApprovedate String
+	 */
+	public void setApprovedate (UFDateTime newApprovedate ) {
+	 	this.approvedate = newApprovedate;
+	} 	  
+	/**
+	 * 属性plandeptid的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getPlandeptid () {
+		return plandeptid;
+	}   
+	/**
+	 * 属性plandeptid的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newPlandeptid String
+	 */
+	public void setPlandeptid (String newPlandeptid ) {
+	 	this.plandeptid = newPlandeptid;
+	} 	  
+	/**
+	 * 属性vdef10的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef10 () {
+		return vdef10;
+	}   
+	/**
+	 * 属性vdef10的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef10 String
+	 */
+	public void setVdef10 (String newVdef10 ) {
+	 	this.vdef10 = newVdef10;
+	} 	  
+	/**
+	 * 属性vdef11的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef11 () {
+		return vdef11;
+	}   
+	/**
+	 * 属性vdef11的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef11 String
+	 */
+	public void setVdef11 (String newVdef11 ) {
+	 	this.vdef11 = newVdef11;
+	} 	  
+	/**
+	 * 属性billmaker的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getBillmaker () {
+		return billmaker;
+	}   
+	/**
+	 * 属性billmaker的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newBillmaker String
+	 */
+	public void setBillmaker (String newBillmaker ) {
+	 	this.billmaker = newBillmaker;
+	} 	  
+	/**
+	 * 属性workmanid的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getWorkmanid () {
+		return workmanid;
+	}   
+	/**
+	 * 属性workmanid的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newWorkmanid String
+	 */
+	public void setWorkmanid (String newWorkmanid ) {
+	 	this.workmanid = newWorkmanid;
+	} 	  
+	/**
+	 * 属性vdef16的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef16 () {
+		return vdef16;
+	}   
+	/**
+	 * 属性vdef16的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef16 String
+	 */
+	public void setVdef16 (String newVdef16 ) {
+	 	this.vdef16 = newVdef16;
+	} 	  
+	/**
+	 * 属性vdef17的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef17 () {
+		return vdef17;
+	}   
+	/**
+	 * 属性vdef17的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef17 String
+	 */
+	public void setVdef17 (String newVdef17 ) {
+	 	this.vdef17 = newVdef17;
+	} 	  
+	/**
+	 * 属性vdef18的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef18 () {
+		return vdef18;
+	}   
+	/**
+	 * 属性vdef18的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef18 String
+	 */
+	public void setVdef18 (String newVdef18 ) {
+	 	this.vdef18 = newVdef18;
+	} 	  
+	/**
+	 * 属性vdef19的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef19 () {
+		return vdef19;
+	}   
+	/**
+	 * 属性vdef19的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef19 String
+	 */
+	public void setVdef19 (String newVdef19 ) {
+	 	this.vdef19 = newVdef19;
+	} 	  
+	/**
+	 * 属性vdef12的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef12 () {
+		return vdef12;
+	}   
+	/**
+	 * 属性vdef12的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef12 String
+	 */
+	public void setVdef12 (String newVdef12 ) {
+	 	this.vdef12 = newVdef12;
+	} 	  
+	/**
+	 * 属性vdef13的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef13 () {
+		return vdef13;
+	}   
+	/**
+	 * 属性vdef13的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef13 String
+	 */
+	public void setVdef13 (String newVdef13 ) {
+	 	this.vdef13 = newVdef13;
+	} 	  
+	/**
+	 * 属性vdef14的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef14 () {
+		return vdef14;
+	}   
+	/**
+	 * 属性vdef14的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef14 String
+	 */
+	public void setVdef14 (String newVdef14 ) {
+	 	this.vdef14 = newVdef14;
+	} 	  
+	/**
+	 * 属性status的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return Integer
+	 */
+	public Integer getBillstatus () {
+		return billstatus;
+	}   
+	/**
+	 * 属性billstatus的Setter方法.
+	 * 创建日期:2023-10-18 15:52:34
+	 * @param newBillstatus String
+	 */
+	public void setBillstatus (Integer newBillstatus ) {
+	 	this.billstatus = newBillstatus;
+	} 	  
+	/**
+	 * 属性vdef15的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef15 () {
+		return vdef15;
+	}   
+	/**
+	 * 属性vdef15的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef15 String
+	 */
+	public void setVdef15 (String newVdef15 ) {
+	 	this.vdef15 = newVdef15;
+	} 	  
+	/**
+	 * 属性vdef20的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef20 () {
+		return vdef20;
+	}   
+	/**
+	 * 属性vdef20的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef20 String
+	 */
+	public void setVdef20 (String newVdef20 ) {
+	 	this.vdef20 = newVdef20;
+	} 	  
+	/**
+	 * 属性vdef21的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef21 () {
+		return vdef21;
+	}   
+	/**
+	 * 属性vdef21的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef21 String
+	 */
+	public void setVdef21 (String newVdef21 ) {
+	 	this.vdef21 = newVdef21;
+	} 	  
+	/**
+	 * 属性vdef22的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef22 () {
+		return vdef22;
+	}   
+	/**
+	 * 属性vdef22的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef22 String
+	 */
+	public void setVdef22 (String newVdef22 ) {
+	 	this.vdef22 = newVdef22;
+	} 	  
+	/**
+	 * 属性approvenote的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getApprovenote () {
+		return approvenote;
+	}   
+	/**
+	 * 属性approvenote的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newApprovenote String
+	 */
+	public void setApprovenote (String newApprovenote ) {
+	 	this.approvenote = newApprovenote;
+	} 	  
+	/**
+	 * 属性dbilldate的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return UFDate
+	 */
+	public UFDate getDbilldate () {
+		return dbilldate;
+	}   
+	/**
+	 * 属性dbilldate的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newDbilldate UFDate
+	 */
+	public void setDbilldate (UFDate newDbilldate ) {
+	 	this.dbilldate = newDbilldate;
+	} 	  
+	/**
+	 * 属性modifiedtime的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public UFDateTime getModifiedtime () {
+		return modifiedtime;
+	}   
+	/**
+	 * 属性modifiedtime的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newModifiedtime String
+	 */
+	public void setModifiedtime (UFDateTime newModifiedtime ) {
+	 	this.modifiedtime = newModifiedtime;
+	} 	  
+	/**
+	 * 属性pk_corp的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getPk_corp () {
+		return pk_corp;
+	}   
+	/**
+	 * 属性pk_corp的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newPk_corp String
+	 */
+	public void setPk_corp (String newPk_corp ) {
+	 	this.pk_corp = newPk_corp;
+	} 	  
+	/**
+	 * 属性vdef27的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef27 () {
+		return vdef27;
+	}   
+	/**
+	 * 属性vdef27的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef27 String
+	 */
+	public void setVdef27 (String newVdef27 ) {
+	 	this.vdef27 = newVdef27;
+	} 	  
+	/**
+	 * 属性vdef28的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef28 () {
+		return vdef28;
+	}   
+	/**
+	 * 属性vdef28的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef28 String
+	 */
+	public void setVdef28 (String newVdef28 ) {
+	 	this.vdef28 = newVdef28;
+	} 	  
+	/**
+	 * 属性vnote的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVnote () {
+		return vnote;
+	}   
+	/**
+	 * 属性vnote的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVnote String
+	 */
+	public void setVnote (String newVnote ) {
+	 	this.vnote = newVnote;
+	} 	  
+	/**
+	 * 属性vdef29的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef29 () {
+		return vdef29;
+	}   
+	/**
+	 * 属性vdef29的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef29 String
+	 */
+	public void setVdef29 (String newVdef29 ) {
+	 	this.vdef29 = newVdef29;
+	} 	  
+	/**
+	 * 属性vdef23的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef23 () {
+		return vdef23;
+	}   
+	/**
+	 * 属性vdef23的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef23 String
+	 */
+	public void setVdef23 (String newVdef23 ) {
+	 	this.vdef23 = newVdef23;
+	} 	  
+	/**
+	 * 属性projectid的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getProjectid () {
+		return projectid;
+	}   
+	/**
+	 * 属性projectid的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newProjectid String
+	 */
+	public void setProjectid (String newProjectid ) {
+	 	this.projectid = newProjectid;
+	} 	  
+	/**
+	 * 属性vdef24的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef24 () {
+		return vdef24;
+	}   
+	/**
+	 * 属性vdef24的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef24 String
+	 */
+	public void setVdef24 (String newVdef24 ) {
+	 	this.vdef24 = newVdef24;
+	} 	  
+	/**
+	 * 属性vdef25的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef25 () {
+		return vdef25;
+	}   
+	/**
+	 * 属性vdef25的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef25 String
+	 */
+	public void setVdef25 (String newVdef25 ) {
+	 	this.vdef25 = newVdef25;
+	} 	  
+	/**
+	 * 属性vdef26的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef26 () {
+		return vdef26;
+	}   
+	/**
+	 * 属性vdef26的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef26 String
+	 */
+	public void setVdef26 (String newVdef26 ) {
+	 	this.vdef26 = newVdef26;
+	} 	  
+	/**
+	 * 属性vdef30的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef30 () {
+		return vdef30;
+	}   
+	/**
+	 * 属性vdef30的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef30 String
+	 */
+	public void setVdef30 (String newVdef30 ) {
+	 	this.vdef30 = newVdef30;
+	} 	  
+	/**
+	 * 属性vdef8的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef8 () {
+		return vdef8;
+	}   
+	/**
+	 * 属性vdef8的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef8 String
+	 */
+	public void setVdef8 (String newVdef8 ) {
+	 	this.vdef8 = newVdef8;
+	} 	  
+	/**
+	 * 属性vdef7的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef7 () {
+		return vdef7;
+	}   
+	/**
+	 * 属性vdef7的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef7 String
+	 */
+	public void setVdef7 (String newVdef7 ) {
+	 	this.vdef7 = newVdef7;
+	} 	  
+	/**
+	 * 属性vdef9的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef9 () {
+		return vdef9;
+	}   
+	/**
+	 * 属性vdef9的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef9 String
+	 */
+	public void setVdef9 (String newVdef9 ) {
+	 	this.vdef9 = newVdef9;
+	} 	  
+	/**
+	 * 属性vdef4的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef4 () {
+		return vdef4;
+	}   
+	/**
+	 * 属性vdef4的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef4 String
+	 */
+	public void setVdef4 (String newVdef4 ) {
+	 	this.vdef4 = newVdef4;
+	} 	  
+	/**
+	 * 属性vdef3的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef3 () {
+		return vdef3;
+	}   
+	/**
+	 * 属性vdef3的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef3 String
+	 */
+	public void setVdef3 (String newVdef3 ) {
+	 	this.vdef3 = newVdef3;
+	} 	  
+	/**
+	 * 属性pk_demand的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getPk_demand () {
+		return pk_demand;
+	}   
+	/**
+	 * 属性pk_demand的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newPk_demand String
+	 */
+	public void setPk_demand (String newPk_demand ) {
+	 	this.pk_demand = newPk_demand;
+	} 	  
+	/**
+	 * 属性vdef6的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef6 () {
+		return vdef6;
+	}   
+	/**
+	 * 属性vdef6的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef6 String
+	 */
+	public void setVdef6 (String newVdef6 ) {
+	 	this.vdef6 = newVdef6;
+	} 	  
+	/**
+	 * 属性vdef5的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef5 () {
+		return vdef5;
+	}   
+	/**
+	 * 属性vdef5的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef5 String
+	 */
+	public void setVdef5 (String newVdef5 ) {
+	 	this.vdef5 = newVdef5;
+	} 	  
+	/**
+	 * 属性makedate的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public UFDate getMakedate () {
+		return makedate;
+	}   
+	/**
+	 * 属性makedate的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newMakedate String
+	 */
+	public void setMakedate (UFDate newMakedate ) {
+	 	this.makedate = newMakedate;
+	} 	  
+	/**
+	 * 属性vdef2的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef2 () {
+		return vdef2;
+	}   
+	/**
+	 * 属性vdef2的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef2 String
+	 */
+	public void setVdef2 (String newVdef2 ) {
+	 	this.vdef2 = newVdef2;
+	} 	  
+	/**
+	 * 属性vdef1的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVdef1 () {
+		return vdef1;
+	}   
+	/**
+	 * 属性vdef1的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVdef1 String
+	 */
+	public void setVdef1 (String newVdef1 ) {
+	 	this.vdef1 = newVdef1;
+	} 	  
+	/**
+	 * 属性vbillcode的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getVbillcode () {
+		return vbillcode;
+	}   
+	/**
+	 * 属性vbillcode的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newVbillcode String
+	 */
+	public void setVbillcode (String newVbillcode ) {
+	 	this.vbillcode = newVbillcode;
+	} 	  
+	/**
+	 * 属性approve的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return String
+	 */
+	public String getApprove () {
+		return approve;
+	}   
+	/**
+	 * 属性approve的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newApprove String
+	 */
+	public void setApprove (String newApprove ) {
+	 	this.approve = newApprove;
+	} 	  
+	/**
+	 * 属性ts的Getter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return UFDateTime
+	 */
+	public UFDateTime getTs () {
+		return ts;
+	}   
+	/**
+	 * 属性ts的Setter方法.
+	 * 创建日期:2023-10-20 16:00:43
+	 * @param newTs UFDateTime
+	 */
+	public void setTs (UFDateTime newTs ) {
+	 	this.ts = newTs;
+	} 	  
+ 
+	/**
+	  * <p>取得父VO主键字段.
+	  * <p>
+	  * 创建日期:2023-10-20 16:00:43
+	  * @return java.lang.String
+	  */
+	public java.lang.String getParentPKFieldName() {
+	    return null;
+	}   
+    
+	/**
+	  * <p>取得表主键.
+	  * <p>
+	  * 创建日期:2023-10-20 16:00:43
+	  * @return java.lang.String
+	  */
+	public java.lang.String getPKFieldName() {
+	  return "pk_demand";
+	}
+    
+	/**
+	 * <p>返回表名称.
+	 * <p>
+	 * 创建日期:2023-10-20 16:00:43
+	 * @return java.lang.String
+	 */
+	public java.lang.String getTableName() {
+		return "po_demand";
+	}    
+    
+    /**
+	  * 按照默认方式创建构造子.
+	  *
+	  * 创建日期:2023-10-20 16:00:43
+	  */
+     public MRPDemandVO() {
+		super();	
+	}    
+} 

mmpac/mmpac/src/private/u8c/bs/mmpac/bp/SpecialDataRule.java

@@ -61,7 +61,7 @@ public class SpecialDataRule implements IRule<ExAggOrderMainVO>{
 				//窗号
 				orderInVO.setConf(invbasdocMap.get("def1"));
 				//专用区
-				orderInVO.setPrjtypecode(invbasdocMap.get("def4"));
+				orderInVO.setPrjtypecode(getzyqpk("专用区",invbasdocMap.get("def4")));
 				//待定
 				orderInVO.setPrjtypename(invbasdocMap.get("def5"));
 				//计量单位
@@ -184,4 +184,28 @@ public class SpecialDataRule implements IRule<ExAggOrderMainVO>{
         	iDefdoc.saveVOs(pk_defdoclist, new DefdocVO[] {defdocVO});
         }
     }
+    
+    
+    private String getzyqpk(String doclistname,String pk_defdoc) throws BusinessException {
+    	
+    	if(null==pk_defdoc || "".equals(pk_defdoc)) {
+    		return "";
+    	}
+    	
+    	//取到自定义档案列表主键
+    	String sql = "select pk_defdoclist from bd_defdoclist where doclistname = '"+doclistname+"'";
+    	Object pk_defdoclist = iuap.executeQuery(sql, new ColumnProcessor());
+    	if(pk_defdoclist == null) {
+    		throw new BusinessException("以下档案在U8cloud系统中根据公司或者账簿信息找不到，请检查！详细信息：1、档案类型：自定义档案列表，档案名称："+doclistname);
+    	}
+        String sql1 = "select docname  from bd_defdoc where pk_defdoclist = '"+pk_defdoclist.toString()+"' and pk_defdoc ='"+pk_defdoc+"'";
+        String docname = (String) iuap.executeQuery(sql1, new ColumnProcessor());
+        
+		return docname;
+    	
+    }
+    
+    
+    
+    
 }