油量计算带上一车多单，一车一单条件，行车路单传参修改，油量添加车辆，线路取消关联

廖磊
1 parent 6b660b21
Showing 3 changed files with 86 additions and 8 deletions
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/resources/static/pages/forms/statement/waybill.html
src/main/resources/static/pages/oil/add.html
@@ -266,7 +266,44 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			List<Ylb> ylListBe =repository.listMaxRqJcsx(rq, gsbm, fgsbm, line, nbbm);
 			List<Cyl> clyList = cylRepository.obtainCyl(nbbm,gsbm);
 			// 从排班表中计算出行驶的总里程
-			List<Map<String, Object>> listpb = scheduleRealInfoService.yesterdayDataList(line, rq, gsbm, fgsbm, "", nbbm);
+			List<Map<String, Object>> listpb =new ArrayList<Map<String, Object>>();
+			List<Map<String, Object>> listpbs=scheduleRealInfoService.yesterdayDataList(line, rq, gsbm, fgsbm, "", nbbm);
+
+			String sxtj=map2.get("sxtj").toString();
+			if(sxtj.equals("0")){
+				listpb=listpbs;
+			}else{
+				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, line,nbbm);
+				List<String> stringList=new ArrayList<String>();
+				for (int i = 0; i < objectLists.size(); i++) {
+					String clbm=objectLists.get(i)[0].toString();
+					int cs=Integer.parseInt(objectLists.get(i)[1].toString());
+					//一车一单
+					if(sxtj.equals("1")){
+						if(cs==1){
+							stringList.add(clbm);
+						}
+					}	
+					//一车多单
+					if(sxtj.equals("2")){
+						if(cs>1){
+							stringList.add(clbm);
+						}
+					}
+				}
+				
+				for (int i = 0; i < stringList.size(); i++) {
+					String strNbbm=stringList.get(i);
+					for (int j = 0; j < listpbs.size(); j++) {
+						Map<String, Object> map = listpbs.get(j);
+						String mapNbbm=map.get("clZbh").toString();
+						if(strNbbm.equals(mapNbbm)){
+							listpb.add(map);
+						}
+					}
+				}
+			}
+			
 			List<Ylb> addList = new ArrayList<Ylb>();
 			List<Ylb> updateList = new ArrayList<Ylb>();
 			String ins="";
@@ -443,15 +480,53 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			List<Cyl> cylList = cylRepository.obtainCyl(nbbm,gsbm);
 			// 指定日期YLB信息
 			List<Ylb> ylbList =new ArrayList<Ylb>();
+			List<Ylb> ylbLists =new ArrayList<Ylb>();
 			List<Ylb> iterator2=new ArrayList<Ylb>();
 			if(xlbm.equals("")){
-				ylbList=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
+				ylbLists=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
 				iterator2=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
 			}else{
-				ylbList=repository.obtainYl_eq(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
+				ylbLists=repository.obtainYl_eq(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
 				iterator2=repository.obtainYl_eq(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
 			}
+			// 从排班表中计算出行驶的总里程
+
+			String sxtj=map.get("sxtj").toString();
+			if(sxtj.equals("0")){
+				ylbList=ylbLists;
+			}else{
+				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
+				List<String> stringList=new ArrayList<String>();
+				for (int i = 0; i < objectLists.size(); i++) {
+					String clbm=objectLists.get(i)[0].toString();
+					int cs=Integer.parseInt(objectLists.get(i)[1].toString());
+					//一车一单
+					if(sxtj.equals("1")){
+						if(cs==1){
+							stringList.add(clbm);
+						}
+					}	
+					//一车多单
+					if(sxtj.equals("2")){
+						if(cs>1){
+							stringList.add(clbm);
+						}
+					}
+				}
+				
+				for (int i = 0; i < stringList.size(); i++) {
+					String strNbbm=stringList.get(i);
+					for (int j = 0; j < ylbLists.size(); j++) {
+						Ylb y = ylbLists.get(j);
+						String mapNbbm=y.getNbbm();
+						if(strNbbm.equals(mapNbbm)){
+							ylbList.add(y);
+						}
+					}
+				}
+			}
+			
 			for (int i=0;i<ylbList.size();i++) {
 				Ylb ylb = ylbList.get(i);
 				// 判断是否已经计算过
@@ -263,14 +263,13 @@
 			});
 			jName = params[0].split("\\")[0];
 			jGh = params[0].split("\\")[1];
-			var id = $("#"+params[1]).val();
+			var id = params[3];
 			$get('/realSchedule/MapById',{id:id},function(result){
 			    result.scheduleDate = moment(result.scheduleDate).format("YYYY/MM/DD");
 				var ludan_1 = template('ludan_1',result);
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms .ludan_1').html(ludan_1);
 			});
-			console.log(params);
 			$get('/realSchedule/queryListWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
 			    getTime(result);
 				var ludan_2 = template('ludan_2',{list:result});
@@ -336,7 +335,8 @@
 		<tr>
 			<td width="45%">{{obj[4]}}\{{obj[1]}}</td>
 			<td width="32%">{{obj[2]}}</td>
-			<td width="23%">{{obj[3]}}<input type="hidden" id="{{obj[2]}}" value="{{obj[0]}}"></td>
+			<td width="20%">{{obj[3]}}</td>
+			<td  width="3%"  hidden="true">{{obj[0]}}</td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -348,9 +348,11 @@
 <script type="text/html" id="list_info_px">
 	{{each list as obj i}}
 		<tr>
+			
 			<td width="45%">{{obj.jName}}\{{obj.jGh}}</td>
 			<td width="32%">{{obj.clZbh}}</td>
-			<td width="23%">{{obj.lpName}}<input type="hidden" id="{{obj.clZbh}}" value="{{obj.id}}"></td>
+			<td width="23%">{{obj.lpName}}</td>
+			<td  hidden="true">{{obj.id}}</td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -259,7 +259,8 @@
 					return{nbbm: params.term,
 	            	    gsbm:$('#ssgsdm').val(),
 	            	    fgsbm:$('#fgsdm').val(),
-	            	    xlbm:$('#xlbm').val()};
+	            	    xlbm:""
+	            	    };
 				},
 			    processResults: function (data) {
 			      return {