导出导入调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/controller/SyPreAssembledPackingListController.java

@@ -1398,7 +1398,6 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                 /*Cell cellx = row3.createCell(10);//横向
                 cellx.setCellValue("测试数据");
                 cellx.setCellStyle(cellStyle);*/
-
                 String [] args=list.toString1().split("_____");
                 String [] args1=args[0].split(",");
                 String [] args2=args[1].split(",");
@@ -1442,7 +1441,6 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                         //row.createCell(6).setCellValue("size");
                         Cell cell2= row.createCell(6);
                         cell2.setCellStyle(cellStyle2);
-                        System.out.println("第"+(mainLength+1)+"行数据的smallPo\t"+list.getOrderNumber());
                         cell2.setCellValue("size");
                         continue;
                     }else if(i<6){
@@ -1486,7 +1484,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                         cell.setCellStyle(cellStyle3);
                         //cell.setCellValue();//
                     }
-                    //sheet.setColumnWidth(x,1000);
+                    sheet.setColumnWidth(i,2500);
                 }
 
                 //cell6.setCellStyle(cellStyle);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/entity/SyPreAssembledPackingListItem.java

@@ -518,19 +518,19 @@ public class SyPreAssembledPackingListItem implements Serializable {
 			}
 		}
 		return
-			" ," +
-			" ,"+
-			" ,"+
+			"," +
+			itemCode + ","+
+			prepackSku + ","+
 			startingBoxNumber + ","+
 			endCaseNumber +  ","+
 			colour +  ","+
 			sizes +
 			piecesBox+ ","+
-			boxNumber+ ","+
-			total+ ","+
 			totalPack+ ","+
 			packBox+ ","+
 			packs+ ","+
+			boxNumber+ ","+
+			total+ ","+
 			outerBoxLength + ","+
 			outerBoxWidth + ","+
 			outerBoxHeight + ","+

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/xml/SyPreAssembledPackingListMapper.xml

@@ -358,7 +358,7 @@
     <select id="queryById2" resultType="org.jeecg.modules.spapl.entity.SyPreAssembledPackingList" parameterType="java.lang.String">
         SELECT
         a.item_Number item_Number,
-        a.salesman salesman,
+        b.salesman salesman,
         b.small_Po order_Number,
         d.inventory_Currency_Name inventory_Currency_Name,
         b.distribution_Point,

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -537,17 +537,21 @@ public class SyPackingListFabricController implements Job {
 	  * @param id
 	  * @return
 	  */
-	 @AutoLog(value = "测试推送")
+	/* @AutoLog(value = "测试推送")
 	 @ApiOperation(value="测试推送", notes="测试推送")
-	 @GetMapping(value = "/testPushInvoice")
-	 public Result<List<SyPackingListFabric>> pushInvoice(@RequestParam(name="id",required=true) String id) {
-		 Result<List<SyPackingListFabric>> result=new Result<>();
-		 if(oConvertUtils.isEmpty(id)){
-			 result.setSuccess(false);
-			 result.setMessage("id为空");
-			 return result;
-		 }
+	 @GetMapping(value = "/testPushInvoice")*/
+//	 public Result<List<SyPackingListFabric>> pushInvoice(@RequestParam(name="id",required=true) String id) {
+	 public String pushInvoice(@RequestParam(name="id",required=true) String id) {
+//		 Result<List<SyPackingListFabric>> result=new Result<>();
+//		 if(oConvertUtils.isEmpty(id)){
+//			 result.setSuccess(false);
+//			 result.setMessage("id为空");
+//			 return result;
+//		 }
 		 List<SyPackingListFabric> listFabrics=syPackingListFabricService.queryByList(id);
+		 if(listFabrics.size()==0){
+			 return "未在装箱单找到对应单据";
+		 }
 		 Map<String,Object> mapdate=syPackingListTailoringService.getSyShippingOrder(listFabrics.get(0).getId());//获取一些日期信息
 		 for (SyPackingListFabric fabric : listFabrics){
 			 //System.out.println("madate\t"+mapdate);
@@ -573,27 +577,26 @@ public class SyPackingListFabricController implements Job {
 					 fabric.setSupplierCode(dataItem.getSupplierCode());
 				 }
 			 }
-
 			 fabric.setSyPackingListFabricItem(listFabricItems);
 			/* List<SyPackingListFabricItem> fabricItemList=syPackingListFabricService.getList(fabric.getId());
 			 fabric.setSyPackingListFabricItem(fabricItemList);*/
 		 }
-
+		 return syPackingListFabricService.pushInvoice(listFabrics);
+		 //return message;
 		 //List<SyPackingListFabricItem> listFabricItems=syPackingListFabricItemService.queryByList(id);//获取托书下所有的主表信
 		 /*for (SyPackingListFabric syPackingListFabric : listFabrics){
 		 }*/
 		 //String message = syPackingListFabricService.pushInvoice(listFabricItems,listFabrics);
-		 if(listFabrics.size()==0){
-			 result.setSuccess(false);
-			 result.setMessage("未查询到装箱单的数据");
-			 result.setResult(listFabrics);
-			 return result;
-		 }
-		 String message = syPackingListFabricService.pushInvoice(listFabrics);
-		 result.setSuccess(true);
-		 result.setMessage(message);
-		 result.setResult(listFabrics);
-		 return result;
+//		 if(listFabrics.size()==0){
+//			 result.setSuccess(false);
+//			 result.setMessage("未查询到装箱单的数据");
+//			 result.setResult(listFabrics);
+//			 return result;
+//		 }
+//		 result.setSuccess(true);
+//		 result.setMessage(message);
+//		 result.setResult(listFabrics);
+//		 return result;
 	 }
 
 	/**
@@ -1615,5 +1618,11 @@ public class SyPackingListFabricController implements Job {
 	 	return Result.ok("更新了"+num+"条数据");
 	 }
 
+	 /*@AutoLog(value = "获取数据")
+	 @ApiOperation(value="获取数据", notes="获取数据")
+	 @GetMapping(value = "/getMessage")*/
+	 public String getMessage( ) {
+		 return "更新了6条数据";
+	 }
 
  }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/entity/SyPackingListFabric.java

@@ -228,6 +228,12 @@ public class SyPackingListFabric implements Serializable {
 	@TableField(exist = false)
 	private String planLotNumber;
 
+	/**计划单号*/
+	@Excel(name = "销售发票单编码", width = 15)
+	@ApiModelProperty(value = "销售发票单编码")
+	@TableField(exist = false)
+	private String saleInvoiceCode;
+
 	/**是否云工厂推送*/
 	//@TableField(exist = false)
 	@ApiModelProperty(value = "是否云工厂推送")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -2407,9 +2407,14 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		//List<SyPackingListFabricItem> listFabricItems=syPackingListFabricItemMapper.queryByList(id);
 		//List<SyPackingListFabric> listFabrics=syPackingListFabricMapper.queryByList(id);//获取托书下所有的主表信息
 		List<String> codes=getList(listFabrics);//获取出库单号
+		System.out.println("面辅料查看出库单号\t"+codes);
+		if(codes.size()==0){
+			return "推送失败,未查询到对应的出库单号!";
+		}
 		Map<String,List<String>> customers=getCustomers(codes);//key：供应商编码，value：出库单id
-		Map<String,List<SyPackingListFabricItem>> listFabricItemMaps=getListFabricItemMaps(customers,listFabrics);//key：供应商编码，value：出库单id
-		Map<String,List<SyPackingListFabric>> listFabricMaps=getListFabricMaps(customers,listFabrics);
+		Map<String,List<SyPackingListFabricItem>> listFabricItemMaps=getListFabricItemMaps(customers,listFabrics);//key：供应商编码，value：子表数据
+		Map<String,List<SyPackingListFabric>> listFabricMaps=getListFabricMaps(customers,listFabrics);//key：供应商编码，value：主表数据
+		Map<String,List<SyPackingListFabric>> codeMaps=getListFabricMaps(customers,listFabrics);//key：传入销售发票单id，value：主表数据
 		JSONArray jsonArrays1=new JSONArray();
 		String code=purchaseWarehousingMapper.getMaxCode("cSBVCode","SaleBillVouch where cvouchtype=27","cSBVCode");//发票号
 
@@ -2424,8 +2429,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 
 			Map<String,Object> order=syPackingListTailoringMapper.getSoMainCode(syPackingListFabric.getRdrecord32Code());//随便哪一个做主表信息
 			System.out.println("syPackingListFabric.getRdrecord32Code\t"+order);
-
 			code=org.jeecg.modules.system.util.oConvertUtils.addOne(code);
+			codeMaps.put(code,listFabricMaps.get(customer));
 			jsonObject1.put("CVOUCHCODE",code);//发票号
 			jsonObject1.put("CMAKER","进出口平台管理员");//制单人
 			jsonObject1.put("CVERIFIER","进出口平台管理员");//审核人
@@ -2507,7 +2512,29 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			System.out.println("互相插入数据时用的时间：" + (endTime - startTime) + "ms");
 		}
 		System.out.println("jsonArrays1\t"+jsonArrays1);
-		return "";
+		JSONArray resturnJsonArrays = InterfaceConnUtils.doPost(jsonArrays1,"saleinvoice_import");//销售发票单
+		Map<String,String> codeMaps2 = result(resturnJsonArrays);
+		for (String code1 : codeMaps.keySet()){
+			List<SyPackingListFabric> listFabricList=codeMaps.get(code1);
+			List<String> ids=new ArrayList<>();
+			for (SyPackingListFabric fabric : listFabricList){
+				ids.add(fabric.getId());
+			}
+			UpdateWrapper updateWrapper=new UpdateWrapper();
+			updateWrapper.set("sale_Invoice_Code","103销售发票:"+codeMaps2.get(code1));
+			updateWrapper.in("id",ids);
+			syPackingListFabricMapper.update(null,updateWrapper);
+		}
+		return "推送成功";
+	}
+
+	public Map<String,String> result(JSONArray jsonArray){
+		Map<String,String> codeMaps=new HashMap<>();
+		for (int i=0;i<jsonArray.size();i++){
+			JSONObject jsonObject=jsonArray.getJSONObject(i);
+			codeMaps.put(jsonObject.get("ReceiptNo").toString(),jsonObject.get("U8ReceiptNo").toString());//key:传入的单号,value:生成的单号
+		}
+		return codeMaps;//账套号-序号-生成的单号
 	}
 
 	@Override

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

@@ -1019,6 +1019,8 @@ public class SyPackingListTailoringController implements Job {
 				// x=x<2?++x:x;//跨行
 			 }
 			 main.setSyPackingListTailoringItemList(items);
+			 System.out.println("controller申报要素id\t"+main.getElementsId());
+			 System.out.println("controller主表id\t"+main.getSyPreAssembledPackingListId());
 			 mains.add(main);
 		 }
 		 syPackingListTailoringService.excelAdd(mains);//新增
@@ -1935,17 +1937,21 @@ public class SyPackingListTailoringController implements Job {
 	  * @param id
 	  * @return
 	  */
-	 @AutoLog(value = "测试推送")
+	/* @AutoLog(value = "测试推送")
 	 @ApiOperation(value="测试推送", notes="测试推送")
-	 @GetMapping(value = "/testPushInvoice")
-	 public Result<List<SyPackingListTailoring>> pushInvoice(@RequestParam(name="id",required=true) String id) {
-		 Result<List<SyPackingListTailoring>> result=new Result<>();
-		 if(oConvertUtils.isEmpty(id)){
-			 result.setSuccess(false);
-			 result.setMessage("id为空");
-			 return result;
-		 }
+	 @GetMapping(value = "/testPushInvoice")*/
+	 //public Result<List<SyPackingListTailoring>> pushInvoice(@RequestParam(name="id",required=true) String id) {
+	 public String pushInvoice(@RequestParam(name="id",required=true) String id) {
+//		 Result<List<SyPackingListTailoring>> result=new Result<>();
+//		 if(oConvertUtils.isEmpty(id)){
+//			 result.setSuccess(false);
+//			 result.setMessage("id为空");
+//			 return result;
+//		 }
 		 List<SyPackingListTailoring> listTailorings=syPackingListTailoringService.queryByList(id);
+		 if(listTailorings.size()==0){
+		 	return "未在装箱单找到对应单据";
+		 }
 		 //List<SyPackingListFabricItem> listFabricItems=syPackingListFabricItemService.queryByList(id);//获取托书下所有的主表信
 		 Map<String,Object> mapdate=syPackingListTailoringService.getSyShippingOrder(listTailorings.get(0).getId());//获取一些日期信息
 		 for (SyPackingListTailoring tailoring : listTailorings){
@@ -1964,18 +1970,25 @@ public class SyPackingListTailoringController implements Job {
 			 List<SyPackingListTailoringItem> tailoringItemList=syPackingListTailoringService.getList(tailoring.getId());
 			 tailoring.setSyPackingListTailoringItemList(tailoringItemList);
 		 }
+		 return syPackingListTailoringService.pushInvoice1(listTailorings);
+		 //return message;
 		 //String message = syPackingListFabricService.pushInvoice(listFabricItems,listFabrics);
-		 if(listTailorings.size()==0){
-			 result.setSuccess(false);
-			 result.setMessage("未查询到装箱单的数据");
-			 result.setResult(listTailorings);
-			 return result;
-		 }
-		 String message = syPackingListTailoringService.pushInvoice1(listTailorings);
-		 result.setSuccess(true);
-		 result.setMessage(message);
-		 result.setResult(listTailorings);
-		 return result;
+//		 if(listTailorings.size()==0){
+//			 result.setSuccess(false);
+//			 result.setMessage("未查询到装箱单的数据");
+//			 result.setResult(listTailorings);
+//			 return result;
+//		 }
+//		 result.setSuccess(true);
+//		 result.setMessage(message);
+//		 result.setResult(listTailorings);
+//		 return result;
 	 }
 
+	 /*@AutoLog(value = "获取数据")
+	 @ApiOperation(value="获取数据", notes="获取数据")
+	 @GetMapping(value = "/getMessage")*/
+	 public String getMessage( ) {
+		 return "更新了6条数据";
+	 }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/entity/PushJob.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.splt.entity;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrder;
 import org.jeecg.modules.documents.syShippingOrder.mapper.SyShippingOrderMapper;
@@ -9,7 +11,10 @@ import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class PushJob implements Job {
 
@@ -26,15 +31,64 @@ public class PushJob implements Job {
 
     @Override
     public void execute(JobExecutionContext context) throws JobExecutionException {
+        long startTime = System.currentTimeMillis();
         QueryWrapper queryWrapper= new QueryWrapper();
         queryWrapper.eq("time_Stuta","1");
+        queryWrapper.eq("del_flag","0");
+      //  queryWrapper.nested(i->i.ne("recording_Status","1").nested(s->s.eq("push_State","3").or().like("recording_Error","超时"))) ;//推送中
+        //queryWrapper.ne("time_Stuta",2);
+        //queryWrapper.last("limit 3");
         List<SyShippingOrder> orderList=syShippingOrderMapper.selectList(queryWrapper);
+        System.out.println("orderList.size\t"+orderList.size());
+        Map<String,String> codeMaps=new HashMap<>();
         for (SyShippingOrder order : orderList){
+            String message="";
             if(order.getReadyFabric().equals("成衣")){
-                syPackingListTailoringController.pushInvoice(order.getId());
+                message=syPackingListTailoringController.pushInvoice(order.getId());
+                //System.out.println("成衣\t"+order.getReadyFabric());
+               // System.out.println(syPackingListTailoringController.getMessage());
+            }else{
+                message=syPackingListFabricController.pushInvoice(order.getId());
+                //System.out.println("面辅料\t"+order.getReadyFabric());
+              //  System.out.println(syPackingListFabricController.getMessage());
+            }
+            if(message.indexOf("失败")>-1){
+                order.setTimeStuta(2);
             }else{
-                syPackingListTailoringController.pushInvoice(order.getId());
+                order.setTimeStuta(1);
+            }
+            syShippingOrderMapper.updateById(order);
+            codeMaps.put(order.getId(),message);
+        }
+        /*for (String id : codeMaps.keySet()){
+            if(codeMaps.get(id).indexOf("失败")>-1){
+
             }
+        }*/
+        long endTime = System.currentTimeMillis();
+        System.out.println("互相插入数据时用的时间：" + (endTime - startTime) + "ms");
+        System.out.println("codeMaps\n"+codeMaps);
+    }
+
+  /*  public static void main(String[] args) {
+        //ReceiptNo U8ReceiptNo
+        JSONArray jsonArrays=new JSONArray();
+        for (int i=1;i<=5;i++){
+            JSONObject jsonObject=new JSONObject();
+            jsonObject.put("ReceiptNo","test10001"+i);
+            jsonObject.put("U8ReceiptNo","test10002"+i);
+            jsonArrays.add(jsonObject);
+        }
+        Map<String,String> codeMaps=result(jsonArrays);
+        System.out.println("codeMaps\t"+codeMaps);
+    }*/
+
+    public static Map<String,String> result(JSONArray jsonArray){
+        Map<String,String> codeMaps=new HashMap<>();
+        for (int i=0;i<jsonArray.size();i++){
+            JSONObject jsonObject=jsonArray.getJSONObject(i);
+            codeMaps.put(jsonObject.get("ReceiptNo").toString(),jsonObject.get("U8ReceiptNo").toString());//key:传入的单号,value:生成的单号
         }
+        return codeMaps;//账套号-序号-生成的单号
     }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/entity/SyPackingListTailoring.java

@@ -247,6 +247,10 @@ public class SyPackingListTailoring implements Serializable {
 	@TableField(exist = false)
 	private String rdrecord32Code;
 
+	/**数组来源 参照 拉取 导入 云工厂*/
+	@ApiModelProperty(value = "数组来源")
+	private String dataSource;
+
 	/**装运期限*/
 	@TableField(exist = false)
 	private String latestDateOfShipment2;

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

@@ -754,7 +754,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		List<String> mainIds=new ArrayList<>();
 		long startTime = System.currentTimeMillis();
 		for (SyPackingListTailoring item : mains){
-			mainIds.add(item.getId());
+			mainIds.add(item.getSyPreAssembledPackingListId());
 			List<SyPackingListTailoringItem> listItems2=item.getSyPackingListTailoringItemList();
 			for (SyPackingListTailoringItem listItem : listItems2){
 				for (SizeTable sizeTable : listItem.getSizeTables()){
@@ -774,11 +774,13 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 
 		UpdateWrapper updateWrapper=new UpdateWrapper();
 		updateWrapper.set("is_Reference","2");//已被装箱单参照,预装箱单不能取消提交
+		System.out.println("mainIds\t"+mainIds);
 		updateWrapper.in("id",mainIds);//预装箱单主表id做为修改条件
 		syPreAssembledPackingListMapper.update(null,updateWrapper);//修改
 
 		try{
 			for (SyPackingListTailoring syPackingListTailoring : mains){
+				syPackingListTailoring.setId(oConvertUtils.id());
 				syPackingListTailoring.setDelFlag("0");//删除状态默认为0
 				syPackingListTailoring.setPushState("0");//推送状态默认为0
 				syPackingListTailoring.setStatus("0");//单据状态默认为0
@@ -828,8 +830,8 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 						item1.setId(oConvertUtils.id());//获取到随机id
 						SyPreAssembledPackingListItem syPreItem=mapItems.get(size.getItemId());//获取预装箱单数据
 						if(syPreItem!=null){
-							syPreItem.setRemainingQuantity(syPreItem.getRemainingQuantity().subtract(item.getTotal()));//新剩余数量=原剩余数量-装箱单新增数量
-							syPreItem.setExcessQuantity(syPreItem.getRemainingQuantity().subtract(item.getTotal()).negate());//同上面,取相反值
+							//syPreItem.setRemainingQuantity(syPreItem.getRemainingQuantity().subtract(item.getTotal()));//新剩余数量=原剩余数量-装箱单新增数量
+							//syPreItem.setExcessQuantity(syPreItem.getRemainingQuantity().subtract(item.getTotal()).negate());//同上面,取相反值
 							item1.setUnitPrice(syPreItem.getUnitPrice());//获取单价
 							item1.setHod(new SimpleDateFormat("yyyy-MM-dd").parse(syPreItem.getHod()));//预发货日期
 							item1.setWithCode(syPreItem.getWithCode());
@@ -1032,6 +1034,8 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				}
 			}
 			total4=total4.add(total2).add(total3);
+			System.out.println("total4.doubleValue()\t"+total4.doubleValue());
+			System.out.println("total1.doubleValue()*1.9\t"+total1.doubleValue()*1.9);
 			if(total4.doubleValue()>total1.doubleValue()*1.9){//(本次数量+现有数量)>1.9*发货数量就报错
 				throw new JeecgBootException("本次导入数量+装箱单现有数量大于发货订单数量*1.9,请勿重复导入");
 			}
@@ -1916,6 +1920,10 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		//List<SyPackingListFabricItem> listFabricItems=syPackingListFabricItemMapper.queryByList(id);
 		//List<SyPackingListFabric> listFabrics=syPackingListFabricMapper.queryByList(id);//获取托书下所有的主表信息
 		List<String> codes=getList(listTailorings);//获取出库单号
+		System.out.println("成衣查看出库单号\t"+codes);
+		if(codes.size()==0){
+			return "推送失败,未查询到对应的出库单号!";
+		}
 		Map<String,List<String>> customers=getSuppliers(codes);//key：供应商编码，value：出库单id
 		Map<String,List<SyPackingListTailoringItem>> listTailoringItemMaps=getListTailoringItemMaps(customers,listTailorings);//key：供应商编码，value：对应子表
 		Map<String,List<SyPackingListTailoring>> listTailoringMaps=getListTailoringMaps(customers,listTailorings);//key：供应商编码，value：对应主表
@@ -2003,7 +2011,18 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			System.out.println("互相插入数据时用的时间：" + (endTime - startTime) + "ms");
 		}
 		System.out.println("jsonArrays1\n"+jsonArrays1);
-		return "";
+		//JSONArray resturnJsonArrays = InterfaceConnUtils.doPost(jsonArrays1,"saleinvoice_import");//采购发票单
+		//Map<String,String> codeMaps2 = result(resturnJsonArrays);
+		return "推送成功";
+	}
+
+	public Map<String,String> result(JSONArray jsonArray){
+		Map<String,String> codeMaps=new HashMap<>();
+		for (int i=0;i<jsonArray.size();i++){
+			JSONObject jsonObject=jsonArray.getJSONObject(i);
+			codeMaps.put(jsonObject.get("ReceiptNo").toString(),jsonObject.get("U8ReceiptNo").toString());//key:传入的单号,value:生成的单号
+		}
+		return codeMaps;//账套号-序号-生成的单号
 	}
 
 	@Override