code format
erzhongxmu
parent
7ea711d21d
commit
e3c411950e
|
|
@ -75,13 +75,6 @@ import org.springframework.web.util.UriComponentsBuilder;
|
|||
|
||||
import static com.xiaoleilu.hutool.date.DateTime.now;
|
||||
|
||||
/**
|
||||
* @author onlineGenerator
|
||||
* @version V1.0
|
||||
* @Title: Controller
|
||||
* @Description: wave_to_down
|
||||
* @date 2019-12-11 11:32:25
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/waveToDownController")
|
||||
public class WaveToDownController extends BaseController {
|
||||
|
|
@ -115,10 +108,6 @@ public class WaveToDownController extends BaseController {
|
|||
public ModelAndView doPrint(String waveid, HttpServletRequest request) {
|
||||
String hql = "from WmOmQmIEntity where waveId = ? ";
|
||||
List<WmOmQmIEntity> wavelist = systemService.findHql(hql, waveid);
|
||||
// for(WmOmQmIEntity t: wavelist ){
|
||||
// t.setFirstRq("已打印");
|
||||
// systemService.updateEntitie(t);
|
||||
// }
|
||||
request.setAttribute("kprq", DateUtils.date2Str(DateUtils.date_sdf));
|
||||
request.setAttribute("comname", ResourceUtil.getConfigByName("comname"));
|
||||
request.setAttribute("waveid", waveid);
|
||||
|
|
@ -134,11 +123,6 @@ public class WaveToDownController extends BaseController {
|
|||
CriteriaQuery cq = new CriteriaQuery(WaveToDownEntity.class, dataGrid);
|
||||
//查询条件组装器
|
||||
org.jeecgframework.core.extend.hqlsearch.HqlGenerateUtil.installHql(cq, waveToDown, request.getParameterMap());
|
||||
try {
|
||||
//自定义追加查询条件
|
||||
} catch (Exception e) {
|
||||
throw new BusinessException(e.getMessage());
|
||||
}
|
||||
cq.add();
|
||||
this.waveToDownService.getDataGridReturn(cq, true);
|
||||
TagUtil.datagrid(response, dataGrid);
|
||||
|
|
@ -161,7 +145,6 @@ public class WaveToDownController extends BaseController {
|
|||
systemService.addLog(message, Globals.Log_Type_DEL, Globals.Log_Leavel_INFO);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
message = "wave_to_down删除失败";
|
||||
throw new BusinessException(e.getMessage());
|
||||
}
|
||||
j.setMsg(message);
|
||||
|
|
@ -189,7 +172,6 @@ public class WaveToDownController extends BaseController {
|
|||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
message = "wave_to_down删除失败";
|
||||
throw new BusinessException(e.getMessage());
|
||||
}
|
||||
j.setMsg(message);
|
||||
|
|
@ -213,7 +195,6 @@ public class WaveToDownController extends BaseController {
|
|||
systemService.addLog(message, Globals.Log_Type_INSERT, Globals.Log_Leavel_INFO);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
message = "wave_to_down添加失败";
|
||||
throw new BusinessException(e.getMessage());
|
||||
}
|
||||
j.setMsg(message);
|
||||
|
|
@ -238,7 +219,6 @@ public class WaveToDownController extends BaseController {
|
|||
systemService.addLog(message, Globals.Log_Type_UPDATE, Globals.Log_Leavel_INFO);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
message = "wave_to_down更新失败";
|
||||
throw new BusinessException(e.getMessage());
|
||||
}
|
||||
j.setMsg(message);
|
||||
|
|
@ -467,18 +447,13 @@ public class WaveToDownController extends BaseController {
|
|||
return new ResponseEntity(D0, HttpStatus.OK);
|
||||
}
|
||||
D0.setOK(true);
|
||||
|
||||
return new ResponseEntity(D0, HttpStatus.OK);
|
||||
|
||||
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/jsondown", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
|
||||
public ResponseEntity<?> update(@RequestBody WaveToDownEntity waveToDown) {
|
||||
ResultDO D0 = new ResultDO();
|
||||
|
||||
//调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息.
|
||||
|
||||
//保存
|
||||
try {
|
||||
String hql = "from WmOmQmIEntity where waveId = ? and goodsId = ? and proData = ? and tinId = ? and binId = ? and binSta = ?";
|
||||
|
|
@ -504,7 +479,6 @@ public class WaveToDownController extends BaseController {
|
|||
wmToDownGoods.setImCusCode(wmOmQmI.getImCusCode());//客户单号
|
||||
wmToDownGoods.setOrderType("99");//默认为01
|
||||
wmToDownGoods.setCreateDate(now());
|
||||
|
||||
systemService.save(wmToDownGoods);
|
||||
wmOmQmI.setBinSta("H");
|
||||
wmOmQmI.setFirstRq(waveToDown.getFirstRq());
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
package com.zzjee.wave.controller;
|
||||
|
||||
import com.zzjee.api.ResultDO;
|
||||
import com.zzjee.wave.entity.WaveToDownEntity;
|
||||
import com.zzjee.wave.entity.WaveToFjEntity;
|
||||
import com.zzjee.wave.service.WaveToFjServiceI;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.text.SimpleDateFormat;
|
||||
|
|
@ -46,6 +48,7 @@ import java.io.IOException;
|
|||
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.HashMap;
|
||||
|
||||
|
|
@ -57,21 +60,15 @@ import org.springframework.web.bind.annotation.ResponseBody;
|
|||
import org.springframework.http.HttpHeaders;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.jeecgframework.core.beanvalidator.BeanValidators;
|
||||
|
||||
import java.util.Set;
|
||||
import javax.validation.ConstraintViolation;
|
||||
import javax.validation.Validator;
|
||||
import java.net.URI;
|
||||
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.web.util.UriComponentsBuilder;
|
||||
|
||||
/**
|
||||
* @Title: Controller
|
||||
* @Description: wave_to_fj
|
||||
* @author onlineGenerator
|
||||
* @date 2019-12-11 11:32:18
|
||||
* @version V1.0
|
||||
*
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/waveToFjController")
|
||||
public class WaveToFjController extends BaseController {
|
||||
|
|
@ -84,9 +81,6 @@ public class WaveToFjController extends BaseController {
|
|||
private WaveToFjServiceI waveToFjService;
|
||||
@Autowired
|
||||
private SystemService systemService;
|
||||
@Autowired
|
||||
private Validator validator;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -105,7 +99,6 @@ public class WaveToFjController extends BaseController {
|
|||
* @param request
|
||||
* @param response
|
||||
* @param dataGrid
|
||||
|
||||
*/
|
||||
|
||||
@RequestMapping(params = "datagrid")
|
||||
|
|
@ -179,7 +172,6 @@ public class WaveToFjController extends BaseController {
|
|||
/**
|
||||
* 添加wave_to_fj
|
||||
*
|
||||
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(params = "doAdd")
|
||||
|
|
@ -203,7 +195,6 @@ public class WaveToFjController extends BaseController {
|
|||
/**
|
||||
* 更新wave_to_fj
|
||||
*
|
||||
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(params = "doUpdate")
|
||||
|
|
@ -240,6 +231,7 @@ public class WaveToFjController extends BaseController {
|
|||
}
|
||||
return new ModelAndView("com/zzjee/wave/waveToFj-add");
|
||||
}
|
||||
|
||||
/**
|
||||
* wave_to_fj编辑页面跳转
|
||||
*
|
||||
|
|
@ -284,6 +276,7 @@ public class WaveToFjController extends BaseController {
|
|||
modelMap.put(NormalExcelConstants.DATA_LIST, waveToFjs);
|
||||
return NormalExcelConstants.JEECG_EXCEL_VIEW;
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel 使模板
|
||||
*
|
||||
|
|
@ -341,6 +334,7 @@ public class WaveToFjController extends BaseController {
|
|||
List<WaveToFjEntity> listWaveToFjs = waveToFjService.getList(WaveToFjEntity.class);
|
||||
return listWaveToFjs;
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/list/tofj", method = RequestMethod.GET)
|
||||
@ResponseBody
|
||||
public ResponseEntity<?> list(@RequestParam(value = "username", required = false) String username,
|
||||
|
|
@ -432,6 +426,7 @@ public class WaveToFjController extends BaseController {
|
|||
D0.setObj(listWaveToFjsnew);
|
||||
return new ResponseEntity(D0, HttpStatus.OK);
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
|
||||
@ResponseBody
|
||||
public ResponseEntity<?> get(@PathVariable("id") String id) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue