|
|
@ -1011,13 +1011,27 @@ public class PageController { |
|
|
* @return |
|
|
* @return |
|
|
*/ |
|
|
*/ |
|
|
@GetMapping("/materialForGroup") |
|
|
@GetMapping("/materialForGroup") |
|
|
public ModelAndView materialForGroup(Integer mid, Integer gid) { |
|
|
public ModelAndView materialForGroup(Integer mid, Integer gid,HttpServletRequest request) { |
|
|
ModelAndView mv = new ModelAndView(); |
|
|
ModelAndView mv = new ModelAndView(); |
|
|
// 根据物料id与组合id查询对应明细
|
|
|
// 根据物料id与组合id查询对应明细
|
|
|
GroupInfo groupInfoByMidAndGid = groupService.findGroupInfoByMidAndGid(mid, gid); |
|
|
GroupInfo groupInfoByMidAndGid = groupService.findGroupInfoByMidAndGid(mid, gid); |
|
|
if (groupInfoByMidAndGid != null) { |
|
|
if (groupInfoByMidAndGid != null) { |
|
|
mv.addObject("record", groupInfoByMidAndGid); |
|
|
mv.addObject("record", groupInfoByMidAndGid); |
|
|
List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(groupInfoByMidAndGid.getMid()); |
|
|
List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(groupInfoByMidAndGid.getMid()); |
|
|
|
|
|
String token = request.getHeader("user-token"); |
|
|
|
|
|
if (token == null) { |
|
|
|
|
|
token = (String) request.getSession().getAttribute("userToken"); |
|
|
|
|
|
} |
|
|
|
|
|
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); |
|
|
|
|
|
Integer isadmin = userToken.getIsadmin(); |
|
|
|
|
|
if (isadmin == null) { |
|
|
|
|
|
isadmin = 1; |
|
|
|
|
|
} |
|
|
|
|
|
if (isadmin == 4 || Integer.compare(userToken.getMaindeparment(), 361) == 0) { |
|
|
|
|
|
mv.addObject("display", "inline-block"); |
|
|
|
|
|
} else { |
|
|
|
|
|
mv.addObject("display", "none"); |
|
|
|
|
|
} |
|
|
mv.addObject("splitList", splitInfoByMid); |
|
|
mv.addObject("splitList", splitInfoByMid); |
|
|
} else { |
|
|
} else { |
|
|
throw new MyException("缺少必要参数!"); |
|
|
throw new MyException("缺少必要参数!"); |
|
|
|