1.匹配规则

src/main/java/com/steerinfo/dil/controller/RMScontroller.java

@@ -918,4 +918,38 @@ public class RMScontroller extends BaseRESTfulController {
         map.put("updateUsername", map.get("userName").toString());
         return rmsFeign.Formulaupdate(id,map);
     }
+
+    //   ========================= 需求快捷匹配
+
+    @ApiOperation(value = "需求快捷匹配")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getrmsdemandruless")
+    public Map<String, Object> getrmsdemandrulesslist(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize) {
+        return rmsFeign.rmsdemandrulesslist(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+    @ApiOperation(value="新增需求快捷匹配")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"rulesId"},foreignKeyTypes = {"计算公式"})
+    @PostMapping("/addrmsdemandruless")
+    public  Map<String, Object> insertrmsdemandruless(@RequestBody(required = false) Map<String, Object> map) {
+        map.put("insertUsername",  map.get("userName").toString());
+        return  rmsFeign.addrmsdemandruless(map);
+    }
+
+
+    @ApiOperation(value="修改需求快捷匹配")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PutMapping(value = "/rmsdemandruless/{id}")
+    @LogAround(foreignKeys = {"rulesId"},foreignKeyTypes = {"需求快捷匹配"})
+    public Map<String, Object> rmsdemandrulessUpdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map){
+        map.put("updateUsername", map.get("userName").toString());
+        return rmsFeign.rmsdemandrulessupdate(id,map);
+    }
 }

src/main/java/com/steerinfo/dil/controller/WMSController.java

@@ -12,6 +12,9 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -63,5 +66,45 @@ public class WMSController extends BaseRESTfulController {
                                                    Integer pageSize) {
         return wmsFeign.selectDlivDirNo(parmas == null ? new HashMap<>() : parmas, apiId, pageNum, pageSize);
     }
+
+    //====================> 实时库存
+    @ApiOperation(value = "实时库存")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/wmsgridmaterialsList")
+    public Map<String, Object> getAmsSalaryContracList(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
+                                                       Integer pageNum,
+                                                       Integer pageSize) {
+        return wmsFeign.list(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+    @ApiOperation(value = "新增实时库存")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"gridMaterialId"}, foreignKeyTypes = {"实时库存"})
+    @PostMapping("/wmsgridmaterialsinsert")
+    public Map<String, Object> insertAmsSalaryContrac(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
+        map.put("insertUsername", map.get("userName").toString());
+        return wmsFeign.insert(map);
+    }
+
+    @ApiOperation(value = "修改实时库存")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PutMapping(value = "/wmsgridmaterialsUpdate/{id}")
+    @LogAround(foreignKeys = {"gridMaterialId"}, foreignKeyTypes = {"实时库存"})
+    public Map<String, Object> updateAmsSalaryContrac(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map) {
+        map.put("updateUsername", map.get("userName").toString());
+        return wmsFeign.update(id, map);
+    }
+
+    @ApiOperation(value = "实时库存逻辑删除")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PutMapping(value = "/wmsgridmaterialsDelete")
+    @LogAround(foreignKeys = {"gridMaterialId"}, foreignKeyTypes = {"实时库存"})
+    public Map<String, Object> logicdeleteAmsSaalryContrac(@RequestBody(required = false) Map<String, Object> map) {
+        return wmsFeign.delete(map);
+    }
 }
 

src/main/java/com/steerinfo/dil/feign/RmsFeign.java

@@ -607,6 +607,20 @@ public interface RmsFeign {
 
     @PutMapping("api/v1/rms/rmsformulas/{id}")
     Map<String, Object> Formulaupdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
+//========================》需求快捷匹配
+
+    @PostMapping("api/v1/rms/rmsdemandruless/rmsdemandrulesslist")
+    Map<String, Object> rmsdemandrulesslist(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/rms/rmsdemandruless/rmsdemandrulessInsert")
+    Map<String, Object> addrmsdemandruless(@RequestBody(required = false) Map<String, Object> map);
+
+
+    @PutMapping("api/v1/rms/rmsdemandruless/rmsdemandrulessUpdate/{id}")
+    Map<String, Object> rmsdemandrulessupdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
 
 }
 
+

src/main/java/com/steerinfo/dil/feign/WMSFeign.java

@@ -32,4 +32,21 @@ public interface WMSFeign {
                                              @RequestParam("apiId") Integer apiId,
                                              @RequestParam("pageNum") Integer pageNum,
                                              @RequestParam("pageSize") Integer pageSize);
+
+    //==================实时库存
+
+    @PostMapping("api/v1/wms/wmsgridmaterials/wmsgridmaterialsList")
+    Map<String, Object> list(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/wms/wmsgridmaterials/wmsgridmaterialsinsert")
+    Map<String, Object> insert(@RequestBody(required = false) Map<String, Object> map);
+
+    @PutMapping("api/v1/wms/wmsgridmaterials/wmsgridmaterialsDelete")
+    Map<String, Object> delete(@RequestBody(required = false) Map<String, Object> map);
+
+    @PutMapping("api/v1/wms/wmsgridmaterials/wmsgridmaterialsUpdate/{id}")
+    Map<String, Object> update(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
+
 }