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

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

@@ -362,11 +362,16 @@ public class AMScontroller {
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
     })
     @PostMapping(value = "/saleAdd")
-    @LogAround(foreignKeys = {"transPlanId"}, foreignKeyTypes = {"采购计划"})
+    @LogAround(foreignKeys = {"transRequirementId"}, foreignKeyTypes = {"销售需求"})
     public Map<String, Object> saleAdd(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.saleAdd(map);
     }
 
+    @PostMapping(value = "/readExcel")
+    public RESTfulResult readExcel(MultipartFile file,@RequestParam("userCode") String userCode)  {
+        return amsFeign.readExcel(file, userCode);
+    }
+
     @ApiOperation(value="展示销售需求")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
@@ -417,6 +422,14 @@ public class AMScontroller {
         return amsFeign.editButton(params);
     }
 
+    @ApiOperation(value = "删除发货单信息", notes = "根据填写的数据将发货单进行删除")
+    @ApiImplicitParam(name = "params", value = "查询内容", required = false, dataType = "HashMap<String, Object>")
+    @PostMapping(value = "/deleteDlivDirno")
+    public RESTfulResult deleteDlivDirno(@RequestBody(required = false) HashMap<String, Object> params) {
+        return amsFeign.deleteDlivDirno(params);
+    }
+
+
     @ApiOperation(value="展示销售合同")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),

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

@@ -6,7 +6,9 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
@@ -132,6 +134,8 @@ public interface AmsFeign {
 	@PostMapping(value = "api/v1/ams/amstransrequirements/saleAdd")
     Map<String, Object> saleAdd(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/ams/amstransrequirements/readExcel", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    RESTfulResult readExcel(MultipartFile file, @RequestParam("userCode") String userCode);
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/selectDlivDirNo")
     Map<String, Object> selectDlivDirNo(@RequestBody(required = false) HashMap<String, Object> map,
@@ -154,6 +158,9 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amsrequirementchilds/editButton")
     RESTfulResult editButton(@RequestBody(required = false) HashMap<String, Object> params);
 
+    @PostMapping(value = "api/v1/ams/amsrequirementchilds/deleteDlivDirno")
+    RESTfulResult deleteDlivDirno(@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")