2

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumService.java

@@ -510,6 +510,8 @@ public class ProductNumService extends MybatisBaseService<ProductNumMapper, Prod
 
 		createRow3(sheet, 1, col1, style);
 		String pd="符合";
+		 Map<String,Object> map=new HashMap<>();
+		 map.put("pd",pd);
 		//创建内容
 		for(int i=0;i<productNums.size();i++){
 			row = sheet.createRow(i + 2);
@@ -533,12 +535,14 @@ public class ProductNumService extends MybatisBaseService<ProductNumMapper, Prod
 			row.createCell(13).setCellValue(productNums.get(i).getTaxReceipt());
 			row.createCell(14).setCellValue(productNums.get(i).getDiscount());
 			pd=productNums.get(i).getState()==1?"符合":"不符合";
+			if(pd.equals("不符合")){
+				map.put("pd",pd);
+			}
 			row.createCell(15).setCellValue(pd);
 			row.createCell(16).setCellValue(productNums.get(i).getRemarks());
 		}
-		Map<String,Object> map=new HashMap<>();
 		map.put("wb",wb);
-		map.put("pd",pd);
+
 		return map;
 	}
 

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java

@@ -62,4 +62,6 @@ public interface PurchaseRequisitionMapper extends BaseMapper<PurchaseRequisitio
     List<ProductNum> selectByPc(@Param("pc")String pc);
     @Delete(" DELETE FROM hz_ztspglhzb")
     void deleteAll();
+    @Select("select * from hz_ztspglhzb where codeUnified =#{codeUnified} AND wdhjz=0 ")
+    List<Map<String, String>> suplierZtyz( @Param("codeUnified") String supplierCode);
 }

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionRest.java

@@ -65,7 +65,11 @@ public class PurchaseRequisitionRest implements PurchaseRequisitionFeign {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        String code = purchaseRequisitionService.readBrandPeriodSorXls1(in, "");
+        ResultBean<String> r= purchaseRequisitionService.readBrandPeriodSorXls1(in);
+        if(!r.getSuccess()){
+            return r;
+        }
+        String code= r.getData();
         PurchaseRequisition purchaseRequisition = purchaseRequisitionService.selectByCode(code);
         String sid = purchaseRequisition.getSid();
         ResultBean<Object> objectResultBean = fetchDetailsBySid(sid);

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java

@@ -21,6 +21,7 @@ import com.yxt.supervise.portal.api.purchaserequisition.PurchaseRequisitionVo;
 import com.yxt.supervise.portal.api.purchaserequisitionpro.PurchaseRequisitionPro;
 import com.yxt.supervise.portal.api.purchaserequisitionpro.PurchaseRequisitionProDto;
 import com.yxt.supervise.portal.api.restrictedcategory.RestrictedCategory;
+import com.yxt.supervise.portal.api.supplierinfo.SupplierInfoVo;
 import com.yxt.supervise.portal.api.warehouseposition.WarehousePosition;
 import com.yxt.supervise.portal.api.warehouseposition.WarehousePositionVo;
 import com.yxt.supervise.portal.biz.dictcommon.DictCommonService;
@@ -173,7 +174,7 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
         baseMapper.insertGysddmxb(list2);
     }
 
-    public String readBrandPeriodSorXls1(InputStream is, String sid)  {
+    public  ResultBean<String>  readBrandPeriodSorXls1(InputStream is)  {
        /* int ii=uddatePrice();
          if(ii==1){
             return;
@@ -233,6 +234,7 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
                     ProductInformation p=new ProductInformation();
                     PurchaseRequisitionPro prp = new PurchaseRequisitionPro();
                     prp.setMainSid(pr.getSid());
+                    String hsje="";//含税金额
                     for ( ; i < hssfRow.getLastCellNum(); i++) {
                         HSSFCell brandIdHSSFCell = hssfRow.getCell(i);
                         if(brandIdHSSFCell!=null){
@@ -266,14 +268,14 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
                                     prp.setNumber(value);
                                 }
                             }
-                            if (i == 9) {//第二代码
+                            if (i == 10) {//第二代码
                                 brandIdHSSFCell.setCellType(CellType.STRING);
                                 if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
                                     String value = brandIdHSSFCell.getStringCellValue();
                                     prp.setSecondCode(value);
                                 }
                             }
-                            if (i == 4) {//包装数量
+                            if (i == 53) {//包装数量
                                 brandIdHSSFCell.setCellType(CellType.STRING);
                                 if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
                                     String value = brandIdHSSFCell.getStringCellValue();
@@ -284,6 +286,7 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
                                 brandIdHSSFCell.setCellType(CellType.STRING);
                                 if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
                                     String value=	brandIdHSSFCell.getStringCellValue();
+                                    prp.setPackageNumber(value);
                                     prp.setPackageInsideNumber(value);
                                     BigDecimal v3 = new BigDecimal(value);//包内数量  规格
                                     String packagePrice = prp.getPackagePrice();//包装价格
@@ -295,9 +298,14 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
                                     String packageInsideNumber = prp.getPackageInsideNumber();
                                     BigDecimal v = new BigDecimal(packagePrice).divide(new BigDecimal(packageInsideNumber),2,BigDecimal.ROUND_HALF_UP);
                                     prp.setUnitPrice(v.toString());
+                                    BigDecimal bigDecimal = new BigDecimal(hsje);
+                                    BigDecimal v10 = bigDecimal.divide(new BigDecimal(value),2,BigDecimal.ROUND_HALF_UP);
+                                    prp.setUnitPriceTax(v10.toString());
                                     prp.setTotalPrice(v6.toString());
                                     ProductInformationVo productInformationVo = productInformationService.selectByCode(prp.getProCode());
                                     productInformationVo.setNewestPurchasePrice(divide.toString());
+                                    BigDecimal v122 = new BigDecimal(packagePrice).divide(new BigDecimal(prp.getPackageNumber()),2,BigDecimal.ROUND_HALF_UP);
+                                    productInformationVo.setLatestPurchasePrice(v122.toString());
                                     ProductInformation pif=new ProductInformation();
                                     BeanUtil.copyProperties(productInformationVo,pif);
                                     productInformationService.updateById(pif);
@@ -322,14 +330,14 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
                                     productInformationService.insert(p);
                                 }
                             }
-                            if (i == 7) {//包装规格
+                            if (i == 4) {//包装规格
                                 brandIdHSSFCell.setCellType(CellType.STRING);
                                 if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
                                     String value=	brandIdHSSFCell.getStringCellValue();
                                     prp.setPackageSpec(value);
                                 }
                             }
-                            if (i == 10) {//单位
+                            if (i == 11) {//单位
                                 brandIdHSSFCell.setCellType(CellType.STRING);
                                 if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
                                     String value=	brandIdHSSFCell.getStringCellValue();
@@ -352,24 +360,10 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
                                     String value=	brandIdHSSFCell.getStringCellValue();
                                     prp.setPackageTotalPrice(value);
                                     //latestPurchasePrice
-                                    String packagePrice = prp.getPackagePrice(); //送货金额
-                                    String number = prp.getPackageNumber();//数量
-                                    BigDecimal v = new BigDecimal(packagePrice).divide(new BigDecimal(number),2,BigDecimal.ROUND_HALF_UP);
-                                    ProductInformationVo productInformationVo = productInformationService.selectByCode(prp.getProCode());
-                                    productInformationVo.setLatestPurchasePrice(v.toString());
-                                    ProductInformation pif=new ProductInformation();
-                                    BeanUtil.copyProperties(productInformationVo,pif);
-                                    productInformationService.updateById(pif);
                                 }
                             }
-                            if (i == 10) {//第二代码
+
-                                brandIdHSSFCell.setCellType(CellType.STRING);
+                            if (i == 54) {//零售金额
-                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
-                                    String value=	brandIdHSSFCell.getStringCellValue();
-                                    prp.setSecondCode(value);
-                                }
-                            }
-                            if (i == 56) {//零售金额
                                 brandIdHSSFCell.setCellType(CellType.STRING);
                                 if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
                                     String value=	brandIdHSSFCell.getStringCellValue();
@@ -395,17 +389,13 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
                                 }
                             }
 
-                            if (i == 21) {//含税单价（元）
+                             if (i == 7) {//含税单价（元）
                                 brandIdHSSFCell.setCellType(CellType.STRING);
                                 if(StringUtils.isBlank(prp.getProCode())){
                                     continue;
                                 }
-                                if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
+                             if (StringUtils.isNotBlank(brandIdHSSFCell.getStringCellValue())) {
-                                    String value=	brandIdHSSFCell.getStringCellValue();
+                                 hsje=	brandIdHSSFCell.getStringCellValue();
-                                    BigDecimal v = new BigDecimal(value);
-                                    BigDecimal v1 =  new BigDecimal(prp.getPackageNumber());
-                                    BigDecimal v2 =  v.divide( v1,2,BigDecimal.ROUND_HALF_UP);
-                                    prp.setUnitPriceTax(v2.toString());
                                 }
                             }
                         }else{
@@ -413,7 +403,6 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
                         }
                     }
                     if(StringUtils.isNotBlank(prp.getProCode())){
-
                         prps.add(prp);
                     }
                 }
@@ -426,6 +415,15 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
 
         }
         log.info("productInformation:{}", JSONObject.toJSONString(pr));
+        ResultBean<String> objectResultBean=ResultBean.fireFail();
+        SupplierInfoVo supplierInfoVo = supplierInfoService.selectByCode(pr.getSupplierCode());
+        if(supplierInfoVo==null){
+            return objectResultBean.setMsg("供应商不存在!");
+        }
+        List<Map<String,String>> suplierZtyz=baseMapper.suplierZtyz(pr.getSupplierCode());
+        if(suplierZtyz.size()>0){
+            return objectResultBean.setMsg("供应商有在途商品!");
+        }
         purchaseRequisitionService.insert(pr);
         for (PurchaseRequisitionPro p: prps){
             purchaseRequisitionProService.insert(p);
@@ -436,11 +434,10 @@ public class PurchaseRequisitionService extends MybatisBaseService<PurchaseRequi
             }*/
         }
         GdRescategoryProdService.resetCache();
-        String x = JSON.toJSONString(lisss);
+        log.info("x:{}",JSON.toJSONString(lisss));
-        System.out.println(x);
         String x1 = JSON.toJSONString(lisss2);
-        System.out.println(x1);
+        log.info("x1:{}",JSON.toJSONString(lisss2));
-       return  pr.getCode();
+        return  objectResultBean.success().setData(pr.getCode());
         //return message;
     }
 

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoService.java

@@ -247,10 +247,12 @@ public class PurchaseRequisitionTobaccoService extends MybatisBaseService<Purcha
 					String substring1 = s3.substring(s3.indexOf("]")+1, s3.length());
 					map.put("purchasingOrgName",substring);
 					map.put("purchasingOrgCode",substring1);
-					map.put("expiryDate", r.get(6).toString());
+					String expiryDate=r.get(6)==null?"":r.get(6).toString();
+					map.put("expiryDate",expiryDate);
 				}
 				if(rowNum==4){
-					map.put("completionStatus", r.get(6).toString());
+					String completionStatus=r.get(6)==null?"":r.get(6).toString();
+					map.put("completionStatus", completionStatus);
 					map.put("completionStatus", "0");
 				}
 

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsService.java

@@ -27,6 +27,10 @@ package com.yxt.supervise.portal.biz.purchaserequisitiontobaccodetails;
 
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.io.resource.ResourceUtil;
+import cn.hutool.core.text.csv.CsvReader;
+import cn.hutool.core.text.csv.CsvUtil;
+import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.sax.handler.RowHandler;
 import com.alibaba.fastjson.JSONObject;
@@ -53,6 +57,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -104,19 +111,89 @@ public class PurchaseRequisitionTobaccoDetailsService extends MybatisBaseService
     }
     public void readBrandPeriodSorXls1(MultipartFile file,String sid)  {
 
-        ResultBean<FileUploadResult> fub = fileUploadComponent.uploadFile(file, "PurchaseRequisitionTobaccoDetails");
+        /*ResultBean<FileUploadResult> fub = fileUploadComponent.uploadFile(file, "PurchaseRequisitionTobaccoDetails");
         String filePath = fub.getData().getFilePath();
         String fp = fileUploadComponent.getUploadPath() + filePath;
         long millis = System.currentTimeMillis();
-        ExcelUtil.read07BySax(fp, -1, createRowHandler(sid));
+        ExcelUtil.read07BySax(fp, -1, createRowHandler(sid));*/
+        CsvReader csvReader = CsvUtil.getReader();
+        File f = this.multiToFile(file);
+        BufferedReader reader = ResourceUtil.getReader(f.getPath(), CharsetUtil.CHARSET_GBK);
+        List<HashMap > rows = csvReader.read(reader, HashMap.class);
+        List<PurchaseRequisitionTobaccoDetails> ls=new ArrayList<>();
+        int i = 0;
+        BigDecimal bigDecimal=new BigDecimal("0");
+        for(HashMap hm:rows){
+            /*"商品": "钻石(硬迎宾)\t",
+                    "批发价": "61.500000\t",
+                    "卷烟代码": "130690\t",
+                    "订单量": "3.000000\t",
+                    "要货量": "3.000000\t",
+                    "零售指导价": "70.00\t",
+                    "金额": "184.50\t",
+                    "厂家名称": "河北中烟\t"*/
+            try{ String sp = hm.get("商品").toString().trim();
+            String pfj = hm.get("批发价").toString().trim();
+            String jydm = hm.get("卷烟代码").toString().trim();
+            String ddl = hm.get("订单量").toString().trim();
+            String yhl = hm.get("要货量").toString().trim();
+            String lszdj = hm.get("零售指导价").toString().trim();
+            String je = hm.get("金额").toString().trim();
+            String cjmc = hm.get("厂家名称").toString().trim();
+            PurchaseRequisitionTobaccoDetails p=new PurchaseRequisitionTobaccoDetails();
+            p.setCjmc(cjmc);
+            p.setDdl(ddl);
+            p.setLszdj(lszdj);
+            p.setPfj(pfj);
+                BigDecimal price = new BigDecimal(je.trim());
+                bigDecimal= bigDecimal.add(price);
+            p.setPrice(je);
+            p.setProdName(sp);
+            p.setYCode(jydm);
+            p.setYhl(yhl);
+            p.setMainSid(sid);
+            ls.add(p);
+            i++;
+            }catch(Exception e){
+                e.printStackTrace();
+                SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                baseMapper.insertIntoImportDataInfo(sdf.format(new Date()),"烟草数据明细导入第"+i+"出现异常"+e.getMessage());
+                System.err.println("i="+i+",value=null");
+            }
+        }
+        log.info("rows:{}",JSONObject.toJSONString(rows));
+        log.info("ls:{}",JSONObject.toJSONString(ls));
+        baseMapper.batchInsert(ls);
+        purchaseRequisitionStoreService.updateDetailsPrice(sid,bigDecimal.toString());
+    }
+    /**
+     * MultipartFile转file
+     * @param multipartFile
+     * @return
+     */
+    private File multiToFile(MultipartFile multipartFile) {
+        //选择用缓冲区来实现这个转换即使用java 创建的临时文件 使用 MultipartFile.transferto()方法 。
+        File file = null;
+        try {
+            String originalFilename = multipartFile.getOriginalFilename();
+            String[] filename = originalFilename.split("\\.");
+            file=File.createTempFile(filename[0], filename[1]);
+            multipartFile.transferTo(file);
+            file.deleteOnExit();
+        } catch (IOException e) {
+            e.printStackTrace();
+            log.error(e.getMessage());
+        }
+        return file;
     }
+
     private RowHandler createRowHandler(String sid ) {
         return new RowHandler() {
 
             List<String> lisss=new ArrayList<>();
             List<PurchaseRequisitionTobaccoDetails> salesDatas=new ArrayList<>();
             int i = 0;
-            int j = 0;
+           // int j = 0;
             BigDecimal bigDecimal=new BigDecimal("0");
             @Override
             public void handle(int sheetIndex, long rowNum, List<Object> r) {

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataService.java

@@ -26,11 +26,16 @@
 package com.yxt.supervise.portal.biz.salesdata;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.io.resource.ResourceUtil;
+import cn.hutool.core.text.csv.CsvReader;
+import cn.hutool.core.text.csv.CsvUtil;
+import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.sax.handler.RowHandler;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetails;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.core.result.FileUploadResult;
 import com.yxt.supervise.portal.api.brandinfo.BrandInfo;
@@ -71,6 +76,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -209,10 +217,10 @@ public class SalesDataService extends MybatisBaseService<SalesDataMapper, SalesD
 						baseMapper.insertIntoImportDataInfo(sdf.format(new Date()),"销售数据导入第"+i+"出现异常"+e.getMessage());
 						System.err.println("i="+i+",value=null");
 					}
-					lisss.add(rowNum+"");
+					//lisss.add(rowNum+"");
 					//inventoryInformationService.reduceStock(sd.getProCode(),sd.getProName(),sd.getStoreCode(),sd.getSaleNum());
-					log.info("productInformation:{}", JSONObject.toJSONString(sd_map));
+					//log.info("productInformation:{}", JSONObject.toJSONString(sd_map));
-					log.info("rowNum:{}", rowNum);
+					//log.info("rowNum:{}", rowNum);
 				}
 			}
 
@@ -291,6 +299,98 @@ public class SalesDataService extends MybatisBaseService<SalesDataMapper, SalesD
 			}
 		};
 	}
+	public void readBrandPeriodSorXls1(MultipartFile file,String sid)  {
+
+        /*ResultBean<FileUploadResult> fub = fileUploadComponent.uploadFile(file, "PurchaseRequisitionTobaccoDetails");
+        String filePath = fub.getData().getFilePath();
+        String fp = fileUploadComponent.getUploadPath() + filePath;
+        long millis = System.currentTimeMillis();
+        ExcelUtil.read07BySax(fp, -1, createRowHandler(sid));*/
+		log.info("readBrandPeriodSorXls1:{}",1);
+		CsvReader csvReader = CsvUtil.getReader();
+		log.info("readBrandPeriodSorXls1:{}",2);
+		File f = this.multiToFile(file);
+		log.info("readBrandPeriodSorXls1:{}",3);
+		BufferedReader reader = ResourceUtil.getReader(f.getPath(), CharsetUtil.CHARSET_GBK);
+		log.info("readBrandPeriodSorXls1:{}",4);
+		List<HashMap > rows = csvReader.read(reader, HashMap.class);
+		log.info("readBrandPeriodSorXls1:{}",5);
+		List<SalesData> ls=new ArrayList<>();
+		log.info("readBrandPeriodSorXls1:{}",6);
+		int i = 0;
+		log.info("readBrandPeriodSorXls1:{}",7);
+		for(HashMap hm:rows){
+			try{
+				/*String sp = hm.get("商品").toString().trim();
+				String pfj = hm.get("批发价").toString().trim();
+				String jydm = hm.get("卷烟代码").toString().trim();
+				String ddl = hm.get("订单量").toString().trim();
+				String yhl = hm.get("要货量").toString().trim();
+				String lszdj = hm.get("零售指导价").toString().trim();
+				String je = hm.get("金额").toString().trim();
+				String cjmc = hm.get("厂家名称").toString().trim()`	;*/
+				/*SalesData sd=new SalesData();
+				sd.setType( hm.get("类型").toString().trim());//类型
+				sd.setCode(hm.get("销售订单号").toString().trim());//销售订单号
+				sd.setProCode(hm.get("商品编码").toString().trim());//商品代码
+				sd.setProBarCode(hm.get("商品条码").toString().trim());//商品条码
+				sd.setProName(hm.get("商品名称").toString().trim());//商品名称
+				sd.setBrandCode(hm.get("品牌代码").toString().trim());//品牌代码
+				String brandName=hm.get("品牌名称").toString().trim();
+				sd.setBrandName(brandName);//品牌名称
+				String dalei=hm.get("大类").toString().trim();//大类
+				sd.setCategoryb(dalei);
+				String zhonglei=hm.get("中类").toString().trim();//中类
+				sd.setCategorym(zhonglei);
+				String xiaolei=hm.get("小类").toString().trim();//小类
+				sd.setCategorys(xiaolei);
+				sd.setCustomerCode(hm.get("客户代码").toString().trim());//客户代码
+				sd.setCustomerName(hm.get("客户名称").toString().trim());//客户名称
+				sd.setSaleNum(hm.get("销售数量").toString().trim());//销售数量
+				sd.setStoreCode(hm.get("销售渠道").toString().trim());//销售渠道
+				sd.setSalePrice(hm.get("销售价格").toString().trim());//销售价格
+				sd.setSaleCost(hm.get("销售成本").toString().trim());//销售成本
+				sd.setProfit(hm.get("利润").toString().trim());//利润
+				sd.setDataDate(hm.get("数据日期").toString().trim());//销售日期
+				ls.add(sd);*/
+//				log.info("iiiiiiiiiiiiiiiiiiiiiii:{}",i);
+//				log.info("p:{}",JSONObject.toJSONString(sd));
+				//i++;
+			}catch(Exception e){
+				e.printStackTrace();
+				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+				baseMapper.insertIntoImportDataInfo(sdf.format(new Date()),"烟草数据明细导入第"+i+"出现异常"+e.getMessage());
+				System.err.println("i="+i+",value=null");
+			}
+		}
+		/*log.info("readBrandPeriodSorXls1:{}",8);
+		log.info("readBrandPeriodSorXls1-rows:{}",rows.size());
+		log.info("readBrandPeriodSorXls1-ls:{}",ls.size());
+		log.info("rows:{}",JSONObject.toJSONString(rows));
+		log.info("ls:{}",JSONObject.toJSONString(ls));*/
+		/*baseMapper.batchInsert(ls);
+		purchaseRequisitionStoreService.updateDetailsPrice(sid,bigDecimal.toString());*/
+	}
+	/**
+	 * MultipartFile转file
+	 * @param multipartFile
+	 * @return
+	 */
+	private File multiToFile(MultipartFile multipartFile) {
+		//选择用缓冲区来实现这个转换即使用java 创建的临时文件 使用 MultipartFile.transferto()方法 。
+		File file = null;
+		try {
+			String originalFilename = multipartFile.getOriginalFilename();
+			String[] filename = originalFilename.split("\\.");
+			file=File.createTempFile(filename[0], filename[1]);
+			multipartFile.transferTo(file);
+			file.deleteOnExit();
+		} catch (IOException e) {
+			e.printStackTrace();
+			log.error(e.getMessage());
+		}
+		return file;
+	}
 	public void readBrandPeriodSorXls1(MultipartFile file)  {
 
 		ResultBean<FileUploadResult> fub = fileUploadComponent.uploadFile(file, "salesdata");
@@ -423,7 +523,7 @@ public class SalesDataService extends MybatisBaseService<SalesDataMapper, SalesD
 			String[] split = colc2.split("]");
 			map.put("t2",split[1]);
 			map.put("t3",gdInstorageGd.getColg6());//统配出
-			map.put("t4","无");// 销售订单编号
+			map.put("t4",gdInstorageGd.getColf5());// 销售订单编号
 			map.put("t5",gdInstorageGd.getColh7());//商品编码
 			map.put("t6",gdInstorageGd.getColi8());//商品名称
 			map.put("t7",gdInstorageGd.getColr17());//数量