From f7a2fcdda7f1120498c5c5f75c5a99955fc54b43 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 16 十二月 2025 16:54:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java | 117 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 78 insertions(+), 39 deletions(-)
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..a5df64c 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
@@ -27,7 +27,7 @@
import java.util.Map;
@RestController
-@RequestMapping("/FinishedGoodsInventory")
+@RequestMapping("/finishedGoodsInventory")
@Api(value="鎴愬搧搴撳瓨controller",tags={"鎴愬搧搴撳瓨鎿嶄綔鎺ュ彛"})
public class FinishedGoodsInventoryController {
@Autowired
@@ -35,115 +35,115 @@
/*鎴愬搧搴撳瓨鏌ヨ*/
@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));
+ return Result.success(finishedGoodsInventoryService.defaultDateFinishedGoodsInventory(pageNum,pageSize,finishedGoodsInventory));
}
/*鏌ヨ鍙叆搴撶殑鎴愬搧鏁版嵁*/
@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));
+ return Result.success(finishedGoodsInventoryService.getSelectWarehousing(pageNum,pageSize,flowCard));
}
/*鎴愬搧鍏ュ簱*/
@ApiOperation("鎴愬搧鍏ュ簱鎺ュ彛")
- @SaCheckPermission("CreateProductStock.add")
+ @SaCheckPermission("createProductStock.add")
@PostMapping("/addSelectWarehousing")
public Result addSelectWarehousing( @RequestBody Map<String,Object> object){
- return Result.seccess(finishedGoodsInventoryService.addSelectWarehousing(object));
+ return Result.success(finishedGoodsInventoryService.addSelectWarehousing(object));
}
/*鏌ヨ鍙彂璐х殑鎴愬搧鏁版嵁*/
@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));
+ return Result.success(finishedGoodsInventoryService.getSelectDeliveryDetail(pageNum,pageSize,orderDetail));
}
/*鎴愬搧鍙戣揣*/
@ApiOperation("鎴愬搧鍙戣揣鎺ュ彛")
- @SaCheckPermission("FinishedProductOut.add")
+ @SaCheckPermission("finishedProductOut.add")
@PostMapping("/addDeliveryDetail")
public Result addDeliveryDetail( @RequestBody Map<String,Object> object){
- return Result.seccess(finishedGoodsInventoryService.addDeliveryDetail(object));
+ return Result.success(finishedGoodsInventoryService.addDeliveryDetail(object));
}
/* 璋冩嫧鏌ヨ*/
@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));
+ return Result.success(finishedGoodsInventoryService.getSelectAllocate(pageNum,pageSize,orderDetail));
}
/*璁㈠崟璋冩嫧*/
@ApiOperation("璁㈠崟璋冩嫧鎺ュ彛")
- @SaCheckPermission("OrderAllocation.add")
+ @SaCheckPermission("orderAllocation.add")
@PostMapping("/updateFinishedGoodsInventoryAllocate")
public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
- return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryAllocate(object));
+ return Result.success(finishedGoodsInventoryService.updateFinishedGoodsInventoryAllocate(object));
}
/*璋冩嫧璁板綍鏌ヨ*/
@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));
+ return Result.success(finishedGoodsInventoryService.getSelectAllocateFinishedOperateLog(pageNum,pageSize,selectDate,finishedOperateLog));
}
/*璁㈠崟棰嗗嚭*/
@ApiOperation("璁㈠崟棰嗗嚭鎺ュ彛")
- @SaCheckPermission("FinishedGoodsIssue.add")
+ @SaCheckPermission("finishedGoodsIssue.add")
@PostMapping("/updateFinishedGoodsInventoryTakeOut")
public Result updateFinishedGoodsInventoryTakeOut( @RequestBody Map<String,Object> object){
- return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryTakeOut(object));
+ return Result.success(finishedGoodsInventoryService.updateFinishedGoodsInventoryTakeOut(object));
}
/*棰嗗嚭璁板綍鏌ヨ*/
@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));
+ return Result.success(finishedGoodsInventoryService.getSelectOperateRecord(pageNum,pageSize,selectDate,finishedOperateLog));
}
/*璁㈠崟杩斿伐*/
@ApiOperation("璁㈠崟杩斿伐鏌ヨ鎺ュ彛")
@PostMapping("/updateFinishedGoodsInventoryRework")
public Result updateFinishedGoodsInventoryRework( @RequestBody Map<String,Object> object){
- return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryRework(object));
+ return Result.success(finishedGoodsInventoryService.updateFinishedGoodsInventoryRework(object));
}
/*璁㈠崟瀹℃牳*/
@ApiOperation("璁㈠崟瀹℃牳鎺ュ彛")
- @SaCheckPermission("TakeOutRecord.review")
+ @SaCheckPermission("takeOutRecord.review")
@PostMapping("/updateFinishedGoodsInventoryToExamine")
public Result updateFinishedGoodsInventoryToExamine( @RequestBody Map<String,Object> object){
- return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"瀹℃牳"));
+ return Result.success(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,"鍙嶅"));
+ return Result.success(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"鍙嶅"));
}
/*璁㈠崟浣滃簾*/
@ApiOperation("璁㈠崟浣滃簾鎺ュ彛")
- @SaCheckPermission("TakeOutRecord.update")
+ @SaCheckPermission("takeOutRecord.update")
@PostMapping("/cancelFinishedGoodsInventoryToExamine")
public Result cancelFinishedGoodsInventoryToExamine( @RequestBody Map<String,Object> object){
- return Result.seccess(finishedGoodsInventoryService.cancelFinishedGoodsInventoryToExamine(object));
+ return Result.success(finishedGoodsInventoryService.cancelFinishedGoodsInventoryToExamine(object));
}
/*鍑哄叆搴撹褰曟煡璇�*/
@@ -151,7 +151,7 @@
@SaCheckPermission("storageRecord.search")
@PostMapping("/getSelectStorageRecord/{pageNum}/{pageSize}/{selectDate}/{type}")
public Result getSelectStorageRecord(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@PathVariable String type, @RequestBody FinishedOperateLog finishedOperateLog){
- return Result.seccess(finishedGoodsInventoryService.getSelectStorageRecord(pageNum,pageSize,selectDate,type,finishedOperateLog));
+ return Result.success(finishedGoodsInventoryService.getSelectStorageRecord(pageNum,pageSize,selectDate,type,finishedOperateLog));
}
/*鍑哄叆搴撹繑鍥�*/
@@ -159,30 +159,69 @@
@SaCheckPermission("storageRecord.update")
@PostMapping("/cancelFinishedGoodsInventoryStorage")
public Result cancelFinishedGoodsInventoryStorage( @RequestBody Map<String,Object> object){
- return Result.seccess(finishedGoodsInventoryService.cancelFinishedGoodsInventoryStorage(object));
+ return Result.success(finishedGoodsInventoryService.cancelFinishedGoodsInventoryStorage(object));
}
@ApiOperation("鎴愬搧搴撳瓨璁板綍鏌ヨ鎺ュ彛")
- @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));
+ @SaCheckPermission("warehouseReport.search")
+ @PostMapping("/getSelectFinishedOperateLogReport/{type}/{pageNum}/{pageSize}/{selectDate}")
+ public Result getSelectFinishedOperateLogReport(@PathVariable String type,@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
+ return Result.success(finishedGoodsInventoryService.getSelectFinishedOperateLogReport(type,pageNum,pageSize,selectDate,finishedOperateLog));
}
@ApiOperation("鎴愬搧鎶ヨ〃瀵煎嚭")
- @PostMapping("/exportFinishedOperateLogReport")
- public void exportFinishedOperateLogReport(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
+ @PostMapping("/exportFinishedOperateLogReport/{type}")
+ public void exportFinishedOperateLogReport(@PathVariable String type,HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
//鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
- DownExcel.download(response, FinishedOperateLogDTO.class, finishedGoodsInventoryService.exportFinishedOperateLogReport(dates),"orderReport");
+ DownExcel.download(response, FinishedOperateLogDTO.class, finishedGoodsInventoryService.exportFinishedOperateLogReport(dates,type),"orderReport");
}
/*璁㈠崟涓�閿叆搴�*/
@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));
+ return Result.success(finishedGoodsInventoryService.oneClickStorage(orderId,userName));
+
+ }
+
+ /*瑁呯鎵撳嵃鏌ヨ*/
+ @ApiOperation("瑁呯鎵撳嵃鏌ヨ鎺ュ彛")
+ @SaCheckPermission("storageRecordPint.search")
+ @PostMapping("/getSelectStorageRecordPint/{pageNum}/{pageSize}/{selectDate}")
+ public Result getSelectStorageRecordPint(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
+ return Result.success(finishedGoodsInventoryService.getSelectStorageRecordPint(pageNum,pageSize,selectDate,finishedOperateLog));
+ }
+
+ /*瑁呯鎵撳嵃鏌ヨ*/
+ @ApiOperation("瑁呯鎵撳嵃鍐呭鏌ヨ鎺ュ彛")
+ @SaCheckPermission("storageRecordPint.search")
+ @PostMapping("/getSelectPrint")
+ public Result getSelectPrint( @RequestBody Map<String, Object> object){
+ return Result.success(finishedGoodsInventoryService.getSelectPrintSv(object));
+ }
+
+ /*瑁呯鎵撳嵃鏌ヨ*/
+ @ApiOperation("瑁呯鎵撳嵃鍐呭鏌ヨ鎺ュ彛")
+ @SaCheckPermission("storageRecordPint.search")
+ @PostMapping("/getSelectPrints")
+ public Result getSelectPrints( @RequestBody Map<String, Object> object){
+ return Result.success(finishedGoodsInventoryService.getSelectPrintSvs(object));
+ }
+ /*瑁呯鎵撳嵃鏌ヨ*/
+ @ApiOperation("搴撳瓨瑁呯鎵撳嵃鍐呭鏌ヨ鎺ュ彛")
+ @SaCheckPermission("createProductStock.search")
+ @PostMapping("/getInventoryPrints")
+ public Result getInventoryPrints( @RequestBody List<FinishedGoodsInventory> finishedGoodsInventories){
+ return Result.success(finishedGoodsInventoryService.getInventoryPrints(finishedGoodsInventories));
+ }
+
+ @ApiOperation("鎴愬搧瑁呯璋冩灦")
+ @SaCheckPermission("createProductStock.add")
+ @PostMapping("/changeRack/{user}")
+ public Result changeRack( @RequestBody FinishedGoodsInventory finishedGoodsInventory,@PathVariable String user){
+ return Result.success(finishedGoodsInventoryService.changeRack(finishedGoodsInventory,user));
}
}
--
Gitblit v1.8.0