From e4ec0bad2edb0af11118e73a21f5e79f3acf21e4 Mon Sep 17 00:00:00 2001
From: TanYibin <5491541@qq.com>
Date: Mon, 13 Mar 2023 14:38:53 +0800
Subject: [PATCH] 出入库单据缺失权限添加
---
ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue | 4 ++--
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue | 2 +-
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue | 9 +++------
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/address/controller/AddressController.java | 8 ++------
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java | 18 +++++++-----------
5 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
index 5b17745..0f9b9f8 100644
--- a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
@@ -106,8 +106,8 @@
</a-button>
</template>
<span slot="action" slot-scope="text, record">
- <a v-if="record.status == 0 && record.taskType == 200" @click="selectPort(record)">生成任务<a-divider type="vertical"/></a>
- <a v-else-if="record.status == 0" @click="createTask(record)">生成任务<a-divider type="vertical"/></a>
+ <a v-if="record.status == 0 && record.taskType == 200" @click="selectPort(record)" v-has="'receiptContainerHeader:createTask'">生成任务<a-divider type="vertical"/></a>
+ <a v-else-if="record.status == 0" @click="createTask(record)" v-has="'receiptContainerHeader:createTask'">生成任务<a-divider type="vertical"/></a>
<a-popconfirm v-if="record.status == 0" v-has="'receiptContainerHeader:delete'" title="确定取消配盘吗?" @confirm="() => handleDelete(record.id)">
<a>取消配盘<a-divider type="vertical"/></a>
</a-popconfirm>
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 e46b6a8..73597a9 100644
--- a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
@@ -166,7 +166,7 @@
<a-popconfirm v-has="'receiptHeader:back'" v-if="record.lastStatus == 800" title="确定回传吗?" @confirm="() => hanleBack(record)">
<a>回传<a-divider type="vertical"/></a>
</a-popconfirm>
- <a v-if="record.lastStatus < 800" @click="receive(record)">组盘<a-divider type="vertical"/></a>
+ <a v-if="record.lastStatus < 800" @click="receive(record)" v-has="'receiptHeader:receive'">组盘<a-divider type="vertical"/></a>
<a v-if="record.lastStatus == 850" @click="viewReason(record)">原因<a-divider type="vertical"/></a>
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
diff --git a/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue b/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
index 0a10d4d..a2b4049 100644
--- a/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
@@ -176,17 +176,14 @@
type="primary"
icon="download"
size="small"
- @click="downloadFile(text)">
- 下载
+ @click="downloadFile(text)">下载
</a-button>
</template>
-
<span slot="action" slot-scope="text, record">
- <a-popconfirm v-has="'shipmentHeader:back'" v-if="record.lastStatus == 800" title="确定回传吗?"
- @confirm="() => hanleBack(record)">
+ <a-popconfirm v-has="'shipmentHeader:back'" v-if="record.lastStatus == 800" title="确定回传吗?" @confirm="() => hanleBack(record)">
<a>回传</a>
</a-popconfirm>
- <a v-if="record.lastStatus < 800" @click="autoShipmentCombine(record)">自动配盘<a-divider type="vertical"/></a>
+ <a v-if="record.lastStatus < 800" @click="autoShipmentCombine(record)" v-has="'shipmentHeader:autoShipmentCombine'">自动配盘<a-divider type="vertical"/></a>
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
<a-menu slot="overlay">
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/address/controller/AddressController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/address/controller/AddressController.java
index 2d1896c..9060027 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/address/controller/AddressController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/address/controller/AddressController.java
@@ -53,8 +53,7 @@ public class AddressController extends JeecgController<Address, IAddressService>
@GetMapping(value = "/list")
public Result<IPage<Address>> queryPageList(Address address, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
- String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
- address.setWarehouseCode(warehouseCode);
+ HuahengJwtUtil.setWarehouseCode(req, address);
QueryWrapper<Address> queryWrapper = QueryGenerator.initQueryWrapper(address, req.getParameterMap());
Page<Address> page = new Page<Address>(pageNo, pageSize);
IPage<Address> pageList = addressService.page(page, queryWrapper);
@@ -71,10 +70,7 @@ public class AddressController extends JeecgController<Address, IAddressService>
@PostMapping(value = "/add")
@RequiresPermissions("address:add")
public Result<String> add(@RequestBody Address address, HttpServletRequest req) {
- String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
- if (StringUtils.isNotEmpty(warehouseCode)) {
- address.setWarehouseCode(warehouseCode);
- }
+ HuahengJwtUtil.setWarehouseCode(req, address);
addressService.save(address);
return Result.OK("添加成功！");
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
index 1c7df01..6507bbe 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
@@ -68,11 +68,13 @@ public class ReceiptContainerHeaderController extends JeecgController<ReceiptCon
@Autowired
private IReceiptContainerDetailService receiptContainerDetailService;
- @Resource
+ @Autowired
private ILocationService locationService;
- @Resource
+
+ @Autowired
private IZoneService zoneService;
- @Resource
+
+ @Autowired
private IPortService portService;
/*---------------------------------主表处理-begin-------------------------------------*/
@@ -85,14 +87,12 @@ public class ReceiptContainerHeaderController extends JeecgController<ReceiptCon
* @param req
* @return
*/
- // @AutoLog(value = "入库组盘-分页列表查询")
@ApiOperation(value = "入库组盘-分页列表查询", notes = "入库组盘-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<ReceiptContainerHeader>> queryPageList(ReceiptContainerHeader receiptContainerHeader,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
- String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
- receiptContainerHeader.setWarehouseCode(warehouseCode);
+ HuahengJwtUtil.setWarehouseCode(req, receiptContainerHeader);
QueryWrapper<ReceiptContainerHeader> queryWrapper = QueryGenerator.initQueryWrapper(receiptContainerHeader, req.getParameterMap());
Page<ReceiptContainerHeader> page = new Page<ReceiptContainerHeader>(pageNo, pageSize);
IPage<ReceiptContainerHeader> pageList = receiptContainerHeaderService.page(page, queryWrapper);
@@ -109,10 +109,7 @@ public class ReceiptContainerHeaderController extends JeecgController<ReceiptCon
@RequiresPermissions("receiptContainerHeader:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody ReceiptContainerHeader receiptContainerHeader, HttpServletRequest req) {
- String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
- if (StringUtils.isNotEmpty(warehouseCode)) {
- receiptContainerHeader.setWarehouseCode(warehouseCode);
- }
+ HuahengJwtUtil.setWarehouseCode(req, receiptContainerHeader);
receiptContainerHeaderService.save(receiptContainerHeader);
return Result.OK("添加成功！");
}
@@ -141,7 +138,6 @@ public class ReceiptContainerHeaderController extends JeecgController<ReceiptCon
@DeleteMapping(value = "/delete")
@RequiresPermissions("receiptContainerHeader:delete")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-// receiptContainerHeaderService.delMain(id);
return receiptContainerHeaderService.cancelReceiving(Integer.parseInt(id));
}
--
libgit2 0.22.2