场外加油添加线路条件

调度日报修改加油人员不符修改后盖板JYLX

场外加油添加线路条件
调度日报修改加油人员不符修改后盖板JYLX
廖磊
1 parent aeceea9a
Showing 12 changed files with 103 additions and 25 deletions
src/main/java/com/bsth/controller/oil/CwjyController.java
src/main/java/com/bsth/entity/oil/Cwjy.java
src/main/java/com/bsth/entity/oil/Ylxxb.java
src/main/java/com/bsth/repository/oil/CwjyRepository.java
src/main/java/com/bsth/service/oil/CwjyService.java
src/main/java/com/bsth/service/oil/impl/CwjyServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlxxbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/oil/jyglList.html
src/main/resources/static/pages/oil/jyszAdd.html
src/main/resources/static/pages/oil/jyszList.html
@@ -13,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import com.bsth.controller.BaseController;
+import com.bsth.data.BasicData;
+import com.bsth.entity.Line;
 import com.bsth.entity.oil.Cwjy;
 import com.bsth.entity.oil.Ylxxb;
 import com.bsth.entity.sys.SysUser;
@@ -30,12 +32,15 @@ public class CwjyController extends BaseController&lt;Cwjy, Integer&gt;{
 		SysUser sysUser = SecurityUtils.getCurrentUser();
 		t.setCreateDate(new Date());
 		t.setXgr(sysUser.getUserName());
+		t.setNbbm(t.getNbbm().trim().toUpperCase());
+		Line line=BasicData.nbbm2LineMap.get(t.getNbbm());
+		t.setLine(line == null?"" : line.getLineCode());
 		return service.save(t);
 	}
 	@RequestMapping(value = "/checkNbbm",method = RequestMethod.GET)
 	public int checkNbbm(Cwjy t){
-		return service.checkNbbm(t.getNbbm().trim());
+		return service.checkNbbm(t);
 	}
 	@RequestMapping(value = "/queryList",method = RequestMethod.GET)
@@ -26,6 +26,11 @@ public class Cwjy {
 	private String xgr;
 	private Date createDate;
+	
+	private String line;
+	
+	@Transient
+	private String linename;
 	@Transient
 	private String gsname;
@@ -95,6 +100,24 @@ public class Cwjy {
 	public void setFgsname(String fgsname) {
 		this.fgsname = fgsname;
 	}
+
+	public String getLine() {
+		return line;
+	}
+
+	public void setLine(String line) {
+		this.line = line;
+	}
+
+	public String getLinename() {
+		return BasicData.lineCode2NameMap.get(this.line);
+	}
+
+	public void setLinename(String linename) {
+		this.linename = linename;
+	}
+	
+	
 }
@@ -44,7 +44,8 @@ public class Ylxxb {
 	private String gsname;
 	@Transient
 	private String fgsname;
-	
+	@Transient
+	private String linename;
 	@Transient
 	private Double zjzl;
@@ -193,6 +194,12 @@ public class Ylxxb {
 	public void setZjzl(Double zjzl) {
 		this.zjzl = zjzl;
 	}
+	public String getLinename() {
+		return linename;
+	}
+	public void setLinename(String linename) {
+		this.linename = linename;
+	}
@@ -30,5 +30,8 @@ public interface CwjyRepository extends BaseRepository&lt;Cwjy, Integer&gt;{
 	@Query(value="select * from bsth_c_cwjy where nbbm like %?1% and gsdm like %?2% and fgsdm like %?3%",nativeQuery=true)
 	List<Cwjy> selectAll(String nbbm,String gsdm,String fgsdm);
+	@Query(value="select * from bsth_c_cwjy where nbbm like %?1% and gsdm like %?2% and fgsdm like %?3% and line =?4",nativeQuery=true)
+	List<Cwjy> selectAll_s(String nbbm,String gsdm,String fgsdm,String line);
+	
 }
@@ -15,5 +15,5 @@ public interface CwjyService extends BaseService&lt;Cwjy, Integer&gt;{
 	Map<String, Object> savejzl(Map<String, Object> map) throws Exception ;
-	int checkNbbm(String nbbm);
+	int checkNbbm(Cwjy t);
 }
@@ -24,6 +24,7 @@ import org.springframework.stereotype.Service;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
+import com.bsth.data.BasicData;
 import com.bsth.entity.oil.Cwjy;
 import com.bsth.entity.oil.Cyl;
 import com.bsth.entity.oil.Ylb;
@@ -281,6 +282,7 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 		String gsdm=map.get("gsdm_like").toString();
 		String fgsdm=map.get("fgsdm_like").toString();
+		String line =map.get("line_like").toString().trim();
 		/*String sql="SELECT a.gsdm as gsdm,a.fgsdm as fgsdm,a.nbbm as nbbm,"
 				+ "b.jyggh as jyggh,b.jzl as jzl ,b.stationid as stationid,b.jsy as jsy,"
 				+ "b.nylx as nylx,b.yj as yj,b.bz as bz,b.id as id ,c.jsy as ldgh  FROM  bsth_c_cwjy  a "+ 
@@ -318,7 +320,13 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 				 return t;
 			 }
 		});
-		List<Cwjy> cwList=repository.selectAll(nbbm, gsdm, fgsdm);
+		List<Cwjy> cwList=null;
+		if(line.equals("")){
+			cwList = repository.selectAll(nbbm, gsdm, fgsdm);
+		}else{
+			cwList = repository.selectAll_s(nbbm, gsdm, fgsdm, line);
+		}
+				
 		String sql_ylb="SELECT nbbm,group_concat(jsy) AS jsy FROM bsth_c_ylb WHERE "
 				+ " to_days(rq) = to_days('"+rq+"') AND ssgsdm = '"+gsdm+"' AND "
 				+ " fgsdm = '"+fgsdm+"' GROUP BY nbbm";
@@ -338,9 +346,6 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 		Ylxxb y=null;
 		for (int i = 0; i < cwList.size(); i++) {
 			Cwjy cwjy=cwList.get(i);
-			if(cwjy.getNbbm().equals("W7B-092")){
-				System.out.println();
-			}
 			y=new Ylxxb();
 			y.setNylx(0);
 			y.setId(0);
@@ -348,6 +353,7 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 			y.setGsdm(cwjy.getGsdm());
 			y.setFgsdm(cwjy.getFgsdm());
 			y.setNbbm(cwjy.getNbbm());
+			y.setLinename(cwjy.getLinename());
 			for (int j = 0; j < yList.size(); j++) {
 				Ylxxb ylxxb=yList.get(j);
 				if(y.getNbbm().equals(ylxxb.getNbbm())){
@@ -379,9 +385,10 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 	}
 	@Override
-	public int checkNbbm(String nbbm) {
+	public int checkNbbm(Cwjy t) {
 		// TODO Auto-generated method stub
-		String sql="select count(*) from bsth_c_cwjy where nbbm ='"+nbbm+"'";
+		String sql="select count(*) from bsth_c_cwjy where nbbm ='"+t.getNbbm()+"'"
+				+ " and gsdm ='"+t.getFgsdm()+"' and fgsdm ='"+t.getFgsdm()+"'";
 		int cs=jdbcTemplate.queryForObject(sql, Integer.class);
 		return cs;
@@ -384,6 +384,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						for (int i = 0; i < ylxxList.size(); i++) {
 							Ylxxb ylxxb = ylxxList.get(i);
 							if (map.get("clZbh").toString().equals(ylxxb.getNbbm())
+									&& map.get("jGh").toString().equals(ylxxb.getJsy())
 									&& ylxxb.getJylx()==1) {
 								if(ylxxb.getJzl()>0){
 									fage2=true;
@@ -176,6 +176,7 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 				String jsy =jsonObject.getString("jsy");
 				Ylxxb ylxxb=repository.findOne(id);
 				ylxxb.setJsy(jsy);
+				ylxxb.setJylx(1);
 				repository.save(ylxxb);
 			}
 		newMap.put("status", ResponseCode.SUCCESS);
@@ -2737,7 +2737,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if (a == 2) {
                 x = b + 1;
                 y = x * 2;
-            } else if (b == 1) {
+            } else if (a == 1) {
                 x = b + 1;
                 y = x * 2 - 1;
             } else {
@@ -4068,7 +4068,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             	 if((zdsj_-zdsjActual_)>0){
             		 zdsjk =String.valueOf(zdsj_-zdsjActual_);
             	 }else{
-            		 zdsjm =String.valueOf(zdsj_-zdsjActual_);
+            		 zdsjm =String.valueOf(zdsjActual_-zdsj_);
             	 }
              }
              tempMap.put("zdsjk" + x, zdsjk);
@@ -4095,7 +4095,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             	 if((zdsj_-fcsjActural_)>0){
             		 fcsjk =String.valueOf(zdsj_-fcsjActural_);
             	 }else{
-            		 fcsjm =String.valueOf(zdsj_-fcsjActural_);
+            		 fcsjm =String.valueOf(fcsjActural_-zdsj_);
             	 }
              }
              tempMap.put("fcsjk" + x, fcsjk);
@@ -58,15 +58,15 @@
 							<tr role="row" class="heading">
 								<th width="2%">#</th>
 								<th width="10%">日期</th>
-								<th width="10%">公司</th>
-								<th width="10%">分公司</th>
+								<th width="8%">公司</th>
+								<th width="8%">分公司</th>
+								<th width="8%">线路</th>
 								<th width="8%">车辆</th>
 								<th width="14%">驾驶员</th>
 								<th width="5%">加注量</th>
 								<th width="4%">加油站</th>
 								<th width="3%">加油类型</th>
 								<th width="5%">加油工工号</th>
-								<th width="3%">油价</th>
 								<th width="4%">路单工号</th>
 								<th width="4%">备注</th>
 								<th width="10%">操作</th>
@@ -83,6 +83,9 @@
 									<select class="form-control" name="fgsdm_like" id="jyglListFgsdmId" ></select>
 								</td>
 								<td>
+									 <select class="form-control" name="line_like" id="line" style="width: 120px;"></select>
+								</td>
+								<td>
 									<input type="text" class="form-control form-filter input-sm" name="nbbh" id="nbbh">
 								</td>
 								<td></td>
@@ -92,7 +95,6 @@
 								<td></td>
 								<td></td>
 								<td></td>
-								<td></td>
 								<td>
 									<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
                                                                 <i class="fa fa-search"></i> 搜索</button>
@@ -124,6 +126,7 @@
 		<td>
 		{{obj.fgsname}}
 	</td>
+	<td>{{obj.linename}}</td>
 	<td>
 		{{obj.nbbm}}
 	</td>
@@ -153,7 +156,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
 	<input data-id="{{obj.nbbm}}" href="javascript:;" class="in_carpark_jyggh" 
             type="text" value="{{obj.jyggh}}" style=" width:45px" />
 	</td>
-	<td></td>
+	
 	<td>{{obj.ldgh}}</td>
 	<td>
 <input data-id="{{obj.nbbm}}" href="javascript:;" class="in_carpark_bz" 
@@ -234,6 +237,27 @@ $(function(){
 	});
+	
+	$.get('/report/lineList',function(xlList){
+		var data = [];
+		data.push({id: " ", text: "全部线路"});
+		$.get('/user/companyData', function(result){
+			for(var i = 0; i < result.length; i++){
+				var companyCode = result[i].companyCode;
+				var children = result[i].children;
+				for(var j = 0; j < children.length; j++){
+					var code = children[j].code;
+					for(var k=0;k < xlList.length;k++ ){
+						if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
+							data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+						}
+					}
+				}
+			}
+			initPinYinSelect2('#line',data,'');
+			
+		});
+	});
 // 	var gsqx="";
 // 	var fgsqx="";
@@ -33,7 +33,7 @@
 							<label class="col-md-3 control-label">内部编码</label>
 							<div class="col-md-9">
 <!-- 									<select  class="form-control input-medium " name="nbbm" id="nbbm" ></select> -->
-									<input type="text" class="form-control input-medium" name="nbbm" > 
+									<input type="text" class="form-control" name="nbbm" style="width: 180px"> 
 							</div>
 						</div>
 					</div>
@@ -87,6 +87,8 @@ $(function(){
 		$('#fgsdm').html(options);
 	}
+	
+	
 	//提交
 	$('#addJyszModuleButton').on('click', function() {
 		form.submit();
@@ -98,7 +100,7 @@ $(function(){
 		focusInvalid : false, 
 		rules : {
 			nbbm : {
-				minlength : 2,
+				minlength : 4,
 				required : true,
 				maxlength : 10
 			}
@@ -125,7 +127,7 @@ $(function(){
 			error.hide();
 			$get('/cwjy/checkNbbm',params,function(result){
 				if(result>0){
-					layer.msg('该车辆已经添加.');
+					layer.msg('分公司该车辆已经添加.');
 				}else{
 					$post('/cwjy', params, function(result){
 						layer.msg('新增加油设置成功.');
@@ -21,8 +21,9 @@
 					</div>
 					<div class="actions">
 	<!-- 					<a class="btn btn-circle blue" href="jyszAdd.html" data-pjax><i class="fa fa-plus"></i> 添加</a> -->
-						<button type="button" class="btn btn-circle blue"  id="addJysz"><i class="fa fa-trash"></i> 添加</button>
-<!-- 						<button type="button" class="btn btn-circle blue"  onclick="refreshJsTree()"><i class="fa fa-trash"></i>刷新</button> -->
+                    <button type="button" class="btn btn-circle blue"  id="addJysz"><i class="fa fa-plus"></i> 添加</button>
+<!-- 						
+			<button type="button" class="btn btn-circle blue"  onclick="refreshJsTree()"><i class="fa fa-trash"></i>刷新</button> -->
 						<!-- <div class="btn-group">
 							<a class="btn red btn-outline btn-circle" href="javascript:;"
@@ -60,8 +61,9 @@
 									<th width="15%">公司</th>
 									<th width="13%">分公司</th>
 									<th width="10%">车辆</th>
+									<th width="10%">线路</th>
 									<th width="10%">修改人</th>
-									<th width="20%">日期</th>
+									<th width="10%">日期</th>
 									<th width="19%">操作</th>
 								</tr>
 								<tr role="row" class="filter">
@@ -77,6 +79,8 @@
 									</td>
 									<td>
 									</td>
+									<td>
+									</td>
 									<td></td>
 									<td>
 										<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
@@ -107,6 +111,7 @@
 	<td>{{obj.gsname}}</td>
 	<td>{{obj.fgsname}}</td>
 	<td>{{obj.nbbm}}</td>
+	<td>{{obj.linename}}</td>
 	<td>{{obj.xgr}}</td>
 	<td>{{obj.createDate}}</td>
 	<td>
@@ -236,6 +241,7 @@ $(function(){
 			$.each(data.content, function(i, obj) {
                 obj.createDate = moment(obj.createDate).format("YYYY-MM-DD");
             });
+			console.log(data.content);
 			var bodyHtm = template('jysz_list_temp', {list: data.content});
 			$('#datatable_jysz tbody').html(bodyHtm)
@@ -288,7 +294,7 @@ $(function(){
 					for(var j = 0, item; item = items[j++];){
 						name = $(item).attr('name');
 						if(name){
-							params[name] = $(item).val();
+							params[name] = $(item).val().replace(/(^\s*)|(\s*$)/g, "");
 						}
 					}
 				});
@@ -315,7 +321,6 @@ $(function(){
 		$.get('jyszAdd.html', function(m){$(pjaxContainer).append(m);});
 	});
-
 });