| 
					
				 | 
			
			
				@@ -260,58 +260,106 @@ public class EmsProdplanYearServiceImpl extends BaseServiceImpl<EmsProdplanYear, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             spp.setWeight(new BigDecimal(arr[k].trim()).setScale(0, BigDecimal.ROUND_HALF_UP));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         // 机焦厂
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        else if (arr1[k].trim().indexOf("成品焦") != -1) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        else if (arr1[k].trim().indexOf("其中成品焦生产数量") != -1) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            spp.setProductid("成品焦");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            spp.setParentid("JJZ");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            spp.setUnit("吨");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            spp.setWeight(BigDecimal.ZERO);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            for (int m = 0;m <= 2; m++ ){
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                                if ("高炉用量".equals(arr2[k+m].trim())) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                                    spp.setWeight1(new BigDecimal(arr[k+m].trim()).setScale(0, BigDecimal.ROUND_HALF_UP));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                                } else if ("外销数量".equals(arr2[k+m].trim())) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                                    spp.setWeight2(new BigDecimal(arr[k+m].trim()).setScale(0, BigDecimal.ROUND_HALF_UP));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                                }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            k +=2;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             spp.setProductid("成品焦");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             spp.setParentid("JJZ");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             spp.setUnit("吨");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             spp.setWeight(BigDecimal.ZERO);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            for (int m = 0;m <= 2; m++ ){
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                if ("高炉用量".equals(arr2[k+m].trim())) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    spp.setWeight1(new BigDecimal(arr[k+m].trim()).setScale(0, BigDecimal.ROUND_HALF_UP));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                } else if ("外销数量".equals(arr2[k+m].trim())) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    spp.setWeight2(new BigDecimal(arr[k+m].trim()).setScale(0, BigDecimal.ROUND_HALF_UP));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                              String sppName= arr1[k+1].trim().toString();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                if ("其中成品焦高炉用量".equals(sppName)) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                    spp.setWeight1(new BigDecimal(arr[k+1].trim()).setScale(0, BigDecimal.ROUND_HALF_UP));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            String sppName2= arr1[k+2].trim().toString();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            if ("其中成品焦高炉用量".equals(sppName)) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                spp.setWeight2(new BigDecimal(arr[k+2].trim()).setScale(0, BigDecimal.ROUND_HALF_UP));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            k +=2;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        } else if (arr1[k].trim().indexOf("小粒焦") != -1) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            k+=2;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        else if (arr1[k].trim().indexOf("小粒焦") != -1) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            spp.setProductid("小粒焦");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            spp.setParentid("JJZ");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            spp.setUnit("吨");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            spp.setWeight(BigDecimal.ZERO);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            for (int m = 0;m <= 2; m++ ) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                                if ("高炉用量".equals(arr2[k+m].trim())) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                                    spp.setWeight1(new BigDecimal(arr[k+m].trim()).setScale(0, BigDecimal.ROUND_HALF_UP));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                                } else if ("外销数量".equals(arr2[k+m].trim())) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                                    spp.setWeight2(new BigDecimal(arr[k+m].trim()).setScale(0, BigDecimal.ROUND_HALF_UP));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                                }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            k +=2;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             spp.setProductid("小粒焦");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             spp.setParentid("JJZ");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             spp.setUnit("吨");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             spp.setWeight(BigDecimal.ZERO);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            for (int m = 0;m <= 2; m++ ) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                if ("高炉用量".equals(arr2[k+m].trim())) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    spp.setWeight1(new BigDecimal(arr[k+m].trim()).setScale(0, BigDecimal.ROUND_HALF_UP));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                } else if ("外销数量".equals(arr2[k+m].trim())) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    spp.setWeight2(new BigDecimal(arr[k+m].trim()).setScale(0, BigDecimal.ROUND_HALF_UP));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            k +=2;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        } else if (arr1[k].trim().indexOf("除尘焦粉") != -1) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            spp.setProductid("除尘焦粉");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        else if (arr1[k].trim().indexOf("其中焦粉烧结用量") != -1) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            spp.setProductid("小粒焦");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            spp.setParentid("JJZ");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            spp.setUnit("吨");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            spp.setWeight(BigDecimal.ZERO);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            for (int m = 0;m <= 2; m++ ) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                                if ("高炉用量".equals(arr2[k+m].trim())) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                                    spp.setWeight1(new BigDecimal(arr[k+m].trim()).setScale(0, BigDecimal.ROUND_HALF_UP));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                                } else if ("外销数量".equals(arr2[k+m].trim())) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                                    spp.setWeight2(new BigDecimal(arr[k+m].trim()).setScale(0, BigDecimal.ROUND_HALF_UP));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                                }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            k +=2;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            spp.setProductid("焦粉");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             spp.setParentid("JJZ");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             spp.setUnit("吨");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            spp.setWeight1(new BigDecimal(arr[k].trim()).setScale(0,BigDecimal.ROUND_HALF_UP));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             spp.setWeight(BigDecimal.ZERO);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            for (int m = 0;m <= 2; m++ ) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                if ("高炉用量".equals(arr2[k+m].trim())) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    spp.setWeight1(new BigDecimal(arr[k+m].trim()).setScale(0, BigDecimal.ROUND_HALF_UP));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                } else if ("外销数量".equals(arr2[k+m].trim())) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    spp.setWeight2(new BigDecimal(arr[k+m].trim()).setScale(0, BigDecimal.ROUND_HALF_UP));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            String sppName= arr1[k+1].trim().toString();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            if ("其中焦粉预计外销".equals(sppName)) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                spp.setWeight2(new BigDecimal(arr[k+1].trim()).setScale(0, BigDecimal.ROUND_HALF_UP));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            k +=2;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        } else if (arr1[k].trim().indexOf("焦粉") != -1) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            spp.setProductid("焦粉");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            k+=1;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        else if (arr1[k].trim().indexOf("其中除尘焦粉高炉+烧结用量") != -1) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            spp.setProductid("小粒焦");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            spp.setParentid("JJZ");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            spp.setUnit("吨");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            spp.setWeight(BigDecimal.ZERO);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            for (int m = 0;m <= 2; m++ ) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                                if ("高炉用量".equals(arr2[k+m].trim())) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                                    spp.setWeight1(new BigDecimal(arr[k+m].trim()).setScale(0, BigDecimal.ROUND_HALF_UP));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                                } else if ("外销数量".equals(arr2[k+m].trim())) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                                    spp.setWeight2(new BigDecimal(arr[k+m].trim()).setScale(0, BigDecimal.ROUND_HALF_UP));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                                }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//                            k +=2;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            spp.setProductid("除尘焦粉");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             spp.setParentid("JJZ");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             spp.setUnit("吨");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            spp.setWeight2(BigDecimal.ZERO);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            for (int m = 0;m <= 2; m++ ) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                if ("烧结用量".equals(arr2[k+m].trim())) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    spp.setWeight1(new BigDecimal(arr[k+m].trim()).setScale(0, BigDecimal.ROUND_HALF_UP));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                } else if ("预计外购".equals(arr2[k+m].trim())) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                    spp.setWeight(new BigDecimal(arr[k+m].trim()).setScale(0, BigDecimal.ROUND_HALF_UP));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            spp.setWeight1(new BigDecimal(arr[k].trim()).setScale(0,BigDecimal.ROUND_HALF_UP));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            spp.setWeight(BigDecimal.ZERO);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            String sppName= arr1[k+1].trim().toString();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            if ("其中除尘焦粉外销数量".equals(sppName)) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                spp.setWeight2(new BigDecimal(arr[k+1].trim()).setScale(0, BigDecimal.ROUND_HALF_UP));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            k +=2;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            k+=1;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         // 发电厂
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         else if (arr1[k].trim().indexOf("40MW") != -1) {
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -390,7 +438,7 @@ public class EmsProdplanYearServiceImpl extends BaseServiceImpl<EmsProdplanYear, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             spp.setWeight(new BigDecimal(arr[k].trim()).setScale(0, BigDecimal.ROUND_HALF_UP));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         } else {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             continue;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                          }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         spp.setCjr(payload.getUserName());
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         spp.setCjsj(new Date());
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         lists.add(spp);
 
			 |