Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

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

@@ -918,4 +918,80 @@ 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 = "/rmsdemandrulessUpdate/{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);
+    }
+
+    //   ========================= 费用类别
+
+    @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 = "/rmsexpansecategorysList")
+    public Map<String, Object> getrmsexpansecategorys(@RequestBody(required = false) Map<String, Object> map, Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize) {
+        return rmsFeign.rmsexpansecategorysList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+    @ApiOperation(value="新增费用类别")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @LogAround(foreignKeys = {"categoryId"},foreignKeyTypes = {"费用类别"})
+    @PostMapping("/rmsexpansecategorysInsert")
+    public  Map<String, Object> insertrmsexpansecategorys(@RequestBody(required = false) Map<String, Object> map) {
+        map.put("insertUsername", map.get("userName").toString());
+        return  rmsFeign.addrmsexpansecategorys(map);
+    }
+
+    @ApiOperation(value="费用类别删除")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PutMapping(value = "/rmsexpansecategorysDelete")
+    @LogAround(foreignKeys = {"categoryId"},foreignKeyTypes = {"费用类别"})
+    public Map<String, Object> rmsexpansecategorysDelete(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.rmsexpansecategorysdelete(map);
+    }
+
+    @ApiOperation(value="修改费用类别")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PutMapping(value = "/rmsexpansecategorysUpdate/{id}")
+    @LogAround(foreignKeys = {"categoryId"},foreignKeyTypes = {"费用类别"})
+    public Map<String, Object> rmsexpansecategorysUpdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map){
+        map.put("updateUsername", map.get("userName").toString());
+        return rmsFeign.rmsexpansecategorysupdate(id,map);
+    }
+
 }

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

@@ -113,6 +113,16 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+
+    @ApiModelProperty(value = "边输边查运输范围")
+    @GetMapping("/getTransRangeByLike")
+    public RESTfulResult getTransRange(String index,@RequestParam(required = false) List<String> id) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("index",index);
+        map.put("id",id);
+        List<Map<String, Object>> list = universalMapper.getTransRangeByLike(map);
+        return success(list);
+    }
     @ApiOperation("上传文件通用方法,返回成功后的url")
     @PostMapping("/uploadFile")
     public RESTfulResult uploadFile(MultipartRequest request) throws Exception {

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

@@ -569,19 +569,19 @@ public interface RmsFeign {
     Map<String, Object> add(@RequestBody(required = false) Map<String, Object> map);
 
     @PutMapping("api/v1/rms/rmsjobinfos/{id}")
-    Map<String, Object> update(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> update(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map);
 
     @PutMapping("api/v1/rms/rmsjobinfos/logicdelete")
     Map<String, Object> logicdelete(@RequestBody(required = false) Map<String, Object> map);
 
-    @PostMapping(value = "api/v1/rms/rmsjobinfos/readExcel",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @PostMapping(value = "api/v1/rms/rmsjobinfos/readExcel", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     RESTfulResult readExcel(MultipartFile file);
 
     //==================提取比例
     @PostMapping("api/v1/rms/rmsextractscales/getrmsextractscales")
     Map<String, Object> extractscalelist(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
-                             @RequestParam Integer pageNum,
-                             @RequestParam Integer pageSize);
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/rms/rmsextractscales/add")
     Map<String, Object> addExtractscale(@RequestBody(required = false) Map<String, Object> map);
@@ -590,14 +590,14 @@ public interface RmsFeign {
     Map<String, Object> Extractscalelogicdelete(@RequestBody(required = false) Map<String, Object> map);
 
     @PutMapping("api/v1/rms/rmsextractscales/{id}")
-    Map<String, Object> Extractscaleupdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> Extractscaleupdate(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map);
 
     //==================计算公式
 
     @PostMapping("api/v1/rms/rmsformulas/getformula")
     Map<String, Object> FormulaList(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
-                                         @RequestParam Integer pageNum,
-                                         @RequestParam Integer pageSize);
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize);
 
     @PostMapping("api/v1/rms/rmsformulas/add")
     Map<String, Object> addFormula(@RequestBody(required = false) Map<String, Object> map);
@@ -606,7 +606,36 @@ public interface RmsFeign {
     Map<String, Object> Formulalogicdelete(@RequestBody(required = false) Map<String, Object> map);
 
     @PutMapping("api/v1/rms/rmsformulas/{id}")
-    Map<String, Object> Formulaupdate(@PathVariable BigDecimal id,@RequestBody(required = false) Map<String, Object> map);
+    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);
+
+    //==================费用类别
+
+    @PostMapping("api/v1/rms/rmsexpansecategorys/rmsexpansecategorysList")
+    Map<String, Object> rmsexpansecategorysList(@RequestBody(required = false) Map<String, Object> map, @RequestParam Integer apiId,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize);
+
+    @PostMapping("api/v1/rms/rmsexpansecategorys/rmsexpansecategorysInsert")
+    Map<String, Object> addrmsexpansecategorys(@RequestBody(required = false) Map<String, Object> map);
+
+    @PutMapping("api/v1/rms/rmsexpansecategorys/rmsexpansecategorysDelete")
+    Map<String, Object> rmsexpansecategorysdelete(@RequestBody(required = false) Map<String, Object> map);
+
+    @PutMapping("api/v1/rms/rmsexpansecategorys/rmsexpansecategorysUpdate/{id}")
+    Map<String, Object> rmsexpansecategorysupdate(@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);
+
 }

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -26,6 +26,8 @@ public interface UniversalMapper {
 
     List<Map<String, Object>> getPersonnelByLike(Map<String, Object> map);
 
+    List<Map<String, Object>> getTransRangeByLike(Map<String, Object> map);
+
     List<Map<String, Object>> getrmsrmsjobinfosBylike(Map<String, Object> map);
 
 

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -250,4 +250,29 @@
         </where>
         FETCH NEXT 100 ROWS ONLY
     </select>
-        </mapper>
+    <select id="getTransRangeByLike" resultType="java.util.Map">
+        select * from(
+        select
+        RC.TRANS_RANGE_ID "transrangeId",
+        RC.TRANS_RANGE_NAME "transrangeName",
+        RC.TRANS_RANGE_ID "id",
+        RC.TRANS_RANGE_ID "value",
+        RC.TRANS_RANGE_NAME "label"
+        from RMS_TRANS_RANGE RC
+        where DELETED = 0
+        )
+        <where>
+            <if test="index!=null and index!=''">
+                AND REGEXP_LIKE("label", #{index})
+            </if>
+            <if test="id!=null and !(index!=null and index!='')">
+                AND "id" in
+                <foreach collection="id" item="item"  open="(" close=")" separator="," >
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        FETCH NEXT 100 ROWS ONLY
+    </select>
+
+</mapper>