zthwr 9 месяцев назад
Родитель
Сommit
10c00ff2c2
1 измененных файлов с 21 добавлено и 13 удалено
  1. 21 13
      mmpac/mmpac/src/private/u8c/bs/mmpac/bp/SpecialDataRule.java

+ 21 - 13
mmpac/mmpac/src/private/u8c/bs/mmpac/bp/SpecialDataRule.java

@@ -45,8 +45,15 @@ public class SpecialDataRule implements IRule<ExAggOrderMainVO>{
 				orderInVO.setPrjtypecode(JobbasfilMap.get("jobtypecode"));
 				//项目分类名称
 				orderInVO.setPrjtypename(JobbasfilMap.get("jobtypename"));
-				//批次
-				orderInVO.setVbatchcode(JobbasfilMap.get("jobcode"));
+				
+				if(headvo.getBusitype().equals("家装")) {
+					//批次
+					orderInVO.setVbatchcode("家装");
+				}else {
+					//批次
+					orderInVO.setVbatchcode(JobbasfilMap.get("jobcode"));
+				}
+				
 				Map<String,String> invbasdocMap = getInvbasdoc(orderInVO.getCmaterialcode());
 				//存货名称
 				orderInVO.setCmaterialname(invbasdocMap.get("invname"));
@@ -164,17 +171,18 @@ public class SpecialDataRule implements IRule<ExAggOrderMainVO>{
         	//公司                  
         	defdocVO.setPk_corp("0001");
         	//档案编码
-        	UFDate date = new UFDate();
-        	//YSDC20231219000000
-        	HashMap<String, String> billcode_map = UpifsTool
-					.GreatVbillcode("doccode", "YSDC", date,
-							"bd_defdoc",pk_defdoclist);
-        	String billcode_s = billcode_map.get("billcode_s");// 单据号前段
-			String billcode_e = billcode_map.get("billcode_e");// 单据号流水号
-			Integer billcode_tj = new Integer(billcode_e);
-			billcode_tj=billcode_tj+1;
-			String billcode =billcode_s+UpifsTool.ChangeIntToStr(billcode_tj);
-        	defdocVO.setDoccode(billcode);
+//        	UFDate date = new UFDate();
+//        	//YSDC20231219000000
+//        	HashMap<String, String> billcode_map = UpifsTool
+//					.GreatVbillcode("doccode", "YSDC", date,
+//							"bd_defdoc",pk_defdoclist);
+//        	String billcode_s = billcode_map.get("billcode_s");// 单据号前段
+//			String billcode_e = billcode_map.get("billcode_e");// 单据号流水号
+//			Integer billcode_tj = new Integer(billcode_e);
+//			billcode_tj=billcode_tj+1;
+//			String billcode =billcode_s+UpifsTool.ChangeIntToStr(billcode_tj);
+//        	defdocVO.setDoccode(billcode);
+        	defdocVO.setDoccode(docname);
         	//档案名称
         	defdocVO.setDocname(docname);
         	//档案系统属性