From 5efd01db698683e95a63053da43aaa08fa35a185 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期五, 01 十二月 2023 11:20:28 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe

---
 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/weigh/controller/WeighController.java |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/weigh/controller/WeighController.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/weigh/controller/WeighController.java
index c782925..2797868 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/weigh/controller/WeighController.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/weigh/controller/WeighController.java
@@ -8,10 +8,7 @@
 import com.thhy.materials.modules.biz.weigh.service.WeighService;
 import org.omg.CORBA.StringHolder;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 
@@ -40,6 +37,31 @@
 		return weighService.weighbridgeList(values);
 	}
 
+	//原料库存
+	@PostMapping("/headThingJsInventory")
+	public BasicResult headThingJsInventory(){
+		return weighService.headThingJsInventory();
+	}
+	//料仓列表
+	@PostMapping("/materialWarehouseRecordList")
+	public BasicResult materialWarehouseRecordList(@RequestBody Map<String,Object> values){
+		return weighService.materialWarehouseRecordList(values);
+	}
 
+	//料仓添加进仓
+	@PostMapping("/materialWarehouseRecordInsert")
+	public BasicResult materialWarehouseRecordInsert(@RequestBody Map<String,Object> values){
+		return weighService.materialWarehouseRecordInsert(values);
+	}
+	//料仓修改进仓
+	@PostMapping("/materialWarehouseRecordUpdate")
+	public BasicResult materialWarehouseRecordUpdate(@RequestBody Map<String,Object> values){
+		return weighService.materialWarehouseRecordUpdate(values);
+	}
+	//删除
+	@GetMapping("/materialWarehouseRecordDel")
+	public BasicResult materialWarehouseRecordDel(@RequestParam String id){
+		return weighService.materialWarehouseRecordDel(id);
+	}
 
 }

--
Gitblit v1.9.3