Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop

pengcheng
2 parents 78b4a357 aca6122c
Showing 16 changed files with 195 additions and 148 deletions
src/main/java/com/huaheng/pc/check/checkDetail/controller/CheckDetailController.java
src/main/java/com/huaheng/pc/inventory/adjustHeader/controller/adjustHeaderController.java
src/main/java/com/huaheng/pc/inventory/adjustHeader/service/AdjustHeaderService.java
src/main/java/com/huaheng/pc/inventory/adjustHeader/service/AdjustHeaderServiceImpl.java
src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java
src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
src/main/resources/templates/check/checkHeader/checkHeader.html
src/main/resources/templates/inventory/adjustHeader/add.html
src/main/resources/templates/inventory/adjustHeader/adjustHeader.html
src/main/resources/templates/inventory/adjustHeader/report.html
src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html
src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html
src/main/resources/templates/inventory/inventoryTransaction/report.html
@@ -131,8 +131,7 @@ public class CheckDetailController extends BaseController {
  
     /**
      * 保存质检完成
-     * @param inventorySts 库存状态
-     * @param qty 数量
+     * @param id
      * @return AjaxResult
      */
     @ApiOperation(value="完成质检详情", notes="完成质检详情", httpMethod = "POST")
@@ -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;
@@ -13,17 +14,17 @@ import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.framework.web.page.PageDomain;
 import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.inventory.adjustDetail.domain.AdjustDetail;
 import com.huaheng.pc.inventory.adjustDetail.service.AdjustDetailService;
 import com.huaheng.pc.inventory.adjustDetail.service.AdjustDetailServiceImpl;
 import com.huaheng.pc.inventory.adjustHeader.domain.AdjustHeader;
 import com.huaheng.pc.inventory.adjustHeader.service.AdjustHeaderService;
 import com.huaheng.pc.inventory.adjustHeader.service.AdjustHeaderServiceImpl;
 import com.huaheng.pc.inventory.cycleCountHeader.domain.CycleCountHeader;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
  
 import javax.annotation.Resource;
 import java.util.Date;
@@ -40,7 +41,6 @@ public class adjustHeaderController extends BaseController {
     private AdjustDetailService adjustDetailService;
  
  
-
     private String prefix = "inventory/adjustHeader";
  
  
@@ -90,7 +90,7 @@ public class adjustHeaderController extends BaseController {
     }
  
     /**
-     * 新增调整单主
+     * 新增调整单主页面
      */
     @GetMapping("/add")
     public String add()
@@ -108,13 +108,50 @@ public class adjustHeaderController extends BaseController {
     public AjaxResult addSave(AdjustHeader adjustHeader)
     {
         adjustHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
-        adjustHeader.setCreated(new Date());
-        adjustHeader.setCreatedBy(ShiroUtils.getLoginName());
-        adjustHeader.setCode(adjustHeaderService.createCode());
-        return toAjax(adjustHeaderService.save(adjustHeader));
+        return AjaxResult.success(adjustHeaderService.addSave(adjustHeader));
     }
  
+    /**
+     * 删除调整单主
+     */
+    //@RequiresPermissions("inventory:cycleCount:remove")
+    @Log(title = "库存-调整",operating = "删除调整主单", action = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        if (StringUtils.isEmpty(ids))
+            return AjaxResult.error("id不能为空");
+        for (Integer id : Convert.toIntArray(ids))
+        {
+            AjaxResult result = adjustHeaderService.delete(id);
+            if(result.code!=200){
+                return result;
+            }
+        }
+        return AjaxResult.success("删除成功！");
+    }
  
+    /**
+     *  调整单打印
+     * @return
+     */
+    //@RequiresPermissions("inventory:cyclecountAdjust:report")
+    @GetMapping("/report/{id}")
+    public String report(@PathVariable("id") Integer id, ModelMap mmap)
+    {
+        AdjustHeader adjustHeader = adjustHeaderService.getById(id);
+        mmap.put("adjustHeader", adjustHeader);
+        //明细
+        AdjustDetail adjustDetail = new AdjustDetail();
+        adjustDetail.setAdjustCode(adjustHeader.getCode());
+        adjustDetail.setWarehouseCode(adjustHeader.getWarehouseCode());
+        adjustDetail.setCompanyCode(adjustHeader.getCompanyCode());
+        LambdaQueryWrapper<AdjustDetail> adjustDetailLambdaQueryWrapper = Wrappers.lambdaQuery(adjustDetail);
+        List<AdjustDetail> adjustDetails = adjustDetailService.list(adjustDetailLambdaQueryWrapper);
+        mmap.put("adjustDetails", adjustDetails);
+        return prefix + "/report";
+    }
  
  
  
 package com.huaheng.pc.inventory.adjustHeader.service;
  
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.pc.inventory.adjustHeader.domain.AdjustHeader;
 import com.huaheng.pc.inventory.cycleCountHeader.domain.CycleCountHeader;
  
@@ -10,8 +11,9 @@ public interface AdjustHeaderService extends IService&lt;AdjustHeader&gt; {
  
     String createCode();
  
+    AjaxResult delete(Integer id);
  
-
+    AjaxResult addSave(AdjustHeader adjustHeader);
  
 }
  
 package com.huaheng.pc.inventory.adjustHeader.service;
  
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.inventory.adjustDetail.domain.AdjustDetail;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.pc.inventory.adjustHeader.domain.AdjustHeader;
 import com.huaheng.pc.inventory.adjustHeader.mapper.AdjustHeaderMapper;
+import org.springframework.transaction.annotation.Transactional;
  
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
@@ -21,6 +26,7 @@ public class AdjustHeaderServiceImpl extends ServiceImpl&lt;AdjustHeaderMapper, Adj
  
  
  
+
     //生成差异单号
     @Override
     public String createCode() {
@@ -41,9 +47,56 @@ public class AdjustHeaderServiceImpl extends ServiceImpl&lt;AdjustHeaderMapper, Adj
         return code;
     }
  
+    /**
+     * 删除
+     * 空缺
+     * @param id
+     * @return
+     */
+    @Override
+    public AjaxResult delete(Integer id) {
+        AdjustHeader adjustHeader = this.getById(id);
+        if(adjustHeader == null){
+            return AjaxResult.error("id为"+id.toString()+"的调整单不存在出，操作中止");
+        }
  
+        //批量删除子单据
+        AdjustDetail temp = new AdjustDetail();
+        temp.setAdjustCode(adjustHeader.getCode());
+
+        return AjaxResult.success("删除成功");
+    }
  
  
+    /**
+     * 保存新增调整头
+     * @param adjustHeader
+     * @return
+     */
+    @Transactional
+    @Override
+    public AjaxResult addSave(AdjustHeader adjustHeader) {
+        //校验调整类型
+        //盘点调整，质检调整需要和盘点和质检单据确认。
+        switch (adjustHeader.getProblemType()){
+            case "checkAdjust":   //质检调整
+            if(StringUtils.isEmpty(adjustHeader.getCheckCode())){
+                throw new SecurityException("选择单据类型为质检调整时，质检单编码不能为空！");
+            }
+                break;
+            case "adjust":   //盘点调整
+                if(StringUtils.isEmpty(adjustHeader.getCycleCountCode())){
+                    throw new SecurityException("选择单据类型为盘点调整时，盘点单编码不能为空！");
+                }
+                break;
+        }
+
+        adjustHeader.setCreated(new Date());
+        adjustHeader.setCreatedBy(ShiroUtils.getLoginName());
+        adjustHeader.setCode(this.createCode());
+        this.save(adjustHeader);
+        return AjaxResult.success("新增调整头成功！");
+    }
  
  
 }
@@ -18,6 +18,7 @@ import com.huaheng.pc.config.material.service.MaterialServiceImpl;
 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
 import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
 import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -160,9 +161,8 @@ public class InventoryDetailController extends BaseController
         return AjaxResult.success("库存明细出库查看任务下发成功！");
     }
  
-
     /**在库质检*/
-    //@RequiresPermissions("inventory:inventoryHeader:detailCheckTask")
+    @RequiresPermissions("inventory:inventoryDetail:detailCheckTask")
     @PostMapping("/detailCheckTask")
     @ResponseBody
     public AjaxResult detailCheckTask(String ids) throws InvocationTargetException, IllegalAccessException {
@@ -95,7 +95,7 @@ public class InventoryHeaderController extends BaseController
 	}
  
 	/**移库*/
-	//@RequiresPermissions("inventory:inventoryHeader:transfer")
+	@RequiresPermissions("inventory:inventoryHeader:transfer")
 	@PostMapping("/transfer")
 	@ResponseBody
 	public AjaxResult transfer(String sourceLocation, String destinationLocation){
@@ -106,7 +106,7 @@ public class InventoryHeaderController extends BaseController
 	}
  
     /**出库查看*/
-	//@RequiresPermissions("inventory:inventoryHeader:seeOut")
+	@RequiresPermissions("inventory:inventoryHeader:seeOut")
 	@PostMapping("/createCheckOutTask")
 	@ResponseBody
 	public AjaxResult createCheckOutTask(String[] ids){
@@ -130,7 +130,7 @@ public class InventoryHeaderController extends BaseController
      * @param destinationLocation
      * @return
      */
-    //@RequiresPermissions("task:task:emptyIn")
+    @RequiresPermissions("inventory:inventoryHeader:emptyIn")
     @PostMapping("/emptyIn")
     @Log(title = "任务-任务管理", operating = "生成空托盘入库任务", action = BusinessType.INSERT)
     @ResponseBody
@@ -155,7 +155,7 @@ public class InventoryHeaderController extends BaseController
      * @param sourceLocation
      * @return
      */
-   //@RequiresPermissions("task:task:emptyOut")
+    @RequiresPermissions("inventory:inventoryHeader:emptyOut")
     @PostMapping("/emptyOut")
     @Log(title = "任务-任务管理", operating = "生成空托盘出库任务", action = BusinessType.INSERT)
     @ResponseBody
@@ -180,7 +180,7 @@ public class InventoryHeaderController extends BaseController
      * @param location
      * @return
      */
-    //@RequiresPermissions("task:task:emptyInOut")
+    @RequiresPermissions("inventory:inventoryHeader:emptyCheckOut")
     @PostMapping("/emptyCheckOut")
     @Log(title = "任务-任务管理", operating = "生成空托盘出库查看任务", action = BusinessType.INSERT)
     @ResponseBody
@@ -18,6 +18,7 @@ import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
 import com.huaheng.pc.inventory.inventoryTransaction.domain.InventoryTransaction;
 import com.huaheng.pc.inventory.inventoryTransaction.service.InventoryTransactionService;
 import io.swagger.models.auth.In;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
@@ -43,7 +44,7 @@ public class InventoryTransactionController extends BaseController{
  
     private String prefix = "inventory/inventoryTransaction";
  
-    //@RequiresPermissions("inventory:inventoryTransaction:view")
+    @RequiresPermissions("inventory:inventoryTransaction:view")
     @GetMapping()
     public String inventoryTransaction()
     {
@@ -53,7 +54,7 @@ public class InventoryTransactionController extends BaseController{
     /**
      * 查询库存交易列表
      */
-    //@RequiresPermissions("inventory:inventoryTransaction:inventoryTransactionList")
+    @RequiresPermissions("inventory:inventoryTransaction:inventoryTransactionList")
     @Log(title = "库存-库存交易",operating = "查看库存交易列表", action = BusinessType.GRANT)
     @PostMapping("/inventoryTransactionList")
     @ResponseBody
@@ -95,15 +96,16 @@ public class InventoryTransactionController extends BaseController{
         }
     }
  
-    //@RequiresPermissions("receipt:bill:report")
+    @RequiresPermissions("inventory:inventoryTransaction:view:report")
     @Log(title = "库存-库存交易明细", operating = "库存交易明细报表打印", action = BusinessType.OTHER)
     @GetMapping("/report/{ids}")
     public String report(@PathVariable("ids") Integer[] ids, ModelMap mmap)
     {
-        List<InventoryTransaction> list=new ArrayList<InventoryTransaction>();
+        List<InventoryTransaction> list = new ArrayList<>();
         for(Integer id:ids){
-            if(id!=null) {
-                //list.add(inventoryTransaction);
+            if(id != null) {
+                InventoryTransaction inventoryTransaction = inventoryTransactionService.getById(id);
+                list.add(inventoryTransaction);
             }
             mmap.put("inventoryTransaction", list);
         }
@@ -865,6 +865,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
  
         for (String id : ids) {
             InventoryHeader inventoryHeader = inventoryHeaderService.getById(Integer.parseInt(id));
+            //校验库位是否锁定
             //检查库位容器
             Location temp = new Location();
             temp.setCode(inventoryHeader.getLocationCode());
@@ -924,7 +925,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             }
             if (taskDetailService.saveBatch(taskDetails)) {
                 //锁定库位状态
-                locationService.updateStatus(loc.getContainerCode(), "lock");
+                locationService.updateStatus(inventoryHeader.getLocationCode(), "lock");
             } else {
                 throw new ServiceException("出库查看任务明细生成失败！");
             }
@@ -103,10 +103,12 @@
                     </div>
  
                     <div class="btn-group hidden-xs" id="toolbarReg" role="group">
-                        <a class="btn btn-outline btn-success btn-rounded" onclick="complete()" shiro:hasPermission="check:checkingRegister:remove">
+                        <a class="btn btn-outline btn-success btn-rounded" onclick="complete()"
+                           shiro:hasPermission="check:checkingRegister:remove">
                             <i class="fa fa-check-circle-o"></i> 质检完成
                         </a>
-                        <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="check:checkingRegister:remove">
+                        <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()"
+                           shiro:hasPermission="check:checkingRegister:remove">
                             <i class="fa fa-trash-o"></i> 删除
                         </a>
                     </div>
@@ -6,106 +6,66 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
  
         <form class="form-horizontal m" id="form-adjustHeader-add" >
+
             <div class="form-group">
-                <label class="col-sm-3 control-label">调整单编号：</label>
+                <label class="col-sm-3 control-label">货主：</label>
                 <div class="col-sm-8">
-					<input id="code" name="code" class="form-control" type="text">
+                    <select id="companyCode" name="companyCode" class="form-control" th:with="list=${@companyService.getCode()}">
+                        <option th:each="item : ${list}" th:text="${item['name']}" th:value="${item['code']}" th:attr = " code = ${item['code']}"></option>
+                    </select>
                 </div>
             </div>
+            <!--<div class="form-group">
+                <label class="col-sm-3 control-label">调整类型：</label>
+                <div class="col-sm-8">
+                    <div class="col-sm-8">
+                        <select id="problemType" name="problemType" class="form-control" th:with="problemType=${@dict.getType('adjustType')}">
+                            <option th:each="dict : ${problemType}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
+                        </select>
+                    </div>
+                </div>
+            </div>-->
+
             <div class="form-group">
-                <label class="col-sm-3 control-label">货主编码：</label>
+                <label class="col-sm-3 control-label">调整类型：</label>
                 <div class="col-sm-8">
-                    <input id="companyCode" name="companyCode" class="form-control" type="text" readonly="readonly">
+                    <select id="problemType" name="problemType" class="form-control" th:with="problemType=${@dict.getType('adjustType')}">
+                        <option th:each="dict : ${problemType}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
+                    </select>
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">盘点单编号：</label>
+                <label class="col-sm-3 control-label">盘点单编码：</label>
                 <div class="col-sm-8">
-                    <input id="cyclecountHeadCode" name="cyclecountHeadCode" class="form-control" type="text" readonly="readonly">
+                    <input id="cyclecountHeadCode" name="cyclecountHeadCode" class="form-control" type="text" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')">
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">物料编码：</label>
+                <label class="col-sm-3 control-label">质检单编码：</label>
                 <div class="col-sm-8">
-                    <input id="materialCode" name="materialCode"  class="form-control" type="text" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')">
+                    <input id="checkCode" name="checkCode" class="form-control" type="text" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')">
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">库位编码：</label>
+                <label class="col-sm-3 control-label">关联上游单编码：</label>
                 <div class="col-sm-8">
-                    <input id="locationCode" name="locationCode"  class="form-control" type="text" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')">
+                    <input id="referCode" name="referCode"  class="form-control" type="text" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')">
                 </div>
             </div>
 			<div class="form-group">	
-                <label class="col-sm-3 control-label">容器编号：</label>
+                <label class="col-sm-3 control-label">关联上游说明：</label>
                 <div class="col-sm-8">
-                    <input id="containerCode" name="containerCode"  class="form-control" type="text" onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')">
+                    <input id="referReason" name="referReason"  class="form-control" type="text" >
                 </div>
             </div>
-            <div class="form-group">
+            <!--<div class="form-group">
                 <label class="col-sm-3 control-label">库存状态：</label>
                 <div class="col-sm-8">
                     <select id="inventoryStatus" name="inventoryStatus" class="form-control" th:with="inventoryStatus=${@dict.getType('inventoryStatus')}">
                         <option th:each="dict : ${inventoryStatus}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
                     </select>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">系统数量：</label>
-                <div class="col-sm-8">
-                    <input id="systemQty" name="systemQty" value="0" class="form-control" type="text" onkeyup="this.value=this.value.replace(/[^\-?\d.]/g,'')" readonly="readonly">
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">实际数量：</label>
-                <div class="col-sm-8">
-                    <input id="countedQty" name="countedQty" class="form-control" type="text" onkeyup="this.value=this.value.replace(/[^\-?\d.]/g,'')" >
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">差异数量：</label>
-                <div class="col-sm-8">
-                    <input id="gapQty" name="gapQty"  class="form-control" type="text" onkeyup="this.value=this.value.replace(/[^\-?\d.]/g,'')" >
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">调整数量：</label>
-                <div class="col-sm-8">
-                     <input id="adjustQty" name="adjustQty" class="form-control" type="text" onkeyup="this.value=this.value.replace(/[^\-?\d.]/g,'')">
-                </div>
-            </div>
-
-            <div class="form-group">
-                <label class="col-sm-3 control-label">批次：</label>
-                <div class="col-sm-8">
-                    <input id="batch" name="batch"  class="form-control" type="text" >
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">批号：</label>
-                <div class="col-sm-8">
-                    <input id="lot" name="lot" class="form-control" type="text" >
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">项目号：</label>
-                <div class="col-sm-8">
-                    <input id="project" name="project"  class="form-control" type="text" >
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">生产日期：</label>
-                <div class="col-sm-8">
-                    <input id="manufactureDate" name="manufactureDate"  class="form-control" type="text" >
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">失效日期：</label>
-                <div class="col-sm-8">
-                    <input id="expirationDate" name="expirationDate" class="form-control" type="text">
-                </div>
-            </div>
-
+            </div>-->
  
 			<div class="form-group">
 				<div class="form-control-static col-sm-offset-9">
@@ -121,28 +81,12 @@
  
         $("#form-adjustHeader-add").validate({
             rules:{
-                materialCode:{
-                    required:true,
-                },
-                containerCode:{
-                    required:true,
-                },
-                locationCode:{
+                companyCode:{
                     required:true,
                 },
-                systemQty:{
+                problemType:{
                     required:true,
                 },
-                countedQty:{
-                    required:true,
-                },
-                gapQty:{
-                    required:true,
-                },
-                adjustQty:{
-                    required:true,
-                },
-
                 //必须填值判定
             },
             submitHandler: function(form) {
@@ -131,10 +131,11 @@
                     field: 'cycleCountCode',
                     title: '盘点单编码'
                 },
-                /*{
-                    field: 'problemType',
-                    title: '调整类型'
-                },*/
+                {
+                    field: 'checkCode',
+                    title: '质检单编码'
+                },
+
                 {
                     field: 'referCode',
                     title: '关联上游单编码'
@@ -179,9 +180,9 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + report + '" href="#" onclick="cyclecountPrint(\'' + 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 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('');
                     }
@@ -212,7 +213,7 @@
         $("#tabDetail").addClass("in active");
     }
  
-    function cyclecountPrint(id) {
+    function adjustPrint(id) {
         var url = prefix + "/report/" + id;
         $.modal.open("调整单打印", url);
     }
@@ -10,8 +10,8 @@
             <tr>
                 <td colspan="10">
                     <span style="padding-top:40px;width: 40%; float:left;" class="time_c"></span>
-                    <h2 style="width:24%;text-align:center;float:left;padding-top:10px;">盘点差异调整单</h2>
-                    <span style="padding-top:20px;width:35%;float:right; text-align: right"><img id="code" th:data="${cyclecountAdjust['code']}"></img></span>
+                    <h2 style="width:24%;text-align:center;float:left;padding-top:10px;">调整单</h2>
+                    <span style="padding-top:20px;width:35%;float:right; text-align: right"><img id="code" th:data="${adjustHeader['code']}"></img></span>
                 </td>
             </tr>
             <tr style="padding:15px 0 5px 0;border-bottom:1px solid #606060">
@@ -35,7 +35,7 @@
             </tr>
             </thead>
             <tbody>
-            <tr th:each="row,rowStat : ${details}">
+            <tr th:each="row,rowStat : ${adjustDetails}">
                 <td th:text="${row.containerCode}"></td>
                 <td th:text="${row.id}"></td>
                 <td th:text="${row.materialCode}"></td>
@@ -83,11 +83,11 @@
         </div>
         <div class="btn-group hidden-xs" id="toolbar" role="group">
             <a class="btn btn-outline btn-primary btn-rounded" onclick="checkOut()"
-               shiro:hasPermission="inventory:inventory:seeOut">
+               shiro:hasPermission="inventory:inventoryHeader:seeOut">
                 <i class="fa fa-eye"></i> 出库查看
             </a>
             <a class="btn btn-outline btn-primary btn-rounded" onclick="check()"
-            >
+               shiro:hasPermission="inventory:inventoryDetail:detailCheckTask">
                 <i class="fa fa-eye"></i> 在库质检
             </a>
         </div>
@@ -53,19 +53,24 @@
                         </form>
                     </div>
                     <div class="btn-group hidden-xs" id="toolbar" role="group">
-                        <a class="btn btn-outline btn-danger btn-rounded" onclick="transfer()">
+                        <a class="btn btn-outline btn-danger btn-rounded" onclick="transfer()"
+                           shiro:hasPermission="inventory:inventoryHeader:transfer">
                             <i class="fa fa-exchange"></i> 立库移库
                         </a>
-                        <a class="btn btn-outline btn-primary btn-rounded" onclick="checkOut()">
+                        <a class="btn btn-outline btn-primary btn-rounded" onclick="checkOut()"
+                           shiro:hasPermission="inventory:inventoryHeader:seeOut">
                             <i class="fa fa-eye"></i> 出库查看
                         </a>
-                        <a class="btn btn-outline btn-info btn-rounded" onclick="emptyIn()" shiro:hasPermission="task:task:emptyIn">
+                        <a class="btn btn-outline btn-info btn-rounded" onclick="emptyIn()"
+                           shiro:hasPermission="inventory:inventoryHeader:emptyIn">
                             <i class="fa fa-level-down"></i> 空托入库
                         </a>
-                        <a class="btn btn-outline btn-default btn-rounded" onclick="emptyCheckOut()" >
+                        <a class="btn btn-outline btn-default btn-rounded" onclick="emptyCheckOut()"
+                           shiro:hasPermission="inventory:inventoryHeader:emptyCheckOut">
                             <i class="fa fa fa-eye"></i> 空托出库查看
                         </a>
-                        <a class="btn btn-outline btn-info btn-rounded" onclick="emptyOut()" shiro:hasPermission="task:task:emptyOut">
+                        <a class="btn btn-outline btn-info btn-rounded" onclick="emptyOut()"
+                           shiro:hasPermission="inventory:inventoryHeader:emptyOut">
                             <i class="fa fa-level-up"></i> 空托出库
                         </a>
                     </div>
@@ -81,7 +81,8 @@
             </div>
             <div class="col-sm-12 select-info">
                 <div class="btn-group hidden-xs" id="toolbar" role="group">
-                    <a class="btn btn-outline btn-success btn-rounded" onclick="report()">
+                    <a class="btn btn-outline btn-success btn-rounded" onclick="report()"
+                       shiro:hasPermission="inventory:inventoryTransaction:report">
                         <i class="fa fa-plus"></i> 打印
                     </a>
                 </div>
@@ -4,7 +4,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <head th:include="include :: header"></head>
-    <title>文字</title>
+    <title>库存交易明细</title>
     <!--<link href="css/bootstrap.min.css" rel="stylesheet" />-->
     <!--<link href="css/font-awesome.min.css" rel="stylesheet" />-->
     <!--&lt;!&ndash;[if IE]>-->
@@ -33,19 +33,19 @@
             <caption style="font-size:18px;text-align:center; color:#333; padding-bottom: 3px;">长沙华恒机器人系统有限公司</caption>
             <tbody>
             <tr>
-                <td width="20%" scope="col">存货编码</td>
+                <td width="20%" scope="col">物料编码</td>
                 <td colspan="2" scope="col" style="text-align:center">
                     <span th:text="${row.materialCode}" ></span>
                 </td>
             </tr>
             <tr>
-                <td scope="col">存货代码</td>
+                <td scope="col">重量</td>
                 <td colspan="2" scope="col" style="text-align:center">
-                    <span th:text="${row.userDef1}" ></span>
+                    <span th:text="${row.weight}" ></span>
                 </td>
             </tr>
             <tr style="vertical-align:middle">
-                <td>存货名称</td>
+                <td>物料名称</td>
                 <td style="text-align:center">
                     <span th:text="${row.materialName}"></span>
                 </td>
@@ -56,22 +56,22 @@
                 </td>
             </tr>
             <tr>
-                <td>规格型号</td>
+                <td>物料规格</td>
                 <td style="text-align:center">
                     <span th:text="${row.materialSpec}"></span>
                 </td>
             </tr>
             <tr>
-                <td>数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;量</td>
+                <td>任务数量</td>
                 <td style="text-align:center; padding: 0">
                     <!--<input name="" type="text" style="line-height:18px;  border:0; text-align:center;" th:text="${receiptDetail.qty}"/>-->
-                    <input id="qty" name="qty" th:value="*{row.qty}" class="form-control" type="text" style="text-align:center;height:30px;border: none"/>
+                    <input id="qty" name="qty" th:value="*{row.taskQty}" class="form-control" type="text" style="text-align:center;height:30px;border: none"/>
                 </td>
             </tr>
             <tr>
-                <td scope="col">生产编号</td>
+                <td scope="col">项目号</td>
                 <td colspan="2" scope="col" style="text-align:center">
-                    <span th:text="${row.project}" ></span>
+                    <span th:text="${row.projectNo}" ></span>
                 </td>
             </tr>
             </tbody>
@@ -102,12 +102,12 @@
             var code16=$(this).children()[1].children[1].innerText;
             var name=$(this).children()[1].children[2].innerText;
             var spec=$(this).children()[1].children[3].innerText;
-            var project=$(this).children()[1].children[5].innerText;
+            var projectNo=$(this).children()[1].children[5].innerText;
             company=company.substring(5);
             code16=code16.substring(5);
             name=name.substring(5);
             spec=spec.substring(5);
-            project=project.substring(5);
+            projectNo=projectNo.substring(5);
             var reg=/\t/;
             name=name.replace(reg,"");
             var qty=$(this).find('input').val();