diff --git a/.idea/WMSV1.iml b/.idea/WMSV1.iml deleted file mode 100644 index 88aff5d..0000000 --- a/.idea/WMSV1.iml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module type="JAVA_MODULE" version="4"> - <component name="FacetManager"> - <facet type="Spring" name="Spring"> - <configuration /> - </facet> - <facet type="web" name="Web"> - <configuration> - <webroots /> - <sourceRoots> - <root url="file://$MODULE_DIR$/src/main/java" /> - <root url="file://$MODULE_DIR$/src/main/resources" /> - </sourceRoots> - </configuration> - </facet> - </component> -</module> \ No newline at end of file diff --git a/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java b/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java index 3f48c3a..534edd0 100644 --- a/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java +++ b/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.huaheng.common.support.Convert; import com.huaheng.common.utils.StringUtils; import com.huaheng.common.utils.security.ShiroUtils; import com.huaheng.framework.aspectj.lang.annotation.Log; @@ -146,6 +147,50 @@ public class CycleCountDetailController extends BaseController { return cycleCountDetailService.addDetails(cycleCountHeadId,inventoryDetailIdIds); } + /** + * 删除盘点明细 + */ + //@RequiresPermissions("inventory:cyclecountDetail:remove") + @Log(title = "库存-盘点", operating = "删除盘点明细", action = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids){ + + if (StringUtils.isEmpty(ids)) + return AjaxResult.error("删除的明细id不能为空"); + Integer[] detailsIds = Convert.toIntArray(ids); + CycleCountDetail cyclecountDetail = cycleCountDetailService.getById(detailsIds[0]); + CycleCountHeader cyclecountHeader = cycleCountHeaderService.getById(cyclecountDetail.getCycleCountHeadId()); + if(cyclecountHeader==null){ + return AjaxResult.error("主单据不存在"); + } + if(cyclecountHeader.getStatusCyc() > 29){ + return AjaxResult.error("主单据状态不允许删除"); + } + for (Integer id : detailsIds) + { + //只允许删除新建状态下的盘点明细。 + CycleCountDetail cyclecountDetailFor = cycleCountDetailService.getById(id); + if(cyclecountDetailFor.getEnableStatus() > 1){ + return AjaxResult.error("盘点已开始执行,不允许删除该盘点明细!"); + } + cycleCountDetailService.removeById(id); + } + return AjaxResult.success("删除成功!"); + } + + + + + + + + + + + + + diff --git a/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html b/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html index 8f0bb41..441b051 100644 --- a/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html +++ b/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html @@ -136,6 +136,7 @@ sortOrder: "desc", showRefresh:false, search: false, + refresh:true, columns: [ { checkbox: true