From 9e5e58482221833de13ad0553123a94aaee66379 Mon Sep 17 00:00:00 2001 From: siontion Date: Fri, 2 Feb 2024 15:20:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=89=A9=E6=96=99ID=EF=BC=8C?= =?UTF-8?q?=E5=BA=93=E4=BD=8DID=E8=8E=B7=E5=8F=96=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 根据物料ID，库位ID获取最新库存数量 --- .../storagecheck/StorageCheckController.java | 36 +++- .../StorageCheckMatController.java | 197 +++++++++--------- .../storagelog/StorageLogController.java | 13 ++ .../dal/mysql/material/MaterialMapper.java | 2 +- .../StorageCheckMatMapper.java | 6 + .../mysql/storagelog/StorageLogNowMapper.java | 7 + .../storagecheck/StorageCheckService.java | 112 +++++----- .../StorageCheckMatService.java | 114 +++++----- .../StorageCheckMatServiceImpl.java | 162 +++++++------- .../service/storagelog/StorageLogService.java | 2 + .../storagelog/StorageLogServiceImpl.java | 5 + .../service/storagemat/StorageMatService.java | 2 +- .../storagemat/StorageMatServiceImpl.java | 2 +- .../mapper/storagelog/StorageLogNowMapper.xml | 4 + .../src/api/heli/storagecheck/index.ts | 5 + .../src/api/heli/storagecheckmat/index.ts | 95 +++++---- .../src/api/heli/storagelog/index.ts | 5 + .../views/heli/storagecheck/checkdetail.vue | 63 +++++- 18 files changed, 489 insertions(+), 343 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/StorageCheckController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/StorageCheckController.java index df09b770..0acc2905 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/StorageCheckController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/StorageCheckController.java @@ -1,7 +1,10 @@ package com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck; import com.chanko.yunxi.mes.module.heli.controller.admin.storage.vo.StorageSaveReqVO; +import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheckmat.vo.StorageCheckMatSaveReqVO; +import com.chanko.yunxi.mes.module.heli.controller.admin.storagemat.vo.StorageMatSaveReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.storage.StorageDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheckmat.StorageCheckMatDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelog.StorageLogDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagemat.StorageMatDO; import com.chanko.yunxi.mes.module.heli.service.storagecheckmat.StorageCheckMatService; @@ -54,10 +57,29 @@ public class StorageCheckController { return success(storageCheckService.createStorageCheck(createReqVO)); } + @PostMapping("/create-batch") + @Operation(summary = "批量创建盘点物料") + @PreAuthorize("@ss.hasPermission('heli:storage-mat:create')") + public CommonResult createStorageCheckMat(@Valid @RequestBody List createReqVO, @RequestParam("checkId") Long checkId) { + + storageCheckMatService.deleteCheckMatList(checkId); + for (StorageCheckMatSaveReqVO item : createReqVO) { + item.setId(null); + storageCheckMatService.createStorageCheckMat(item); + } + return success(1L); + } + @PutMapping("/update") @Operation(summary = "更新入/出库盘点") @PreAuthorize("@ss.hasPermission('heli:storage-check:update')") public CommonResult updateStorageCheck(@Valid @RequestBody StorageCheckSaveReqVO updateReqVO) { + // 保存/删除按钮操作 + if(updateReqVO.getStatus().equals(3)){ + LocalDateTime currTime = LocalDateTime.now(); + // 已删除时间更新 + updateReqVO.setOutboundTime(currTime); + } storageCheckService.updateStorageCheck(updateReqVO); return success(true); } @@ -67,18 +89,16 @@ public class StorageCheckController { @PreAuthorize("@ss.hasPermission('heli:storage:update')") public CommonResult updateStorageCheckStatus(@Valid @RequestBody StorageCheckSaveReqVO updateReqVO) { - // 提交或者删除时记录相关操作人 + // 提交按钮时记录相关操作人 LocalDateTime currTime = LocalDateTime.now(); - if(updateReqVO.getStatus().equals(2)){ - // 已提交时间更新 - updateReqVO.setKeeperTime(currTime); - } else if(updateReqVO.getStatus().equals(3)){ - // 已删除时间更新 - updateReqVO.setCancelTime(currTime); - } + // 已提交时间更新 + updateReqVO.setKeeperTime(currTime); // 盘点信息保存 storageCheckService.updateStorageCheck(updateReqVO); + // 获取当前盘点下所有物料信息 + List matList = storageCheckMatService.getStorageMatListByCheckId(updateReqVO.getId()); + // TODO保存物料列表信息 // TODO生成入库/出库单据 diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheckmat/StorageCheckMatController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheckmat/StorageCheckMatController.java index c0667b82..c91b952f 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheckmat/StorageCheckMatController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheckmat/StorageCheckMatController.java @@ -1,95 +1,102 @@ -package com.chanko.yunxi.mes.module.heli.controller.admin.storagecheckmat; - -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.chanko.yunxi.mes.framework.common.pojo.PageParam; -import com.chanko.yunxi.mes.framework.common.pojo.PageResult; -import com.chanko.yunxi.mes.framework.common.pojo.CommonResult; -import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; -import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success; - -import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils; - -import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog; -import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheckmat.vo.*; -import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheckmat.StorageCheckMatDO; -import com.chanko.yunxi.mes.module.heli.service.storagecheckmat.StorageCheckMatService; - -@Tag(name = "管理后台 - 盘点物料") -@RestController -@RequestMapping("/heli/storage-check-mat") -@Validated -public class StorageCheckMatController { - - @Resource - private StorageCheckMatService storageCheckMatService; - - @PostMapping("/create") - @Operation(summary = "创建盘点物料") - @PreAuthorize("@ss.hasPermission('heli:storage-check-mat:create')") - public CommonResult createStorageCheckMat(@Valid @RequestBody StorageCheckMatSaveReqVO createReqVO) { - return success(storageCheckMatService.createStorageCheckMat(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新盘点物料") - @PreAuthorize("@ss.hasPermission('heli:storage-check-mat:update')") - public CommonResult updateStorageCheckMat(@Valid @RequestBody StorageCheckMatSaveReqVO updateReqVO) { - storageCheckMatService.updateStorageCheckMat(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除盘点物料") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('heli:storage-check-mat:delete')") - public CommonResult deleteStorageCheckMat(@RequestParam("id") Long id) { - storageCheckMatService.deleteStorageCheckMat(id); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得盘点物料") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('heli:storage-check-mat:query')") - public CommonResult getStorageCheckMat(@RequestParam("id") Long id) { - StorageCheckMatDO storageCheckMat = storageCheckMatService.getStorageCheckMat(id); - return success(BeanUtils.toBean(storageCheckMat, StorageCheckMatRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得盘点物料分页") - @PreAuthorize("@ss.hasPermission('heli:storage-check-mat:query')") - public CommonResult> getStorageCheckMatPage(@Valid StorageCheckMatPageReqVO pageReqVO) { - PageResult pageResult = storageCheckMatService.getStorageCheckMatPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, StorageCheckMatRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出盘点物料 Excel") - @PreAuthorize("@ss.hasPermission('heli:storage-check-mat:export')") - @OperateLog(type = EXPORT) - public void exportStorageCheckMatExcel(@Valid StorageCheckMatPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = storageCheckMatService.getStorageCheckMatPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "盘点物料.xls", "数据", StorageCheckMatRespVO.class, - BeanUtils.toBean(list, StorageCheckMatRespVO.class)); - } - -} \ No newline at end of file +package com.chanko.yunxi.mes.module.heli.controller.admin.storagecheckmat; + +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import javax.validation.constraints.*; +import javax.validation.*; +import javax.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import com.chanko.yunxi.mes.framework.common.pojo.PageParam; +import com.chanko.yunxi.mes.framework.common.pojo.PageResult; +import com.chanko.yunxi.mes.framework.common.pojo.CommonResult; +import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; +import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success; + +import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils; + +import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog; +import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*; + +import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheckmat.vo.*; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheckmat.StorageCheckMatDO; +import com.chanko.yunxi.mes.module.heli.service.storagecheckmat.StorageCheckMatService; + +@Tag(name = "管理后台 - 盘点物料") +@RestController +@RequestMapping("/heli/storage-check-mat") +@Validated +public class StorageCheckMatController { + + @Resource + private StorageCheckMatService storageCheckMatService; + + @PostMapping("/create") + @Operation(summary = "创建盘点物料") + @PreAuthorize("@ss.hasPermission('heli:storage-check-mat:create')") + public CommonResult createStorageCheckMat(@Valid @RequestBody StorageCheckMatSaveReqVO createReqVO) { + return success(storageCheckMatService.createStorageCheckMat(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新盘点物料") + @PreAuthorize("@ss.hasPermission('heli:storage-check-mat:update')") + public CommonResult updateStorageCheckMat(@Valid @RequestBody StorageCheckMatSaveReqVO updateReqVO) { + storageCheckMatService.updateStorageCheckMat(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除盘点物料") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('heli:storage-check-mat:delete')") + public CommonResult deleteStorageCheckMat(@RequestParam("id") Long id) { + storageCheckMatService.deleteStorageCheckMat(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得盘点物料") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('heli:storage-check-mat:query')") + public CommonResult getStorageCheckMat(@RequestParam("id") Long id) { + StorageCheckMatDO storageCheckMat = storageCheckMatService.getStorageCheckMat(id); + return success(BeanUtils.toBean(storageCheckMat, StorageCheckMatRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得盘点物料分页") + @PreAuthorize("@ss.hasPermission('heli:storage-check-mat:query')") + public CommonResult> getStorageCheckMatPage(@Valid StorageCheckMatPageReqVO pageReqVO) { + PageResult pageResult = storageCheckMatService.getStorageCheckMatPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, StorageCheckMatRespVO.class)); + } + @GetMapping("/list") + @Operation(summary = "获得盘点物料分页") + @PreAuthorize("@ss.hasPermission('heli:storage-check-mat:query')") + public CommonResult> getStorageCheckMatListByCheckID(@RequestParam("checkId") Long checkId) { + List pageResult = storageCheckMatService.getStorageMatListByCheckId(checkId); + return success(BeanUtils.toBean(pageResult, StorageCheckMatRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出盘点物料 Excel") + @PreAuthorize("@ss.hasPermission('heli:storage-check-mat:export')") + @OperateLog(type = EXPORT) + public void exportStorageCheckMatExcel(@Valid StorageCheckMatPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = storageCheckMatService.getStorageCheckMatPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "盘点物料.xls", "数据", StorageCheckMatRespVO.class, + BeanUtils.toBean(list, StorageCheckMatRespVO.class)); + } + +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/StorageLogController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/StorageLogController.java index ca73963d..8ebe9aa4 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/StorageLogController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagelog/StorageLogController.java @@ -13,6 +13,7 @@ import io.swagger.v3.oas.annotations.Operation; import javax.validation.constraints.*; import javax.validation.*; import javax.servlet.http.*; +import java.math.BigDecimal; import java.util.*; import java.io.IOException; @@ -89,6 +90,18 @@ public class StorageLogController { return success(pageResult); } + @GetMapping("/matRest") + @Operation(summary = "获得最新库存数量") + @PreAuthorize("@ss.hasPermission('heli:storage-log:query')") + public CommonResult getStorageNowPage(@RequestParam("matId") Long matId, @RequestParam("pnId") Long pnId) { + List pageResult = storageLogService.selectNowByMatPnId(matId,pnId); + BigDecimal matRest = BigDecimal.valueOf(0); + for(StorageLogNowDO item : pageResult){ + matRest = item.getStorageOkQty(); + } + return success(matRest); + } + @GetMapping("/all") @Operation(summary = "获得全部库存数据") @PreAuthorize("@ss.hasPermission('heli:storage-log:query')") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java index d03ac8e7..22df73e2 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java @@ -40,7 +40,7 @@ public interface MaterialMapper extends BaseMapperX { default List> selectSimpleList() { - return selectMaps(new QueryWrapper().select("id", "name","code","material_type","spec","unit").lambda()); + return selectMaps(new QueryWrapper().select("id", "name","short_name","code","material_type","spec","unit","brand").lambda()); } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagecheckmat/StorageCheckMatMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagecheckmat/StorageCheckMatMapper.java index 42d4d551..e14e19a2 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagecheckmat/StorageCheckMatMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagecheckmat/StorageCheckMatMapper.java @@ -35,4 +35,10 @@ public interface StorageCheckMatMapper extends BaseMapperX { .orderByDesc(StorageCheckMatDO::getId)); } + default List selectListByCheckID(Long checkId) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(StorageCheckMatDO::getCheckId, checkId) + .orderByDesc(StorageCheckMatDO::getId)); + } + } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogNowMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogNowMapper.java index 2a838766..ad28faed 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogNowMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogNowMapper.java @@ -8,7 +8,10 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.storagelog.vo.StorageNo import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogNow.StorageLogNowDO; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.poi.hpsf.Decimal; +import java.math.BigDecimal; import java.util.List; /** @@ -35,9 +38,13 @@ public interface StorageLogNowMapper extends BaseMapperX { return selectPage(reqVO,query); } + PageResult selectAllPage(StorageLogPageReqVO reqVO); List selectNoZero(StorageNowAllReqVO reqVO); List selectNowList(StorageNowAllReqVO reqVO); + + + List selectNowByMatPnId(@Param("matId")Long matId,@Param("pnId")Long pnId); } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckService.java index 5c7412f8..7d48e76f 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckService.java @@ -1,55 +1,57 @@ -package com.chanko.yunxi.mes.module.heli.service.storagecheck; - -import java.util.*; -import javax.validation.*; -import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck.vo.*; -import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheck.StorageCheckDO; -import com.chanko.yunxi.mes.framework.common.pojo.PageResult; -import com.chanko.yunxi.mes.framework.common.pojo.PageParam; - -/** - * 入/出库盘点 Service 接口 - * - * @author 管理员 - */ -public interface StorageCheckService { - - /** - * 创建入/出库盘点 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createStorageCheck(@Valid StorageCheckSaveReqVO createReqVO); - - /** - * 更新入/出库盘点 - * - * @param updateReqVO 更新信息 - */ - void updateStorageCheck(@Valid StorageCheckSaveReqVO updateReqVO); - - /** - * 删除入/出库盘点 - * - * @param id 编号 - */ - void deleteStorageCheck(Long id); - - /** - * 获得入/出库盘点 - * - * @param id 编号 - * @return 入/出库盘点 - */ - StorageCheckDO getStorageCheck(Long id); - - /** - * 获得入/出库盘点分页 - * - * @param pageReqVO 分页查询 - * @return 入/出库盘点分页 - */ - PageResult getStorageCheckPage(StorageCheckPageReqVO pageReqVO); - -} \ No newline at end of file +package com.chanko.yunxi.mes.module.heli.service.storagecheck; + +import java.util.*; +import javax.validation.*; +import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck.vo.*; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheck.StorageCheckDO; +import com.chanko.yunxi.mes.framework.common.pojo.PageResult; +import com.chanko.yunxi.mes.framework.common.pojo.PageParam; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheckmat.StorageCheckMatDO; + +/** + * 入/出库盘点 Service 接口 + * + * @author 管理员 + */ +public interface StorageCheckService { + + /** + * 创建入/出库盘点 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createStorageCheck(@Valid StorageCheckSaveReqVO createReqVO); + + /** + * 更新入/出库盘点 + * + * @param updateReqVO 更新信息 + */ + void updateStorageCheck(@Valid StorageCheckSaveReqVO updateReqVO); + + /** + * 删除入/出库盘点 + * + * @param id 编号 + */ + void deleteStorageCheck(Long id); + + /** + * 获得入/出库盘点 + * + * @param id 编号 + * @return 入/出库盘点 + */ + StorageCheckDO getStorageCheck(Long id); + + /** + * 获得入/出库盘点分页 + * + * @param pageReqVO 分页查询 + * @return 入/出库盘点分页 + */ + PageResult getStorageCheckPage(StorageCheckPageReqVO pageReqVO); + + +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheckmat/StorageCheckMatService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheckmat/StorageCheckMatService.java index 00227048..07adc6f1 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheckmat/StorageCheckMatService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheckmat/StorageCheckMatService.java @@ -1,55 +1,59 @@ -package com.chanko.yunxi.mes.module.heli.service.storagecheckmat; - -import java.util.*; -import javax.validation.*; -import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheckmat.vo.*; -import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheckmat.StorageCheckMatDO; -import com.chanko.yunxi.mes.framework.common.pojo.PageResult; -import com.chanko.yunxi.mes.framework.common.pojo.PageParam; - -/** - * 盘点物料 Service 接口 - * - * @author 管理员 - */ -public interface StorageCheckMatService { - - /** - * 创建盘点物料 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createStorageCheckMat(@Valid StorageCheckMatSaveReqVO createReqVO); - - /** - * 更新盘点物料 - * - * @param updateReqVO 更新信息 - */ - void updateStorageCheckMat(@Valid StorageCheckMatSaveReqVO updateReqVO); - - /** - * 删除盘点物料 - * - * @param id 编号 - */ - void deleteStorageCheckMat(Long id); - - /** - * 获得盘点物料 - * - * @param id 编号 - * @return 盘点物料 - */ - StorageCheckMatDO getStorageCheckMat(Long id); - - /** - * 获得盘点物料分页 - * - * @param pageReqVO 分页查询 - * @return 盘点物料分页 - */ - PageResult getStorageCheckMatPage(StorageCheckMatPageReqVO pageReqVO); - -} \ No newline at end of file +package com.chanko.yunxi.mes.module.heli.service.storagecheckmat; + +import java.util.*; +import javax.validation.*; +import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheckmat.vo.*; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheckmat.StorageCheckMatDO; +import com.chanko.yunxi.mes.framework.common.pojo.PageResult; +import com.chanko.yunxi.mes.framework.common.pojo.PageParam; + +/** + * 盘点物料 Service 接口 + * + * @author 管理员 + */ +public interface StorageCheckMatService { + + /** + * 创建盘点物料 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createStorageCheckMat(@Valid StorageCheckMatSaveReqVO createReqVO); + + /** + * 更新盘点物料 + * + * @param updateReqVO 更新信息 + */ + void updateStorageCheckMat(@Valid StorageCheckMatSaveReqVO updateReqVO); + + /** + * 删除盘点物料 + * + * @param id 编号 + */ + void deleteStorageCheckMat(Long id); + + /** + * 获得盘点物料 + * + * @param id 编号 + * @return 盘点物料 + */ + StorageCheckMatDO getStorageCheckMat(Long id); + + /** + * 获得盘点物料分页 + * + * @param pageReqVO 分页查询 + * @return 盘点物料分页 + */ + PageResult getStorageCheckMatPage(StorageCheckMatPageReqVO pageReqVO); + + List getStorageMatListByCheckId(Long id); + + Integer deleteCheckMatList(Long checkId); + +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheckmat/StorageCheckMatServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheckmat/StorageCheckMatServiceImpl.java index 6ab814b3..b5a33518 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheckmat/StorageCheckMatServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheckmat/StorageCheckMatServiceImpl.java @@ -1,74 +1,88 @@ -package com.chanko.yunxi.mes.module.heli.service.storagecheckmat; - -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheckmat.vo.*; -import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheckmat.StorageCheckMatDO; -import com.chanko.yunxi.mes.framework.common.pojo.PageResult; -import com.chanko.yunxi.mes.framework.common.pojo.PageParam; -import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; - -import com.chanko.yunxi.mes.module.heli.dal.mysql.storagecheckmat.StorageCheckMatMapper; - -import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*; - -/** - * 盘点物料 Service 实现类 - * - * @author 管理员 - */ -@Service -@Validated -public class StorageCheckMatServiceImpl implements StorageCheckMatService { - - @Resource - private StorageCheckMatMapper storageCheckMatMapper; - - @Override - public Long createStorageCheckMat(StorageCheckMatSaveReqVO createReqVO) { - // 插入 - StorageCheckMatDO storageCheckMat = BeanUtils.toBean(createReqVO, StorageCheckMatDO.class); - storageCheckMatMapper.insert(storageCheckMat); - // 返回 - return storageCheckMat.getId(); - } - - @Override - public void updateStorageCheckMat(StorageCheckMatSaveReqVO updateReqVO) { - // 校验存在 - validateStorageCheckMatExists(updateReqVO.getId()); - // 更新 - StorageCheckMatDO updateObj = BeanUtils.toBean(updateReqVO, StorageCheckMatDO.class); - storageCheckMatMapper.updateById(updateObj); - } - - @Override - public void deleteStorageCheckMat(Long id) { - // 校验存在 - validateStorageCheckMatExists(id); - // 删除 - storageCheckMatMapper.deleteById(id); - } - - private void validateStorageCheckMatExists(Long id) { - if (storageCheckMatMapper.selectById(id) == null) { - throw exception(STORAGE_CHECK_MAT_NOT_EXISTS); - } - } - - @Override - public StorageCheckMatDO getStorageCheckMat(Long id) { - return storageCheckMatMapper.selectById(id); - } - - @Override - public PageResult getStorageCheckMatPage(StorageCheckMatPageReqVO pageReqVO) { - return storageCheckMatMapper.selectPage(pageReqVO); - } - -} \ No newline at end of file +package com.chanko.yunxi.mes.module.heli.service.storagecheckmat; + +import com.google.common.collect.Maps; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheckmat.vo.*; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheckmat.StorageCheckMatDO; +import com.chanko.yunxi.mes.framework.common.pojo.PageResult; +import com.chanko.yunxi.mes.framework.common.pojo.PageParam; +import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; + +import com.chanko.yunxi.mes.module.heli.dal.mysql.storagecheckmat.StorageCheckMatMapper; + +import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*; + +/** + * 盘点物料 Service 实现类 + * + * @author 管理员 + */ +@Service +@Validated +public class StorageCheckMatServiceImpl implements StorageCheckMatService { + + @Resource + private StorageCheckMatMapper storageCheckMatMapper; + + @Override + public Long createStorageCheckMat(StorageCheckMatSaveReqVO createReqVO) { + // 插入 + StorageCheckMatDO storageCheckMat = BeanUtils.toBean(createReqVO, StorageCheckMatDO.class); + storageCheckMatMapper.insert(storageCheckMat); + // 返回 + return storageCheckMat.getId(); + } + + @Override + public void updateStorageCheckMat(StorageCheckMatSaveReqVO updateReqVO) { + // 校验存在 + validateStorageCheckMatExists(updateReqVO.getId()); + // 更新 + StorageCheckMatDO updateObj = BeanUtils.toBean(updateReqVO, StorageCheckMatDO.class); + storageCheckMatMapper.updateById(updateObj); + } + + @Override + public void deleteStorageCheckMat(Long id) { + // 校验存在 + validateStorageCheckMatExists(id); + // 删除 + storageCheckMatMapper.deleteById(id); + } + + private void validateStorageCheckMatExists(Long id) { + if (storageCheckMatMapper.selectById(id) == null) { + throw exception(STORAGE_CHECK_MAT_NOT_EXISTS); + } + } + + @Override + public StorageCheckMatDO getStorageCheckMat(Long id) { + return storageCheckMatMapper.selectById(id); + } + + @Override + public PageResult getStorageCheckMatPage(StorageCheckMatPageReqVO pageReqVO) { + return storageCheckMatMapper.selectPage(pageReqVO); + } + + @Override + public List getStorageMatListByCheckId(Long id){ + return storageCheckMatMapper.selectListByCheckID(id); + } + + @Override + public Integer deleteCheckMatList(Long checkId) { + //删除条件 + Map columnMap = Maps.newHashMap(); + columnMap.put("check_id", checkId); + + return storageCheckMatMapper.deleteByMap(columnMap); + } +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogService.java index 41768291..dd4adf47 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogService.java @@ -57,6 +57,8 @@ public interface StorageLogService { PageResult getStorageNowPage(StorageLogPageReqVO pageReqVO); + List selectNowByMatPnId(Long matId,Long pnId); + List getStorageNowList(StorageNowAllReqVO queryReqVO); void createStorageLogBatch(List storageLogDOs); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java index 292955de..585aaf6d 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java @@ -98,6 +98,11 @@ public class StorageLogServiceImpl implements StorageLogService { // } + @Override + public List selectNowByMatPnId(Long matId,Long pnId) { + return storageLogNowMapper.selectNowByMatPnId(matId,pnId); + } + @Override public void createStorageLogBatch(List storageLogDOs) { for (StorageLogDO storageLogDo : storageLogDOs){ diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatService.java index c2deb6ad..a640d95d 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatService.java @@ -59,7 +59,7 @@ public interface StorageMatService { */ List getStorageMatList(Long whId); - int deleteStorageMatList(Long stockId); + Integer deleteStorageMatList(Long stockId); List getStorageMatListByStockId(Long stockId); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatServiceImpl.java index 0838a9cd..7c43a01e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatServiceImpl.java @@ -83,7 +83,7 @@ public class StorageMatServiceImpl implements StorageMatService { } @Override - public int deleteStorageMatList(Long stockId) { + public Integer deleteStorageMatList(Long stockId) { //删除条件 Map columnMap = Maps.newHashMap(); columnMap.put("stock_id", stockId); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagelog/StorageLogNowMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagelog/StorageLogNowMapper.xml index 376921cf..8ec94d98 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagelog/StorageLogNowMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/storagelog/StorageLogNowMapper.xml @@ -67,4 +67,8 @@ + + \ No newline at end of file diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/storagecheck/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/storagecheck/index.ts index 1a596650..4f8e9c5e 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/storagecheck/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/storagecheck/index.ts @@ -17,6 +17,11 @@ export interface StorageCheckVO { cancelTime: Date } +// 查询入/出库实时分页 +export const getStorageNowMatRest = async (matid:number,pnid:number) => { + return await request.get({ url: `/heli/storage-log/matRest?matId=`+matid+'&pnId='+pnid }) +} + // 查询入/出库盘点分页 export const getStorageCheckPage = async (params) => { return await request.get({ url: `/heli/storage-check/page`, params }) diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/storagecheckmat/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/storagecheckmat/index.ts index c2efa32c..a4d60d73 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/storagecheckmat/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/storagecheckmat/index.ts @@ -1,43 +1,52 @@ -import request from '@/config/axios' - -export interface StorageCheckMatVO { - id: number - checkId: number - matId: number - whId: number - rgId: number - pnId: number - storageOkQty: number - matRest: number - lotNo: string -} - -// 查询盘点物料分页 -export const getStorageCheckMatPage = async (params) => { - return await request.get({ url: `/heli/storage-check-mat/page`, params }) -} - -// 查询盘点物料详情 -export const getStorageCheckMat = async (id: number) => { - return await request.get({ url: `/heli/storage-check-mat/get?id=` + id }) -} - -// 新增盘点物料 -export const createStorageCheckMat = async (data: StorageCheckMatVO) => { - return await request.post({ url: `/heli/storage-check-mat/create`, data }) -} - -// 修改盘点物料 -export const updateStorageCheckMat = async (data: StorageCheckMatVO) => { - return await request.put({ url: `/heli/storage-check-mat/update`, data }) -} - -// 删除盘点物料 -export const deleteStorageCheckMat = async (id: number) => { - return await request.delete({ url: `/heli/storage-check-mat/delete?id=` + id }) -} - -// 导出盘点物料 Excel -export const exportStorageCheckMat = async (params) => { - return await request.download({ url: `/heli/storage-check-mat/export-excel`, params }) -} \ No newline at end of file +import request from '@/config/axios' + +export interface StorageCheckMatVO { + id: number + checkId: number + matId: number + whId: number + rgId: number + pnId: number + storageOkQty: number + matRest: number + lotNo: string +} + +// 根据盘点ID查询物料列表 +export const getStorageCheckListByCheckID = async (id:number) => { + return await request.get({ url: `/heli/storage-check-mat/list?checkId=`+id }) +} +// 批量新增盘点物料 +export const createCheckMatBatch = async (data: StorageCheckMatVO[],id:number) => { + return await request.post({ url: `/heli/storage-check/create-batch?checkId=`+id, data }) +} + +// 查询盘点物料分页 +export const getStorageCheckMatPage = async (params) => { + return await request.get({ url: `/heli/storage-check-mat/page`, params }) +} + +// 查询盘点物料详情 +export const getStorageCheckMat = async (id: number) => { + return await request.get({ url: `/heli/storage-check-mat/get?id=` + id }) +} + +// 新增盘点物料 +export const createStorageCheckMat = async (data: StorageCheckMatVO) => { + return await request.post({ url: `/heli/storage-check-mat/create`, data }) +} + +// 修改盘点物料 +export const updateStorageCheckMat = async (data: StorageCheckMatVO) => { + return await request.put({ url: `/heli/storage-check-mat/update`, data }) +} + +// 删除盘点物料 +export const deleteStorageCheckMat = async (id: number) => { + return await request.delete({ url: `/heli/storage-check-mat/delete?id=` + id }) +} + +// 导出盘点物料 Excel +export const exportStorageCheckMat = async (params) => { + return await request.download({ url: `/heli/storage-check-mat/export-excel`, params }) +} diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/storagelog/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/storagelog/index.ts index 843c2af5..b8ea95b1 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/storagelog/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/storagelog/index.ts @@ -15,6 +15,11 @@ export interface StorageLogVO { matType:string } +// 查询入/出库实时分页 +export const getStorageNowMatRest = async (matid:number,pnid:number) => { + return await request.get({ url: `/heli/storage-log/matRest?matId=`+matid+'&pnId='+pnid }) +} + // 查询入/出库实时分页 export const getStorageNowList = async (params) => { return await request.get({ url: `/heli/storage-log/all`, params }) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue index c61727c8..0ad9778e 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue @@ -259,7 +259,7 @@ - +