zcy
/
jee_wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

che

master
erzhongxmu 2020-04-18 18:09:34 +08:00
parent fab42f89bf
commit 6a4a60914a
3 changed files with 67 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/main/java/com/zzjee/tms/controller/TmsYwDingdanController.java
View File

@ -60,11 +60,11 @@ import java.util.*;
import static com.xiaoleilu.hutool.date.DateUtil.now; import static com.xiaoleilu.hutool.date.DateUtil.now;
/** /**
* @Title: Controller * @Title: Controller
* @Description: 运输订单 * @Description: 运输订单
* @author onlineGenerator * @author onlineGenerator
* @date 2018-01-29 21:57:25 * @date 2018-01-29 21:57:25
* @version V1.0 * @version V1.0
* *
*/ */
@Api(value="TmsYwDingdan",description="运输订单",tags="tmsYwDingdanController") @Api(value="TmsYwDingdan",description="运输订单",tags="tmsYwDingdanController")
@ -90,7 +90,7 @@ public class TmsYwDingdanController extends BaseController {
/** /**
* 运输订单列表 页面跳转 * 运输订单列表 页面跳转
* *
* @return * @return
*/ */
@RequestMapping(params = "list") @RequestMapping(params = "list")
@ -144,7 +144,7 @@ public class TmsYwDingdanController extends BaseController {
/** /**
* easyui AJAX请求数据 * easyui AJAX请求数据
* *
* @param request * @param request
* @param response * @param response
* @param dataGrid * @param dataGrid
@ -366,7 +366,7 @@ public class TmsYwDingdanController extends BaseController {
/** /**
* 删除运输订单 * 删除运输订单
* *
* @return * @return
*/ */
@RequestMapping(params = "doDel") @RequestMapping(params = "doDel")
@ -424,6 +424,9 @@ public class TmsYwDingdanController extends BaseController {
Set<String> keySets = maphz.keySet(); Set<String> keySets = maphz.keySet();
Iterator<String> ki = keySets.iterator(); Iterator<String> ki = keySets.iterator();
while(ki.hasNext()){ while(ki.hasNext()){
WmOmNoticeHEntity wmOmNoticeH = new WmOmNoticeHEntity();
wmOmNoticeH.setReCarno(chehao);//车号
wmOmNoticeH.setReMember(siji);//司机
String mapkey = ki.next(); String mapkey = ki.next();
String mapvv = maphz.get(mapkey); String mapvv = maphz.get(mapkey);
String[] strva= mapvv.split(";"); String[] strva= mapvv.split(";");
@ -443,7 +446,6 @@ public class TmsYwDingdanController extends BaseController {
List<Map<String, Object>> resultz = systemService List<Map<String, Object>> resultz = systemService
.findForJdbc(tsql); .findForJdbc(tsql);
System.out.print("****************tsqlz" + tsql); System.out.print("****************tsqlz" + tsql);
WmOmNoticeHEntity wmOmNoticeH = new WmOmNoticeHEntity();
String noticeid = wmUtil.getNextomNoticeId(""); String noticeid = wmUtil.getNextomNoticeId("");
wmOmNoticeH.setOmNoticeId(noticeid); wmOmNoticeH.setOmNoticeId(noticeid);
List<WmOmNoticeIEntity> wmOmNoticeIListnew = new ArrayList<>(); List<WmOmNoticeIEntity> wmOmNoticeIListnew = new ArrayList<>();
@ -465,19 +467,8 @@ public class TmsYwDingdanController extends BaseController {
wmOmNoticeIListnew.add(t); wmOmNoticeIListnew.add(t);
} }
} }
wmOmNoticeHService.addMain(wmOmNoticeH, wmOmNoticeIListnew); wmOmNoticeHService.addMain(wmOmNoticeH, wmOmNoticeIListnew);
} }
}catch(Exception e){ }catch(Exception e){
e.printStackTrace(); e.printStackTrace();
message = "运输订单派车失败"; message = "运输订单派车失败";
@ -689,7 +680,7 @@ public class TmsYwDingdanController extends BaseController {
/** /**
* 批量删除运输订单 * 批量删除运输订单
* *
* @return * @return
*/ */
@RequestMapping(params = "doBatchDel") @RequestMapping(params = "doBatchDel")
@ -719,7 +710,7 @@ public class TmsYwDingdanController extends BaseController {
/** /**
* 添加运输订单 * 添加运输订单
* *
* @return * @return
*/ */
@RequestMapping(params = "doAdd") @RequestMapping(params = "doAdd")
@ -826,10 +817,10 @@ public class TmsYwDingdanController extends BaseController {
j.setObj(tmsYwDingdan); j.setObj(tmsYwDingdan);
return j; return j;
} }
/** /**
* 更新运输订单 * 更新运输订单
* *
* @return * @return
*/ */
@RequestMapping(params = "doUpdate") @RequestMapping(params = "doUpdate")
@ -851,11 +842,11 @@ public class TmsYwDingdanController extends BaseController {
j.setMsg(message); j.setMsg(message);
return j; return j;
} }
/** /**
* 运输订单新增页面跳转 * 运输订单新增页面跳转
* *
* @return * @return
*/ */
@RequestMapping(params = "goAdd") @RequestMapping(params = "goAdd")
@ -880,7 +871,7 @@ public class TmsYwDingdanController extends BaseController {
} }
/** /**
* 运输订单编辑页面跳转 * 运输订单编辑页面跳转
* *
* @return * @return
*/ */
@RequestMapping(params = "goUpdate") @RequestMapping(params = "goUpdate")
@ -915,7 +906,7 @@ public class TmsYwDingdanController extends BaseController {
} }
/** /**
* 导入功能跳转 * 导入功能跳转
* *
* @return * @return
*/ */
@RequestMapping(params = "upload") @RequestMapping(params = "upload")
@ -923,10 +914,10 @@ public class TmsYwDingdanController extends BaseController {
req.setAttribute("controller_name","tmsYwDingdanController"); req.setAttribute("controller_name","tmsYwDingdanController");
return new ModelAndView("common/upload/pub_excel_upload"); return new ModelAndView("common/upload/pub_excel_upload");
} }
/** /**
* 导出excel * 导出excel
* *
* @param request * @param request
* @param response * @param response
*/ */
@ -945,7 +936,7 @@ public class TmsYwDingdanController extends BaseController {
} }
/** /**
* 导出excel 使模板 * 导出excel 使模板
* *
* @param request * @param request
* @param response * @param response
*/ */
@ -959,13 +950,13 @@ public class TmsYwDingdanController extends BaseController {
modelMap.put(NormalExcelConstants.DATA_LIST,new ArrayList()); modelMap.put(NormalExcelConstants.DATA_LIST,new ArrayList());
return NormalExcelConstants.JEECG_EXCEL_VIEW; return NormalExcelConstants.JEECG_EXCEL_VIEW;
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@RequestMapping(params = "importExcel", method = RequestMethod.POST) @RequestMapping(params = "importExcel", method = RequestMethod.POST)
@ResponseBody @ResponseBody
public AjaxJson importExcel(HttpServletRequest request, HttpServletResponse response) { public AjaxJson importExcel(HttpServletRequest request, HttpServletResponse response) {
AjaxJson j = new AjaxJson(); AjaxJson j = new AjaxJson();
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) { for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
@ -993,10 +984,10 @@ public class TmsYwDingdanController extends BaseController {
} }
return j; return j;
} }
/** /**
* 获取文件附件信息 * 获取文件附件信息
* *
* @param id tmsYwDingdan主键id * @param id tmsYwDingdan主键id
*/ */
@RequestMapping(params = "getFiles") @RequestMapping(params = "getFiles")
@ -1027,7 +1018,7 @@ public class TmsYwDingdanController extends BaseController {
List<TmsYwDingdanEntity> listTmsYwDingdans=tmsYwDingdanService.getList(TmsYwDingdanEntity.class); List<TmsYwDingdanEntity> listTmsYwDingdans=tmsYwDingdanService.getList(TmsYwDingdanEntity.class);
return Result.success(listTmsYwDingdans); return Result.success(listTmsYwDingdans);
} }
@RequestMapping(value = "/{id}", method = RequestMethod.GET) @RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ResponseBody @ResponseBody
@ApiOperation(value="根据ID获取运输订单信息",notes="根据ID获取运输订单信息",httpMethod="GET",produces="application/json") @ApiOperation(value="根据ID获取运输订单信息",notes="根据ID获取运输订单信息",httpMethod="GET",produces="application/json")

66
src/main/java/com/zzjee/wave/controller/WaveToFjController.java
View File

@ -9,6 +9,7 @@ import java.text.SimpleDateFormat;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.zzjee.wm.entity.WmOmNoticeHEntity;
import com.zzjee.wm.entity.WmOmQmIEntity; import com.zzjee.wm.entity.WmOmQmIEntity;
import com.zzjee.wm.entity.WmToDownGoodsEntity; import com.zzjee.wm.entity.WmToDownGoodsEntity;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
@ -63,12 +64,12 @@ import java.net.URI;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.web.util.UriComponentsBuilder; import org.springframework.web.util.UriComponentsBuilder;
/** /**
* @Title: Controller * @Title: Controller
* @Description: wave_to_fj * @Description: wave_to_fj
* @author onlineGenerator * @author onlineGenerator
* @date 2019-12-11 11:32:18 * @date 2019-12-11 11:32:18
* @version V1.0 * @version V1.0
* *
*/ */
@Controller @Controller
@ -85,12 +86,12 @@ public class WaveToFjController extends BaseController {
private SystemService systemService; private SystemService systemService;
@Autowired @Autowired
private Validator validator; private Validator validator;
/** /**
* wave_to_fj列表 页面跳转 * wave_to_fj列表 页面跳转
* *
* @return * @return
*/ */
@RequestMapping(params = "list") @RequestMapping(params = "list")
@ -100,7 +101,7 @@ public class WaveToFjController extends BaseController {
/** /**
* easyui AJAX请求数据 * easyui AJAX请求数据
* *
* @param request * @param request
* @param response * @param response
* @param dataGrid * @param dataGrid
@ -121,10 +122,10 @@ public class WaveToFjController extends BaseController {
this.waveToFjService.getDataGridReturn(cq, true); this.waveToFjService.getDataGridReturn(cq, true);
TagUtil.datagrid(response, dataGrid); TagUtil.datagrid(response, dataGrid);
} }
/** /**
* 删除wave_to_fj * 删除wave_to_fj
* *
* @return * @return
*/ */
@RequestMapping(params = "doDel") @RequestMapping(params = "doDel")
@ -145,10 +146,10 @@ public class WaveToFjController extends BaseController {
j.setMsg(message); j.setMsg(message);
return j; return j;
} }
/** /**
* 批量删除wave_to_fj * 批量删除wave_to_fj
* *
* @return * @return
*/ */
@RequestMapping(params = "doBatchDel") @RequestMapping(params = "doBatchDel")
@ -159,7 +160,7 @@ public class WaveToFjController extends BaseController {
message = "wave_to_fj"; message = "wave_to_fj";
try{ try{
for(String id:ids.split(",")){ for(String id:ids.split(",")){
WaveToFjEntity waveToFj = systemService.getEntity(WaveToFjEntity.class, WaveToFjEntity waveToFj = systemService.getEntity(WaveToFjEntity.class,
id id
); );
waveToFjService.delete(waveToFj); waveToFjService.delete(waveToFj);
@ -177,7 +178,7 @@ public class WaveToFjController extends BaseController {
/** /**
* 添加wave_to_fj * 添加wave_to_fj
* *
* @return * @return
*/ */
@ -198,10 +199,10 @@ public class WaveToFjController extends BaseController {
j.setMsg(message); j.setMsg(message);
return j; return j;
} }
/** /**
* 更新wave_to_fj * 更新wave_to_fj
* *
* @return * @return
*/ */
@ -224,11 +225,11 @@ public class WaveToFjController extends BaseController {
j.setMsg(message); j.setMsg(message);
return j; return j;
} }
/** /**
* wave_to_fj新增页面跳转 * wave_to_fj新增页面跳转
* *
* @return * @return
*/ */
@RequestMapping(params = "goAdd") @RequestMapping(params = "goAdd")
@ -241,7 +242,7 @@ public class WaveToFjController extends BaseController {
} }
/** /**
* wave_to_fj编辑页面跳转 * wave_to_fj编辑页面跳转
* *
* @return * @return
*/ */
@RequestMapping(params = "goUpdate") @RequestMapping(params = "goUpdate")
@ -252,10 +253,10 @@ public class WaveToFjController extends BaseController {
} }
return new ModelAndView("com/zzjee/wave/waveToFj-update"); return new ModelAndView("com/zzjee/wave/waveToFj-update");
} }
/** /**
* 导入功能跳转 * 导入功能跳转
* *
* @return * @return
*/ */
@RequestMapping(params = "upload") @RequestMapping(params = "upload")
@ -263,10 +264,10 @@ public class WaveToFjController extends BaseController {
req.setAttribute("controller_name","waveToFjController"); req.setAttribute("controller_name","waveToFjController");
return new ModelAndView("common/upload/pub_excel_upload"); return new ModelAndView("common/upload/pub_excel_upload");
} }
/** /**
* 导出excel * 导出excel
* *
* @param request * @param request
* @param response * @param response
*/ */
@ -285,7 +286,7 @@ public class WaveToFjController extends BaseController {
} }
/** /**
* 导出excel 使模板 * 导出excel 使模板
* *
* @param request * @param request
* @param response * @param response
*/ */
@ -299,13 +300,13 @@ public class WaveToFjController extends BaseController {
modelMap.put(NormalExcelConstants.DATA_LIST,new ArrayList()); modelMap.put(NormalExcelConstants.DATA_LIST,new ArrayList());
return NormalExcelConstants.JEECG_EXCEL_VIEW; return NormalExcelConstants.JEECG_EXCEL_VIEW;
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@RequestMapping(params = "importExcel", method = RequestMethod.POST) @RequestMapping(params = "importExcel", method = RequestMethod.POST)
@ResponseBody @ResponseBody
public AjaxJson importExcel(HttpServletRequest request, HttpServletResponse response) { public AjaxJson importExcel(HttpServletRequest request, HttpServletResponse response) {
AjaxJson j = new AjaxJson(); AjaxJson j = new AjaxJson();
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) { for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
@ -333,7 +334,7 @@ public class WaveToFjController extends BaseController {
} }
return j; return j;
} }
@RequestMapping(method = RequestMethod.GET) @RequestMapping(method = RequestMethod.GET)
@ResponseBody @ResponseBody
public List<WaveToFjEntity> list() { public List<WaveToFjEntity> list() {
@ -350,6 +351,8 @@ public class WaveToFjController extends BaseController {
String hql="from WaveToDownEntity where waveId = ? "; String hql="from WaveToDownEntity where waveId = ? ";
List<WaveToFjEntity> listWaveToFjs =new ArrayList<>(); List<WaveToFjEntity> listWaveToFjs =new ArrayList<>();
List<WaveToFjEntity> listWaveToFjsnew =new ArrayList<>();
if(StringUtil.isEmpty(searchstr)&&StringUtil.isEmpty(searchstr2)){ if(StringUtil.isEmpty(searchstr)&&StringUtil.isEmpty(searchstr2)){
hql="from WaveToFjEntity "; hql="from WaveToFjEntity ";
listWaveToFjs=waveToFjService.findHql(hql); listWaveToFjs=waveToFjService.findHql(hql);
@ -367,6 +370,19 @@ public class WaveToFjController extends BaseController {
listWaveToFjs=waveToFjService.findHql(hql,searchstr,searchstr2); listWaveToFjs=waveToFjService.findHql(hql,searchstr,searchstr2);
} }
// List<WaveToFjEntity> listWaveToFjs=waveToFjService.getList(WaveToFjEntity.class); // List<WaveToFjEntity> listWaveToFjs=waveToFjService.getList(WaveToFjEntity.class);
for(WaveToFjEntity t:listWaveToFjs){
try{
String siji = "";
String chehao = "";
WmOmNoticeHEntity wmom = systemService.findUniqueByProperty(WmOmNoticeHEntity.class,"omNoticeId",t.getOmNoticeId());
siji = wmom.getReMember();
chehao = wmom.getReCarno();
t.setBy1(siji);//司机
t.setBy2(chehao);//车号
}catch (Exception e){
}
listWaveToFjsnew.add(t);
}
D0.setObj(listWaveToFjs); D0.setObj(listWaveToFjs);
return new ResponseEntity(D0, HttpStatus.OK); return new ResponseEntity(D0, HttpStatus.OK);

4
src/main/webapp/webpage/com/zzjee/md/mdCus-add.jsp
View File

@ -77,7 +77,7 @@
</div> </div>
<div class="col-xs-3"> <div class="col-xs-3">
<t:dictSelect field="keHuShuXing" type="list" extendJson="{class:'form-control',datatype:'*'}" <t:dictSelect field="keHuShuXing" type="list" extendJson="{class:'form-control',datatype:'*'}"
defaultVal="20" dictTable="ba_keHuShuXing" dictField="kehushuxing_code" dictText="kehushuxing_name" hasLabel="false" title="客户属性"></t:dictSelect> dictTable="ba_keHuShuXing" dictField="kehushuxing_code" dictText="kehushuxing_name" hasLabel="false" title="客户属性"></t:dictSelect>
<span class="Validform_checktip" style="float:left;height:0px;"></span> <span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">客户属性</label> <label class="Validform_label" style="display: none">客户属性</label>
@ -88,7 +88,7 @@
</div> </div>
<div class="col-xs-3"> <div class="col-xs-3">
<t:dictSelect field="keHuZhuangTai" type="list" extendJson="{class:'form-control',datatype:'*'}" <t:dictSelect field="keHuZhuangTai" type="list" extendJson="{class:'form-control',datatype:'*'}"
defaultVal="20" dictTable="ba_kehuzhuangtai" dictField="kehuzhuangtai_code" dictText="kehuzhuangtai_name" hasLabel="false" title="有无意向书"></t:dictSelect> dictTable="ba_kehuzhuangtai" dictField="kehuzhuangtai_code" dictText="kehuzhuangtai_name" hasLabel="false" title="有无意向书"></t:dictSelect>
<span class="Validform_checktip" style="float:left;height:0px;"></span> <span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">出库计费方式</label> <label class="Validform_label" style="display: none">出库计费方式</label>