Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API into dev

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

@@ -70,17 +70,17 @@ public class AmsSalePlanController extends BaseRESTfulController {
 
     /**
      * 新增销售计划
-     * @param amsSalePlan
+     * @param map
      * @return
      */
     @ApiOperation(value="新增销售计划")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "amsSalePlan", value = "销售计划对象", required = false, dataType = "AmsSalePlan")
+            @ApiImplicitParam(name = "amsSalePlan", value = "销售计划", required = false, dataType = "AmsSalePlan")
     })
     @PostMapping(value = "/addAmsSalePlan")
-    public RESTfulResult addAmsSalePlan(@RequestBody(required = false) AmsSalePlan amsSalePlan){
-
-        int i = amsSalePlanService.addAmsSalePlan(amsSalePlan);
+    public RESTfulResult addAmsSalePlan(@RequestBody(required = false) Map<String,Object> map){
+        System.out.println(map);
+        int i = amsSalePlanService.addAmsSalePlan(map);
         return success(i);
     }
 

src/main/java/com/steerinfo/dil/service/IAmsSalePlanService.java

@@ -23,7 +23,7 @@ public interface IAmsSalePlanService{
     //查询所有销售计划信息
     List<Map<String, Object>> getSalePlanInfo(Map<String,Object> map);
     //新增销售计划
-    int addAmsSalePlan(AmsSalePlan amsSalePlan);
+    int addAmsSalePlan(Map<String, Object> map);
     //获得物资编码
     List<Map<String, Object>> getMaterialName();
     //获得销售片区名称

src/main/java/com/steerinfo/dil/service/impl/AmsSalePlanServiceImpl.java

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.AmsSalePlanMapper;
+import com.steerinfo.dil.mapper.AmsSalePlanMaterialMapper;
 import com.steerinfo.dil.model.AmsSalePlan;
 import com.steerinfo.dil.service.IAmsSalePlanService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +32,9 @@ public class AmsSalePlanServiceImpl implements IAmsSalePlanService {
     @Autowired
     private AmsSalePlanMapper amsSalePlanMapper;
 
+    @Autowired
+    private AmsSalePlanMaterialMapper amsSalePlanMaterialMapper;
+
     @Override
     public int deleteAmsSalePlan(BigDecimal planId) {
         AmsSalePlan amsSalePlan = amsSalePlanMapper.selectByPrimaryKey(planId);
@@ -54,8 +58,10 @@ public class AmsSalePlanServiceImpl implements IAmsSalePlanService {
     }
 
     @Override
-    public int addAmsSalePlan(AmsSalePlan amsSalePlan) {
+    public int addAmsSalePlan(Map<String, Object> map) {
+        //新增销售计划
         long id;
+        AmsSalePlan amsSalePlan = new AmsSalePlan();
         if(amsSalePlanMapper.selectMaxId()==null){
             id = 1;
         }else {
@@ -76,6 +82,11 @@ public class AmsSalePlanServiceImpl implements IAmsSalePlanService {
         amsSalePlan.setUpdateUsername("admin");
         amsSalePlan.setUpdateTime(new Date());
         amsSalePlan.setDeleted(new BigDecimal(0));
+        //新增
+        int i = amsSalePlanMapper.insert(amsSalePlan);
+        if(i==1){
+
+        }
         return amsSalePlanMapper.insert(amsSalePlan);
     }