|
|
|
@ -233,9 +233,9 @@ public class PageController { |
|
|
|
mv.addObject("notices", noticeService.findNoticeByCondition(map, userToken, userKey, token)); |
|
|
|
} |
|
|
|
// 查询当前用户所在部门
|
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
// 查询当前用户管理的仓库
|
|
|
|
List<Integer> depositoryIdList = roleService.findDepositoryIdForUserHas(userToken); |
|
|
|
List<Long> depositoryIdList = roleService.findDepositoryIdForUserHas(userToken); |
|
|
|
mv.addObject("depositoryCount", depositoryIdList.size()); |
|
|
|
Integer inventoryCountByDepository = materialService.findInventoryCountByDepository(depositoryIdList); |
|
|
|
if (inventoryCountByDepository == null) { |
|
|
|
@ -321,7 +321,7 @@ public class PageController { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
mv.setViewName("pages/warehouse/depository_add"); |
|
|
|
Map<String, Object> administration = PublicConfig.findAdministration(userKey, token); |
|
|
|
List<AdministrationP> administrationPList = (List<AdministrationP>) administration.get("administrationPList"); |
|
|
|
List<AdministrationP> administrationPList = ObjectFormatUtil.objToList(administration.get("administrationPList"),AdministrationP.class); |
|
|
|
mv.addObject("administrationPList", administrationPList); |
|
|
|
return mv; |
|
|
|
} |
|
|
|
@ -368,7 +368,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/split_edit") |
|
|
|
public ModelAndView split_edit(Integer id, HttpServletRequest request) { |
|
|
|
public ModelAndView split_edit(Long id, HttpServletRequest request) { |
|
|
|
if (id == null) { |
|
|
|
throw new MyException("缺少必要参数"); |
|
|
|
} |
|
|
|
@ -383,7 +383,7 @@ public class PageController { |
|
|
|
SplitInfoP splitInfoPById = splitUnitService.findSplitInfoPById(id); |
|
|
|
mv.addObject("record", splitInfoPById); |
|
|
|
mv.setViewName("pages/split/split_edit"); |
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
if (PublicConfig.roleAdminorgList.contains(maindeparment)) { |
|
|
|
mv.addObject("display", "block"); |
|
|
|
} else { |
|
|
|
@ -408,7 +408,7 @@ public class PageController { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
mv.setViewName("pages/split/split-out"); |
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
if (PublicConfig.roleAdminorgList.contains(maindeparment)) { |
|
|
|
mv.addObject("display", "inline-block"); |
|
|
|
} else { |
|
|
|
@ -438,7 +438,7 @@ public class PageController { |
|
|
|
token = (String) request.getSession().getAttribute("userToken"); |
|
|
|
} |
|
|
|
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); |
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
if (PublicConfig.roleAdminorgList.contains(maindeparment)) { |
|
|
|
mv.addObject("display", "inline-block"); |
|
|
|
} else { |
|
|
|
@ -482,7 +482,7 @@ public class PageController { |
|
|
|
token = (String) request.getSession().getAttribute("userToken"); |
|
|
|
} |
|
|
|
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); |
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
if (type == 1) { |
|
|
|
mv.addObject("adminorg", maindeparment); |
|
|
|
} else if (type == 2) { |
|
|
|
@ -498,14 +498,14 @@ public class PageController { |
|
|
|
|
|
|
|
// 库位树形菜单
|
|
|
|
@GetMapping("/selectPlaceByDepository") |
|
|
|
public ModelAndView selectPlaceByDepository(Integer depositoryId, Integer mid, String placeCode, String unit) { |
|
|
|
public ModelAndView selectPlaceByDepository(Long depositoryId, Long mid, String placeCode, String unit) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
MaterialAndPlace placeAndMaterialByMidAndPid = null; |
|
|
|
if ("0000".equals(placeCode)) { |
|
|
|
// 如果要改变默认库位
|
|
|
|
|
|
|
|
// 获取当前物料的对应关系
|
|
|
|
placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(0, mid); |
|
|
|
placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(0L, mid); |
|
|
|
mv.addObject("placeId", 0); |
|
|
|
} else { |
|
|
|
// 获取当前库位id
|
|
|
|
@ -532,10 +532,10 @@ public class PageController { |
|
|
|
SplitInfo splitInfo = splitUnitService.findSplitInfoByMidAndUnit(paramForSplitInfo); |
|
|
|
SplitInventory splitInventory = splitUnitService.findSplitInventoryByIidAndSid(placeAndMaterialByMidAndPid.getId(), splitInfo.getId()); |
|
|
|
if (splitInventory != null) { |
|
|
|
double quantity = splitUnitService.findAllInventoryForSplitInfo(-1, placeAndMaterialByMidAndPid, splitInfo.getId(), 0, true); |
|
|
|
double quantity = splitUnitService.findAllInventoryForSplitInfo(-1L, placeAndMaterialByMidAndPid, splitInfo.getId(), 0, true); |
|
|
|
mv.addObject("quantity", quantity); |
|
|
|
} else { |
|
|
|
int Scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); |
|
|
|
int Scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); |
|
|
|
mv.addObject("quantity", (placeAndMaterialByMidAndPid.getQuantity() * Scale / 100)); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -548,11 +548,11 @@ public class PageController { |
|
|
|
|
|
|
|
// 同一仓库下的库位树形菜单
|
|
|
|
@GetMapping("/selectPlaceByDepositoryForInventory") |
|
|
|
public ModelAndView selectPlaceByDepositoryForInventory(Integer id, String unit) { |
|
|
|
public ModelAndView selectPlaceByDepositoryForInventory(Long id, String unit) { |
|
|
|
if (id != null) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
MaterialAndPlace placeAndMaterialById = placeService.findPlaceAndMaterialById(id); |
|
|
|
Integer mid = placeAndMaterialById.getMid(); |
|
|
|
Long mid = placeAndMaterialById.getMid(); |
|
|
|
Inventory inventoryById = materialService.findInventoryById(mid); |
|
|
|
if (inventoryById.getUnit().equals(unit)) { |
|
|
|
// 如果转移的基础单位
|
|
|
|
@ -566,11 +566,11 @@ public class PageController { |
|
|
|
SplitInfo splitInfo = splitUnitService.findSplitInfoByMidAndUnit(paramForSplitInfo); |
|
|
|
SplitInventory splitInventory = splitUnitService.findSplitInventoryByIidAndSid(placeAndMaterialById.getId(), splitInfo.getId()); |
|
|
|
if (splitInventory != null) { |
|
|
|
double quantity = splitUnitService.findAllInventoryForSplitInfo(-1, placeAndMaterialById, splitInfo.getId(), 0, true); |
|
|
|
double quantity = splitUnitService.findAllInventoryForSplitInfo(-1L, placeAndMaterialById, splitInfo.getId(), 0, true); |
|
|
|
|
|
|
|
mv.addObject("quantity", quantity); |
|
|
|
} else { |
|
|
|
int Scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); |
|
|
|
int Scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); |
|
|
|
mv.addObject("quantity", (placeAndMaterialById.getQuantity() * Scale / 100)); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -604,7 +604,7 @@ public class PageController { |
|
|
|
} |
|
|
|
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); |
|
|
|
if (type == 1) { |
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
mv.addObject("adminorg", maindeparment); |
|
|
|
mv.addObject("clickObj", clickObj); |
|
|
|
mv.addObject("flagForGroup", flagForGroup); |
|
|
|
@ -699,7 +699,7 @@ public class PageController { |
|
|
|
|
|
|
|
|
|
|
|
@GetMapping("material_view") |
|
|
|
public ModelAndView material_view(Integer id, HttpServletRequest request) { |
|
|
|
public ModelAndView material_view(Long id, HttpServletRequest request) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
mv.setViewName("pages/material/material-view"); |
|
|
|
String token = request.getHeader("user-token"); |
|
|
|
@ -713,7 +713,7 @@ public class PageController { |
|
|
|
map.put("mcode", material.getCode()); |
|
|
|
map.put("codeFlag", 1); |
|
|
|
// 获取物料与条形码的对应关系
|
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
if (PublicConfig.roleAdminorgList.contains(maindeparment)) { |
|
|
|
mv.addObject("display", "block"); |
|
|
|
} else { |
|
|
|
@ -729,7 +729,7 @@ public class PageController { |
|
|
|
} |
|
|
|
|
|
|
|
@GetMapping("materialEditForInventory") |
|
|
|
public ModelAndView materialEditForInvetory(Integer id, HttpServletRequest request) { |
|
|
|
public ModelAndView materialEditForInvetory(Long id, HttpServletRequest request) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
mv.setViewName("pages/material/material-viewForInventoryEdit"); |
|
|
|
String token = request.getHeader("user-token"); |
|
|
|
@ -739,11 +739,7 @@ public class PageController { |
|
|
|
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); |
|
|
|
if (id != null) { |
|
|
|
Material material = materialService.findMaterialById(id); |
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
map.put("mcode", material.getCode()); |
|
|
|
map.put("codeFlag", 1); |
|
|
|
// 获取物料与条形码的对应关系
|
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
if (PublicConfig.roleAdminorgList.contains(maindeparment)) { |
|
|
|
mv.addObject("display", "block"); |
|
|
|
} else { |
|
|
|
@ -788,7 +784,7 @@ public class PageController { |
|
|
|
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); |
|
|
|
List<MaterialType> materialTypeAll = materialTypeService.findMaterialTypeByCondition(map); |
|
|
|
mv.addObject("materialTypes", materialTypeAll); |
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
if (PublicConfig.roleAdminorgList.contains(maindeparment)) { |
|
|
|
mv.addObject("display", "inline-block"); |
|
|
|
} else { |
|
|
|
@ -843,7 +839,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/application_in_back") |
|
|
|
public ModelAndView applicationIn(Integer mid, Integer depositoryId, Integer placeId) { |
|
|
|
public ModelAndView applicationIn(Long mid, Long depositoryId, Long placeId) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
InventoryP materialById = new InventoryP(); |
|
|
|
Depository depositoryById = new Depository(); |
|
|
|
@ -860,7 +856,7 @@ public class PageController { |
|
|
|
materialById.setSplitInfoList(splitInfoByMid); |
|
|
|
mv.addObject("materialById", materialById); |
|
|
|
if (placeId == null) { |
|
|
|
placeId = 0; |
|
|
|
placeId = 0L; |
|
|
|
} else { |
|
|
|
Place placeById = placeService.findPlaceById(placeId); |
|
|
|
if (placeById != null) { |
|
|
|
@ -901,7 +897,7 @@ public class PageController { |
|
|
|
} |
|
|
|
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); |
|
|
|
// 获取当前用户是否存在可见仓库
|
|
|
|
List<Integer> union = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userToken); |
|
|
|
List<Long> union = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userToken); |
|
|
|
if (union.size() > 0) { |
|
|
|
mv.addObject("display", "block"); |
|
|
|
} else { |
|
|
|
@ -910,7 +906,7 @@ public class PageController { |
|
|
|
List<BusinessType> businessTypeAll = businessTypeService.findBusinessTypeAll(); |
|
|
|
mv.addObject("btList", businessTypeAll); |
|
|
|
mv.setViewName("pages/application/application-out"); |
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
if (PublicConfig.roleAdminorgList.contains(maindeparment)) { |
|
|
|
mv.setViewName("pages/applicationForStorageCenter/application-out"); |
|
|
|
} |
|
|
|
@ -953,20 +949,20 @@ public class PageController { |
|
|
|
} |
|
|
|
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); |
|
|
|
// 获取当前用户是否存在可见仓库
|
|
|
|
List<Integer> union = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userToken); |
|
|
|
List<Long> union = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userToken); |
|
|
|
if (union.size() > 0) { |
|
|
|
mv.addObject("display", "block"); |
|
|
|
} else { |
|
|
|
mv.addObject("display", "none"); |
|
|
|
} |
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
if (PublicConfig.roleAdminorgList.contains(maindeparment)) { |
|
|
|
mv.setViewName("pages/applicationForStorageCenter/application-out_back"); |
|
|
|
} |
|
|
|
InventoryP inventoryP = new InventoryP(); |
|
|
|
if (code != null) { |
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
Depository depositoryByCode = depositoryService.findDepositoryById(ObjectFormatUtil.toInteger(depositoryId.trim())); |
|
|
|
Depository depositoryByCode = depositoryService.findDepositoryById(ObjectFormatUtil.toLong(depositoryId.trim())); |
|
|
|
map.put("depositoryId", depositoryByCode.getId()); |
|
|
|
map.put("mcode", code); |
|
|
|
List<InventoryP> inventory = materialService.findInventory(map); |
|
|
|
@ -1012,7 +1008,7 @@ public class PageController { |
|
|
|
token = (String) request.getSession().getAttribute("userToken"); |
|
|
|
} |
|
|
|
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); |
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
if (PublicConfig.roleAdminorgList.contains(maindeparment)) { |
|
|
|
mv.addObject("display", "inline-block"); |
|
|
|
mv.addObject("type", "2"); |
|
|
|
@ -1044,7 +1040,7 @@ public class PageController { |
|
|
|
token = (String) request.getSession().getAttribute("userToken"); |
|
|
|
} |
|
|
|
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); |
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
if (PublicConfig.roleAdminorgList.contains(maindeparment)) { |
|
|
|
mv.addObject("display", "inline-block"); |
|
|
|
mv.addObject("type", "2"); |
|
|
|
@ -1112,7 +1108,7 @@ public class PageController { |
|
|
|
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
mv.setViewName("pages/depository/table-stock"); |
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
mv.addObject("type", "2"); |
|
|
|
if (PublicConfig.roleAdminorgList.contains(maindeparment)) { |
|
|
|
mv.addObject("display", "table-cell"); |
|
|
|
@ -1188,7 +1184,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/InventoryView") |
|
|
|
public ModelAndView InventoryView(Integer id, HttpServletRequest request) { |
|
|
|
public ModelAndView InventoryView(Long id, HttpServletRequest request) { |
|
|
|
if (id != null) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
mv.setViewName("pages/depository/Inventory-view"); |
|
|
|
@ -1212,7 +1208,7 @@ public class PageController { |
|
|
|
token = (String) request.getSession().getAttribute("userToken"); |
|
|
|
} |
|
|
|
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); |
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
if (PublicConfig.roleAdminorgList.contains(maindeparment)) { |
|
|
|
mv.addObject("display", "block"); |
|
|
|
} else { |
|
|
|
@ -1241,7 +1237,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/InventoryViewBack") |
|
|
|
public ModelAndView InventoryViewBack(Integer id, HttpServletRequest request) { |
|
|
|
public ModelAndView InventoryViewBack(Long id, HttpServletRequest request) { |
|
|
|
if (id != null) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
mv.setViewName("pages/material/material-view_back"); |
|
|
|
@ -1267,7 +1263,7 @@ public class PageController { |
|
|
|
token = (String) request.getSession().getAttribute("userToken"); |
|
|
|
} |
|
|
|
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); |
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
if (PublicConfig.roleAdminorgList.contains(maindeparment)) { |
|
|
|
mv.addObject("display", "block"); |
|
|
|
} else { |
|
|
|
@ -1294,7 +1290,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/group_add") |
|
|
|
public ModelAndView group_add(@RequestParam(required = false) Integer gid) { |
|
|
|
public ModelAndView group_add(@RequestParam(required = false) Long gid) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
if (gid != null) { |
|
|
|
mv.addObject("gid", gid); |
|
|
|
@ -1321,7 +1317,7 @@ public class PageController { |
|
|
|
token = (String) request.getSession().getAttribute("userToken"); |
|
|
|
} |
|
|
|
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); |
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
if (PublicConfig.roleAdminorgList.contains(maindeparment)) { |
|
|
|
mv.addObject("display", "inline-block"); |
|
|
|
} else { |
|
|
|
@ -1345,7 +1341,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/materialForGroup") |
|
|
|
public ModelAndView materialForGroup(Integer mid, Integer gid, HttpServletRequest request) { |
|
|
|
public ModelAndView materialForGroup(Long mid, Long gid, HttpServletRequest request) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
// 根据物料id与组合id查询对应明细
|
|
|
|
GroupInfo groupInfoByMidAndGid = groupService.findGroupInfoByMidAndGid(mid, gid); |
|
|
|
@ -1357,7 +1353,7 @@ public class PageController { |
|
|
|
token = (String) request.getSession().getAttribute("userToken"); |
|
|
|
} |
|
|
|
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); |
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
if (PublicConfig.roleAdminorgList.contains(maindeparment)) { |
|
|
|
mv.addObject("display", "inline-block"); |
|
|
|
} else { |
|
|
|
@ -1380,7 +1376,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/group_edit") |
|
|
|
public ModelAndView groupEdit(Integer id, HttpServletRequest request) { |
|
|
|
public ModelAndView groupEdit(Long id, HttpServletRequest request) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
mv.setViewName("pages/group/group_edit"); |
|
|
|
Group group = groupService.findGroupOnlyById(id); |
|
|
|
@ -1389,7 +1385,7 @@ public class PageController { |
|
|
|
token = (String) request.getSession().getAttribute("userToken"); |
|
|
|
} |
|
|
|
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); |
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
if (PublicConfig.roleAdminorgList.contains(maindeparment)) { |
|
|
|
mv.addObject("display", "inline-block"); |
|
|
|
} else { |
|
|
|
@ -1424,7 +1420,7 @@ public class PageController { |
|
|
|
} |
|
|
|
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); |
|
|
|
|
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
if (PublicConfig.roleAdminorgList.contains(maindeparment)) { |
|
|
|
mv.addObject("display", "block"); |
|
|
|
} else { |
|
|
|
@ -1437,7 +1433,7 @@ public class PageController { |
|
|
|
// 获取当前用户管理的仓库
|
|
|
|
List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId()); |
|
|
|
depositoryAndRole.addAll(roleService.findDepositoryAndRole(userToken.getPosition())); |
|
|
|
List<Integer> depositoryIdList = new ArrayList<>(); |
|
|
|
List<Long> depositoryIdList = new ArrayList<>(); |
|
|
|
for (Depository depository : depositoryByAdminorg |
|
|
|
) { |
|
|
|
depositoryIdList.add(depository.getId()); |
|
|
|
@ -1495,7 +1491,7 @@ public class PageController { |
|
|
|
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); |
|
|
|
|
|
|
|
|
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
if (PublicConfig.roleAdminorgList.contains(maindeparment)) { |
|
|
|
mv.addObject("display", "block"); |
|
|
|
} else { |
|
|
|
@ -1509,7 +1505,7 @@ public class PageController { |
|
|
|
List<RoleAndDepository> depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId()); |
|
|
|
depositoryAndRole.addAll(roleService.findDepositoryAndRole(userToken.getPosition())); |
|
|
|
|
|
|
|
List<Integer> depositoryIdList = new ArrayList<>(); |
|
|
|
List<Long> depositoryIdList = new ArrayList<>(); |
|
|
|
for (Depository depository : depositoryByAdminorg |
|
|
|
) { |
|
|
|
depositoryIdList.add(depository.getId()); |
|
|
|
@ -1580,7 +1576,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/user_add") |
|
|
|
public ModelAndView user_add(Integer userId, Integer classes, HttpServletRequest request) { |
|
|
|
public ModelAndView user_add(Long userId, Integer classes, HttpServletRequest request) { |
|
|
|
String token = request.getHeader("user-token"); |
|
|
|
String userKey = request.getHeader("user-key"); |
|
|
|
if (token == null) { |
|
|
|
@ -1606,7 +1602,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/user_addForIn") |
|
|
|
public ModelAndView user_addForIn(Integer userId, Integer classes, HttpServletRequest request) { |
|
|
|
public ModelAndView user_addForIn(Long userId, Integer classes, HttpServletRequest request) { |
|
|
|
String token = request.getHeader("user-token"); |
|
|
|
String userKey = request.getHeader("user-key"); |
|
|
|
if (token == null) { |
|
|
|
@ -1632,7 +1628,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/user_role_edit") |
|
|
|
public ModelAndView user_role_edit(Integer id, HttpServletRequest request) { |
|
|
|
public ModelAndView user_role_edit(Long id, HttpServletRequest request) { |
|
|
|
String token = request.getHeader("user-token"); |
|
|
|
String userKey = request.getHeader("user-key"); |
|
|
|
if (token == null) { |
|
|
|
@ -1663,7 +1659,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/user_role_editForIn") |
|
|
|
public ModelAndView user_role_editForIn(Integer id, HttpServletRequest request) { |
|
|
|
public ModelAndView user_role_editForIn(Long id, HttpServletRequest request) { |
|
|
|
String token = request.getHeader("user-token"); |
|
|
|
String userKey = request.getHeader("user-key"); |
|
|
|
if (token == null) { |
|
|
|
@ -1696,7 +1692,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/post_role_edit") |
|
|
|
public ModelAndView post_role_edit(Integer id, Integer depositoryId, HttpServletRequest request) { |
|
|
|
public ModelAndView post_role_edit(Long id, Long depositoryId, HttpServletRequest request) { |
|
|
|
String token = request.getHeader("user-token"); |
|
|
|
String userKey = request.getHeader("user-key"); |
|
|
|
if (token == null) { |
|
|
|
@ -1758,7 +1754,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/warehouse_view") |
|
|
|
public ModelAndView warehouse_view(Integer id, HttpServletRequest request) { |
|
|
|
public ModelAndView warehouse_view(Long id, HttpServletRequest request) { |
|
|
|
String token = request.getHeader("user-token"); |
|
|
|
String userKey = request.getHeader("user-key"); |
|
|
|
if (token == null) { |
|
|
|
@ -1773,7 +1769,7 @@ public class PageController { |
|
|
|
// 用于二维码存放数据
|
|
|
|
|
|
|
|
mv.addObject("record", depositoryRecordById); |
|
|
|
Integer cid = depositoryRecordById.getCid(); |
|
|
|
Long cid = depositoryRecordById.getCid(); |
|
|
|
List<AdministrationP> postList = PublicConfig.findCompanyBySuperior(cid.toString(), userKey, token); |
|
|
|
List<AdministrationP> administrationPList = PublicConfig.findAllCompany(userKey, token); |
|
|
|
// 部门列表
|
|
|
|
@ -1823,7 +1819,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/placeView") |
|
|
|
public ModelAndView placeView(Integer id) { |
|
|
|
public ModelAndView placeView(Long id) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
mv.setViewName("pages/place/place_edit"); |
|
|
|
if (id != null) { |
|
|
|
@ -1847,7 +1843,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/insertPlace") |
|
|
|
public ModelAndView insertPlace(Integer depositoryId) { |
|
|
|
public ModelAndView insertPlace(Long depositoryId) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
mv.setViewName("pages/place/place_add"); |
|
|
|
if (depositoryId != null) { |
|
|
|
@ -1865,7 +1861,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/insertListPlace") |
|
|
|
public ModelAndView insertListPlace(Integer depositoryId) { |
|
|
|
public ModelAndView insertListPlace(Long depositoryId) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
mv.setViewName("pages/place/place_list_add"); |
|
|
|
if (depositoryId != null) { |
|
|
|
@ -1884,7 +1880,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/findWareHouseByParentId") |
|
|
|
public ModelAndView findWareHouseByParentId(Integer parentId, HttpServletRequest request) { |
|
|
|
public ModelAndView findWareHouseByParentId(Long parentId, HttpServletRequest request) { |
|
|
|
String token = request.getHeader("user-token"); |
|
|
|
String userKey = request.getHeader("user-key"); |
|
|
|
if (token == null) { |
|
|
|
@ -1990,7 +1986,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/ManagerViewByMid") |
|
|
|
public ModelAndView findManagerViewByMid(Integer id) { |
|
|
|
public ModelAndView findManagerViewByMid(Long id) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
Inventory materialById = materialService.findInventoryById(id); |
|
|
|
mv.addObject("did", materialById.getDepositoryId()); |
|
|
|
@ -2006,7 +2002,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/findMaterialTypeByParentId") |
|
|
|
public ModelAndView findMaterialTypeByParentId(Integer parentId, HttpServletRequest request) { |
|
|
|
public ModelAndView findMaterialTypeByParentId(Long parentId, HttpServletRequest request) { |
|
|
|
String token = request.getHeader("user-token"); |
|
|
|
if (token == null) { |
|
|
|
token = (String) request.getSession().getAttribute("userToken"); |
|
|
|
@ -2047,7 +2043,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/materialType_detail") |
|
|
|
public ModelAndView materialType_detail(Integer id) { |
|
|
|
public ModelAndView materialType_detail(Long id) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
mv.setViewName("pages/materialtype/materialType_edit"); |
|
|
|
if (id != null) { |
|
|
|
@ -2069,7 +2065,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/application_review") |
|
|
|
public ModelAndView application_review(Integer id, HttpServletRequest request) { |
|
|
|
public ModelAndView application_review(Long id, HttpServletRequest request) { |
|
|
|
String token = request.getHeader("user-token"); |
|
|
|
String userKey = request.getHeader("user-key"); |
|
|
|
if (token == null) { |
|
|
|
@ -2099,18 +2095,18 @@ public class PageController { |
|
|
|
double sumPrice = 0.0; |
|
|
|
// 计量单位
|
|
|
|
StringBuilder sumUnit = new StringBuilder(); |
|
|
|
List<Integer> depositoryIdList = new ArrayList<>(); |
|
|
|
List<Integer> placeIdList = new ArrayList<>(); |
|
|
|
List<Long> depositoryIdList = new ArrayList<>(); |
|
|
|
List<Long> placeIdList = new ArrayList<>(); |
|
|
|
for (ApplicationOutRecordMinP applicationOutRecordMin : applicationOutRecordMinByParent) { |
|
|
|
// 获取子订单信息
|
|
|
|
// 获取出库物料信息
|
|
|
|
Inventory inventoryById = materialService.findInventoryById(applicationOutRecordMin.getMid()); |
|
|
|
// 获取出库物料仓库信息
|
|
|
|
Integer depositoryId = applicationOutRecordMin.getDepositoryId(); |
|
|
|
Long depositoryId = applicationOutRecordMin.getDepositoryId(); |
|
|
|
if (!depositoryIdList.contains(depositoryId)) { |
|
|
|
depositoryIdList.add(depositoryId); |
|
|
|
} |
|
|
|
Integer placeId = applicationOutRecordMin.getPlaceId(); |
|
|
|
Long placeId = applicationOutRecordMin.getPlaceId(); |
|
|
|
if (!placeIdList.contains(placeId)) { |
|
|
|
placeIdList.add(placeId); |
|
|
|
} |
|
|
|
@ -2133,7 +2129,7 @@ public class PageController { |
|
|
|
// 获取拆单记录
|
|
|
|
SplitInfo splitInfo = splitUnitService.findSplitInfoByMidAndUnit(paramForSplitInfo); |
|
|
|
// 获取当前拆单与基础单位的进制
|
|
|
|
int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); |
|
|
|
int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); |
|
|
|
sumUnit.append(unit).append(","); |
|
|
|
if (inventoryById.getPrice() != null) { |
|
|
|
BigDecimal bd = BigDecimal.valueOf((inventoryById.getPrice() / scale * applicationOutRecordMin.getQuantity())); |
|
|
|
@ -2154,7 +2150,7 @@ public class PageController { |
|
|
|
String[] split = departmenthead.split(","); |
|
|
|
for (String s : split) { |
|
|
|
if (!"".equals(s)) { |
|
|
|
UserByPort departmentUser = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(s), userKey, token); |
|
|
|
UserByPort departmentUser = PublicConfig.FindUserById(ObjectFormatUtil.toLong(s), userKey, token); |
|
|
|
String name = departmentUser.getMaindeparmentname() + "-" + departmentUser.getName(); |
|
|
|
departmentHeadIconPhoto.put(name, departmentUser.getIconphoto()); |
|
|
|
departmentHeadName.append("name").append(","); |
|
|
|
@ -2195,7 +2191,7 @@ public class PageController { |
|
|
|
recordP.setUnit(sumUnit.toString()); |
|
|
|
mv.addObject("record", recordP); |
|
|
|
mv.addObject("recordMinList", applicationOutRecordMinByParent); |
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
if (PublicConfig.roleAdminorgList.contains(maindeparment)) { |
|
|
|
mv.addObject("display", "table-row"); |
|
|
|
} else { |
|
|
|
@ -2212,7 +2208,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/form_step_look") |
|
|
|
public ModelAndView form_step_look(Integer id, HttpServletRequest request) { |
|
|
|
public ModelAndView form_step_look(Long id, HttpServletRequest request) { |
|
|
|
String token = request.getHeader("user-token"); |
|
|
|
String userKey = request.getHeader("user-key"); |
|
|
|
if (token == null) { |
|
|
|
@ -2232,9 +2228,9 @@ public class PageController { |
|
|
|
} |
|
|
|
|
|
|
|
// 获取入库库位id
|
|
|
|
Integer placeId = applicationInRecordPById.getPlaceId(); |
|
|
|
Long placeId = applicationInRecordPById.getPlaceId(); |
|
|
|
String placeCode = "默认库位"; |
|
|
|
if (Integer.compare(placeId, 0) != 0) { |
|
|
|
if (Long.compare(placeId, 0) != 0) { |
|
|
|
Place placeById = placeService.findPlaceById(placeId); |
|
|
|
placeCode = placeById.getCode(); |
|
|
|
} |
|
|
|
@ -2245,7 +2241,7 @@ public class PageController { |
|
|
|
for (String approverId : airapproverId |
|
|
|
) { |
|
|
|
if (!"".equals(approverId)) { |
|
|
|
UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(approverId), userKey, token); |
|
|
|
UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toLong(approverId), userKey, token); |
|
|
|
airapproverName.append(userByPort.getName()).append(","); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -2291,7 +2287,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/application_in_review") |
|
|
|
public ModelAndView application_in_review(Integer id, HttpServletRequest request) { |
|
|
|
public ModelAndView application_in_review(Long id, HttpServletRequest request) { |
|
|
|
String token = request.getHeader("user-token"); |
|
|
|
String userKey = request.getHeader("user-key"); |
|
|
|
if (token == null) { |
|
|
|
@ -2311,9 +2307,9 @@ public class PageController { |
|
|
|
} |
|
|
|
|
|
|
|
// 获取入库库位id
|
|
|
|
Integer placeId = applicationInRecordPById.getPlaceId(); |
|
|
|
Long placeId = applicationInRecordPById.getPlaceId(); |
|
|
|
String placeCode = "默认库位"; |
|
|
|
if (Integer.compare(placeId, 0) != 0) { |
|
|
|
if (Long.compare(placeId, 0) != 0) { |
|
|
|
Place placeById = placeService.findPlaceById(placeId); |
|
|
|
placeCode = placeById.getCode(); |
|
|
|
} |
|
|
|
@ -2324,7 +2320,7 @@ public class PageController { |
|
|
|
for (String approverId : airapproverId |
|
|
|
) { |
|
|
|
if (!"".equals(approverId)) { |
|
|
|
UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(approverId), userKey, token); |
|
|
|
UserByPort userByPort = PublicConfig.FindUserById(ObjectFormatUtil.toLong(approverId), userKey, token); |
|
|
|
airapproverName.append(userByPort.getName()).append(","); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -2369,7 +2365,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/form_step_lookByminRecordOut") |
|
|
|
public ModelAndView form_step_lookByminRecordOut(Integer id, HttpServletRequest request) { |
|
|
|
public ModelAndView form_step_lookByminRecordOut(Long id, HttpServletRequest request) { |
|
|
|
String token = request.getHeader("user-token"); |
|
|
|
String userKey = request.getHeader("user-key"); |
|
|
|
if (token == null) { |
|
|
|
@ -2390,7 +2386,7 @@ public class PageController { |
|
|
|
|
|
|
|
|
|
|
|
// 获取处理人
|
|
|
|
Integer checkId = recordMinP.getCheckId(); |
|
|
|
Long checkId = recordMinP.getCheckId(); |
|
|
|
if (checkId != null) { |
|
|
|
UserByPort userByPort = PublicConfig.FindUserById(checkId, userKey, token); |
|
|
|
|
|
|
|
@ -2424,7 +2420,7 @@ public class PageController { |
|
|
|
// 获取拆单记录
|
|
|
|
SplitInfo splitInfo = splitUnitService.findSplitInfoByMidAndUnit(paramForSplitInfo); |
|
|
|
// 获取当前拆单与基础单位的进制
|
|
|
|
int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); |
|
|
|
int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); |
|
|
|
double price = 0.0; |
|
|
|
if (inventoryById.getPrice() != null) { |
|
|
|
price = (inventoryById.getPrice()) / scale * recordMinP.getQuantity(); |
|
|
|
@ -2448,7 +2444,7 @@ public class PageController { |
|
|
|
// 获取当前主单
|
|
|
|
ApplicationOutRecordP recordP = depositoryRecordService.findApplicationOutRecordPById(recordMinP.getParentId()); |
|
|
|
boolean b = DateUtil.IsMonthStartAndEnd(recordP.getApplicantTime()); |
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
if (PublicConfig.roleAdminorgList.contains(maindeparment) && b) { |
|
|
|
mv.addObject("edisplay", "inline-block"); |
|
|
|
} else { |
|
|
|
@ -2473,7 +2469,7 @@ public class PageController { |
|
|
|
|
|
|
|
// 跳转到出库详情
|
|
|
|
@GetMapping("/ApplicationOutView") |
|
|
|
public ModelAndView ApplicationOutView(Integer id, HttpServletRequest request) { |
|
|
|
public ModelAndView ApplicationOutView(Long id, HttpServletRequest request) { |
|
|
|
String token = request.getHeader("user-token"); |
|
|
|
String userKey = request.getHeader("user-key"); |
|
|
|
if (token == null) { |
|
|
|
@ -2500,9 +2496,9 @@ public class PageController { |
|
|
|
StringBuilder depositoryName = new StringBuilder(); |
|
|
|
// 展示出库的库位编码
|
|
|
|
StringBuilder placeCode = new StringBuilder(); |
|
|
|
List<Integer> placeIdList = new ArrayList<>(); |
|
|
|
List<Long> placeIdList = new ArrayList<>(); |
|
|
|
// 展示当前子订单的处理人
|
|
|
|
List<Integer> outDisPoserIdList = new ArrayList<>(); |
|
|
|
List<Long> outDisPoserIdList = new ArrayList<>(); |
|
|
|
StringBuilder outDisposer = new StringBuilder(); |
|
|
|
// 当前订单总数
|
|
|
|
Double sumQuantity = 0.0; |
|
|
|
@ -2511,26 +2507,26 @@ public class PageController { |
|
|
|
// 当前总额
|
|
|
|
double sumPrice = 0.0; |
|
|
|
// 出库仓库id列表
|
|
|
|
List<Integer> depositoryIdList = new ArrayList<>(); |
|
|
|
List<Long> depositoryIdList = new ArrayList<>(); |
|
|
|
for (ApplicationOutRecordMinP recordMinP : applicationOutRecordMinByParent) { |
|
|
|
// 获取子订单信息
|
|
|
|
|
|
|
|
// 获取出库物料信息
|
|
|
|
Inventory inventoryById = materialService.findInventoryById(recordMinP.getMid()); |
|
|
|
// 获取出库物料仓库Id
|
|
|
|
Integer depositoryId = recordMinP.getDepositoryId(); |
|
|
|
Long depositoryId = recordMinP.getDepositoryId(); |
|
|
|
if (!depositoryIdList.contains(depositoryId)) { |
|
|
|
depositoryIdList.add(depositoryId); |
|
|
|
} |
|
|
|
recordMinP.setMname(inventoryById.getMname()); |
|
|
|
Integer checkId = recordMinP.getCheckId(); |
|
|
|
Long checkId = recordMinP.getCheckId(); |
|
|
|
if (checkId != null) { |
|
|
|
// 如果当前子订单已经处理
|
|
|
|
// 获取当前处理人
|
|
|
|
if (!outDisPoserIdList.contains(checkId)) { |
|
|
|
outDisPoserIdList.add(checkId); |
|
|
|
} |
|
|
|
Integer placeId = recordMinP.getPlaceId(); |
|
|
|
Long placeId = recordMinP.getPlaceId(); |
|
|
|
if (!placeIdList.contains(placeId)) { |
|
|
|
placeIdList.add(placeId); |
|
|
|
} |
|
|
|
@ -2561,7 +2557,7 @@ public class PageController { |
|
|
|
// 查询拆单记录
|
|
|
|
SplitInfo splitInfo = splitUnitService.findSplitInfoByMidAndUnit(paramForSplitInfo); |
|
|
|
// 获取当前拆单记录与基础单位的进制
|
|
|
|
int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); |
|
|
|
int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1L); |
|
|
|
if (inventoryById.getPrice() != null) { |
|
|
|
BigDecimal bd = BigDecimal.valueOf((inventoryById.getPrice() / scale * recordMinP.getQuantity())); |
|
|
|
double v = bd.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); |
|
|
|
@ -2579,7 +2575,7 @@ public class PageController { |
|
|
|
} |
|
|
|
// 如果处理过
|
|
|
|
if (outDisPoserIdList.size() > 0) { |
|
|
|
for (Integer outDispositorId : outDisPoserIdList |
|
|
|
for (Long outDispositorId : outDisPoserIdList |
|
|
|
) { |
|
|
|
UserByPort disposer = PublicConfig.FindUserById(outDispositorId, userKey, token); |
|
|
|
outDisposer.append(disposer.getName()).append(","); |
|
|
|
@ -2588,7 +2584,7 @@ public class PageController { |
|
|
|
if (placeIdList.size() > 0) { |
|
|
|
List<Place> placeByIdS = placeService.findPlaceByIdS(placeIdList); |
|
|
|
for (Place place : placeByIdS) { |
|
|
|
int placeId = place.getId(); |
|
|
|
Long placeId = place.getId(); |
|
|
|
if (placeId == 0) { |
|
|
|
placeCode.append("默认库位").append(","); |
|
|
|
} else { |
|
|
|
@ -2597,7 +2593,7 @@ public class PageController { |
|
|
|
} |
|
|
|
} |
|
|
|
// 申请人Id
|
|
|
|
Integer applicantId = applicationOutRecordPById.getApplicantId(); |
|
|
|
Long applicantId = applicationOutRecordPById.getApplicantId(); |
|
|
|
// 获取申请人信息
|
|
|
|
UserByPort userByPort = PublicConfig.FindUserById(applicantId, userKey, token); |
|
|
|
|
|
|
|
@ -2615,7 +2611,7 @@ public class PageController { |
|
|
|
if ("".equals(value)) { |
|
|
|
continue; |
|
|
|
} |
|
|
|
UserByPort departmenthead = PublicConfig.FindUserById(ObjectFormatUtil.toInteger(value), userKey, token); |
|
|
|
UserByPort departmenthead = PublicConfig.FindUserById(ObjectFormatUtil.toLong(value), userKey, token); |
|
|
|
String name = departmenthead.getMaindeparmentname() + "-" + departmenthead.getName(); |
|
|
|
departmentHeadUserIcon.put(name, departmenthead.getIconphoto()); |
|
|
|
departmentHeadName.append(name).append(","); |
|
|
|
@ -2626,8 +2622,8 @@ public class PageController { |
|
|
|
applicationOutRecordPById.setUseAdminorgName(useAdminorgName); |
|
|
|
|
|
|
|
|
|
|
|
Integer adminorgId = applicationOutRecordPById.getAdminorgId(); |
|
|
|
Integer constructionUnitId = applicationOutRecordPById.getConstructionUnitId(); |
|
|
|
Long adminorgId = applicationOutRecordPById.getAdminorgId(); |
|
|
|
Long constructionUnitId = applicationOutRecordPById.getConstructionUnitId(); |
|
|
|
if (adminorgId != null) { |
|
|
|
Administration company = PublicConfig.getCompany(adminorgId, userKey, token); |
|
|
|
applicationOutRecordPById.setAdminorgName(company.getName()); |
|
|
|
@ -2643,7 +2639,7 @@ public class PageController { |
|
|
|
mv.addObject("cdisplay", "none"); |
|
|
|
} |
|
|
|
|
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
if (PublicConfig.roleAdminorgList.contains(maindeparment)) { |
|
|
|
mv.addObject("display", "table-row"); |
|
|
|
} else { |
|
|
|
@ -2697,7 +2693,7 @@ public class PageController { |
|
|
|
} |
|
|
|
|
|
|
|
// 获取当前用户是否存在可见仓库
|
|
|
|
List<Integer> union = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userToken); |
|
|
|
List<Long> union = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userToken); |
|
|
|
if (union.size() > 0) { |
|
|
|
mv.addObject("display", "block"); |
|
|
|
} else { |
|
|
|
@ -2705,7 +2701,7 @@ public class PageController { |
|
|
|
} |
|
|
|
mv.addObject("gidList", gidList); |
|
|
|
mv.setViewName("pages/group/applicationOutForGroup"); |
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
if (PublicConfig.roleAdminorgList.contains(maindeparment)) { |
|
|
|
mv.setViewName("pages/applicationForStorageCenter/applicationOutForGroup"); |
|
|
|
} |
|
|
|
@ -2741,7 +2737,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/StockTakingReview") |
|
|
|
public ModelAndView StockTakingReview(Integer id, HttpServletRequest request) { |
|
|
|
public ModelAndView StockTakingReview(Long id, HttpServletRequest request) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
String token = request.getHeader("user-token"); |
|
|
|
String userKey = request.getHeader("user-key"); |
|
|
|
@ -2804,7 +2800,7 @@ public class PageController { |
|
|
|
|
|
|
|
// 跳转到盘点详情
|
|
|
|
@GetMapping("/StockTakingView") |
|
|
|
public ModelAndView StockTakingView(Integer id, HttpServletRequest request) { |
|
|
|
public ModelAndView StockTakingView(Long id, HttpServletRequest request) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
String token = request.getHeader("user-token"); |
|
|
|
String userKey = request.getHeader("user-key"); |
|
|
|
@ -2979,14 +2975,13 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/company_detail") |
|
|
|
public ModelAndView company_detail(Integer id, HttpServletRequest request) { |
|
|
|
public ModelAndView company_detail(Long id, HttpServletRequest request) { |
|
|
|
String token = request.getHeader("user-token"); |
|
|
|
String userKey = request.getHeader("user-key"); |
|
|
|
if (token == null) { |
|
|
|
token = (String) request.getSession().getAttribute("userToken"); |
|
|
|
userKey = (String) request.getSession().getAttribute("userKey"); |
|
|
|
} |
|
|
|
UserByPort userByPort = AuthenticationTokenPool.getUserToken(token); |
|
|
|
String url = PublicConfig.external_url + "/org/getgovcont"; |
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
@ -3024,7 +3019,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/findCompanyByParentId") |
|
|
|
public ModelAndView findCompanyByParentId(Integer parentId, Integer level, HttpServletRequest request) { |
|
|
|
public ModelAndView findCompanyByParentId(Long parentId, Integer level, HttpServletRequest request) { |
|
|
|
String token = request.getHeader("user-token"); |
|
|
|
String userKey = request.getHeader("user-key"); |
|
|
|
if (token == null) { |
|
|
|
@ -3107,7 +3102,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/post_detail") |
|
|
|
public ModelAndView post_detail(Integer id, HttpServletRequest request) { |
|
|
|
public ModelAndView post_detail(Long id, HttpServletRequest request) { |
|
|
|
String token = request.getHeader("user-token"); |
|
|
|
String userKey = request.getHeader("user-key"); |
|
|
|
if (token == null) { |
|
|
|
@ -3128,7 +3123,7 @@ public class PageController { |
|
|
|
|
|
|
|
|
|
|
|
@GetMapping("/findPostByParentId") |
|
|
|
public ModelAndView findPostByParentId(Integer parentId, HttpServletRequest request) { |
|
|
|
public ModelAndView findPostByParentId(Long parentId, HttpServletRequest request) { |
|
|
|
String token = request.getHeader("user-token"); |
|
|
|
String userKey = request.getHeader("user-key"); |
|
|
|
if (token == null) { |
|
|
|
@ -3177,7 +3172,7 @@ public class PageController { |
|
|
|
|
|
|
|
// 跳转到添加权限界面
|
|
|
|
@GetMapping("/postRoleAdd") |
|
|
|
public ModelAndView PostRoleAdd(Integer id, Integer classes, HttpServletRequest request) { |
|
|
|
public ModelAndView PostRoleAdd(Long id, Integer classes, HttpServletRequest request) { |
|
|
|
String token = request.getHeader("user-token"); |
|
|
|
String userKey = request.getHeader("user-key"); |
|
|
|
if (token == null) { |
|
|
|
@ -3230,7 +3225,7 @@ public class PageController { |
|
|
|
|
|
|
|
// 跳转到扫码出库界面
|
|
|
|
@GetMapping("/scanQrCodeByOut") |
|
|
|
public ModelAndView scanQrCodeByOut(Integer id, HttpServletRequest request) { |
|
|
|
public ModelAndView scanQrCodeByOut(Long id, HttpServletRequest request) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
// 获取当前要处理的子订单
|
|
|
|
ApplicationOutRecordMinP applicationOutMinById = depositoryRecordService.findApplicationOutMinById(id); |
|
|
|
@ -3243,7 +3238,7 @@ public class PageController { |
|
|
|
|
|
|
|
// 跳转到新扫码出库界面
|
|
|
|
@GetMapping("/scanBarOrQrCodeOut") |
|
|
|
public ModelAndView scanBarOrQrCodeOut(Integer id, HttpServletRequest request) { |
|
|
|
public ModelAndView scanBarOrQrCodeOut(Long id, HttpServletRequest request) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
// 获取当前要处理的子订单
|
|
|
|
ApplicationOutRecordMinP applicationOutMinById = depositoryRecordService.findApplicationOutMinById(id); |
|
|
|
@ -3256,7 +3251,7 @@ public class PageController { |
|
|
|
|
|
|
|
// 用于展示当前库位所存在的物料
|
|
|
|
@GetMapping("/ScanBarOrQrCodeOut_selectMaterial") |
|
|
|
public ModelAndView ScanBarOrQrCodeOut_selectMaterial(Integer pid, String mcode, Integer depositoryId) { |
|
|
|
public ModelAndView ScanBarOrQrCodeOut_selectMaterial(Long pid, String mcode, Long depositoryId) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
mv.addObject("mcode", mcode); |
|
|
|
mv.addObject("depositoryId", depositoryId); |
|
|
|
@ -3331,13 +3326,13 @@ public class PageController { |
|
|
|
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); |
|
|
|
List<String> range = redisPool.getRedisTemplateByDb(15).boundListOps("WMS_temporaryValue_Out" + userToken.getNumber()).range(0, -1); |
|
|
|
// 获取当前用户是否存在可见仓库
|
|
|
|
List<Integer> union = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userToken); |
|
|
|
List<Long> union = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userToken); |
|
|
|
if (union.size() > 0) { |
|
|
|
mv.addObject("display", "block"); |
|
|
|
} else { |
|
|
|
mv.addObject("display", "none"); |
|
|
|
} |
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
if (range != null && range.size() > 0) { |
|
|
|
mv.setViewName("pages/application/application-out_temporaryValue"); |
|
|
|
if (PublicConfig.roleAdminorgList.contains(maindeparment)) { |
|
|
|
@ -3365,7 +3360,7 @@ public class PageController { |
|
|
|
mv.addObject("btList", businessTypeAll); |
|
|
|
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); |
|
|
|
List<String> range = redisPool.getRedisTemplateByDb(15).boundListOps("WMS_temporaryValue_Out" + userToken.getNumber()).range(0, -1); |
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
if (range != null && range.size() > 0) { |
|
|
|
if (PublicConfig.roleAdminorgList.contains(maindeparment)) { |
|
|
|
mv.setViewName("pages/applicationForStorageCenter/application-out_admin_temporaryValue"); |
|
|
|
@ -3391,7 +3386,7 @@ public class PageController { |
|
|
|
|
|
|
|
// 当前仓库中该用户的子订单详情,用于移动端
|
|
|
|
@GetMapping("/ApplicationOutMinByDidForMobile") |
|
|
|
public ModelAndView ApplicationOutMinByDidForMobile(Integer depositoryId, Integer state, HttpServletRequest request) { |
|
|
|
public ModelAndView ApplicationOutMinByDidForMobile(Long depositoryId, Integer state, HttpServletRequest request) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
Depository depository = depositoryService.findDepositoryById(depositoryId); |
|
|
|
mv.addObject("depositoryId", depositoryId); |
|
|
|
@ -3454,26 +3449,22 @@ public class PageController { |
|
|
|
List<StockTakingChildP> takingChildPS = new ArrayList<>(); |
|
|
|
StockTaking stockTaking = null; |
|
|
|
String[] split = minIds.split(","); |
|
|
|
for (int i = 0; i < split.length; i++) { |
|
|
|
String minRecordId = split[i]; |
|
|
|
for (String minRecordId : split) { |
|
|
|
if ("".equals(minRecordId)) { |
|
|
|
continue; |
|
|
|
} |
|
|
|
// 获取当前子订单
|
|
|
|
StockTakingChildP stcp = stockTakingService.findStockTakingChildPById(ObjectFormatUtil.toInteger(minRecordId)); |
|
|
|
StockTakingChildP stcp = stockTakingService.findStockTakingChildPById(ObjectFormatUtil.toLong(minRecordId)); |
|
|
|
|
|
|
|
|
|
|
|
// 获取主订单
|
|
|
|
stockTaking = stockTakingService.findStockTakingById(stcp.getMainId()); |
|
|
|
|
|
|
|
Integer placeId = stcp.getMid(); |
|
|
|
Long placeId = stcp.getMid(); |
|
|
|
// 获取库位详情
|
|
|
|
Place placeById = placeService.findPlaceById(placeId); |
|
|
|
|
|
|
|
|
|
|
|
// 获取当前物料在其库位中的数量
|
|
|
|
MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(placeId, stcp.getMid()); |
|
|
|
|
|
|
|
// 获取盈亏数量
|
|
|
|
Double newInventory = stcp.getInventory(); |
|
|
|
|
|
|
|
@ -3510,7 +3501,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/printCode") |
|
|
|
public ModelAndView printCode(int mid, int flag) { |
|
|
|
public ModelAndView printCode(Long mid, int flag) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
mv.addObject("mcode", "noMaterial"); |
|
|
|
mv.addObject("version", "noMaterial"); |
|
|
|
@ -3543,7 +3534,7 @@ public class PageController { |
|
|
|
|
|
|
|
// 获取对应库位
|
|
|
|
Place placeById = placeService.findPlaceById(mid); |
|
|
|
if (Integer.compare(0, placeById.getDid()) == 0) { |
|
|
|
if (Long.compare(0, placeById.getDid()) == 0) { |
|
|
|
mv.addObject("name", "默认库位"); |
|
|
|
} else { |
|
|
|
Depository depositoryById = depositoryService.findDepositoryById(placeById.getDid()); |
|
|
|
@ -3564,7 +3555,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/materialForPlace") |
|
|
|
public ModelAndView materialForPlace(Integer id) { |
|
|
|
public ModelAndView materialForPlace(Long id) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
mv.setViewName("pages/place/materialForPlace"); |
|
|
|
// 获取当前的映射
|
|
|
|
@ -3596,7 +3587,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/noticeView") |
|
|
|
public ModelAndView noticeView(Integer id, HttpServletRequest request) { |
|
|
|
public ModelAndView noticeView(Long id, HttpServletRequest request) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
mv.setViewName("pages/notice/notice-view"); |
|
|
|
String token = request.getHeader("user-token"); |
|
|
|
@ -3607,7 +3598,7 @@ public class PageController { |
|
|
|
} |
|
|
|
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); |
|
|
|
NoticeP noticeById = noticeService.findNoticeById(id, userKey, token); |
|
|
|
if (Integer.compare(noticeById.getUserId(), userToken.getId()) == 0) { |
|
|
|
if (Long.compare(noticeById.getUserId(), userToken.getId()) == 0) { |
|
|
|
String header = request.getHeader("user-agent"); |
|
|
|
String crypt = Md5.crypt(header); |
|
|
|
StringBuilder sb = new StringBuilder(); |
|
|
|
@ -3701,7 +3692,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/constructionUnitEdit") |
|
|
|
public ModelAndView constructionUnitEdit(Integer id) { |
|
|
|
public ModelAndView constructionUnitEdit(Long id) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
mv.setViewName("pages/constructionunit/constructionunit_edit"); |
|
|
|
ConstructionUnit constructionUnitById = constructionUnitService.findConstructionUnitById(id); |
|
|
|
@ -3738,7 +3729,7 @@ public class PageController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("/businessTypeEdit") |
|
|
|
public ModelAndView businessTypeEdit(Integer id) { |
|
|
|
public ModelAndView businessTypeEdit(Long id) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
mv.setViewName("pages/BusinessType/businesstype_edit"); |
|
|
|
BusinessType businessTypeById = businessTypeService.findBusinessTypeById(id); |
|
|
|
@ -3759,7 +3750,7 @@ public class PageController { |
|
|
|
} |
|
|
|
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); |
|
|
|
if (param.containsKey("id")) { |
|
|
|
Integer maindeparment = userToken.getMaindeparment(); |
|
|
|
Long maindeparment = userToken.getMaindeparment(); |
|
|
|
if (PublicConfig.roleAdminorgList.contains(maindeparment)) { |
|
|
|
mv.addObject("display", "inline-block"); |
|
|
|
} |
|
|
|
@ -3787,8 +3778,8 @@ public class PageController { |
|
|
|
public ModelAndView stockTakingInfoForInventory(@RequestParam Map<String, String> param, HttpServletRequest request) { |
|
|
|
ModelAndView mv = new ModelAndView(); |
|
|
|
mv.setViewName("pages/stockTaking/stockTakingInfoForInventory"); |
|
|
|
Integer id = ObjectFormatUtil.toInteger(param.get("id")); |
|
|
|
Integer pid = ObjectFormatUtil.toInteger(param.get("pid")); |
|
|
|
Long id = ObjectFormatUtil.toLong(param.get("id")); |
|
|
|
Long pid = ObjectFormatUtil.toLong(param.get("pid")); |
|
|
|
// 获取库存记录
|
|
|
|
InventoryP inventoryById = new InventoryP(materialService.findInventoryById(id)); |
|
|
|
// 获取当前物料与库位的对应关系
|
|
|
|
@ -3797,7 +3788,7 @@ public class PageController { |
|
|
|
// 获取库位信息
|
|
|
|
Place placeById = placeService.findPlaceById(pid); |
|
|
|
inventoryById.setPid(pid); |
|
|
|
if (Integer.compare(0, pid) != 0) { |
|
|
|
if (Long.compare(0, pid) != 0) { |
|
|
|
inventoryById.setDepositoryCode(inventoryById.getDepositoryName() + "-" + placeById.getKingdeecode()); |
|
|
|
} else { |
|
|
|
inventoryById.setDepositoryCode(inventoryById.getDepositoryName()); |
|
|
|
@ -3868,7 +3859,7 @@ public class PageController { |
|
|
|
if ("".equals(s)) { |
|
|
|
continue; |
|
|
|
} |
|
|
|
Integer minRecordId = ObjectFormatUtil.toInteger(s.split(":")[1].trim()); |
|
|
|
Long minRecordId = ObjectFormatUtil.toLong(s.split(":")[1].trim()); |
|
|
|
ApplicationOutRecordMinP applicationOutMinById = depositoryRecordService.findApplicationOutMinById(minRecordId); |
|
|
|
ApplicationOutRecordP applicationOutRecordPById = depositoryRecordService.findApplicationOutRecordPById(applicationOutMinById.getParentId()); |
|
|
|
UserByPort userByPort = PublicConfig.FindUserById(applicationOutRecordPById.getApplicantId(), userKey, token); |
|
|
|
|
