u8调试接口

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -28,6 +28,7 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.config.InterfaceConnUtils;
 import org.jeecg.modules.documents.letterDeposit.entity.SyLetterDepositItem;
 import org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrderItem;
 import org.jeecg.modules.spapl.entity.SizeTable;
@@ -136,12 +137,12 @@ public class SyPackingListTailoringController {
 		return Result.OK(pageList);
 	}
 
-	 /**
+	/* *//**
 	  * 分页列表查询
 	  *
 	  * @param id
 	  * @return
-	  */
+	  *//*
 	 @AutoLog(value = "根据预装箱单-id获取数据")
 	 @ApiOperation(value="根据预装箱单-id获取数据", notes="根据预装箱单-id获取数据")
 	 @GetMapping(value = "/querySpaplId")
@@ -156,6 +157,33 @@ public class SyPackingListTailoringController {
 		 result.setMessage("查询成功！");
 		 result.setSuccess(true);
 		 return result;
+	 }*/
+
+	 /**
+	  * 分页列表查询
+	  *
+	  * @param ids
+	  * @return
+	  */
+	 @AutoLog(value = "预装箱单批量生成数据")
+	 @ApiOperation(value="预装箱单批量生成数据", notes="预装箱单批量生成数据")
+	 @GetMapping(value = "/querySpaplId2")
+	 public Result<?> querySpaplId(String[] ids) {
+		 Result<SyPackingListTailoring> result=new Result<>();
+		 if(oConvertUtils.isEmpty(ids)){
+			 result.setSuccess(false);
+			 result.setMessage("未获取到id的信息");
+			 return result;
+		 }
+		 int num=0;
+		 for (String id : ids){
+			SyPackingListTailoring syPackingListTailoring=syPackingListTailoringService.querySpaplId(id);
+			syPackingListTailoringService.saveMain2(syPackingListTailoring);
+			num++;
+		 }
+		 result.setMessage("生成"+num+"条数据！");
+		 result.setSuccess(true);
+		 return result;
 	 }
 
 	 /**
@@ -1180,7 +1208,7 @@ public class SyPackingListTailoringController {
 		 }/*
 		 JSONArray items=new JSONArray();*/
 		 List<SyPackingListTailoring> mains=new ArrayList<>();
-		 Map<String,String> map=new HashMap<>();
+		 Map<String,Object> map=new HashMap<>();
 		 for (int i=0;i<ids.length;i++){
 			 SyPackingListTailoring main=syPackingListTailoringService.getById(ids[i]);
 			 QueryWrapper queryWrapper=new QueryWrapper();
@@ -1193,21 +1221,27 @@ public class SyPackingListTailoringController {
 			 	 map.put("account",main.getSyPackingListTailoringItemList().get(0).getOmpoAccount());//委外采购账套号
 			 	 map.put("ompoId",main.getOmpoId());//采购委外主表id
 			 	 map.put("mpOrder",main.getPurchase());//采购委外订单号
+				 System.out.println("mporder\t"+main.getPurchase());//采购委外订单号
 				 map.put("customerCode","one");//客户编码
 				 map.put("CVENCODE","one");//供应商编码
 			 	 map.put("orderNumber","one");//销售订单号
 			 	// map.put("soId","one");//销售订单号
 			 }
 		 }
+		 System.out.println("循环前\n"+map);
 		 for (int i=0;i<1;i++){//最多循环3次
 			 if (map.get("account").equals("903")){
-				 map=syPackingListTailoringService.three(mains,map);
+				// map=
+				syPackingListTailoringService.three(mains,map);
 			 }else if(map.get("account").equals("902")){
-				 map=syPackingListTailoringService.two(mains,map);
+				// map=
+				syPackingListTailoringService.two(mains,map);
 			 }else if(map.get("account").equals("901")){
-				 map=syPackingListTailoringService.one(mains,map);
+				 //map=
+				syPackingListTailoringService.one(mains,map);
 			 }
 		 }
+		 System.out.println("循环后\n"+map);
 		 //返回的map需要判断，是去102还是101或者完成
 		 //需要返回客户编码，销售订单号，账套号
 		 //--委外采购订单主表(主表id+订单号)-->委外采购订单子表(主表id)-->销售订单子表(销售订单子表ID)-->销售订单主表(主表id)
@@ -1270,4 +1304,24 @@ public class SyPackingListTailoringController {
 		 }
 		 return result;
 	 }
+
+	 @AutoLog(value = "调试接口-采购发票")
+	 @ApiOperation(value="调试接口-采购发票", notes="调试接口-采购发票")
+	 @RequestMapping(value = "/pushJson", method = {RequestMethod.POST})
+	 public Result json(@RequestBody JSONArray jsonArray){
+		 JSONArray jsonArray2= InterfaceConnUtils.doPost(jsonArray,"purinvoice_import");
+		 Result result=new Result();
+		 result.setResult(jsonArray2);
+		 return  result;
+	 }
+
+	 @AutoLog(value = "调试接口-销售发货")
+	 @ApiOperation(value="调试接口-销售发货", notes="调试接口-销售发货")
+	 @RequestMapping(value = "/pushJson2", method = {RequestMethod.POST})
+	 public Result json2(@RequestBody JSONArray jsonArray){
+		 JSONArray jsonArray2= InterfaceConnUtils.doPost(jsonArray,"consignment_import");
+		 Result result=new Result();
+		 result.setResult(jsonArray2);
+		 return  result;
+	 }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/xml/syPackingListTailoringMapper.xml

@@ -155,7 +155,7 @@
     </select>
 
     <select id="getOmOrPoItem" parameterType="java.lang.String" resultType="java.util.HashMap">
-        select  iMoney,iNatMoney,iSOsID,${id} as id   from ${tableName} where  ${orderName}
+        select  iMoney,iNatMoney,iSOsID,${id} as id,inum   from ${tableName} where  ${orderName}
     </select>
 
     <select id="getSoMain" parameterType="java.lang.String" resultType="java.util.HashMap">

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/ISyPackingListTailoringService.java

@@ -86,11 +86,11 @@ public interface ISyPackingListTailoringService extends IService<SyPackingListTa
 
     String test(List<SyPackingListTailoring> mains);
 
-	Map<String,String> one(List<SyPackingListTailoring> mains,Map<String,String> map);
+	Map<String,Object> one(List<SyPackingListTailoring> mains,Map<String,Object> map);
 
-	Map<String,String> two(List<SyPackingListTailoring> mains,Map<String,String> map);
+	Map<String,Object> two(List<SyPackingListTailoring> mains,Map<String,Object> map);
 
-	Map<String,String> three(List<SyPackingListTailoring> mains,Map<String,String> map);
+	Map<String,Object> three(List<SyPackingListTailoring> mains,Map<String,Object> map);
 
     String getOrderDataId(String id);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/impl/SyPackingListTailoringServiceImpl.java

@@ -670,17 +670,17 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 	private PurchaseWarehousingMapper purchaseWarehousingMapper;//采购入库表
 
 	@DS("multi-one")
-	public Map<String,String> one(List<SyPackingListTailoring> mains,Map<String,String> map){
+	public Map<String,Object> one(List<SyPackingListTailoring> mains,Map<String,Object> map){
 		return saveBatch(mains,map);
 	}
 
 	@DS("multi-two")
-	public Map<String,String> two(List<SyPackingListTailoring> mains,Map<String,String> map){
+	public Map<String,Object> two(List<SyPackingListTailoring> mains,Map<String,Object> map){
 		return saveBatch(mains,map);
 	}
 
 	@DS("multi-three")
-	public Map<String,String> three(List<SyPackingListTailoring> mains,Map<String,String> map){
+	public Map<String,Object> three(List<SyPackingListTailoring> mains,Map<String,Object> map){
 		return saveBatch(mains,map);
 	}
 
@@ -688,7 +688,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		return syPackingListTailoringMapper.getOrderDataId(id);
 	}
 
-	Map<String,String> saveBatch(List<SyPackingListTailoring> mains,Map<String,String> mapt){
+	Map<String,Object> saveBatch(List<SyPackingListTailoring> mains,Map<String,Object> mapt){
 		if(mains==null||mains.size()==0){
 			return new HashMap();//为空就传回空对象
 		}
@@ -704,6 +704,8 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		JSONArray mapLists=new JSONArray();
 		//账套号
 		for (SyPackingListTailoring main : mains){
+			Map<String,String> mapSort=new HashMap<>();
+
 			String createBy="进出口平台管理员";
 			JSONObject map=new JSONObject();//采购(委外)入库单
 			map.put("CVOUCHCODE",purchaseWarehousingMapper.getMaxCode("id+1","RdRecord01","dnmaketime"));//获取单据号
@@ -751,19 +753,23 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			Map<String,Object> orderData=null;
 
 			if(mapt.get("account").equals("903")){//查询委外订单主表数据	顺序---1
-				orderData=syPackingListTailoringMapper.getOmOrPo("om_momain","cCode='"+map.get("mpOrder")+"'","moid");
+				orderData=syPackingListTailoringMapper.getOmOrPo("om_momain","cCode='"+mapt.get("mpOrder")+"'","moid");
 				map.put("CRDCODE","委外入库");//入库类别（采购入库/委外入库）
+				map.put("CGLTYPE","委外订单");//制单人
 				//map2.put("CRDCODE","委外出库");//出库类别
 			}else {//查询委外订单表数据
 				if(mapt.get("orderNumber").equals("one")){
-					orderData=syPackingListTailoringMapper.getOmOrPo("PO_POMAIN","cPOID='"+map.get("mpOrder")+"'","POID");
+					orderData=syPackingListTailoringMapper.getOmOrPo("PO_POMAIN","cPOID='"+mapt.get("mpOrder")+"'","POID");
 				}else{
 					orderData=syPackingListTailoringMapper.getOmOrPo("PO_POMAIN","cPOID='"+mapt.get("orderNumber")+"'","POID");//根据采购订单号判断
 				}
 				map.put("CRDCODE","采购入库");//入库类别（采购入库/委外入库）
+				map.put("CGLTYPE","采购订单");//制单人
 				//map2.put("CRDCODE","采购出库");//出库类别
 			}
 			if(orderData!=null){
+				map.put("CVENCODE",orderData.get("cvencode"));//供应商编码
+				mapt.put("CVENCODE",orderData.get("cvencode"));//供应商编码
 				map5.put("IEXCHRATE",orderData.get("nflat"));//汇率（如果传空，接口默认1）cPayCode
 				map5.put("CPAYCODE",orderData.get("cPayCode"));//付款条件编码（如果传空，取来源单据）
 			}
@@ -785,7 +791,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 
 
 
-				Map<String,Object> orderDataItem=null;
+				Map<String,Object> orderDataItem=null;// inum
 				if(!mapt.get("account").equals("903")){ //采购订单子表数据  顺序---2
 					if(mapt.get("orderNumber").equals("one")){
 						orderDataItem=syPackingListTailoringMapper.getOmOrPoItem("PO_PoDetails", "ID='"+item.getOmpoIdItem()+"'","ID");
@@ -797,19 +803,22 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 								"xxxxxxxx" +
 								"xxxxxxx","ID");
 					}
+					Map<String,Object> orderDataItem2=purchaseWarehousingMapper.getPOPodetails(orderDataItem.get("id").toString());//获取自由项
+					getcFree(mapItem,orderDataItem2);
 					mapItem.put("POAUTOIDCOL","ID");//订单明细ID对应字段名(关联单据类型为采购订单传ID，为采购到货单为Autoid，为委外订单传MODetailsID，为委外到货单为Autoid)
 					mapItem.put("AUTOID_PO",orderDataItem.get("id"));//明细ID（采购订单行ID/委外订单行ID）
+					map5.put("CGLTYPE","采购订单");
 					mapItem5.put("POAUTOIDCOL","ID");//明细ID对应字段名(关联单据类型为采购订单传ID，委外订单传MODetailsID，入库单为Autoid)
 					mapItem5.put("AUTOID_PO",orderDataItem.get("id"));//明细ID（采购订单行ID/委外订单行ID）
-				}{//委外订单子表数据  顺序---2
+				}else{//委外订单子表数据  顺序---2
 					//第二次怎么获取采购订单的子表id	查询销售订单子表保存行号去绑定上游的账套
 					orderDataItem=syPackingListTailoringMapper.getOmOrPoItem("OM_MODetails", "MODetailsID='"+item.getOmpoIdItem()+"'","MODetailsID");
-					Map<String,Object> orderDataItem2=purchaseWarehousingMapper.getOMMoDetails(item.getOmpoIdItem());
-					System.out.println("orderDataItme2\t"+orderDataItem2);
+					Map<String,Object> orderDataItem2=purchaseWarehousingMapper.getOMMoDetails(item.getOmpoIdItem());//获取自由项
 					getcFree(mapItem,orderDataItem2);
 					System.out.println("mapItem\t"+mapItem);
 					mapItem.put("POAUTOIDCOL","MODetailsID");//订单明细ID对应字段名(关联单据类型为采购订单传ID，为采购到货单为Autoid，为委外订单传MODetailsID，为委外到货单为Autoid)
 					mapItem.put("AUTOID_PO",orderDataItem.get("id"));//明细ID（采购订单行ID/委外订单行ID）
+					map5.put("CGLTYPE","委外订单");
 				/*	mapItem2.put("AUTOID_ALL",orderDataItem.get("id"));//关联明细ID
 					mapItem2.put("ALLCAUTOIDCOL","AllocateId");//订单明细ID对应字段名(固定AllocateId)*/
 					mapItem5.put("POAUTOIDCOL","MODetailsID");//明细ID对应字段名(关联单据类型为采购订单传ID，委外订单传MODetailsID，入库单为Autoid)
@@ -818,14 +827,12 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				mapItem5.put("IORIMONEY",orderDataItem.get("iMoney"));//原币金额
 				mapItem5.put("IMONEY",orderDataItem.get("iNatMoney"));//本币金额
 
-
-				if(item.getSupplierCode()!=null){//查询供应商表获取编码 	顺序---3
-					map.put("CVENCODE",orderData.get("cVenCode"));//供应商编码（如果传空，取来源单据）
-					String wheCode=syPackingListTailoringMapper.getWhCodeByVenCode(item.getSupplierCode());
+				if(!mapt.get("CVENCODE").equals("one")){//查询供应商表获取编码 	顺序---3
+					String wheCode=syPackingListTailoringMapper.getWhCodeByVenCode(mapt.get("CVENCODE").toString());
 					if(wheCode!=null){
 						map.put("CWHCODE",wheCode);//仓库编码
 					//	map2.put("CWHCODE",wheCode);//仓库编码
-						map4.put("CWHCODE",main.getCreateBy());//仓库编码
+						map4.put("CWHCODE",wheCode);//仓库编码
 						mapItem3.put("CWHCODE",wheCode);//仓库编码	这个是子表需要字段
 						mapItem6.put("CWHCODE",wheCode);//仓库编码
 					}
@@ -834,15 +841,20 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 
 				if(item.getSyOrderDataItemId()!=null){//销售发货单 ---查询销售订单子表数据  顺序---5
 					Map<String,Object> orderDataItem2=syPackingListTailoringMapper.getSoMainItem(orderDataItem.get("iSOsID").toString());
+					System.out.println("irowno\t"+orderDataItem2.get("irowno"));
+					System.out.println("id\t"+item.getId());
+					mapSort.put(item.getId(),orderDataItem2.get("irowno").toString());
 					mapItem3.put("ITAXUNITPRICE",orderDataItem2.get("iTaxUnitPrice"));//原币含税单价（如果传空，取来源单据）（以含税单价为准自动计算相关价格及金额）
 					mapItem3.put("ITAXRATE",orderDataItem2.get("iTaxRate"));//税率（如果传空，取来源单据，无来源单据，取存货档案对应的销项税率）
 					mapItem3.put("SOAUTOIDCOL","ISOSID");//来源单据明细ID对应字段名(如果取销售订单主键，需传固定值ISOSID)
 					mapItem3.put("AUTOID_SO",orderDataItem2.get("iSOsID"));//来源单据明细ID
-					mapt.put("orderNumber", orderDataItem2.get("id").toString());
+					mapt.put("orderNumber", orderDataItem2.get("id"));
 				}
 
 				if(!mapt.get("orderNumber").equals("one")){//销售订单
-					Map<String,Object> order=syPackingListTailoringMapper.getSoMain(mapt.get("orderNumber"));
+					Map<String,Object> order=syPackingListTailoringMapper.getSoMain(mapt.get("orderNumber").toString());//
+					mapt.put("orderNumber",order.get("cSOCode"));//销售订单号
+					mapt.put("customerCode",order.get("cCusCode"));//销售订单号
 					if(order!=null){//销售订单主表
 						//cPersonCode,cDepCode,cBusType,cPayCode,cexch_name,nflat
 						/*map2.put("CDEPCODE",order.get("cDepCode"));//部门编码（如果传空，取来源单据）
@@ -859,6 +871,8 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 
 				mapItem.put("CINVCODE",item.getInventoryCode());//存货编码
 				mapItem.put("IQUANTITY",item.getTotal());//数量
+				mapItem.put("INUM",orderDataItem.get("inum"));//明细ID（采购订单行ID/委外订单行ID）
+
 				//mapItem.put("cBatch","x");//批号
 
 				/*mapItem2.put("CINVCODE",item.getInventoryCode());//存货编码（如果来源单据是委外订单，此字段需要传该订单的子件编码）
@@ -898,6 +912,15 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			mapList5.add(map5);
 			map6.put("DETAILList",mapItems6);//明细集合
 			mapList6.add(map6);
+
+			if(mapt.get("customerCode").equals("0001")){
+				mapt.put("account","901");//账套号
+			}else if(mapt.get("customerCode").equals("T020001")){
+				mapt.put("account","902");//账套号
+			}else{
+				mapt.put("account","904");//账套号
+			}
+			mapt.put("itemSort",mapSort);
 		}
 
 		mapLists.addAll(mapList);
@@ -920,7 +943,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		System.out.println("mapList5\n"+mapList5);
 		System.out.println("mapList6\n"+mapList6);
 
-		/*JSONArray resturn1 = InterfaceConnUtils.doPost(mapList,"purchasein_import");//采购入库单
+		/*JSONArray resturn1 = InterfaceConnUtils.doPost(mapList,"purchasein_import");//采购入库单		主表添加了一个字段，子表可能要添加一个字段
 		//JSONArray resturn2 = InterfaceConnUtils.doPost(mapList,"materialout_import");//材料出库单
 		JSONArray resturn3 = InterfaceConnUtils.doPost(mapList3,"consignment_import");//销售发货单
 		JSONArray resturn4 = InterfaceConnUtils.doPost(mapList4,"saleout_import");//销售出库单
@@ -935,7 +958,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		System.out.println("调用接口后返回的信息resturn6\n"+resturn6);*/
 
 		try{
-			FileWriter file =new FileWriter ("D:\\test\\test.txt",true);
+			FileWriter file =new FileWriter ("D:\\test1\\test.txt",true);
 			//FileOutputStream fo = new FileOutputStream(file);
 			//向文件中写入内容
 		//	byte [] bytecontent = txtWorld.getBytes();	//将字符串转换文字节数组类型
@@ -946,39 +969,37 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		}catch (Exception e){
 			e.printStackTrace();
 		}
-
-
-		return new HashMap<>();
+		return mapt;
 	}
 
 
 	public void getcFree(JSONObject itemMap,Map<String,Object> mapPOPodetails){
-		itemMap.put("cDefine22",setNull(mapPOPodetails.get("cDefine22")));
-		itemMap.put("cDefine23",setNull(mapPOPodetails.get("cDefine23")));
-		itemMap.put("cDefine24",setNull(mapPOPodetails.get("cDefine24")));
-		itemMap.put("cDefine25",setNull(mapPOPodetails.get("cDefine25")));
-		itemMap.put("cDefine26",setNull(mapPOPodetails.get("cDefine26")));
-		itemMap.put("cDefine27",setNull(mapPOPodetails.get("cDefine27")));
-		itemMap.put("cDefine28",setNull(mapPOPodetails.get("cDefine28")));
-		itemMap.put("cDefine29",setNull(mapPOPodetails.get("cDefine29")));
-		itemMap.put("cDefine30",setNull(mapPOPodetails.get("cDefine30")));
-		itemMap.put("cDefine31",setNull(mapPOPodetails.get("cDefine31")));
-		itemMap.put("cDefine32",setNull(mapPOPodetails.get("cDefine32")));
-		itemMap.put("cDefine33",setNull(mapPOPodetails.get("cDefine33")));
-		itemMap.put("cDefine34",setNull(mapPOPodetails.get("cDefine34")));
-		itemMap.put("cDefine35",setNull(mapPOPodetails.get("cDefine35")));
-		itemMap.put("cDefine36",setNull(mapPOPodetails.get("cDefine36")));
-		itemMap.put("cDefine37",setNull(mapPOPodetails.get("cDefine37")));
-		itemMap.put("cFree1",setNull(mapPOPodetails.get("cFree1")));
-		itemMap.put("cFree2",setNull(mapPOPodetails.get("cFree2")));
-		itemMap.put("cFree3",setNull(mapPOPodetails.get("cFree3")));
-		itemMap.put("cFree4",setNull(mapPOPodetails.get("cFree4")));
-		itemMap.put("cFree5",setNull(mapPOPodetails.get("cFree5")));
-		itemMap.put("cFree6",setNull(mapPOPodetails.get("cFree6")));
-		itemMap.put("cFree7",setNull(mapPOPodetails.get("cFree7")));
-		itemMap.put("cFree8",setNull(mapPOPodetails.get("cFree8")));
-		itemMap.put("cFree9",setNull(mapPOPodetails.get("cFree9")));
-		itemMap.put("cFree10",setNull(mapPOPodetails.get("cFree10")));
+		itemMap.put("CDEFINE22",setNull(mapPOPodetails.get("cDefine22")));
+		itemMap.put("CDEFINE23",setNull(mapPOPodetails.get("cDefine23")));
+		itemMap.put("CDEFINE24",setNull(mapPOPodetails.get("cDefine24")));
+		itemMap.put("CDEFINE25",setNull(mapPOPodetails.get("cDefine25")));
+		itemMap.put("CDEFINE26",setNull(mapPOPodetails.get("cDefine26")));
+		itemMap.put("CDEFINE27",setNull(mapPOPodetails.get("cDefine27")));
+		itemMap.put("CDEFINE28",setNull(mapPOPodetails.get("cDefine28")));
+		itemMap.put("CDEFINE29",setNull(mapPOPodetails.get("cDefine29")));
+		itemMap.put("CDEFINE30",setNull(mapPOPodetails.get("cDefine30")));
+		itemMap.put("CDEFINE31",setNull(mapPOPodetails.get("cDefine31")));
+		itemMap.put("CDEFINE32",setNull(mapPOPodetails.get("cDefine32")));
+		itemMap.put("CDEFINE33",setNull(mapPOPodetails.get("cDefine33")));
+		itemMap.put("CDEFINE34",setNull(mapPOPodetails.get("cDefine34")));
+		itemMap.put("CDEFINE35",setNull(mapPOPodetails.get("cDefine35")));
+		itemMap.put("CDEFINE36",setNull(mapPOPodetails.get("cDefine36")));
+		itemMap.put("CDEFINE37",setNull(mapPOPodetails.get("cDefine37")));
+		itemMap.put("CFREE1",setNull(mapPOPodetails.get("cFree1")));
+		itemMap.put("CFREE2",setNull(mapPOPodetails.get("cFree2")));
+		itemMap.put("CFREE3",setNull(mapPOPodetails.get("cFree3")));
+		itemMap.put("CFREE4",setNull(mapPOPodetails.get("cFree4")));
+		itemMap.put("CFREE5",setNull(mapPOPodetails.get("cFree5")));
+		itemMap.put("CFREE6",setNull(mapPOPodetails.get("cFree6")));
+		itemMap.put("CFREE7",setNull(mapPOPodetails.get("cFree7")));
+		itemMap.put("CFREE8",setNull(mapPOPodetails.get("cFree8")));
+		itemMap.put("CFREE9",setNull(mapPOPodetails.get("cFree9")));
+		itemMap.put("CFREE10",setNull(mapPOPodetails.get("cFree10")));
 	}
 
 	public Object setNull(Object o){