diff --git a/src/main/java/com/huaheng/pc/inventory/adjustDetail/controller/adjustDetailController.java b/src/main/java/com/huaheng/pc/inventory/adjustDetail/controller/adjustDetailController.java
index b5c33b9..fab073e 100644
--- a/src/main/java/com/huaheng/pc/inventory/adjustDetail/controller/adjustDetailController.java
+++ b/src/main/java/com/huaheng/pc/inventory/adjustDetail/controller/adjustDetailController.java
@@ -38,8 +38,6 @@ public class adjustDetailController extends BaseController {
@Resource
- private AdjustHeaderService adjustHeaderService;
- @Resource
private AdjustHeaderMapper adjustHeaderMapper;
@Resource
private AdjustDetailService adjustDetailService;
@@ -49,7 +47,7 @@ public class adjustDetailController extends BaseController {
private String prefix = "inventory/adjustDetail";
- //@RequiresPermissions("inventory:cycleCount:view")
+ @RequiresPermissions("inventory:adjustDetail:view")
@GetMapping()
public String adjustHeader()
{
@@ -60,7 +58,7 @@ public class adjustDetailController extends BaseController {
/**
* 查询调整单主列表
*/
- //@RequiresPermissions("inventory:cycleCount:list")
+ @RequiresPermissions("inventory:adjustDetail:list")
@PostMapping("/list")
@Log(title = "库存-调整",operating = "查看调整明细单", action = BusinessType.GRANT)
@ResponseBody
@@ -121,7 +119,7 @@ public class adjustDetailController extends BaseController {
/**
* 保存新增调整明细
*/
- //@RequiresPermissions("inventory:cyclecountDetail:add")
+ @RequiresPermissions("inventory:adjustDetail:add")
@Log(title = "库存-盘点", operating = "新增盘点补货明细", action = BusinessType.INSERT)
@PostMapping("/addAdjust")
@ResponseBody
@@ -150,7 +148,7 @@ public class adjustDetailController extends BaseController {
* 调整数量，调整库存状态
* 调整插入库存
*/
- //@RequiresPermissions("inventory:cyclecountAdjustDetail:addAdjust")
+ @RequiresPermissions("inventory:adjustDetail:addAdjust")
@Log(title = "库存-调整单", operating = "调整单调整库存差异，调整数量", action = BusinessType.UPDATE)
@PostMapping("/adjustEdit")
@ResponseBody
@@ -177,6 +175,7 @@ public class adjustDetailController extends BaseController {
* @param ids
* @return
*/
+ @RequiresPermissions("inventory:adjustDetail:adjustAgree")
@Log(title = "库存-调整单", operating = "调整审批", action = BusinessType.OTHER)
@PostMapping("/adjustAgree")
@ResponseBody
@@ -199,7 +198,7 @@ public class adjustDetailController extends BaseController {
/**
* 删除调整单明细
*/
- //@RequiresPermissions("inventory:cyclecountDetail:remove")
+ @RequiresPermissions("inventory:adjustDetail:remove")
@Log(title = "库存-调整", operating = "删除调整单明细", action = BusinessType.DELETE)
@PostMapping( "/remove")
@ResponseBody
@@ -212,7 +211,6 @@ public class adjustDetailController extends BaseController {
return AjaxResult.error("单据状态不允许删除");
}
adjustDetailService.removeById(id);
-
return AjaxResult.success("删除成功！");
}
diff --git a/src/main/java/com/huaheng/pc/inventory/adjustDetail/service/AdjustDetailServiceImpl.java b/src/main/java/com/huaheng/pc/inventory/adjustDetail/service/AdjustDetailServiceImpl.java
index efefe05..de35612 100644
--- a/src/main/java/com/huaheng/pc/inventory/adjustDetail/service/AdjustDetailServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/inventory/adjustDetail/service/AdjustDetailServiceImpl.java
@@ -157,7 +157,7 @@ public class AdjustDetailServiceImpl extends ServiceImpl<AdjustDetailMapper, Adj
AjaxResult.error("该单据已调整，不允许再次调整！" );
}
//查询调整的库存明细
- InventoryDetail inventoryDetail = new InventoryDetail();
+ InventoryDetail inventoryDetail ;
//调整单中不带库存明细时不查询
if(adjustDetail.getInventoryDetailId() != null) {
inventoryDetail = inventoryDetailService.getById(adjustDetail.getInventoryDetailId());
diff --git a/src/main/java/com/huaheng/pc/inventory/adjustHeader/controller/adjustHeaderController.java b/src/main/java/com/huaheng/pc/inventory/adjustHeader/controller/adjustHeaderController.java
index e22e29b..b8fe927 100644
--- a/src/main/java/com/huaheng/pc/inventory/adjustHeader/controller/adjustHeaderController.java
+++ b/src/main/java/com/huaheng/pc/inventory/adjustHeader/controller/adjustHeaderController.java
@@ -44,7 +44,7 @@ public class adjustHeaderController extends BaseController {
private String prefix = "inventory/adjustHeader";
- //@RequiresPermissions("inventory:cycleCount:view")
+ @RequiresPermissions("inventory:adjustHeader:view")
@GetMapping()
public String adjustHeader()
{
@@ -55,7 +55,7 @@ public class adjustHeaderController extends BaseController {
/**
* 查询调整单主列表
*/
- //@RequiresPermissions("inventory:cycleCount:list")
+ @RequiresPermissions("inventory:adjustHeader:list")
@PostMapping("/list")
@Log(title = "库存-调整",operating = "查看调整主单", action = BusinessType.GRANT)
@ResponseBody
@@ -101,7 +101,7 @@ public class adjustHeaderController extends BaseController {
/**
* 新增保存调整单主
*/
- //@RequiresPermissions("inventory:cycleCount:add")
+ @RequiresPermissions("inventory:adjustHeader:add")
@Log(title = "库存-调整",operating = "新增调整主单", action = BusinessType.INSERT)
@PostMapping("/addsave")
@ResponseBody
@@ -114,7 +114,7 @@ public class adjustHeaderController extends BaseController {
/**
* 删除调整单主
*/
- //@RequiresPermissions("inventory:cycleCount:remove")
+ @RequiresPermissions("inventory:adjustHeader:remove")
@Log(title = "库存-调整",operating = "删除调整主单", action = BusinessType.DELETE)
@PostMapping( "/remove")
@ResponseBody
@@ -124,7 +124,7 @@ public class adjustHeaderController extends BaseController {
return AjaxResult.error("id不能为空");
for (Integer id : Convert.toIntArray(ids))
{
- AjaxResult result = adjustHeaderService.delete(id);
+ AjaxResult result = adjustHeaderService.deleteHeader(id);
if(result.code!=200){
return result;
}
@@ -136,7 +136,7 @@ public class adjustHeaderController extends BaseController {
* 调整单打印
* @return
*/
- //@RequiresPermissions("inventory:cyclecountAdjust:report")
+ @RequiresPermissions("inventory:adjustHeader:report")
@GetMapping("/report/{id}")
public String report(@PathVariable("id") Integer id, ModelMap mmap)
{
diff --git a/src/main/java/com/huaheng/pc/inventory/adjustHeader/service/AdjustHeaderService.java b/src/main/java/com/huaheng/pc/inventory/adjustHeader/service/AdjustHeaderService.java
index 4c4635c..3b2e13e 100644
--- a/src/main/java/com/huaheng/pc/inventory/adjustHeader/service/AdjustHeaderService.java
+++ b/src/main/java/com/huaheng/pc/inventory/adjustHeader/service/AdjustHeaderService.java
@@ -11,7 +11,7 @@ public interface AdjustHeaderService extends IService<AdjustHeader> {
String createCode();
- AjaxResult delete(Integer id);
+ AjaxResult deleteHeader(Integer id);
AjaxResult addSave(AdjustHeader adjustHeader);
diff --git a/src/main/java/com/huaheng/pc/inventory/adjustHeader/service/AdjustHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/inventory/adjustHeader/service/AdjustHeaderServiceImpl.java
index 9e1a1b6..2ecae01 100644
--- a/src/main/java/com/huaheng/pc/inventory/adjustHeader/service/AdjustHeaderServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/inventory/adjustHeader/service/AdjustHeaderServiceImpl.java
@@ -1,9 +1,13 @@
package com.huaheng.pc.inventory.adjustHeader.service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.huaheng.common.utils.StringUtils;
import com.huaheng.common.utils.security.ShiroUtils;
import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.config.warehouse.domain.Warehouse;
import com.huaheng.pc.inventory.adjustDetail.domain.AdjustDetail;
+import com.huaheng.pc.inventory.adjustDetail.service.AdjustDetailService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.huaheng.pc.inventory.adjustHeader.domain.AdjustHeader;
@@ -13,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
@Service
public class AdjustHeaderServiceImpl extends ServiceImpl<AdjustHeaderMapper, AdjustHeader> implements AdjustHeaderService {
@@ -20,7 +25,8 @@ public class AdjustHeaderServiceImpl extends ServiceImpl<AdjustHeaderMapper, Adj
@Resource
private AdjustHeaderMapper adjustHeaderMapper;
-
+ @Resource
+ private AdjustDetailService adjustDetailService;
@@ -48,22 +54,29 @@ public class AdjustHeaderServiceImpl extends ServiceImpl<AdjustHeaderMapper, Adj
}
/**
- * 删除
- * 空缺
+ * 调整主单删除
* @param id
* @return
*/
+ @Transactional
@Override
- public AjaxResult delete(Integer id) {
+ public AjaxResult deleteHeader(Integer id) {
AdjustHeader adjustHeader = this.getById(id);
if(adjustHeader == null){
return AjaxResult.error("id为"+id.toString()+"的调整单不存在出，操作中止");
}
-
- //批量删除子单据
+ //判断该主单下有没又存在子单，没有直接删除主单，有则不能删除
AdjustDetail temp = new AdjustDetail();
temp.setAdjustCode(adjustHeader.getCode());
+ temp.setCompanyCode(adjustHeader.getCompanyCode());
+ temp.setWarehouseCode(adjustHeader.getWarehouseCode());
+ LambdaQueryWrapper<AdjustDetail> lambdaQueryWrapper = Wrappers.lambdaQuery(temp);
+ List<AdjustDetail> adjustDetails = adjustDetailService.list(lambdaQueryWrapper);
+ if(adjustDetails.size() > 0){
+ throw new SecurityException("该主单存在明细，无法删除，操作失败！");
+ }
+ adjustHeaderMapper.deleteById(id); //直接删主单
return AjaxResult.success("删除成功");
}
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 a8fce46..5f40023 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
@@ -150,6 +150,9 @@ public class CycleCountDetailController extends BaseController {
@ResponseBody
public AjaxResult addSave(String cycleCountHeadCode, Integer[] inventoryDetailIdIds)
{
+ if(inventoryDetailIdIds == null){
+ return AjaxResult.error("盘点的库存ID不能为空!");
+ }
return cycleCountDetailService.addDetails(cycleCountHeadCode,inventoryDetailIdIds);
}
diff --git a/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java b/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java
index d3b5d7c..9eeb73b 100644
--- a/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java
@@ -48,10 +48,6 @@ public class CycleCountDetailServiceImpl extends ServiceImpl<CycleCountDetailMap
-
-
-
-
/**
* 执行任务修改状态为10
* @param detailid
@@ -131,7 +127,7 @@ public class CycleCountDetailServiceImpl extends ServiceImpl<CycleCountDetailMap
ccd.setCompanyCode(inventoryDetail.getCompanyCode());
ccd.setInventorySts(inventoryDetail.getInventorySts());
ccd.setCountId(inventoryDetail.getId());
- ccd.setEnableStatus(5);
+ //ccd.setEnableStatus(1);
ccd.setLocationCode(inventoryDetail.getLocationCode());
ccd.setContainerCode(inventoryDetail.getContainerCode());
ccd.setMaterialCode(inventoryDetail.getMaterialCode());
@@ -226,10 +222,10 @@ public class CycleCountDetailServiceImpl extends ServiceImpl<CycleCountDetailMap
LambdaQueryWrapper<Location> lambdaQueryWrapper = Wrappers.lambdaQuery(temp);
Location loc = locationService.getOne(lambdaQueryWrapper);
if(!loc.getStatus().equals("empty")){
- return AjaxResult.error(cycleCountDetail.getLocationCode()+"状态非空闲，操作失败");
+ return AjaxResult.error(cycleCountDetail.getLocationCode()+"库位不在空闲状态，请先完成其他任务，操作失败！");
}
if(StringUtils.isEmpty(loc.getContainerCode())){
- return AjaxResult.error(cycleCountDetail.getLocationCode()+"没有托盘，操作失败");
+ return AjaxResult.error(cycleCountDetail.getLocationCode()+"库位中没有容器，操作失败！");
}
//查询任务头和明细有相同容器，没有就新增任务头和明细
@@ -363,9 +359,9 @@ public class CycleCountDetailServiceImpl extends ServiceImpl<CycleCountDetailMap
if (inventoryDetail == null) {
return AjaxResult.error("没有对应库存信息，请重建盘点单");
}
- if(qty.compareTo(inventoryDetail.getTaskQty()) < 0){
+ /*if(qty.compareTo(inventoryDetail.getTaskQty()) < 0){
return AjaxResult.error("登记数量不能小于任务分配数量");
- }
+ }*/
}
cyclecountDetail.setCountedQty(qty);
cyclecountDetail.setGapQty(qty.subtract(cyclecountDetail.getSystemQty()));
@@ -390,7 +386,6 @@ public class CycleCountDetailServiceImpl extends ServiceImpl<CycleCountDetailMap
public AjaxResult createCyclecountWithGapQty(String cycleCountHeaderCode) {
/*找出实盘登记中数量有差异的，重新生成盘点单*/
-
CycleCountHeader cycleCountHeader = new CycleCountHeader();
cycleCountHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
cycleCountHeader.setCode(cycleCountHeaderCode);
diff --git a/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java
index b8fb449..2de1460 100644
--- a/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java
@@ -169,12 +169,10 @@ public class CycleCountHeaderServiceImpl extends ServiceImpl<CycleCountHeaderMap
//查询该条盘点单头 id
CycleCountHeader cyclecountHeader = cycleCountHeaderMapper.selectById(id);
-
- if(cyclecountHeader.getStatusCyc() >= 35){
+ if(cyclecountHeader.getStatusCyc() < 100){
//查询是否已生成差异单
- throw new ServiceException("该条盘点单无法生成调整单，请检查状态！");
+ throw new ServiceException("该条盘点单无法生成调整单，必须为盘点任务完成，请检查状态！");
}
-
AdjustHeader adjustHeader = new AdjustHeader();
adjustHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());//仓库
adjustHeader.setCode(adjustHeaderService.createCode());//生成差异单号
@@ -197,6 +195,7 @@ public class CycleCountHeaderServiceImpl extends ServiceImpl<CycleCountHeaderMap
//AdjustHeader adjust = adjustHeaderService.getById(adjustHeader.getId());
//循环明细条目，查找符合条件的数据写入调整单明细
AdjustDetail adjustDetail = new AdjustDetail();
+ List<AdjustDetail> adjustDetails = new ArrayList<>();
for(CycleCountDetail item:cycleCountDetailList){
//BigDecimal的比较 .compareTo(BigDecimal.ZERO) != 0
@@ -224,14 +223,16 @@ public class CycleCountHeaderServiceImpl extends ServiceImpl<CycleCountHeaderMap
adjustDetail.setCreated(new Date());
adjustDetail.setCreatedBy(ShiroUtils.getLoginName());
//adjustDetail.setStatus(0);//状态
-
- adjustDetailService.save(adjustDetail);
+ adjustDetails.add(adjustDetail);
+ //adjustDetailService.save(adjustDetail);
}
-
}
-
+ if(adjustDetails.size() == 0 ){
+ throw new SecurityException("该盘点单没有差异数据条目，无法生成调整单！");
+ }
+ adjustDetailService.saveBatch(adjustDetails);
//修改盘点主单状态为已生成差异单
- cyclecountHeader.setStatusCyc(35);
+ cyclecountHeader.setStatusCyc(101);
this.saveOrUpdate(cyclecountHeader);
return AjaxResult.success("差异调整及明细单生成完毕！");
diff --git a/src/main/resources/templates/inventory/adjustDetail/adjustDetail.html b/src/main/resources/templates/inventory/adjustDetail/adjustDetail.html
index 232ca9c..d7fb880 100644
--- a/src/main/resources/templates/inventory/adjustDetail/adjustDetail.html
+++ b/src/main/resources/templates/inventory/adjustDetail/adjustDetail.html
@@ -91,14 +91,16 @@
</div>
</div>
<div class="btn-group hidden-xs" id="toolbar" role="group">
- <a class="btn btn-outline btn-success btn-rounded" onclick="add()">
+ <a class="btn btn-outline btn-success btn-rounded" onclick="add()"
+ shiro:hasPermission="inventory:adjustDetail:add" >
<i class="fa fa-plus"></i> 新增
</a>
- <a class="btn btn-outline btn-primary btn-rounded" onclick="agree()">
+ <a class="btn btn-outline btn-primary btn-rounded" onclick="agree()"
+ shiro:hasPermission="inventory:adjustDetail:adjustAgree" >
<i class="fa fa-edit"></i> 审批
</a>
- <a class="btn btn-outline btn-danger btn-rounded" onclick="addAdjust()"/>
- <!--shiro:hasPermission="inventory:cyclecountAdjustDetail:addAdjust"-->
+ <a class="btn btn-outline btn-danger btn-rounded" onclick="addAdjust()"
+ shiro:hasPermission="inventory:adjustDetail:addAdjust">
<i class="fa fa-vcard"></i>调整
</a>
<!--<a class="btn btn-outline btn-success btn-rounded" onclick="$.table.refresh()">
@@ -112,6 +114,7 @@
<script th:inline="javascript">
var prefix = ctx + "inventory/adjustDetail";
var prefix_head = ctx + "inventory/adjustHeader";
+ var removes= [[${@permission.hasPermi('inventory:adjustDetail:remove')}]];
var type2 = [[${@dict.getType('adjustType')}]];
var adjustStatus = [[${@dict.getType('adjustStatus')}]];
var inventoryStatus = [[${@dict.getType('inventoryStatus')}]];
@@ -353,7 +356,7 @@
align: 'center',
formatter: function (value, row, index) {
var actions = [];
- actions.push('<a class="btn btn-danger btn-xs" href="#" onclick="remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a> ');
+ actions.push('<a class="btn btn-danger btn-xs ' + removes + ' " href="#" onclick="remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a> ');
return actions.join('');
}
}
diff --git a/src/main/resources/templates/inventory/adjustHeader/adjustHeader.html b/src/main/resources/templates/inventory/adjustHeader/adjustHeader.html
index 1ab0768..014cbb6 100644
--- a/src/main/resources/templates/inventory/adjustHeader/adjustHeader.html
+++ b/src/main/resources/templates/inventory/adjustHeader/adjustHeader.html
@@ -69,13 +69,13 @@
</div>
<div class="btn-group hidden-xs" id="toolbar" role="group">
<a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()"
- shiro:hasPermission="inventory:cycleCount:add">
+ shiro:hasPermission="inventory:adjustHeader:add">
<i class="fa fa-plus"></i> 新增
</a>
- <!--<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()"
- shiro:hasPermission="inventory:cycleCount:remove">
- <i class="fa fa-trash-o"></i> 删除
- </a>-->
+ <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()"
+ shiro:hasPermission="inventory:adjustHeader:remove">
+ <i class="fa fa-trash-o"></i> 删除
+ </a>
</div>
<table id="bootstrap-table" data-mobile-responsive="true"
class="table table-bordered table-hover"></table>
@@ -90,7 +90,7 @@
<script th:inline="javascript">
var prefix = ctx + "inventory/adjustHeader";
var upload = [[${@permission.hasPermi('inventoryHeader:adjustHeader:upload')}]];
- var report = [[${@permission.hasPermi('inventoryHeader:adjustHeader:report')}]];
+ var report = [[${@permission.hasPermi('inventory:adjustHeader:report')}]];
var datas = [[${@dict.getType('sys_normal_disable')}]];
var type2 = [[${@dict.getType('adjustType')}]];
@@ -180,8 +180,8 @@
align: 'center',
formatter: function (value, row, index) {
var actions = [];
- /* actions.push('<a class="btn btn-success btn-xs " href="#" onclick="adjustPrint(\'' + row.id + '\')"><i class="fa fa-print"></i>打印</a> ');
- actions.push('<a class="btn btn-info btn-xs ' + upload + ' " href="#" onclick="upLoad(\'' + row.code + '\',\'' + row.sourceCode + '\')"><i class="fa fa-edit"></i>上传</a> ');
+ actions.push('<a class="btn btn-success btn-xs " href="#" onclick="adjustPrint(\'' + row.id + '\')"><i class="fa fa-print"></i>打印</a> ');
+ /* actions.push('<a class="btn btn-info btn-xs ' + upload + ' " href="#" onclick="upLoad(\'' + row.code + '\',\'' + row.sourceCode + '\')"><i class="fa fa-edit"></i>上传</a> ');
actions.push('<a class="btn btn-danger btn-xs " href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a> ');*/
actions.push('<a style="background: #b5bdc0" class="btn btn-default btn-xs " href="#" onclick="detail(\'' + row.id + '\',\'' + row.code + '\')"><i class="fa fa-list-ul"></i>明细</a>');
return actions.join('');
diff --git a/src/main/resources/templates/inventory/cycleCountDetail/add.html b/src/main/resources/templates/inventory/cycleCountDetail/add.html
index f1de843..d099d2e 100644
--- a/src/main/resources/templates/inventory/cycleCountDetail/add.html
+++ b/src/main/resources/templates/inventory/cycleCountDetail/add.html
@@ -11,7 +11,6 @@
<input type="hidden" id="cycleCountHeadCode" name="cycleCountHeadCode" th:value="${cycleCountHeadCode}">
<div class="select-list">
<ul>
- <ul>
<li>
库存头ID：<input id="inventoryHeaderId" type="text" name="inventoryHeaderId"/>
</li>
@@ -79,12 +78,14 @@
<a id="search" class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
<!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="general:inventoryHeader:export"><i class="fa fa-download"></i> 导出</a>-->
</li>
- </ul>
+ </ul>
</div>
</form>
</div>
<div class="col-sm-12 select-info">
- <a class="btn btn-success btn-sm" onclick="addDetails()" style="float: left; margin-top: 12px" shiro:hasPermission="inventory:cyclecountDetail:add"><i class="fa fa-edit" ></i> 批量添加盘点明细</a>
+ <a class="btn btn-success btn-sm" onclick="addDetails()" style="float: left; margin-top: 12px"
+ shiro:hasPermission="inventory:cyclecountDetail:add">
+ <i class="fa fa-edit" ></i> 添加盘点明细</a>
<table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
</div>
</div>
@@ -94,7 +95,7 @@
<div th:include="include::footer"></div>
<script th:inline="javascript">
- var addFlag = [[${@permission.hasPermi('inventoryHeader:cycleCountDetail:add')}]];
+ var addFlag = [[${@permission.hasPermi('inventory:cyclecountDetail:add')}]];
// var removeFlag = [[${@permission.hasPermi('inventoryHeader:inventoryHeader:remove')}]];
var prefix = ctx + "inventory/inventoryDetail";
var prefix_cycleDetails = ctx + "inventory/cycleCountDetail";
@@ -132,7 +133,7 @@
{
checkbox: true
},
- {
+ /*{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
@@ -141,10 +142,10 @@
// actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
- },
+ },*/
{
field: 'id',
- title: '明细ID',
+ title: '库存明细ID',
sortable: true
},
{
@@ -315,9 +316,13 @@
});
- /*function addDetail(cycleCountHeadId) {
- addInner($('cycleCountHeadId').val(),cycleCountHeadId);
- }*/
+ function addDetail(id) {
+ /*var ids =[];
+ rows.forEach(function (item) {
+ ids.push(item.id);
+ });*/
+ addInner($('#cycleCountHeadCode').val(),id);
+ }
function addDetails() {
var rows=$("#bootstrap-table").bootstrapTable('getSelections');
@@ -339,7 +344,7 @@
url : prefix_cycleDetails + "/add",
data:{
cycleCountHeadCode:cycleCountHeadCode,
- inventoryDetailIdIds:ids
+ inventoryDetailIds:ids
},
async : false,
error : function(request) {
diff --git a/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html b/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html
index cc1c667..430338b 100644
--- a/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html
+++ b/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html
@@ -318,13 +318,13 @@
align: 'center',
formatter: function (value, row, index) {
var actions = [];
-
- actions.push('<a class="btn btn-success btn-xs ' + confirmFlag + '" href="#" onclick="confirmGapQty(\'' + row.id + '\')"><i class="fa fa-comment"></i>实盘登记</a> ');
-
- actions.push('<a class="btn btn-primary btn-xs ' + createTaskFalg + '" href="#" onclick="outcheck(\'' + row.id + '\')"><i class="fa fa-gbp"></i>生成盘点任务</a> ');
-
+ if(row.enableStatus >= 10 && row.enableStatus < 100){
+ actions.push('<a class="btn btn-success btn-xs ' + confirmFlag + '" href="#" onclick="confirmGapQty(\'' + row.id + '\')"><i class="fa fa-comment"></i>实盘登记</a> ');
+ }
+ if(row.enableStatus === 1 ){
+ actions.push('<a class="btn btn-primary btn-xs ' + createTaskFalg + '" href="#" onclick="outcheck(\'' + row.id + '\')"><i class="fa fa-gbp"></i>生成盘点任务</a> ');
+ }
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.id + '\')" ><i class="fa fa-trash-o"></i>删除</a>');
-
return actions.join('');
}
}]
diff --git a/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html b/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html
index 695d68d..e0c5aa7 100644
--- a/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html
+++ b/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html
@@ -275,9 +275,9 @@
formatter: function (value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + reportFlag + '" href="#" onclick="cyclecountPrint(\'' + row.id + '\')"><i class="fa fa-print"></i>打印</a> ');
-
- actions.push('<a class="btn btn-warning btn-xs ' + addAdjust + '" href="#" onclick="goAdjust(\'' + row.id + '\')"><i class="fa fa-gbp"></i>生成调整单</a> ');
-
+ if(row.statusCyc === 100){
+ actions.push('<a class="btn btn-warning btn-xs ' + addAdjust + '" href="#" onclick="goAdjust(\'' + row.id + '\')"><i class="fa fa-gbp"></i>生成调整单</a> ');
+ }
//actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a> ');
return actions.join('');
diff --git a/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html b/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
index f7c4248..40388a5 100644
--- a/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
+++ b/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
@@ -305,7 +305,9 @@
visible: false
}
]
- },url = location.search.substr(1);
+ },
+
+ url = location.search.substr(1);
let strs = url.split("&");
$("#inventoryHeaderId").val(strs[0]);
$("#locationCode").val(strs[1]);