From e6d98dc8232feae94c6f695926fc75b89dfcf662 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 27 九月 2024 09:52:39 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java | 34 ++++++++--------
north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java | 2
north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java | 30 +++++++-------
north-glass-erp/northglass-erp/src/lang/zh.js | 3 +
north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java | 8 ++--
5 files changed, 39 insertions(+), 38 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 25e3476..3544c50 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -337,7 +337,8 @@
workOrder:{
page:{
- selectWorkOrder:'宸ュ崟绠＄悊'
+ selectWorkOrder:'宸ュ崟绠＄悊',
+ addWorkOrder:'杞敓浜ц鍗�'
},
productionId:'鐢熶骇璁㈠崟鍙�',
convert:'宸茶浆',
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java b/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java
index b12a326..0bd7d1f 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java
@@ -35,7 +35,7 @@
/*鎴愬搧搴撳瓨鏌ヨ*/
@ApiOperation("鎴愬搧搴撳瓨鏌ヨ鎺ュ彛")
- @SaCheckPermission("ProductStockList.search")
+ @SaCheckPermission("productStockList.search")
@PostMapping("/getSelect/{pageNum}/{pageSize}")
public Result defaultDateFinishedGoodsInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FinishedGoodsInventory finishedGoodsInventory){
return Result.seccess(finishedGoodsInventoryService.defaultDateFinishedGoodsInventory(pageNum,pageSize,finishedGoodsInventory));
@@ -43,7 +43,7 @@
/*鏌ヨ鍙叆搴撶殑鎴愬搧鏁版嵁*/
@ApiOperation("鍙叆搴撶殑鎴愬搧鏌ヨ鎺ュ彛")
- @SaCheckPermission("CreateProductStock.search")
+ @SaCheckPermission("createProductStock.search")
@PostMapping("/getSelectWarehousing/{pageNum}/{pageSize}")
public Result getSelectWarehousing(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FlowCard flowCard){
return Result.seccess(finishedGoodsInventoryService.getSelectWarehousing(pageNum,pageSize,flowCard));
@@ -51,7 +51,7 @@
/*鎴愬搧鍏ュ簱*/
@ApiOperation("鎴愬搧鍏ュ簱鎺ュ彛")
- @SaCheckPermission("CreateProductStock.add")
+ @SaCheckPermission("createProductStock.add")
@PostMapping("/addSelectWarehousing")
public Result addSelectWarehousing( @RequestBody Map<String,Object> object){
return Result.seccess(finishedGoodsInventoryService.addSelectWarehousing(object));
@@ -60,7 +60,7 @@
/*鏌ヨ鍙彂璐х殑鎴愬搧鏁版嵁*/
@ApiOperation("鍙彂璐х殑鎴愬搧鏌ヨ鎺ュ彛")
- @SaCheckPermission("FinishedProductOut.search")
+ @SaCheckPermission("finishedProductOut.search")
@PostMapping("/getSelectDeliveryDetail/{pageNum}/{pageSize}")
public Result getSelectDeliveryDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
return Result.seccess(finishedGoodsInventoryService.getSelectDeliveryDetail(pageNum,pageSize,orderDetail));
@@ -68,7 +68,7 @@
/*鎴愬搧鍙戣揣*/
@ApiOperation("鎴愬搧鍙戣揣鎺ュ彛")
- @SaCheckPermission("FinishedProductOut.add")
+ @SaCheckPermission("finishedProductOut.add")
@PostMapping("/addDeliveryDetail")
public Result addDeliveryDetail( @RequestBody Map<String,Object> object){
return Result.seccess(finishedGoodsInventoryService.addDeliveryDetail(object));
@@ -76,7 +76,7 @@
/* 璋冩嫧鏌ヨ*/
@ApiOperation("鍙皟鎷ㄦ暟鎹煡璇㈡帴鍙�")
- @SaCheckPermission("OrderAllocation.search")
+ @SaCheckPermission("orderAllocation.search")
@PostMapping("/getSelectAllocate/{pageNum}/{pageSize}")
public Result getSelectAllocate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
return Result.seccess(finishedGoodsInventoryService.getSelectAllocate(pageNum,pageSize,orderDetail));
@@ -84,7 +84,7 @@
/*璁㈠崟璋冩嫧*/
@ApiOperation("璁㈠崟璋冩嫧鎺ュ彛")
- @SaCheckPermission("OrderAllocation.add")
+ @SaCheckPermission("orderAllocation.add")
@PostMapping("/updateFinishedGoodsInventoryAllocate")
public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryAllocate(object));
@@ -92,7 +92,7 @@
/*璋冩嫧璁板綍鏌ヨ*/
@ApiOperation("璋冩嫧璁板綍鏌ヨ鎺ュ彛")
- @SaCheckPermission("TransferRecord.search")
+ @SaCheckPermission("transferRecord.search")
@PostMapping("/getSelectAllocateFinishedOperateLog/{pageNum}/{pageSize}/{selectDate}")
public Result getSelectAllocateFinishedOperateLog(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
return Result.seccess(finishedGoodsInventoryService.getSelectAllocateFinishedOperateLog(pageNum,pageSize,selectDate,finishedOperateLog));
@@ -100,7 +100,7 @@
/*璁㈠崟棰嗗嚭*/
@ApiOperation("璁㈠崟棰嗗嚭鎺ュ彛")
- @SaCheckPermission("FinishedGoodsIssue.add")
+ @SaCheckPermission("finishedGoodsIssue.add")
@PostMapping("/updateFinishedGoodsInventoryTakeOut")
public Result updateFinishedGoodsInventoryTakeOut( @RequestBody Map<String,Object> object){
return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryTakeOut(object));
@@ -108,7 +108,7 @@
/*棰嗗嚭璁板綍鏌ヨ*/
@ApiOperation("棰嗗嚭璁板綍鏌ヨ鎺ュ彛")
- @SaCheckPermission("TakeOutRecord.search")
+ @SaCheckPermission("takeOutRecord.search")
@PostMapping("/getSelectOperateRecord/{pageNum}/{pageSize}/{selectDate}")
public Result getSelectOperateRecord(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
return Result.seccess(finishedGoodsInventoryService.getSelectOperateRecord(pageNum,pageSize,selectDate,finishedOperateLog));
@@ -125,14 +125,14 @@
/*璁㈠崟瀹℃牳*/
@ApiOperation("璁㈠崟瀹℃牳鎺ュ彛")
- @SaCheckPermission("TakeOutRecord.review")
+ @SaCheckPermission("takeOutRecord.review")
@PostMapping("/updateFinishedGoodsInventoryToExamine")
public Result updateFinishedGoodsInventoryToExamine( @RequestBody Map<String,Object> object){
return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"瀹℃牳"));
}
/*璁㈠崟鍙嶅*/
@ApiOperation("璁㈠崟鍙嶅鎺ュ彛")
- @SaCheckPermission("TakeOutRecord.review")
+ @SaCheckPermission("takeOutRecord.review")
@PostMapping("/updateFinishedGoodsInventoryCounterExamination")
public Result updateFinishedGoodsInventoryCounterExamination( @RequestBody Map<String,Object> object){
return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"鍙嶅"));
@@ -140,7 +140,7 @@
/*璁㈠崟浣滃簾*/
@ApiOperation("璁㈠崟浣滃簾鎺ュ彛")
- @SaCheckPermission("TakeOutRecord.update")
+ @SaCheckPermission("takeOutRecord.update")
@PostMapping("/cancelFinishedGoodsInventoryToExamine")
public Result cancelFinishedGoodsInventoryToExamine( @RequestBody Map<String,Object> object){
return Result.seccess(finishedGoodsInventoryService.cancelFinishedGoodsInventoryToExamine(object));
@@ -163,7 +163,7 @@
}
@ApiOperation("鎴愬搧搴撳瓨璁板綍鏌ヨ鎺ュ彛")
- @SaCheckPermission("WarehouseReport.search")
+ @SaCheckPermission("warehouseReport.search")
@PostMapping("/getSelectFinishedOperateLogReport/{pageNum}/{pageSize}/{selectDate}")
public Result getSelectFinishedOperateLogReport(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
return Result.seccess(finishedGoodsInventoryService.getSelectFinishedOperateLogReport(pageNum,pageSize,selectDate,finishedOperateLog));
@@ -179,7 +179,7 @@
/*璁㈠崟涓�閿叆搴�*/
@ApiOperation("璁㈠崟涓�閿叆搴�")
- @SaCheckPermission("CreateProductStock.add")
+ @SaCheckPermission("createProductStock.add")
@PostMapping("/oneClickStorage/{orderId}/{userName}")
public Result oneClickStorage( @PathVariable String orderId,@PathVariable String userName){
return Result.seccess(finishedGoodsInventoryService.oneClickStorage(orderId,userName));
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java b/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java
index fbd62e5..db7b56f 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java
@@ -25,7 +25,7 @@
MaterialInventoryService materialInventoryService;
@ApiOperation("鐗╂枡鍑哄簱鏂板鎺ュ彛")
- @SaCheckPermission("CreateOutbound.add")
+ @SaCheckPermission("createOutbound.add")
@PostMapping("/saveMaterialOutbound")
public Result saveMaterialOutbound( @RequestBody Map<String,Object> object){
@@ -34,7 +34,7 @@
}
@ApiOperation("鐗╂枡鏂板鎺ュ彛")
- @SaCheckPermission("SelectIngredientsStock.add")
+ @SaCheckPermission("selectIngredientsStock.add")
@PostMapping("/saveMaterialInventory")
public Result saveMaterialInventory( @RequestBody Map<String,Object> object){
if(materialInventoryService.saveMaterialInventory(object)){
@@ -46,42 +46,42 @@
}
@ApiOperation("鐗╂枡搴撳瓨鍔犳椂闂存煡璇㈡帴鍙�")
- @SaCheckPermission("SelectIngredientsStock.search")
+ @SaCheckPermission("selectIngredientsStock.search")
@PostMapping("/getSelectMaterialInventoryDate/{pageNum}/{pageSize}/{selectDate}")
public Result getSelectMaterialInventoryDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody MaterialInventory materialInventory){
return Result.seccess(materialInventoryService.getSelectMaterialInventoryDate(pageNum,pageSize,selectDate,materialInventory));
}
@ApiOperation("鐗╂枡搴撳瓨宸ョ▼鍔犳椂闂存煡璇㈡帴鍙�")
- @SaCheckPermission("SelectIngredientsStock.search")
+ @SaCheckPermission("selectIngredientsStock.search")
@PostMapping("/getSelectMaterialInventoryEngineeringDate/{pageNum}/{pageSize}/{selectDate}")
public Result getSelectMaterialInventoryEngineeringDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody MaterialInventory materialInventory){
return Result.seccess(materialInventoryService.getSelectMaterialInventoryEngineeringDate(pageNum,pageSize,selectDate,materialInventory));
}
@ApiOperation("鐗╂枡搴撳瓨鏌ヨ鎺ュ彛")
- @SaCheckPermission("CreateOutbound.search")
+ @SaCheckPermission("createOutbound.search")
@PostMapping("/getSelectMaterialInventory/{pageNum}/{pageSize}")
public Result getSelectMaterialInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialInventory materialInventory){
return Result.seccess(materialInventoryService.getSelectMaterialInventory(pageNum,pageSize,materialInventory));
}
@ApiOperation("鐗╂枡搴撳瓨宸ョ▼鏌ヨ鎺ュ彛")
- @SaCheckPermission("SelectIngredientsStock.search")
+ @SaCheckPermission("selectIngredientsStock.search")
@PostMapping("/getSelectMaterialInventoryEngineering/{pageNum}/{pageSize}")
public Result getSelectMaterialInventoryEngineering(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OptimizeUse optimizeUse){
return Result.seccess(materialInventoryService.getSelectMaterialInventoryEngineering(pageNum,pageSize,optimizeUse));
}
@ApiOperation("鏉愭枡鍑哄簱鍔犳椂闂存煡璇㈡帴鍙�")
- @SaCheckPermission("MaterialOutbound.search")
+ @SaCheckPermission("materialOutbound.search")
@PostMapping("/getSelectMaterialOutboundDate/{pageNum}/{pageSize}/{selectDate}")
public Result getSelectMaterialOutboundDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody MaterialOutbound materialOutbound){
return Result.seccess(materialInventoryService.getSelectMaterialOutboundDate(pageNum,pageSize,selectDate, materialOutbound));
}
@ApiOperation("鏉愭枡鍑哄簱鏌ヨ鎺ュ彛")
- @SaCheckPermission("CreateOutbound.search")
+ @SaCheckPermission("createOutbound.search")
@PostMapping("/getSelectMaterialOutbound/{pageNum}/{pageSize}")
public Result getSelectMaterialOutbound(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialOutboundDetail materialOutboundDetail){
return Result.seccess(materialInventoryService.getSelectMaterialOutbound(pageNum,pageSize,materialOutboundDetail));
@@ -89,35 +89,35 @@
@ApiOperation("鏉愭枡鍑哄簱瀹℃牳鎺ュ彛")
- @SaCheckPermission("CreateOutbound.review")
+ @SaCheckPermission("createOutbound.review")
@PostMapping("/updateMaterialOutboundToExamine")
public Result updateMaterialOutboundToExamine( @RequestBody Map<String,Object> object){
return Result.seccess(materialInventoryService.updateMaterialOutboundToExamine(object));
}
@ApiOperation("鏉愭枡鍑哄簱鍒犻櫎鎺ュ彛")
- @SaCheckPermission("MaterialOutbound.delete")
+ @SaCheckPermission("materialOutbound.delete")
@PostMapping("/deleteMaterialOutbound")
public Result deleteMaterialOutbound( @RequestBody Map<String,Object> object){
return Result.seccess(materialInventoryService.deleteMaterialOutbound(object));
}
@ApiOperation("鐗╂枡杩斿簱鏂板鎺ュ彛")
- @SaCheckPermission("ReturnToStorageCreate.add")
+ @SaCheckPermission("returnToStorageCreate.add")
@PostMapping("/saveReturningWarehouse")
public Result saveReturningWarehouse( @RequestBody Map<String,Object> object){
return Result.seccess(materialInventoryService.saveReturningWarehouse(object));
}
@ApiOperation("鐗╂枡杩斿簱鏂板鏌ヨ鎺ュ彛")
- @SaCheckPermission("ReturnToStorageCreate.search")
+ @SaCheckPermission("returnToStorageCreate.search")
@PostMapping("/getSelectReturningWarehouse/{pageNum}/{pageSize}")
public Result getSelectReturningWarehouse(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody ReturningWarehouseDetail returningWarehouseDetail){
return Result.seccess(materialInventoryService.getSelectReturningWarehouse(pageNum,pageSize,returningWarehouseDetail));
}
@ApiOperation("鐗╂枡杩斿簱瀹℃牳鎺ュ彛")
- @SaCheckPermission("ReturnToStorageCreate.review")
+ @SaCheckPermission("returnToStorageCreate.review")
@PostMapping("/updateReturningWarehouseToExamine")
public Result updateReturningWarehouseToExamine( @RequestBody Map<String,Object> object){
return Result.seccess(materialInventoryService.updateReturningWarehouseToExamine(object));
@@ -125,7 +125,7 @@
@ApiOperation("鐗╂枡杩斿簱鏌ヨ鎺ュ彛")
- @SaCheckPermission("ReturnToStorage.search")
+ @SaCheckPermission("returnToStorage.search")
@PostMapping("/getSelectReturningWarehouseDate/{pageNum}/{pageSize}/{selectDate}")
public Result getSelectReturningWarehouseDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody ReturningWarehouse returningWarehouse){
return Result.seccess(materialInventoryService.getSelectReturningWarehouseDate(pageNum,pageSize,selectDate, returningWarehouse));
@@ -133,21 +133,21 @@
@ApiOperation("浣欐枡搴撳瓨鏌ヨ鎺ュ彛")
- @SaCheckPermission("SelectIngredientsStock.search")
+ @SaCheckPermission("selectIngredientsStock.search")
@PostMapping("/getSelectSurplusMaterialsDate/{pageNum}/{pageSize}/{selectDate}")
public Result getSelectSurplusMaterialsDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody SurplusMaterials surplusMaterials){
return Result.seccess(materialInventoryService.getSelectSurplusMaterialsDate(pageNum,pageSize,selectDate,surplusMaterials));
}
@ApiOperation("浣欐枡鏂板鎺ュ彛")
- @SaCheckPermission("SelectIngredientsStock.search")
+ @SaCheckPermission("selectIngredientsStock.search")
@PostMapping("/addSelectSurplusMaterialsDate")
public Result addSelectSurplusMaterialsDate( @RequestBody Map<String,Object> object){
return Result.seccess(materialInventoryService.addSelectSurplusMaterialsDate(object));
}
@ApiOperation("鐗╂枡鍑哄簱鎵撳嵃鎺ュ彛")
- @SaCheckPermission("SelectIngredientsStock.search")
+ @SaCheckPermission("selectIngredientsStock.search")
@GetMapping ("/printCreateOutbound/{materialOutboundId}")
public Result printCreateOutbound(@PathVariable String materialOutboundId) {
return Result.seccess(materialInventoryService.printCreateOutbound(materialOutboundId));
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java b/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java
index 23fe8ae..cb6b133 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java
@@ -15,28 +15,28 @@
import java.util.Map;
@RestController
-@RequestMapping("/MaterialStore")
+@RequestMapping("/materialStore")
@Api(value="鐗╂枡controller",tags={"鐗╂枡鎿嶄綔鎺ュ彛"})
public class MaterialStoreController {
@Autowired
MaterialStoreService materialStoreService;
@ApiOperation("鐗╂枡鏂板鎺ュ彛")
- @SaCheckPermission("CreateIngredients.add")
+ @SaCheckPermission("createIngredients.add")
@PostMapping("/saveMaterialStore")
public Result saveMaterialStore( @RequestBody Map<String,Object> object){
return Result.seccess(materialStoreService.saveMaterialStore(object));
}
@ApiOperation("鐗╂枡鏌ヨ鎺ュ彛")
- @SaCheckPermission("SelectIngredients.search")
+ @SaCheckPermission("selectIngredients.search")
@PostMapping("/getSelectMaterialStore/{pageNum}/{pageSize}")
public Result getSelectMaterialStore(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialStore materialStore){
return Result.seccess(materialStoreService.getSelectMaterialStore(pageNum,pageSize,materialStore));
}
@ApiOperation("鐗╂枡鍒犻櫎鎺ュ彛")
- @SaCheckPermission("SelectIngredients.delete")
+ @SaCheckPermission("selectIngredients.delete")
@PostMapping("/deleteMaterialStore")
public Result deleteMaterialStore( @RequestBody Map<String,Object> object){
return Result.seccess(materialStoreService.deleteMaterialStore(object));
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java
index 427d9cf..7cd99ce 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java
@@ -43,7 +43,7 @@
}
@ApiOperation("瀹㈡埛鏂板淇敼鎺ュ彛")
- @SaCheckPermission("CreateCustomer.add")
+ @SaCheckPermission("createCustomer.add")
@PostMapping("/insertCustomer")
public Result insertCustomer( @RequestBody Map<String,Object> object){
return Result.seccess(customerService.insertCustomer(object));
--
Gitblit v1.8.0