From decd9f8bf3e6119efce34e6bbc0c320a2a2446c1 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 02 二月 2024 15:41:50 +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/FinishedGoodsInventoryController.java |   71 ++++++++++++++++++++++++++++++++++-
 1 files changed, 68 insertions(+), 3 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 6f36346..942d4ee 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
@@ -4,7 +4,9 @@
 
 import com.example.erp.common.Constants;
 import com.example.erp.common.Result;
+import com.example.erp.entity.mm.FinishedOperateLog;
 import com.example.erp.entity.pp.FlowCard;
+import com.example.erp.entity.sd.OrderDetail;
 import com.example.erp.exception.ServiceException;
 import com.example.erp.service.mm.FinishedGoodsInventoryService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,6 +14,7 @@
 import com.example.erp.entity.mm.FinishedGoodsInventory;
 
 
+import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -20,20 +23,21 @@
     @Autowired
     FinishedGoodsInventoryService finishedGoodsInventoryService;
 
+    /*鎴愬搧搴撳瓨鏌ヨ*/
     @PostMapping("/getselet/{pageNum}/{pageSize}")
     public Result defaultDateFinishedGoodsInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FinishedGoodsInventory finishedGoodsInventory){
-        System.out.println(finishedGoodsInventory);
         return Result.seccess(finishedGoodsInventoryService.defaultDateFinishedGoodsInventory(pageNum,pageSize,finishedGoodsInventory));
     }
 
+    /*鏌ヨ鍙叆搴撶殑鎴愬搧鏁版嵁*/
     @PostMapping("/getseletwarehousing/{pageNum}/{pageSize}")
     public Result getseletwarehousing(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FlowCard flowCard){
-        System.out.println(flowCard);
         return Result.seccess(finishedGoodsInventoryService.getseletwarehousing(pageNum,pageSize,flowCard));
     }
 
+    /*鎴愬搧鍏ュ簱*/
     @PostMapping("/addseletwarehousing")
-    public Result addseletwarehousing( @RequestBody Map<String,Map<String,Object>> object){
+    public Result addseletwarehousing( @RequestBody Map<String,Object>  object){
         if(finishedGoodsInventoryService.addseletwarehousing(object)){
             return Result.seccess();
         }else {
@@ -41,4 +45,65 @@
 
         }
     }
+
+    /*鏌ヨ鍙彂璐х殑鎴愬搧鏁版嵁*/
+    @PostMapping("/getseletdeliveryDetail/{pageNum}/{pageSize}")
+    public Result getseletdeliveryDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
+        return Result.seccess(finishedGoodsInventoryService.getseletdeliveryDetail(pageNum,pageSize,orderDetail));
+    }
+
+    /*鎴愬搧鍙戣揣*/
+    @PostMapping("/adddeliveryDetail")
+    public Result adddeliveryDetail( @RequestBody Map<String,Object>  object){
+        if(finishedGoodsInventoryService.adddeliveryDetail(object)){
+            return Result.seccess();
+        }else {
+            throw new ServiceException(Constants.Code_500,"鍑哄簱澶辫触");
+
+        }
+    }
+
+    /* 璋冩嫧鏌ヨ*/
+    @PostMapping("/getSelectAllocate/{pageNum}/{pageSize}")
+    public Result getSelectAllocate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
+        return Result.seccess(finishedGoodsInventoryService.getSelectAllocate(pageNum,pageSize,orderDetail));
+    }
+
+    /*璁㈠崟璋冩嫧*/
+    @PostMapping("/updateFinishedGoodsInventoryAllocate")
+    public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object>  object){
+        if(finishedGoodsInventoryService.updateFinishedGoodsInventoryAllocate(object)){
+
+            return Result.seccess();
+
+        }else {
+            throw new ServiceException(Constants.Code_500,"璋冩嫧澶辫触");
+
+        }
+    }
+
+    /*棰嗗嚭鏌ヨ*/
+    @PostMapping("/getselectAllocateFinishedOperateLog/{pageNum}/{pageSize}")
+    public Result getselectAllocateFinishedOperateLog(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FinishedOperateLog finishedOperateLog){
+        return Result.seccess(finishedGoodsInventoryService.getselectAllocateFinishedOperateLog(pageNum,pageSize,finishedOperateLog));
+    }
+
+    /*璁㈠崟棰嗗嚭*/
+    @PostMapping("/updateFinishedGoodsInventoryTakeOut")
+    public Result updateFinishedGoodsInventoryTakeOut( @RequestBody Map<String,Object>  object){
+
+        if(finishedGoodsInventoryService.updateFinishedGoodsInventoryTakeOut(object)){
+            return Result.seccess();
+
+        }else {
+            throw new ServiceException(Constants.Code_500,"棰嗗嚭澶辫触");
+
+        }
+    }
+
+    /*棰嗗嚭璁板綍鏌ヨ*/
+    @PostMapping("/getSelectOperateRecord/{pageNum}/{pageSize}")
+    public Result getSelectOperateRecord(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FinishedOperateLog finishedOperateLog){
+        return Result.seccess(finishedGoodsInventoryService.getSelectOperateRecord(pageNum,pageSize,finishedOperateLog));
+    }
 }

--
Gitblit v1.8.0