Merge branch 'master' of http://111.30.93.211:10101/r/supipe

李旭东

2023-12-08 7efc6ed86025b610cab109a2e9f83362740d8ed4

 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,35 @@
      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);
   }
   // 环境监测 thingjs 数据
   @PostMapping("/headThingJsDateValue")
   public BasicResult headThingJsDateValue(){
      return weighService.headThingJsDateValue();
   }
}