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

pengcheng
2 parents 81e4d4c8 e9015353
Showing 8 changed files with 400 additions and 30 deletions
src/main/java/com/huaheng/pc/inventory/adjustHeader/service/AdjustHeaderServiceImpl.java
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java
src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java
src/main/resources/templates/inventory/adjustHeader/addAdjust.html → src/main/resources/templates/inventory/adjustDetail/add.html
src/main/resources/templates/inventory/adjustDetail/adjustDetail.html
src/main/resources/templates/inventory/adjustDetail/adjustEdit.html
src/main/resources/templates/inventory/adjustHeader/add.html
src/main/resources/templates/inventory/adjustHeader/adjustHeader.html
@@ -32,11 +32,11 @@ public class AdjustHeaderServiceImpl extends ServiceImpl&lt;AdjustHeaderMapper, Adj
         if (maxCode != null && maxCode.substring(maxCode.length() - 13, maxCode.length() - 5).equals(df.format(now)))
         {
             Integer Count = Integer.valueOf(maxCode.substring(maxCode.length() - 5, maxCode.length()));
-            code = "CY" + df.format(now) + String.format("%05d", Count + 1);
+            code = "AD" + df.format(now) + String.format("%05d", Count + 1);
         }
         else
         {
-            code = "CY" + df.format(now) + "00001";
+            code = "AD" + df.format(now) + "00001";
         }
         return code;
     }
@@ -349,7 +349,7 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
         if(cyclecountDetail.getEnableStatus() == 100){
             return AjaxResult.error("盘点任务完成后不能再登记数量！");
         }
-        if(cycleCountHeader==null){
+        if(cycleCountHeader == null){
             return AjaxResult.error("主单据不存在");
         }
         /*if(cyclecountDetail.getEnableStatus() == 10){
@@ -178,7 +178,7 @@ public class CycleCountHeaderServiceImpl extends ServiceImpl&lt;CycleCountHeaderMap
         AdjustHeader adjustHeader = new AdjustHeader();
         adjustHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());//仓库
         adjustHeader.setCode(adjustHeaderService.createCode());//生成差异单号
-        adjustHeader.setProblemType("盘点调整");
+        adjustHeader.setProblemType("cyclecountAdjust");
         adjustHeader.setCycleCountCode(cyclecountHeader.getCode());
         adjustHeader.setCompanyCode(cyclecountHeader.getCompanyCode());
         adjustHeader.setCreated(new Date());
@@ -199,6 +199,7 @@ public class CycleCountHeaderServiceImpl extends ServiceImpl&lt;CycleCountHeaderMap
         AdjustDetail adjustDetail = new AdjustDetail();
         for(CycleCountDetail item:cycleCountDetailList){
             //BigDecimal的比较  .compareTo(BigDecimal.ZERO) != 0
+
             if(item.getGapQty().compareTo(BigDecimal.ZERO) != 0){
                 //比较差异数量不为0的就生成差异单
                 adjustDetail.setAdjustCode(adjustHeader.getCode());
@@ -212,7 +213,7 @@ public class CycleCountHeaderServiceImpl extends ServiceImpl&lt;CycleCountHeaderMap
                 adjustDetail.setMaterialSpec(item.getMaterialSpec());
                 adjustDetail.setMaterialUnit(item.getMaterialUnit());
                 adjustDetail.setCycleDetailId(item.getId());
-                adjustDetail.setProblemType("盘点调整");
+                adjustDetail.setProblemType("cyclecountAdjust");
                 adjustDetail.setToInventorySts(item.getInventorySts());//盘点不涉及属性
                 adjustDetail.setFromInventorySts(item.getInventorySts());
                 adjustDetail.setFromQty(item.getSystemQty());//调整前数量
@@ -55,8 +55,8 @@
                             物料规格：<input id="materialSpec" type="text" name="materialSpec"/>
                         </li>
                         <li>
-                            调整单类型：<select name="problemType"
-                                           th:with="problemType=${@dict.getType('cyclecountStatus')}">
+                            调整类型：<select name="problemType"
+                                           th:with="problemType=${@dict.getType('adjustType')}">
                             <option value="">所有</option>
                             <option th:each="e : ${problemType}" th:text="${e['dictLabel']}"
                                     th:value="${e['dictValue']}"></option>
@@ -91,11 +91,13 @@
             </div>
         </div>
         <div class="btn-group hidden-xs" id="toolbar" role="group">
-
-            <a class="btn btn-outline btn-danger btn-rounded" onclick="addAdjust()"/>
-            <!--shiro:hasPermission="inventory:cyclecountAdjustDetail:addAdjust"-->
-            <i class="fa fa-vcard"></i>差异调整
+            <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()">
+                <i class="fa fa-plus"></i> 新增
             </a>
+            <!--<a class="btn btn-outline btn-danger btn-rounded" onclick="addAdjust()"/>
+            &lt;!&ndash;shiro:hasPermission="inventory:cyclecountAdjustDetail:addAdjust"&ndash;&gt;
+            <i class="fa fa-vcard"></i>调整
+            </a>-->
             <!--<a class="btn btn-outline btn-danger btn-rounded" onclick="createCyclecountWithGapQty()"
                 shiro:hasPermission="inventoryHeader:cycleCountDetail:cyclecountRepeat">
                  <i class="fa fa-vcard"></i> 差异复盘
@@ -104,9 +106,9 @@
                shiro:hasPermission="inventoryHeader:cycleCountDetail:adjust">
                 <i class="fa fa-vcard"></i> 差异库存调整
             </a>-->
-            <a class="btn btn-outline btn-success btn-rounded" onclick="update()">
-                <i class="fa fa-refresh"></i>&nbsp;&nbsp;刷&nbsp;&nbsp;&nbsp;&nbsp;新
-            </a>
+            <!--<a class="btn btn-outline btn-success btn-rounded" onclick="$.table.refresh()">
+                <i class="fa fa-refresh"></i> 刷新
+            </a>-->
         </div>
         <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
     </div>
@@ -115,14 +117,14 @@
 <script th:inline="javascript">
     var prefix = ctx + "inventory/adjustDetail";
     var prefix_head = ctx + "inventory/adjustHeader";
-    var datas = [[${@dict.getType('adjustType')}]];
+    var type2 = [[${@dict.getType('adjustType')}]];
+    var adjustStatus = [[${@dict.getType('adjustStatus')}]];
     var inventoryStatus = [[${@dict.getType('inventoryStatus')}]];
     var created;
  
     $(function () {
         update();
     });
-
     function update() {
         let adjustCode=null;
         let options = {
@@ -130,13 +132,22 @@
             modalName: "调整单明细",
             sortName: "id",
             sortOrder: "desc",
-            showRefresh: false,
             search: false,
+            showRefresh: true,
             columns: [
                 {
                     radio: true
                 },
                 {
+                    title: '调整操作',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-warning btn-xs " href="#" onclick="$.operate.addAdjust()"><i class="fa fa-trash-o"></i>调整</a> ');
+                        return actions.join('');
+                    }
+                },
+                {
                     field: 'id',
                     title: '明细id',
                     sortable: true
@@ -201,7 +212,7 @@
                 {
                     field: 'checkDetailId',
                     title: '质检单明细行号',
-                    visible: false
+                    visible: true
                 },
                 {
                     field: 'referCode',
@@ -211,14 +222,18 @@
                 {
                     field: 'referDetailId',
                     title: '调整单关联明细ID',
-                    visible: false
+                    visible: true
                 },
  
                 {
                     field: 'problemType',
                     title: '调整类型',
-                    sortable: true,
-                    visible: true
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(type2, value);
+                    },
+                    visible: true,
+                    //sortable: true
                 },
                 {
                     field: 'fromQty',
@@ -278,9 +293,9 @@
                 },
                 {
                     field: 'status',
-                    title: '明细状态',
+                    title: '调整状态',
                     formatter: function (value, row, index) {
-                        return $.table.selectDictLabel(datas, value);
+                        return $.table.selectDictLabel(adjustStatus, value);
                     },
                     sortable: true
                 },
@@ -299,7 +314,15 @@
                     title: '处理标记',
                     visible: false
                 },
-
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-danger btn-xs" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a> ');
+                        return actions.join('');
+                    }
+                }
  
             ]
         };
+<!DOCTYPE HTML>
+<html  lang="zh" xmlns:th="http://www.thymeleaf.org">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-cyclecountAdjustDetail-AdjustEdit" th:object="${cyclecountAdjustDetailEdit}" >
+        <input type="hidden" id="cyclecountAdjustId" name="cyclecountAdjustId" th:value="*{cyclecountAdjustId}">
+
+        <div class="form-group">
+            <label class="col-sm-3 control-label">明细id：</label>
+            <div class="col-sm-8">
+                <input id="id" name="id" th:value="*{id}" class="form-control" type="text"readonly="readonly">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">调整单编号：</label>
+            <div class="col-sm-8">
+                <input id="cyclecountAdjustCode" name="cyclecountAdjustCode" th:value="*{cyclecountAdjustCode}" class="form-control" type="text" readonly="readonly">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">货主编码：</label>
+            <div class="col-sm-8">
+                <input id="companyCode" name="companyCode" th:value="*{companyCode}" class="form-control" type="text" readonly="readonly">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">盘点单编号：</label>
+            <div class="col-sm-8">
+                <input id="cyclecountHeadCode" name="cyclecountHeadCode" th:value="*{cyclecountHeadCode}" class="form-control" type="text" readonly="readonly">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">物料编码：</label>
+            <div class="col-sm-8">
+                <input id="materialCode" name="materialCode" th:value="*{materialCode}" class="form-control" type="text"readonly="readonly">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label class="col-sm-3 control-label">库位编码：</label>
+            <div class="col-sm-8">
+                <input id="locationCode" name="locationCode" th:value="*{locationCode}" class="form-control" type="text" readonly="readonly">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">容器编号：</label>
+            <div class="col-sm-8">
+                <input id="containerCode" name="containerCode" th:value="*{containerCode}" class="form-control" type="text" readonly="readonly">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">入库单编码：</label>
+            <div class="col-sm-8">
+                <input id="receiptCode" name="receiptCode" th:value="*{receiptCode}" class="form-control" type="text"readonly="readonly">
+            </div>
+        </div>
+        <!--<div class="form-group">
+            <label class="col-sm-3 control-label">重量kg：</label>
+            <div class="col-sm-8">
+                <input id="weight" name="weight" th:value="*{weight}" class="form-control" type="text" readonly="readonly">
+            </div>
+        </div>-->
+        <div class="form-group">
+            <label class="col-sm-3 control-label">库存id：</label>
+            <div class="col-sm-8">
+                <input id="inventoryId" name="inventoryId" th:value="*{inventoryId}" class="form-control" type="text"readonly="readonly">
+            </div>
+        </div>
+        <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')}" disabled="disabled">
+                    <option th:each="dict : ${inventoryStatus}" th:field="*{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" th:value="*{systemQty}" class="form-control" type="text"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" th:value="*{countedQty}" class="form-control" type="text" readonly="readonly">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">差异数量：</label>
+            <div class="col-sm-8">
+                <input id="gapQty" name="gapQty" th:value="*{gapQty}" class="form-control" type="text" readonly="readonly">
+            </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" placeholder="填写物料的差异数值" 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" th:value="*{batch}" class="form-control" type="text" readonly="readonly">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">批号：</label>
+            <div class="col-sm-8">
+                <input id="lot" name="lot" th:value="*{lot}" class="form-control" type="text"readonly="readonly">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">项目号：</label>
+            <div class="col-sm-8">
+                <input id="project" name="project" th:value="*{project}" class="form-control"readonly="readonly">
+            </div>
+        </div>
+        <!--<div class="form-group">
+            <label class="col-sm-3 control-label">生产日期：</label>
+            <div class="col-sm-8">
+                <input id="manufactureDate" name="manufactureDate" th:value="*{manufactureDate}" class="form-control" type="text" readonly="readonly">
+            </div>
+        </div>-->
+        <div class="form-group">
+            <label class="col-sm-3 control-label">失效日期：</label>
+            <div class="col-sm-8">
+                <input id="expirationDate" name="expirationDate" th:value="*{expirationDate}" class="form-control" type="text"readonly="readonly">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="form-control-static col-sm-offset-9">
+                <button type="submit" class="btn btn-success">确认</button><!--只调整数量 adjustUpdate-->
+                <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
+            </div>
+        </div>
+    </form>
+</div>
+<div th:include="include::footer"></div>
+<script type="text/javascript">
+    var prefix = ctx + "inventory/cyclecountAdjustDetail"
+    $("#form-cyclecountAdjustDetail-AdjustEdit").validate({
+        rules:{
+            adjustQty:{
+                required:true,
+            },
+            //必填判定
+        },
+        submitHandler: function(form) {
+            $.operate.save(prefix + "/editAdjustSave", $('#form-cyclecountAdjustDetail-AdjustEdit').serialize());
+        }
+    });
+    /*时间弹框*/
+    $(function () {
+        layui.use('laydate', function() {
+            var laydate = layui.laydate;
+            laydate.render({ elem: '#manufactureDate',max: 0, theme: 'molv' ,type: 'datetime'});
+            laydate.render({ elem: '#expirationDate',min: 0, theme: 'molv' ,type: 'datetime'});
+        });
+    })
+
+</script>
+</body>
+</html>
+<!DOCTYPE HTML>
+<html  lang="zh" xmlns:th="http://www.thymeleaf.org">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+
+        <form class="form-horizontal m" id="form-cyclecountAdjustDetail-addAdjust" >
+            <input type="hidden" id="cyclecountAdjustId" name="cyclecountAdjustId" th:value="${cyclecountAdjustId}">
+
+            <div class="form-group">
+                <label class="col-sm-3 control-label">调整单编号：</label>
+                <div class="col-sm-8">
+					<input id="code" name="code" th:value="${code}" class="form-control" type="text" readonly="readonly">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">货主编码：</label>
+                <div class="col-sm-8">
+                    <input id="companyId" name="companyId" type="hidden" th:value="*{companyId}">
+                    <input id="companyCode" name="companyCode" th:value="${companyCode}" class="form-control" type="text" readonly="readonly">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">盘点单编号：</label>
+                <div class="col-sm-8">
+                    <input id="cyclecountHeadCode" name="cyclecountHeadCode" th:value="${cyclecountHeadCode}" class="form-control" type="text" readonly="readonly">
+                </div>
+            </div>
+            <div class="form-group">
+                <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,'')">
+                </div>
+            </div>
+            <div class="form-group">
+                <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,'')">
+                </div>
+            </div>
+			<div class="form-group">	
+                <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,'')">
+                </div>
+            </div>
+            <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 class="form-group">
+				<div class="form-control-static col-sm-offset-9">
+					<button type="submit" class="btn btn-primary">提交</button><!--盘有 adjustInsert-->
+					<button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
+				</div>
+			</div>
+		</form>
+    </div>
+    <div th:include="include::footer"></div>
+    <script type="text/javascript">
+		var prefix = ctx + "inventory/cyclecountAdjustDetail"
+
+        $("#form-cyclecountAdjustDetail-addAdjust").validate({
+            rules:{
+                materialCode:{
+                    required:true,
+                },
+                containerCode:{
+                    required:true,
+                },
+                locationCode:{
+                    required:true,
+                },
+                systemQty:{
+                    required:true,
+                },
+                countedQty:{
+                    required:true,
+                },
+                gapQty:{
+                    required:true,
+                },
+                adjustQty:{
+                    required:true,
+                },
+
+                //必须填值判定
+            },
+            submitHandler: function(form) {
+                $.operate.save(prefix + "/addAdjust", $('#form-cyclecountAdjustDetail-addAdjust').serialize());
+            }
+        });
+
+		/*时间弹框*/
+        $(function () {
+            layui.use('laydate', function() {
+                var laydate = layui.laydate;
+                laydate.render({ elem: '#manufactureDate',max: 0, theme: 'molv' ,type: 'datetime'});
+                laydate.render({ elem: '#expirationDate',min: 0, theme: 'molv' ,type: 'datetime'});
+            });
+        })
+
+	</script>
+</body>
+</html>
@@ -67,6 +67,16 @@
                             </div>
                         </form>
                     </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">
+                            <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>-->
+                    </div>
                     <table id="bootstrap-table" data-mobile-responsive="true"
                            class="table table-bordered table-hover"></table>
                 </div>
@@ -82,7 +92,7 @@
     var upload = [[${@permission.hasPermi('inventoryHeader:adjustHeader:upload')}]];
     var report = [[${@permission.hasPermi('inventoryHeader:adjustHeader:report')}]];
     var datas = [[${@dict.getType('sys_normal_disable')}]];
-    var status2 = [[${@dict.getType('adjustType')}]];
+    var type2 = [[${@dict.getType('adjustType')}]];
  
     $(function () {
         var options = {
@@ -121,10 +131,10 @@
                     field: 'cycleCountCode',
                     title: '盘点单编码'
                 },
-                {
+                /*{
                     field: 'problemType',
                     title: '调整类型'
-                },
+                },*/
                 {
                     field: 'referCode',
                     title: '关联上游单编码'
@@ -138,9 +148,10 @@
                     title: '调整类型',
                     align: 'center',
                     formatter: function (value, row, index) {
-                        return $.table.selectDictLabel(status2, value);
+                        return $.table.selectDictLabel(type2, value);
                     },
-                    sortable: true
+                    visible: true,
+                    //sortable: true
                 },
  
                 {
@@ -170,7 +181,7 @@
                         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 ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></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('');
                     }