|
@@ -42,61 +42,61 @@ import javax.servlet.http.HttpServletResponse;
|
|
|
@AllArgsConstructor
|
|
|
@RequestMapping("/store/spare-stores")
|
|
|
public class SpareStoreController {
|
|
|
- private final StoreMapper storeMapper;
|
|
|
-
|
|
|
- private final SpareStoreService spareStoreService;
|
|
|
-
|
|
|
- /**
|
|
|
- * 通过id查询单条记录
|
|
|
- *
|
|
|
- * @param id 主键
|
|
|
- * @return R
|
|
|
- */
|
|
|
- @GetMapping("/{id}")
|
|
|
- public R<SpareStoreVO> getById(@PathVariable("id") String id) throws IOException {
|
|
|
- return new R<>(spareStoreService.getDetail(id));
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 新增记录
|
|
|
- *
|
|
|
- * @param spareStoreDTO 备件库存DTO
|
|
|
- * @return R
|
|
|
- */
|
|
|
- @SysLog("新增备件库存")
|
|
|
- @PostMapping
|
|
|
- @PreAuthorize("@pms.hasPermission('store-spare-stores-add')")
|
|
|
- public R save(@Validated({AddGroup.class}) @RequestBody SpareStoreDTO spareStoreDTO) {
|
|
|
- return new R<>(spareStoreService.saveModelByDTO(spareStoreDTO));
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 修改记录
|
|
|
- *
|
|
|
- * @param spareStoreDTO 备件库存DTO
|
|
|
- * @return R
|
|
|
- */
|
|
|
- @SysLog("修改备件库存")
|
|
|
- @PutMapping("/{id}")
|
|
|
- @PreAuthorize("@pms.hasPermission('store-spare-stores-edit')")
|
|
|
- public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody SpareStoreDTO spareStoreDTO) {
|
|
|
- spareStoreService.modModelByDTO(spareStoreDTO);
|
|
|
- return new R<>();
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 通过id删除一条记录
|
|
|
- *
|
|
|
- * @param id 主键
|
|
|
- * @return R
|
|
|
- */
|
|
|
- @SysLog("删除备件库存")
|
|
|
- @DeleteMapping("/{id}")
|
|
|
- @PreAuthorize("@pms.hasPermission('store-spare-stores-del')")
|
|
|
- public R removeById(@PathVariable String id){
|
|
|
- spareStoreService.deleteByPrimaryKey(id);
|
|
|
- return new R<>();
|
|
|
- }
|
|
|
+ private final StoreMapper storeMapper;
|
|
|
+
|
|
|
+ private final SpareStoreService spareStoreService;
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 通过id查询单条记录
|
|
|
+ *
|
|
|
+ * @param id 主键
|
|
|
+ * @return R
|
|
|
+ */
|
|
|
+ @GetMapping("/{id}")
|
|
|
+ public R<SpareStoreVO> getById(@PathVariable("id") String id) throws IOException {
|
|
|
+ return new R<>(spareStoreService.getDetail(id));
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 新增记录
|
|
|
+ *
|
|
|
+ * @param spareStoreDTO 备件库存DTO
|
|
|
+ * @return R
|
|
|
+ */
|
|
|
+ @SysLog("新增备件库存")
|
|
|
+ @PostMapping
|
|
|
+ @PreAuthorize("@pms.hasPermission('store-spare-stores-add')")
|
|
|
+ public R save(@Validated({AddGroup.class}) @RequestBody SpareStoreDTO spareStoreDTO) {
|
|
|
+ return new R<>(spareStoreService.saveModelByDTO(spareStoreDTO));
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 修改记录
|
|
|
+ *
|
|
|
+ * @param spareStoreDTO 备件库存DTO
|
|
|
+ * @return R
|
|
|
+ */
|
|
|
+ @SysLog("修改备件库存")
|
|
|
+ @PutMapping("/{id}")
|
|
|
+ @PreAuthorize("@pms.hasPermission('store-spare-stores-edit')")
|
|
|
+ public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody SpareStoreDTO spareStoreDTO) {
|
|
|
+ spareStoreService.modModelByDTO(spareStoreDTO);
|
|
|
+ return new R<>();
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 通过id删除一条记录
|
|
|
+ *
|
|
|
+ * @param id 主键
|
|
|
+ * @return R
|
|
|
+ */
|
|
|
+ @SysLog("删除备件库存")
|
|
|
+ @DeleteMapping("/{id}")
|
|
|
+ @PreAuthorize("@pms.hasPermission('store-spare-stores-del')")
|
|
|
+ public R removeById(@PathVariable String id) {
|
|
|
+ spareStoreService.deleteByPrimaryKey(id);
|
|
|
+ return new R<>();
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
|
* 批量记录
|
|
@@ -107,44 +107,43 @@ public class SpareStoreController {
|
|
|
@SysLog("批量删除备件库存")
|
|
|
@DeleteMapping("")
|
|
|
@PreAuthorize("@pms.hasPermission('store-spare-stores-del')")
|
|
|
- public R removeIds(@RequestBody List<String> ids){
|
|
|
+ public R removeIds(@RequestBody List<String> ids) {
|
|
|
spareStoreService.batchDelete(ids);
|
|
|
return new R<>();
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 获取分页
|
|
|
- *
|
|
|
- * @param pageNum 当前页码
|
|
|
- * @param pageSize 每页条数
|
|
|
- * @param spareStoreDTO 备件库存DTO
|
|
|
- * @return R
|
|
|
- */
|
|
|
- @GetMapping("/page")
|
|
|
- public R<AbstractPageResultBean<SpareStoreVO>> query(SpareStoreDTO spareStoreDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
|
|
|
- // 备件库存
|
|
|
- /**Map<String,List> formMap = SpareStoreTest.getList();
|
|
|
- List<SpareStore> inList = formMap.get("in");
|
|
|
- List<SparePartInfo> partList = SpareInfo.getList();
|
|
|
- for(SpareStore form:inList){
|
|
|
- for(SparePartInfo part:partList){
|
|
|
- if(form.getSpareId().equals(part.getNo())){
|
|
|
- form.setSpareId(part.getId());
|
|
|
- spareStoreService.saveModel(form);
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
- }*/
|
|
|
- return new R<>(spareStoreService.selectPageList(spareStoreDTO, pageNum, pageSize));
|
|
|
- }
|
|
|
-
|
|
|
+ /**
|
|
|
+ * 获取分页
|
|
|
+ *
|
|
|
+ * @param pageNum 当前页码
|
|
|
+ * @param pageSize 每页条数
|
|
|
+ * @param spareStoreDTO 备件库存DTO
|
|
|
+ * @return R
|
|
|
+ */
|
|
|
+ @GetMapping("/page")
|
|
|
+ public R<AbstractPageResultBean<SpareStoreVO>> query(SpareStoreDTO spareStoreDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
|
|
|
+ // 备件库存
|
|
|
+ /**Map<String,List> formMap = SpareStoreTest.getList();
|
|
|
+ List<SpareStore> inList = formMap.get("in");
|
|
|
+ List<SparePartInfo> partList = SpareInfo.getList();
|
|
|
+ for(SpareStore form:inList){
|
|
|
+ for(SparePartInfo part:partList){
|
|
|
+ if(form.getSpareId().equals(part.getNo())){
|
|
|
+ form.setSpareId(part.getId());
|
|
|
+ spareStoreService.saveModel(form);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }*/
|
|
|
+ return new R<>(spareStoreService.selectPageList(spareStoreDTO, pageNum, pageSize));
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
|
* 获取项目部仓库汇总分页
|
|
|
* 统计某个分公司下某个项目部的总仓库库存,这个就是各个仓库累加的结果
|
|
|
*
|
|
|
- * @param pageNum 当前页码
|
|
|
- * @param pageSize 每页条数
|
|
|
+ * @param pageNum 当前页码
|
|
|
+ * @param pageSize 每页条数
|
|
|
* @param spareStoreDTO 备件库存DTO
|
|
|
* @return R
|
|
|
*/
|
|
@@ -153,46 +152,46 @@ public class SpareStoreController {
|
|
|
return new R<>(spareStoreService.selectTotalStockPageInfo(spareStoreDTO, pageNum, pageSize));
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 获取列表
|
|
|
- *
|
|
|
- * @param spareStoreDTO 备件库存DTO
|
|
|
- * @return R
|
|
|
- */
|
|
|
- @GetMapping("")
|
|
|
- public R query(SpareStoreDTO spareStoreDTO) {
|
|
|
- return new R<>(spareStoreService.getListByDTO(spareStoreDTO));
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
+ /**
|
|
|
+ * 获取列表
|
|
|
+ *
|
|
|
+ * @param spareStoreDTO 备件库存DTO
|
|
|
+ * @return R
|
|
|
+ */
|
|
|
+ @GetMapping("")
|
|
|
+ public R query(SpareStoreDTO spareStoreDTO) {
|
|
|
+ return new R<>(spareStoreService.getListByDTO(spareStoreDTO));
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
* 备件库存导出
|
|
|
* 导出某个仓库下面的仓库数量,单价、总价
|
|
|
- * 需要先选定仓库
|
|
|
+ * 需要先选定仓库
|
|
|
+ *
|
|
|
* @param spareStoreDTO 备件库存DTO
|
|
|
* @return R
|
|
|
*/
|
|
|
- @GetMapping("/export")
|
|
|
- @SysLog("仓库备件库存导出")
|
|
|
- public void export(HttpServletResponse response, SpareStoreDTO spareStoreDTO) {
|
|
|
- List<SpareStoreVO> list = spareStoreService.getListByDTO(spareStoreDTO);
|
|
|
- String storeName = "仓库";
|
|
|
- if(!CollectionUtils.isEmpty(list)){
|
|
|
- storeName = list.get(0).getStoreName();
|
|
|
+ @GetMapping("/export")
|
|
|
+ @SysLog("仓库备件库存导出")
|
|
|
+ public void export(HttpServletResponse response, SpareStoreDTO spareStoreDTO) {
|
|
|
+ List<SpareStoreVO> list = spareStoreService.getListByDTO(spareStoreDTO);
|
|
|
+ String storeName = "仓库";
|
|
|
+ if (!CollectionUtils.isEmpty(list)) {
|
|
|
+ storeName = list.get(0).getStoreName();
|
|
|
+ }
|
|
|
+ ExcelUtil.exportResponseDict(response, ExportSpareStoreVO.class, BeanConverterUtil.copyListProperties(list, ExportSpareStoreVO.class), storeName + "-备件库存导出");
|
|
|
}
|
|
|
- ExcelUtil.exportResponseDict(response, ExportSpareStoreVO.class, BeanConverterUtil.copyListProperties(list, ExportSpareStoreVO.class), storeName +"-备件库存导出");
|
|
|
- }
|
|
|
-
|
|
|
|
|
|
|
|
|
- @GetMapping("/spareInfo")
|
|
|
- public R getSpareInfoVO(String id) {
|
|
|
- SpareStoreInfoVO spareStoreInfoVO=spareStoreService.getAllSpareStoreInfoVO(id);
|
|
|
- spareStoreInfoVO.setStoreId(id);
|
|
|
- Store store=new Store();
|
|
|
- store.setId(id);
|
|
|
- Store store1=storeMapper.selectByPrimaryKey(store);
|
|
|
- spareStoreInfoVO.setStoreName(store1.getName());
|
|
|
- return new R(spareStoreInfoVO);
|
|
|
- }
|
|
|
+ @GetMapping("/spareInfo")
|
|
|
+ public R getSpareInfoVO(String id) {
|
|
|
+ SpareStoreInfoVO spareStoreInfoVO = spareStoreService.getAllSpareStoreInfoVO(id);
|
|
|
+ spareStoreInfoVO.setStoreId(id);
|
|
|
+ Store store = new Store();
|
|
|
+ store.setId(id);
|
|
|
+ Store store1 = storeMapper.selectByPrimaryKey(store);
|
|
|
+ spareStoreInfoVO.setStoreName(store1.getName());
|
|
|
+ return new R(spareStoreInfoVO);
|
|
|
+ }
|
|
|
|
|
|
}
|