添加入库质检行内编辑后台修改方法

mahuandong
1 parent 28a1088c
Showing 4 changed files with 145 additions and 65 deletions
src/main/java/com/huaheng/pc/check/checkingRegister/controller/CheckingRegisterController.java
src/main/java/com/huaheng/pc/check/checkingRegister/service/CheckingRegisterService.java
src/main/resources/templates/check/checkingRegister/checkingRegister.html
src/main/resources/templates/include.html
@@ -16,6 +16,7 @@ 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.check.checkHeader.domain.CheckHeader;
+import com.huaheng.pc.check.checkHeader.service.CheckHeaderService;
 import com.huaheng.pc.check.checkingRegister.domain.CheckingRegister;
 import com.huaheng.pc.check.checkingRegister.service.CheckingRegisterService;
 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
@@ -42,12 +43,20 @@ public class CheckingRegisterController extends BaseController {
  
     @Resource
     private CheckingRegisterService checkingRegisterService;
+    @Resource
+    private CheckHeaderService checkHeaderService;
  
     private String prefix = "check/checkingRegister";
  
     @RequiresPermissions("check:checkingRegister:view")
     @GetMapping("/{checkId}")
     public String checkingRegister(@PathVariable("checkId") Integer checkId, ModelMap modelMap) {
+        if (checkId != 0){
+            CheckHeader checkHeader = checkHeaderService.getById(checkId);
+            modelMap.put("checkHeaderId",checkHeader.getId());
+            modelMap.put("checkCode",checkHeader.getCode());
+        }
+
         modelMap.put("checkId",checkId);
         return prefix + "/checkingRegister";
     }
@@ -144,9 +153,7 @@ public class CheckingRegisterController extends BaseController {
     @PostMapping("/edit")
     @ResponseBody
     public AjaxResult editSave(CheckingRegister checkingRegister) {
-        checkingRegister.setCheckBy(ShiroUtils.getLoginName());
-        checkingRegister.setLastUpdatedBy(ShiroUtils.getLoginName());
-        return toAjax(checkingRegisterService.updateById(checkingRegister));
+        return checkingRegisterService.edit(checkingRegister);
     }
  
     /**
 package com.huaheng.pc.check.checkingRegister.service;
  
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.common.exception.service.ServiceException;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.check.checkDetail.domain.CheckDetail;
+import com.huaheng.pc.check.checkDetail.service.CheckDetailService;
+import com.huaheng.pc.check.checkHeader.domain.CheckHeader;
+import com.huaheng.pc.check.checkHeader.service.CheckHeaderService;
+import com.huaheng.pc.config.material.domain.Material;
+import com.huaheng.pc.config.material.service.MaterialService;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.pc.check.checkingRegister.domain.CheckingRegister;
@@ -9,4 +23,65 @@ import com.huaheng.pc.check.checkingRegister.mapper.CheckingRegisterMapper;
 @Service
 public class CheckingRegisterService extends ServiceImpl<CheckingRegisterMapper, CheckingRegister> {
  
+    @Resource
+    private CheckHeaderService checkHeaderService;
+    @Resource
+    private CheckDetailService checkDetailService;
+    @Resource
+    private MaterialService materialService;
+    /**
+     * 质检登记修改
+     * @return
+     */
+    public AjaxResult edit(CheckingRegister checkingRegister){
+
+        //判断关联质检头表信息是否正确
+        CheckHeader checkHeader = checkHeaderService.getById(checkingRegister.getCheckHeaderId());
+        if (checkHeader.getEnable() == 0){
+            return AjaxResult.error("关联质检单无效，不允许修改");
+        }
+        //判断关联质检头表状态是否允许修改
+        if ("30".equals(checkHeader.getStatus())){
+            return AjaxResult.error("关联质检单已完成质检不允许修改质检登记");
+        }
+        //判断关联质检明细信息是否正确
+        LambdaQueryWrapper<CheckDetail> checkDetailLambda = Wrappers.lambdaQuery();
+        checkDetailLambda.eq(CheckDetail::getCheckHeaderId, checkingRegister.getCheckHeaderId());
+        List<CheckDetail> checkDetails = checkDetailService.list();
+
+        int i = 0;
+        for (CheckDetail checkDetail: checkDetails){
+            if (checkDetail.getId() == checkingRegister.getReceiptDetailId()){
+                i = 1;
+            }
+        }
+        if (i == 0){
+            return AjaxResult.error("质检单下不存在该质检明细");
+        }
+        //判断关联质检明细物料信息是否正确
+        CheckDetail checkDetail = checkDetailService.getById(checkingRegister.getReceiptDetailId());
+        if (checkDetail.getMaterialCode() != checkingRegister.getMaterialCode()){
+            return AjaxResult.error("关联质检明细的物料编码不匹配");
+        }
+        LambdaQueryWrapper<Material> materialLambda = Wrappers.lambdaQuery();
+        materialLambda.eq(Material::getCode, checkingRegister.getMaterialCode());
+        Material material = materialService.getOne(materialLambda);
+        checkingRegister.setMaterialName(material.getName());
+        checkingRegister.setMaterialSpec(material.getSpec());
+        checkingRegister.setMaterialUnit(material.getUnit());
+        checkingRegister.setLastUpdatedBy(ShiroUtils.getLoginName());
+        checkingRegister.setCheckAt(new Date());
+        checkingRegister.setCheckBy(ShiroUtils.getLoginName());
+        if (StringUtils.isNull(checkingRegister.getId())){
+            checkingRegister.setCreatedBy(ShiroUtils.getLoginName());
+            if (!this.save(checkingRegister)){
+                throw new ServiceException("添加质检登记失败");
+            }
+        } else {
+            if (!this.updateById(checkingRegister)){
+                throw new SecurityException("更新质检登记失败");
+            }
+        }
+        return AjaxResult.success("");
+    }
 }
@@ -60,6 +60,7 @@
     var editFlag = [[${@permission.hasPermi('check:checkingRegister:edit')}]];
     var removeFlag = [[${@permission.hasPermi('check:checkingRegister:remove')}]];
     var inventorySts = [[${@dict.getType('inventoryStatus')}]];
+    var curRow = {};
     $(function() {
  
         $("#bootstrap-table").bootstrapTable({
@@ -70,12 +71,14 @@
             cache: false,
             showToggle:true, //显示切换按钮来切换表/卡片视图。
             showPaginationSwitch:true, //显示分页切换按钮
+            method: "post",
             queryParams: queryParams,
             pagination: true,
             pageList: [10,25,50,100],
             pageSize:10,
             pageNumber:1,
             uniqueId: "id",
+            toolbar: "#toolbar",
             showRefresh: true,
             minimumCountColumns: 2,
             smartDisplay:true,
@@ -97,7 +100,15 @@
                 {
                     field : 'checkDetailId',
                     title : '质检明细标识',
-                    visible : false
+                    editable: {
+                        type: 'text',
+                        title: '质检明细标识',
+                        validate: function (v) {
+                            if (isNaN(v)) return '必须是数字';
+                            var age = parseInt(v);
+                            if (age < 0) return '必须是正整数';
+                        }
+                    }
                 },
                 {
                     field : 'checkHeaderId',
@@ -114,15 +125,7 @@
                     title : '质检单号',
                     align:"center",
                     order:"asc",
-                    sortable:"true",
-                    editable: {
-                        type: 'text',
-                        title: '用户名',
-                        validate: function (v) {
-                            if (!v) return '用户名不能为空';
-
-                        }
-                    }
+                    sortable:"true"
                 },
                 {
                     field : 'receiptDetailId',
@@ -131,16 +134,7 @@
                 },
                 {
                     field : 'receiptCode',
-                    title : '入库单号',
-                    editable: {
-                        type: 'text',
-                        title: '入库单号',
-                        validate: function (v) {
-                            if (isNaN(v)) return '年龄必须是数字';
-                            var age = parseInt(v);
-                            if (age <= 0) return '年龄必须是正整数';
-                        }
-                    }
+                    title : '入库单号'
                 },
                 {
                     field : 'referCode',
@@ -158,7 +152,11 @@
                 },
                 {
                     field : 'materialCode',
-                    title : '物料编码'
+                    title : '物料编码',
+                    editable: {
+                        type: 'text',
+                        title: '物料编码',
+                    }
                 },
                 {
                     field : 'materialName',
@@ -181,13 +179,24 @@
                     field : 'inventorySts',
                     title : '库存状态',
                     align: 'center',
-                    formatter: function (value, row, index) {
-                        return $.table.selectDictLabel(inventorySts, value);
+                    editable: {
+                        type: 'select',
+                        title: '库存状态',
+                        source:[{value:"defective",text:"次品"},{value:"discussed",text:"待确认"},{value:"good",text:"良品"},{value:"scrap",text:"报废品"}]
                     }
                 },
                 {
                     field : 'qty',
-                    title : '数量'
+                    title : '数量',
+                    editable: {
+                        type: 'text',
+                        title: '数量',
+                        validate: function (v) {
+                            if (isNaN(v)) return '数量必须是数字';
+                            var age = parseInt(v);
+                            if (age < 0) return '数量必须是正整数';
+                        }
+                    }
                 },
                 {
                     field : 'checkBy',
@@ -231,25 +240,24 @@
             onClickRow: function (row, $element) {
                 curRow = row;
             },
-            onLoadSuccess: function (aa, bb, cc) {
-                $("#tb_user a").editable({
-                    url: function (params) {
-                        var sName = $(this).attr("name");
-                        curRow[sName] = params.value;
-                        $.ajax({
-                            type: 'POST',
-                            url: "/Editable/Edit",
-                            data: curRow,
-                            dataType: 'JSON',
-                            success: function (data, textStatus, jqXHR) {
-                                alert('保存成功！');
-                            },
-                            error: function () { alert("error");}
-                        });
+            onEditableSave: function (field, row, oldValue, $el) {
+                $.ajax({
+                    type: "post",
+                    url: prefix+"/edit",
+                    data: row,
+                    dataType: 'JSON',
+                    success: function (data, status) {
+                        if (status == "success") {
+                            alert('提交数据成功');
+                        }
+                    },
+                    error: function () {
+                        alert('编辑失败');
                     },
-                    type: 'text'
+                    complete: function () {
+                    }
                 });
-            },
+            }
             // onClickCell: function(field, value, row, $element) {
             //     $element.attr('contenteditable', true);
             //     $element.attr('bgcolor', "#FFF");
@@ -261,18 +269,7 @@
             //     })
             // },
         });
-        // $('#bootstrap-table').editable({
-        //     type: "select",              //编辑框的类型。支持text|textarea|select|date|checklist等
-        //     source: [{ value: 1, text: "开发部" }, { value: 2, text: "销售部" }, {value:3,text:"行政部"}],
-        //     title: "选择部门",           //编辑框的标题
-        //     disabled: false,           //是否禁用编辑
-        //     mode: "popup",            //编辑框的模式：支持popup和inline两种模式，默认是popup
-        //     validate: function (value) { //字段验证
-        //         if (!$.trim(value)) {
-        //             return '不能为空';
-        //         }
-        //     }
-        // });
+
         // var options = {
         //
         // };
@@ -282,6 +279,12 @@
  
     var checkHeaderId;
  
+    function addButton() {
+        if (checkHeaderId != ""){
+            $("#toolbar").append("<a class=\"btn btn-outline btn-success btn-rounded\" onclick=\"addRow()\" shiro:hasPermission=\"check:checkingRegister:add\"><i class=\"fa fa-plus\"></i>新增</a>");
+        }
+    }
+
     function queryParams(params) {
         var checkId = [[${checkId}]];
         if (checkId == 0) {
@@ -289,19 +292,13 @@
         } else {
             checkHeaderId = checkId;
         }
+        addButton();
         return {
             checkHeaderId :checkHeaderId,
             pageSize:       params.limit,
             pageNum:        params.offset / params.limit + 1,
             searchValue:    params.search,
         };
-        addButton();
-    }
-
-    function addButton() {
-        if (checkHeaderId != ""){
-            $("#toolbar").append("<a class=\"btn btn-outline btn-success btn-rounded\" onclick=\"addRow()\" shiro:hasPermission=\"check:checkingRegister:add\"><i class=\"fa fa-plus\"></i>新增</a>");
-        }
     }
  
     function addRow() {
@@ -310,9 +307,9 @@
             row: {
                 id: '',
                 checkDetailId: '',
-                checkHeaderId: '',
+                checkHeaderId: [[${checkHeaderId}]],
                 warehouseCode: '',
-                checkCode: '',
+                checkCode: [[${checkCode}]],
                 receiptDetailId: '',
                 receiptCode: '',
                 referCode: '',
@@ -25,6 +25,7 @@
 	<script th:src="@{/ajax/libs/bootstrap-table/bootstrap-table.min.js}"></script>
 	<script th:src="@{/ajax/libs/bootstrap3-editable/js/bootstrap-editable.js}"></script>
 	<script th:src="@{/ajax/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js}"></script>
+	<script th:src="@{/ajax/libs/bootstrap-table/extensions/editable/bootstrap-table-editable.js}"></script>
 	<script th:src="@{/ajax/libs/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js}"></script>
 	<script th:src="@{/ajax/libs/bootstrap-table/extensions/toolbar/bootstrap-table-toolbar.min.js}"></script>
 	<!-- jquery-validate 表单验证插件 -->