From bd1137319f16fcb2750333aeb37366aff0ec4ef9 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 18 二月 2025 11:51:51 +0800
Subject: [PATCH] 检验下单移植
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java | 70 +++++++++++++++-------------------
1 files changed, 31 insertions(+), 39 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java
index 40bdd0d..5ec41ee 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java
@@ -51,13 +51,13 @@
@ApiOperation(value = "鍘熸潗鏂欐楠屾煡璇㈡楠屼腑")
@GetMapping("/getIfsByStateOne")
- public Result getIfsByStateOne(Page page, IfsInventoryQuantityDto ifsInventoryQuantityDto) throws Exception {
+ public Result getIfsByStateOne(Page page, IfsInventoryQuantityDto ifsInventoryQuantityDto){
return Result.success(rawMaterialOrderService.getIfsByStateOne(page, ifsInventoryQuantityDto));
}
@ApiOperation(value = "鍘熸潗鏂欐楠屾煡璇㈠凡妫�楠�")
@GetMapping("/getIfsByOver")
- public Result getIfsByOver(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto) throws Exception {
+ public Result getIfsByOver(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto){
return Result.success(rawMaterialOrderService.getIfsByOver(page, ifsInventoryQuantityDto));
}
@@ -79,7 +79,7 @@
}
@ApiOperation(value = "鍒犻櫎鍘熸潗鏂欐楠屽崟妯℃澘")
- @PostMapping("/delRawMaterOrderTemplate")
+ @DeleteMapping("/delRawMaterOrderTemplate")
public Result<?> delRawMaterOrderTemplate(Integer id) {
return Result.success(rawMaterialOrderTemplateService.delRawMaterOrderTemplate(id));
}
@@ -99,12 +99,13 @@
/**
* 鍙栨秷鎶ユ
- * @param id 鍘熸潗鏂欎笅鍗�
+ * @param param 鍘熸潗鏂欎笅鍗�
* @return
*/
@ApiOperation(value = "鎾ら攢鎶ユ")
@PostMapping("/revokeInspectionReport")
- public Result<?> revokeInspectionReport(Integer id) {
+ public Result<?> revokeInspectionReport(@RequestBody Map<String, Object> param) {
+ Integer id = (Integer) param.get("id");
return Result.success(rawMaterialOrderService.revokeInspectionReport(id));
}
@@ -145,12 +146,13 @@
/**
* 鍘熸潗鏂欐挙閿�
- * @param ifsInventoryId
+ * @param param
* @return
*/
@ApiOperation(value = "鍘熸潗鏂欐挙閿�涓嬪崟")
- @PutMapping("/repealRawOrder")
- public Result<?> repealRawOrder(Integer ifsInventoryId){
+ @GetMapping("/repealRawOrder")
+ public Result<?> repealRawOrder(@RequestBody Map<String, Object> param){
+ Integer ifsInventoryId = (Integer) param.get("ifsInventoryId");
return Result.success(rawMaterialOrderService.repealRawOrder(ifsInventoryId));
}
@@ -167,10 +169,8 @@
@ApiOperation(value = "浠撳簱鎶ユ鏌ヨ")
- @PostMapping("/getWarehouseSubmit")
- public Result getWarehouseSubmit(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- IfsInventoryQuantity ifsInventoryQuantity = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), IfsInventoryQuantity.class);
+ @GetMapping("/getWarehouseSubmit")
+ public Result getWarehouseSubmit(Page page, IfsInventoryQuantity ifsInventoryQuantity) throws Exception {
return Result.success(rawMaterialOrderService.getWarehouseSubmit(page, ifsInventoryQuantity));
}
@@ -180,7 +180,7 @@
* @return
*/
@ApiOperation(value = "鍒犻櫎鍘熸潗鏂欐姤妫�淇℃伅")
- @PostMapping("/delIfsInventory")
+ @DeleteMapping("/delIfsInventory")
public Result<?> delIfsInventory(Integer id) {
return Result.success(rawMaterialOrderService.delIfsInventory(id));
}
@@ -211,10 +211,8 @@
@ApiOperation(value = "鍘熸潗鏂欐姤妫�鏌ヨ鍏ㄩ儴")
- @PostMapping("/getIfsByAll")
- public Result getIfsByAll(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), IfsInventoryQuantitySupplierDto.class);
+ @GetMapping("/getIfsByAll")
+ public Result getIfsByAll(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto){
return Result.success(rawMaterialOrderService.getIfsByOver(page, ifsInventoryQuantityDto));
}
@@ -227,19 +225,10 @@
}
@ApiOperation(value = "鍘熸潗鏂欎笅鍗曟煡鐪嬪凡瀹屾垚淇℃伅")
- @PostMapping("/getIfsByFinish")
- public Result getIfsByFinish(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), IfsInventoryQuantitySupplierDto.class);
+ @GetMapping("/getIfsByFinish")
+ public Result getIfsByFinish(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto) throws Exception {
ifsInventoryQuantityDto.setIsFinish(1);
return Result.success(rawMaterialOrderService.getIfsByOver(page, ifsInventoryQuantityDto));
- }
-
- @ApiOperation(value = "娴嬭瘯绉诲簱")
- @PostMapping("/shiftingParking")
- public Result shiftingParking(@RequestBody List<Integer> ids){
- rawMaterialOrderService.shiftingParking(ids);
- return Result.success();
}
@ApiOperation(value = "寰俊鍙戦�佹枃浠舵祴璇�")
@@ -261,41 +250,43 @@
/**
* 璁╂鏀捐
- * @param ifsInventoryId
+ * @param param
* @return
*/
@ApiOperation(value = "璁╂鏀捐")
@PostMapping("/concessionRelease")
- public Result<?> concessionRelease(Integer ifsInventoryId){
+ public Result<?> concessionRelease(@RequestBody Map<String, Object> param){
+ Integer ifsInventoryId = (Integer) param.get("ifsInventoryId");
return Result.success(rawMaterialOrderService.concessionRelease(ifsInventoryId));
}
/**
* 鍘熸潗鏂欒繘鍘傛挙閿�涓嬪崟
- * @param enterOrderId
+ * @param param
* @return
*/
@ApiOperation(value = "鍘熸潗鏂欒繘鍘傛挙閿�涓嬪崟")
@PostMapping("/repealEnterRawOrder")
- public Result<?> repealEnterRawOrder(Integer enterOrderId){
+ public Result<?> repealEnterRawOrder(@RequestBody Map<String, Object> param){
+ Integer enterOrderId = (Integer) param.get("enterOrderId");
return Result.success(rawMaterialOrderService.repealEnterRawOrder(enterOrderId));
}
/**
* 鍘熸潗鏂欏搴︽挙閿�涓嬪崟
- * @param quarterOrderId
+ * @param param
* @return
*/
@ApiOperation(value = "鍘熸潗鏂欏搴︽挙閿�涓嬪崟")
@PostMapping("/repealQuarterRawOrder")
- public Result<?> repealQuarterRawOrder(Integer quarterOrderId){
+ public Result<?> repealQuarterRawOrder(@RequestBody Map<String, Object> param){
+ Integer quarterOrderId = (Integer) param.get("quarterOrderId");
return Result.success(rawMaterialOrderService.repealQuarterRawOrder(quarterOrderId));
}
@ApiOperation(value = "鍏ㄩ儴淇℃伅瀵煎嚭")
- @PostMapping("/rawAllExport")
- public void rawAllExport(@RequestBody Map<String, Object> data, HttpServletResponse response) throws Exception {
- IfsInventoryQuantitySupplierDto dto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), IfsInventoryQuantitySupplierDto.class);
+ @GetMapping("/rawAllExport")
+ public void rawAllExport(IfsInventoryQuantitySupplierDto dto, HttpServletResponse response) throws Exception {
rawMaterialOrderService.rawAllExport(dto,response);
}
@@ -307,12 +298,13 @@
/**
* 鎻愬墠鍏ュ簱
- * @param ifsInventoryId
+ * @param param
* @return
*/
@ApiOperation(value = "鎻愬墠鍏ュ簱")
@PostMapping("/advancedGodown")
- public Result<?> advancedGodown(Integer ifsInventoryId){
+ public Result<?> advancedGodown(@RequestBody Map<String, Object> param){
+ Integer ifsInventoryId = (Integer) param.get("ifsInventoryId");
return Result.success(rawMaterialOrderService.advancedGodown(ifsInventoryId));
}
--
Gitblit v1.9.3