zhangym 2 anos atrás
pai
commit
725b325ab7

+ 60 - 3
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);
         }
@@ -362,4 +362,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);
+    }
+
+
+
+
 }

+ 15 - 0
src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -123,4 +123,19 @@ 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/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);
+
 }