diff --git a/ant-design-vue-jeecg/src/views/system/config/ContainerList.vue b/ant-design-vue-jeecg/src/views/system/config/ContainerList.vue
index 56b0a43..a40a850 100644
--- a/ant-design-vue-jeecg/src/views/system/config/ContainerList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/ContainerList.vue
@@ -53,16 +53,16 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
- <a-button @click="batchPrint()" type="primary">打印</a-button>
<a-button @click="handleAdd" v-has="'container:add'" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('容器管理')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
+ <a-button v-has="'container:print'" @click="batchPrint()" type="primary">打印</a-button>
</a-upload>
<!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal"-->
+<!-- @handleSuperQuery="handleSuperQuery"></j-super-query>-->
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'container:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/config/LocationList.vue b/ant-design-vue-jeecg/src/views/system/config/LocationList.vue
index 85481a2..4b7586c 100644
--- a/ant-design-vue-jeecg/src/views/system/config/LocationList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/LocationList.vue
@@ -105,17 +105,17 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
- <a-button @click="batchPrint()" type="primary">打印</a-button>
<a-button @click="batchAdd()" v-has="'location:batchAdd'" type="primary" icon="plus">批量新增</a-button>
<a-button v-has="'location:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('库位管理')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
+ <a-button v-has="'material:print'" @click="batchPrint()" type="primary">打印</a-button>
</a-upload>
<!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal"-->
+<!-- @handleSuperQuery="handleSuperQuery"></j-super-query>-->
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'location:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/config/MaterialList.vue b/ant-design-vue-jeecg/src/views/system/config/MaterialList.vue
index 9ea9f46..955ca1d 100644
--- a/ant-design-vue-jeecg/src/views/system/config/MaterialList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/MaterialList.vue
@@ -38,16 +38,16 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
- <a-button @click="batchPrint()" type="primary">打印</a-button>
<a-button v-has="'material:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('物料管理')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
+ <a-button v-has="'material:print'" @click="batchPrint()" type="primary">打印</a-button>
</a-upload>
<!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal"-->
+<!-- @handleSuperQuery="handleSuperQuery"></j-super-query>-->
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay" v-has="'material:deleteBatch'">
<a-menu-item key="1" @click="batchDel">
diff --git a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
index 1cd447e..00ab63e 100644
--- a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
@@ -99,16 +99,16 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
- <a-button @click="batchPrint()" type="primary">打印</a-button>
<a-button v-has="'receiptHeader:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('入库表主表')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
+ <a-button v-has="'receiptHeader:print'"@click="batchPrint()" type="primary">打印</a-button>
</a-upload>
<!-- 高级查询区域 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal"
- @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal"-->
+<!-- @handleSuperQuery="handleSuperQuery"></j-super-query>-->
</div>
<!-- table区域-begin -->
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/controller/ReceiveController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/controller/ReceiveController.java
index 348963a..00c9450 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/controller/ReceiveController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/controller/ReceiveController.java
@@ -1,27 +1,28 @@
package org.jeecg.modules.wms.receipt.receiving.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.utils.HuahengJwtUtil;
-import org.jeecg.modules.wms.config.container.entity.Container;
import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptDetail;
import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptDetailService;
import org.jeecg.modules.wms.receipt.receiving.domain.Receive;
import org.jeecg.modules.wms.receipt.receiving.service.IReceiveService;
import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
-import org.jeecg.utils.StringUtils;
+import org.jeecg.utils.HuahengJwtUtil;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
/**
* @author 游杰
@@ -71,11 +72,11 @@ public class ReceiveController {
}
/**
- * 收货
+ * 组盘
* @return
*/
- @AutoLog("入库单-收货")
- @ApiOperation(value = "入库单-收货", notes = "入库单-收货组盘")
+ @AutoLog("入库单-组盘")
+ @ApiOperation(value = "入库单-组盘", notes = "入库单-组盘")
@PostMapping("/receiving")
@ResponseBody
public Result receiving(@RequestBody List<Receive> receiveList, HttpServletRequest req) {
@@ -87,8 +88,8 @@ public class ReceiveController {
* 收货
* @return
*/
- @AutoLog("入库单-收货-生成任务")
- @ApiOperation(value = "入库单-收货-生成任务", notes = "收货组盘后，自动生成任务")
+ @AutoLog("入库单-生成任务")
+ @ApiOperation(value = "入库单-生成任务", notes = "入库单-生成任务")
@PostMapping("/receivingAndCreateTask")
@ResponseBody
public Result<TaskHeader> receivingAndCreateTask(@RequestBody List<Receive> receiveList, HttpServletRequest req) {