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

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

@@ -101,18 +101,18 @@ public class AMScontroller {
     public Map<String, Object> productionRequirementAdd(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
         map.put("insertUsername", map.get("userName").toString());
         if (map.containsKey("requirementStartTime")){
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH24:mi:ss");
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date requirementStartTime = simpleDateFormat.parse(map.get("requirementStartTime").toString());
             map.put("requirementStartTime", requirementStartTime);
         }
 
         if (map.containsKey("requirementEndTime")){
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH24:mi:ss");
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date requirementEndTime = simpleDateFormat.parse(map.get("requirementEndTime").toString());
             map.put("requirementEndTime", requirementEndTime);
         }
         if (map.containsKey("dueTime")){
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH24:mi:ss");
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date dueTime = simpleDateFormat.parse(map.get("dueTime").toString());
             map.put("dueTime", dueTime);
         }
@@ -357,6 +357,65 @@ public class AMScontroller {
         return amsFeign.logicdeleteAmsSaalryContrac(map);
     }
 
+    @ApiOperation(value = "销售需求新增接口", notes = "销售需求新增接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/saleAdd")
+    @LogAround(foreignKeys = {"transPlanId"}, foreignKeyTypes = {"采购计划"})
+    public Map<String, Object> saleAdd(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.saleAdd(map);
+    }
+
+    @ApiOperation(value="展示销售需求")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", 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 = "/selectDlivDirNo")
+    Map<String, Object> selectDlivDirNo(@RequestBody(required=false) HashMap<String,Object> mapValue,
+                                        Integer apiId,
+                                        Integer pageNum,
+                                        Integer pageSize){
+        return amsFeign.selectDlivDirNo(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+    }
+
+    @ApiOperation(value = "修改发货单状态", notes = "修改发货单状态")
+    @ApiImplicitParam(name = "params", value = "修改内容", required = false, dataType = "ArrayList<HashMap<String, Object>>")
+    @PostMapping(value = "/updateOrder")
+    public RESTfulResult udpateOrder(@RequestBody(required = false) HashMap<String, Object> parmas) {
+        return amsFeign.udpateOrder(parmas);
+    }
+
+    @ApiOperation(value = "退货", notes = "根据填写的数据将发货单进行退货")
+    @ApiImplicitParam(name = "params", value = "查询内容", required = false, dataType = "HashMap<String, Object>")
+    @PostMapping(value = "/returnGoods")
+    public RESTfulResult returnGoods(@RequestBody(required = false) HashMap<String, Object> params) {
+        return amsFeign.returnGoods(params);
+    }
+
+    @ApiOperation(value = "撤销退货", notes = "根据发货单号将发货单的退货记录清除")
+    @ApiImplicitParam(name = "id", value = "查询内容", required = false, dataType = "String")
+    @PostMapping(value = "revokeReturnGoods/{id}")
+    public RESTfulResult revokeReturnGoods(@PathVariable("id") String id) {
+        return amsFeign.revokeReturnGoods(id);
+    }
+
+    @ApiOperation(value = "查询发货单第几次退库", notes = "查询发货单第几次退库")
+    @ApiImplicitParam(name = "dlivDirno", value = "查询内容", required = false, dataType = "String")
+    @GetMapping(value = "/getcut/{dlivDirno}")
+    public RESTfulResult getcut(@PathVariable String dlivDirno) {
+        return amsFeign.getcut(dlivDirno);
+    }
+
+    @ApiOperation(value = "修改发货单信息", notes = "根据填写的数据将发货单进行修改")
+    @ApiImplicitParam(name = "params", value = "查询内容", required = false, dataType = "HashMap<String, Object>")
+    @PostMapping(value = "/editButton")
+    public RESTfulResult editButton(@RequestBody(required = false) HashMap<String, Object> params) {
+        return amsFeign.editButton(params);
+    }
 
     @ApiOperation(value="展示销售合同")
     @ApiImplicitParams({
@@ -372,4 +431,61 @@ public class AMScontroller {
                                                    Integer pageSize){
         return amsFeign.selectSaleContractPage(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
     }
+
+    @ApiOperation(value = "生产计划新增接口", notes = "生产计划新增接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/productionPlanAdd")
+    @LogAround(foreignKeys = {"transPlanId"}, foreignKeyTypes = {"生产计划"})
+    public Map<String, Object> productionPlanAdd(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.productionPlanAdd(map);
+    }
+
+    @ApiOperation(value = "展示生产订单详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", 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 = "/getproductionPlanList")
+    Map<String, Object> getproductionPlanList(@RequestBody(required = false) Map<String, Object> map,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize
+    ) {
+        return amsFeign.getproductionPlanList(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+    @ApiOperation(value = "生产计划新增接口", notes = "生产计划新增接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/productionPlanChange")
+    @LogAround(foreignKeys = {"transPlanId"}, foreignKeyTypes = {"生产计划"})
+    public Map<String, Object> productionPlanChange(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.productionPlanChange(map);
+    }
+    @ApiOperation(value = "生产计划新增接口", notes = "生产计划新增接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PutMapping(value = "/productionPlanlogicdelete")
+    @LogAround(foreignKeys = {"transPlanId"}, foreignKeyTypes = {"生产计划"})
+    public Map<String, Object> productionPlanlogicdelete(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.productionPlanlogicdelete(map);
+    }
+    @ApiOperation(value = "生产需求逻辑删除", notes = "生产需求逻辑删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/getProductiveRequirementDelete")
+    @LogAround(foreignKeys = {"transRequirementId"}, foreignKeyTypes = {"生产需求"})
+    public Map<String, Object> getProductiveRequirementDelete(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.getProductiveRequirementDelete(map);
+    }
+
+
+
+
 }

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

@@ -125,5 +125,45 @@ public interface AmsFeign {
 
     @PutMapping("api/v1/ams/amssalarycontracts/logicdelete")
     Map<String, Object> logicdeleteAmsSaalryContrac(@RequestBody(required = false) Map<String, Object> map);
+	
+	@PostMapping(value = "api/v1/ams/amstransrequirements/saleAdd")
+    Map<String, Object> saleAdd(@RequestBody(required = false) Map<String, Object> map);
+
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/selectDlivDirNo")
+    Map<String, Object> selectDlivDirNo(@RequestBody(required = false) HashMap<String, Object> map,
+                                        @RequestParam  Integer apiId,
+                                        @RequestParam  Integer pageNum,
+                                        @RequestParam  Integer pageSize);
+
+    @PostMapping(value = "api/v1/ams/amsrequirementchilds/udpateOrder")
+    RESTfulResult udpateOrder(@RequestBody(required = false) HashMap<String, Object> params);
+
+    @PostMapping(value = "api/v1/ams/amsrequirementchilds/returnGoods")
+    RESTfulResult returnGoods(@RequestBody(required = false) HashMap<String, Object> params);
+
+    @PostMapping(value = "api/v1/ams/amsrequirementchilds/revokeReturnGoods/{id}")
+    RESTfulResult revokeReturnGoods(@PathVariable("id") String id);
+
+    @GetMapping(value = "api/v1/ams/amsrequirementchilds/getcut/{dlivDirno}")
+    RESTfulResult getcut(@PathVariable String dlivDirno);
+
+    @PostMapping(value = "api/v1/ams/amsrequirementchilds/editButton")
+    RESTfulResult editButton(@RequestBody(required = false) HashMap<String, Object> params);
+
+    @PostMapping(value = "api/v1/ams/amstransplans/productionPlanAdd")
+    Map<String, Object> productionPlanAdd(@RequestBody(required = false)Map<String, Object> map);
+    @PostMapping("api/v1/ams/amstransplans/getproductionPlanList")
+    Map<String, Object> getproductionPlanList(@RequestBody(required = false) Map<String, Object> map,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize
+    );
+    @PostMapping(value = "api/v1/ams/amstransplans/productionPlanChange")
+    Map<String, Object> productionPlanChange(@RequestBody(required = false)Map<String, Object> map);
+    @PutMapping(value = "api/v1/ams/amstransplans/logicdelete")
+    Map<String, Object> productionPlanlogicdelete(@RequestBody(required = false)Map<String, Object> map);
+    @PostMapping(value = "api/v1/ams/amstransrequirements/getProductiveRequirementDelete")
+    Map<String, Object> getProductiveRequirementDelete(@RequestBody(required = false)Map<String, Object> map);
 
 }

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8