|
|
|
@ -66,10 +66,10 @@ public class MaterialController { |
|
|
|
*/ |
|
|
|
@GetMapping("/material") |
|
|
|
public RestResponse findMaterial(@RequestParam Map<String, Object> map) { |
|
|
|
if(map.containsKey("materialTypeId")){ |
|
|
|
if (map.containsKey("materialTypeId")) { |
|
|
|
Long materialTypeId = ObjectFormatUtil.toLong(map.get("materialTypeId")); |
|
|
|
List<Long> childForMaterialTypeByParent = materialTypeService.findChildForMaterialTypeByParent(materialTypeId); |
|
|
|
map.put("materialTypeIds",childForMaterialTypeByParent); |
|
|
|
map.put("materialTypeIds", childForMaterialTypeByParent); |
|
|
|
map.remove("materialTypeId"); |
|
|
|
} |
|
|
|
List<Material> materialPByCondition = materialService.findMaterialPByConditionForTable(map); |
|
|
|
@ -171,19 +171,24 @@ public class MaterialController { |
|
|
|
List<Integer> didList = roleService.findDepositoryIdForUserHas(userToken); |
|
|
|
map.put("depositoryIds", didList); |
|
|
|
} |
|
|
|
if(map.containsKey("depositoryId")){ |
|
|
|
if (map.containsKey("depositoryId")) { |
|
|
|
// 如果包含仓库id
|
|
|
|
Integer depositoryId = ObjectFormatUtil.toInteger(map.get("depositoryId")); |
|
|
|
// 获取当前仓库下所有可见的仓库
|
|
|
|
List<Integer> allChildDepositoryById = depositoryService.findAllChildDepositoryById(depositoryId, userToken); |
|
|
|
map.put("depositoryIds", allChildDepositoryById); |
|
|
|
map.remove("depositoryId"); |
|
|
|
if (allChildDepositoryById.size() > 0) { |
|
|
|
map.put("depositoryIds", allChildDepositoryById); |
|
|
|
map.remove("depositoryId"); |
|
|
|
} |
|
|
|
} |
|
|
|
if(map.containsKey("materialTypeId")){ |
|
|
|
if (map.containsKey("materialTypeId")) { |
|
|
|
Long materialTypeId = ObjectFormatUtil.toLong(map.get("materialTypeId")); |
|
|
|
List<Long> childForMaterialTypeByParent = materialTypeService.findChildForMaterialTypeByParent(materialTypeId); |
|
|
|
map.put("materialTypeIds", childForMaterialTypeByParent); |
|
|
|
map.remove("materialTypeId"); |
|
|
|
if (childForMaterialTypeByParent.size() > 0) { |
|
|
|
map.put("materialTypeIds", childForMaterialTypeByParent); |
|
|
|
map.remove("materialTypeId"); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
list = materialService.findInventory(map); |
|
|
|
total = materialService.findInventoryCount(map); |
|
|
|
@ -193,11 +198,11 @@ public class MaterialController { |
|
|
|
} |
|
|
|
|
|
|
|
@PostMapping("/updateInventoryRemark") |
|
|
|
public RestResponse updateInventoryRemark(@RequestBody Map<String,Object> map,HttpServletRequest request){ |
|
|
|
if(map.containsKey("id")){ |
|
|
|
public RestResponse updateInventoryRemark(@RequestBody Map<String, Object> map, HttpServletRequest request) { |
|
|
|
if (map.containsKey("id")) { |
|
|
|
Integer integer = materialService.updateInventoryRemark(map); |
|
|
|
return CrudUtil.updateHandle(integer,1); |
|
|
|
}else{ |
|
|
|
return CrudUtil.updateHandle(integer, 1); |
|
|
|
} else { |
|
|
|
throw new MyException("缺少必要参数"); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -282,7 +287,7 @@ public class MaterialController { |
|
|
|
List<Object> list = new ArrayList<>(); |
|
|
|
if (!"".equals(mname)) { |
|
|
|
// 如果是出入库
|
|
|
|
list = materialService.InitTreeForSelectName(mname.split(",")[0], type, map,userToken); |
|
|
|
list = materialService.InitTreeForSelectName(mname.split(",")[0], type, map, userToken); |
|
|
|
} else { |
|
|
|
list = materialService.InitTreeMenus_Test(); |
|
|
|
} |
|
|
|
@ -624,8 +629,7 @@ public class MaterialController { |
|
|
|
} |
|
|
|
} |
|
|
|
return new RestResponse(); |
|
|
|
} |
|
|
|
else { |
|
|
|
} else { |
|
|
|
return CrudUtil.insertHandle(-1, 0); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -667,6 +671,7 @@ public class MaterialController { |
|
|
|
return CrudUtil.insertHandle(-1, 0); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@PostMapping("/getTemporaryValueForMaterial") |
|
|
|
public RestResponse getTemporaryValueForMaterial(@RequestBody Map<String, Object> map, HttpServletRequest request) { |
|
|
|
String token = request.getHeader("user-token"); |
|
|
|
|
