Merge remote-tracking branch 'origin/develop' into develop

mahuandong
2 parents 976d7e3c 1a713452
Showing 4 changed files with 57 additions and 107 deletions
src/main/java/com/huaheng/pc/inventory/adjustDetail/controller/adjustDetailController.java
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java
src/main/resources/templates/inventory/adjustDetail/adjustDetail.html
@@ -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;
@@ -99,34 +100,24 @@ public class adjustDetailController extends BaseController {
     }
  
     /**
-     * 只调整数量
-     * 修改
-     */
-    @GetMapping("/adjustEdit")
-    public String editAdjust(Integer id, ModelMap mmap)
-    {
-        AdjustDetail adjustDetailEdit = adjustDetailService.getById(id);
-        mmap.put("adjustDetailEdit", adjustDetailEdit);
-        return prefix + "/adjustEdit";
-    }
-
-    /**
-     * 修改保存调整数量
+     * 调整数量
      */
     //@RequiresPermissions("inventory:cyclecountAdjustDetail:addAdjust")
     @Log(title = "库存-调整单", operating = "调整单调整库存差异，调整数量", action = BusinessType.UPDATE)
-    @PostMapping("/editAdjustSave")
+    @PostMapping("/adjustEdit")
     @ResponseBody
-    public AjaxResult editAdjustSave(AdjustDetail adjustDetail)
+    public AjaxResult editAdjustSave(String ids)
     {
-        //未上传不允许进行明细差异调整
-//        CyclecountAdjust cyclecountAdjust = cycleconutAdjustService.selectEntityById(cyclecountAdjustDetail.getCyclecountAdjustId());
-//        if(cyclecountAdjust.getStatus() != 30 ){
-//            return AjaxResult.error("单据未上传，没有调整单下发，不允许差异调整！！");
-//            //throw new ServiceException("单据未上传，没有调整单下发，不允许差异调整！");
-//        }
-        AjaxResult result = adjustDetailService.updateAdjustDetail(adjustDetail);
-        return result;
+        if(ids == null){
+            throw new SecurityException("ID不能为空！");
+        }
+        Integer[] integers = Convert.toIntArray(ids);
+        for (Integer id : integers)
+        {
+            AdjustDetail adjustDetailEdit = adjustDetailService.getById(id);
+            adjustDetailService.updateAdjustDetail(adjustDetailEdit);
+        }
+        return AjaxResult.success("调整下发成功！");
     }
  
  
@@ -237,6 +237,7 @@ public class CycleCountDetailController extends BaseController {
     @PostMapping("/createCyclecountWithGapQty")
     @ResponseBody
     public AjaxResult createCyclecountWithGapQty(String cycleCountHeadCode){
+
         return cycleCountDetailService.createCyclecountWithGapQty(cycleCountHeadCode);
     }
  
@@ -415,6 +415,9 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
         cycleCountDetail.setCompanyCode(cycleCountHeader.getCompanyCode());
         LambdaQueryWrapper<CycleCountDetail> cycleCountDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
         List<CycleCountDetail> cycleCountDetails = this.list(cycleCountDetailLambdaQueryWrapper);//明细
+        if(cycleCountDetails.size() == 0){
+            throw new SecurityException("没有明细！");
+        }
         //生成复盘盘点主单
         cycleCountHeader.setCode(cycleCountHeaderService.createCode());
         cycleCountHeader.setRound(cycleCountHeader.getRound() + 1);//盘点轮次+1
@@ -438,6 +441,9 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
                 }
  
         }
+        if(cycleCountDetailList.size() == 0){
+            throw new SecurityException("该单据没有符合复盘条件的明细！");
+        }
         if(!this.saveBatch(cycleCountDetailList)){
             throw new ServiceException("复盘明细子单生成失败");
         }
@@ -118,9 +118,6 @@
     var created;
  
     $(function () {
-        update();
-    });
-    function update() {
         let adjustCode=null;
         let options = {
             url:prefix + "/list",
@@ -129,9 +126,12 @@
             sortOrder: "desc",
             search: false,
             showRefresh: true,
+            onRefresh: function(){
+                update();
+            },
             columns: [
                 {
-                    radio: true
+                    checkbox: true
                 },
                 /*{
                     title: '调整操作',
@@ -351,44 +351,24 @@
             $.table.init(options);
         }
  
-        /*$.ajax({
-            url: prefix_head + "/getHeader",
-            type: "post",
-            data: {
-                id: $('#cyclecountAdjustId').val()
-            },
-            success: function (value) {
-                if (value.data) {
-                    $('#code').val(value.data.code);
-                    // $('#type').val(value.data.typeLabel);
-                    $('#status').val(value.data.statusLabel);
-                    $('#created').val(value.data.created);
-                    var text_val = $('#created').val();
-                    $('#created').val(text_val.replace("T", " "));
-                    //$('#createdBy').val(value.data.createdBy);
-                    $('#lastUpdated').val(value.data.lastUpdated);
-                    var text_val_t = $('#lastUpdated').val();
-                    $('#lastUpdated').val(text_val_t.replace("T", " "));
-                    //$('#lastUpdatedBy').val(value.data.lastUpdatedBy);
-                }
-            }
-        })*/
-    }
-
-    /**盘点差异调整*/
-    function addAdjust() {
-        var row = $('#bootstrap-table').bootstrapTable('getSelections');
+    });
  
-        $.modal.confirm("注意：该操作将更改库存，当实盘数量为0且库位上只剩空容器时，请手动执行空托出库任务,容器上有货则无需其他操作！",
-            function () {
-                    /*判断是否已经调整过*/
-                    if (row[0].status == 2) {
-                        $.modal.msg('该条明细已调整，请勿重复调整！')
-                    } else {
-                        $.modal.open("差异调整单", prefix + "/adjustEdit?id=" + row[0].id)
-                    }
  
-            });
+     /*
+      *盘点差异调整
+      * */
+    function addAdjust() {
+        var rows = $.common.isEmpty($.table._option.id) ? $.table.selectFirstColumns() : $.table.selectColumns($.table._option.id);
+        if (rows.length == 0) {
+            $.modal.alertWarning("请至少选择一条记录");
+            return;
+        }
+        $.modal.confirm("注意：该操作将更改库存，当实盘数量为0且库位上只剩空容器时，请手动执行空托出库任务,容器上有货则无需其他操作！"
+            , function() {
+            var url = prefix + "/adjustEdit";
+            var data = { "ids": rows.join() };
+            postInner(url, data);
+        });
     }
  
     //
@@ -422,51 +402,23 @@
             // shadeClose: true, //点击遮罩关闭层
         })
     }
-
-    /*
-     *  差异复盘
-     */
-    function createCyclecountWithGapQty() {
-        $.modal.confirm("确认进行差异复盘么？该操作会将有差异的明细重新生成一个新的盘点单。", function () {
-            var url = prefix + "/createCyclecountWithGapQty";
-            var data = {"headId": $('#headId').val()};
-            postInner(url, data);
-        });
-    }
-
-    /*    //调整差异库存
-        function adjust() {
-            $.modal.confirm("注意：该操作将更改库存，当实盘数量为0且库位上只剩空容器时，请手动执行空托出库任务,容器上有货则无需其他操作！",
-            function() {
-                var url = prefix + "/adjust";
-                var data = { "headId": $('#headId').val() };
-                postInner(url,data);
-            });
-        }
-        function postInner(url,data) {
-            $.modal.loading("正在处理中，请稍后...");
-            $.ajax({
-                url:url,
-                type:"post",
-                data:data,
-                success:function (result) {
-                    if (result.code == web_status.SUCCESS) {
-                        $.modal.msgSuccess(result.msg);
-                        update();
-                    } else {
-                        $.modal.alertError(result.msg);
-                    }
-                    $.modal.closeLoading();
+    function postInner(url,data) {
+        $.modal.loading("正在处理中，请稍后...");
+        $.ajax({
+            url:url,
+            type:"post",
+            data:data,
+            success:function (result) {
+                if (result.code == web_status.SUCCESS) {
+                    $.modal.msgSuccess(result.msg);
+                    update();
+                } else {
+                    $.modal.alertError(result.msg);
                 }
-            })
-        }*/
-
-    /*    //下发单条盘点
-        function outcheck(id) {
-            var url = prefix + "/createCyccoutTaskByDetailId";
-            var data = { "detailId": id };
-            postInner(url,data);
-        }*/
+                $.modal.closeLoading();
+            }
+        })
+    }
  
  
 </script>