diff --git a/src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java b/src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java index 70d311d..e643c20 100644 --- a/src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java +++ b/src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java @@ -98,7 +98,7 @@ public class ReceivingController extends BaseController { // if (count > 0) { // return AjaxResult.error("仓库有“出库查看”任务没有完成,请先完成任务"); // } - AjaxResult result = receiptContainerHeaderService.saveContainer(receiptCode, containerCode, receiptDetailId, + AjaxResult result = receiptContainerHeaderService.saveCountain(receiptCode, containerCode, receiptDetailId, locationCode, qty, locatingRule); return result; } diff --git a/src/main/resources/static/huaheng/js/huahengUI.js b/src/main/resources/static/huaheng/js/huahengUI.js index 6e3e7d5..0136f4e 100644 --- a/src/main/resources/static/huaheng/js/huahengUI.js +++ b/src/main/resources/static/huaheng/js/huahengUI.js @@ -39,6 +39,9 @@ var table = { type: 0, // 0 代表bootstrapTable 1代表bootstrapTreeTable height: undefined, sidePagination: "server", + createUrl: "", + updateUrl: "", + removeUrl: "", sortName: "", sortOrder: "asc", pagination: true, @@ -78,6 +81,9 @@ var table = { cache: false, // 是否使用缓存 height: options.height, // 表格的高度 striped: options.striped, // 是否显示行间隔色 + createUrl: options.createUrl, + updateUrl: options.updateUrl, + removeUrl: options.removeUrl, sortable: true, // 是否启用排序 sortStable: true, // 设置为 true 将获得稳定的排序 sortName: options.sortName, // 排序列名称 @@ -895,49 +901,54 @@ var table = { }, // 删除信息 remove: function(id) { - $.modal.confirm("确定删除该条" + $.table._option.modalName + "信息吗?", function() { - var url = $.common.isEmpty(id) ? $.table._option.removeUrl : $.table._option.removeUrl.replace("{id}", id); + $.modal.confirm("确定删除该条" + $.table.options.modalName + "信息吗?", function() { + var url = $.common.isEmpty(id) ? $.table.options.removeUrl : $.table.options.removeUrl.replace("{id}", id); var data = { "ids": id }; $.operate.submit(url, "post", "json", data); }); }, // 批量删除信息 batRemove: function() { - var rows = $.common.isEmpty($.table._option.id) ? $.table.selectFirstColumns() : $.table.selectColumns($.table._option.id); + var rows = $.common.isEmpty($.table.options.id) ? $.table.selectFirstColumns() : $.table.selectColumns($.table.options.id); if (rows.length == 0) { $.modal.alertWarning("请至少选择一条记录"); return; } $.modal.confirm("确认要删除选中的" + rows.length + "条数据吗?", function() { - var url = $.table._option.removeUrl; + var url = $.table.options.removeUrl; var data = { "ids": rows.join() }; $.operate.submit(url, "post", "json", data); }); }, // 添加信息 add: function(id) { - var url = $.common.isEmpty(id) ? $.table._option.createUrl : $.table._option.createUrl.replace("{id}", id); - $.modal.open("添加" + $.table._option.modalName, url); + table.set(); + var url = $.common.isEmpty(id) ? table.options.createUrl : $.table.options.createUrl.replace("{id}", id); + $.modal.open("添加" + table.options.modalName, url); }, // 修改信息 edit: function(id) { - var url = $.table._option.updateUrl.replace("{id}", id); - $.modal.open("修改" + $.table._option.modalName, url); + table.set(); + var url = table.options.updateUrl.replace("{id}", id); + $.modal.open("修改" + table.options.modalName, url); }, //查看 checklook: function(id) { - var url = $.table._option.updateUrl.replace("{id}", id); - $.modal.open("查看" + $.table._option.modalName, url); + table.set(); + var url = table.options.updateUrl.replace("{id}", id); + $.modal.open("查看" + table.options.modalName, url); }, // 添加信息 全屏 addFull: function(id) { - var url = $.common.isEmpty(id) ? $.table._option.createUrl : $.table._option.createUrl.replace("{id}", id); - $.modal.openFull("添加" + $.table._option.modalName, url); + table.set(); + let url = $.common.isEmpty(id) ? table.options.createUrl : $.table.options.createUrl.replace("{id}", id); + $.modal.openFull("添加" + table.options.modalName, url); }, // 修改信息 全屏 editFull: function(id) { - var url = $.table._option.updateUrl.replace("{id}", id); - $.modal.openFull("修改" + $.table._option.modalName, url); + table.set(); + var url = table.options.updateUrl.replace("{id}", id); + $.modal.openFull("修改" + table.options.modalName, url); }, // 保存信息 save: function(url, data) {