采购计划

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

@@ -153,6 +153,27 @@ public class AMScontroller{
         return amsFeign.purchasePlanAdd(map);
     }
 
+
+    @ApiOperation(value = "采购计划修改接口", notes = "采购计划修改接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/purchasePlanUpdate")
+    @LogAround(foreignKeys = {"transPlanId"},foreignKeyTypes = {"采购计划"})
+    public Map<String, Object> purchasePlanUpdate(@RequestBody(required = false) Map<String ,Object> map) {
+        return amsFeign.purchasePlanUpdate(map);
+    }
+
+    @ApiOperation(value = "采购计划修改状态接口", notes = "采购计划修改状态接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/purchasePlanChange")
+    @LogAround(foreignKeys = {"transPlanId"},foreignKeyTypes = {"采购计划"})
+    public Map<String, Object> purchasePlanChange(@RequestBody(required = false) Map<String ,Object> map) {
+        return amsFeign.purchasePlanChange(map);
+    }
+
     @ApiOperation(value="同步销售订单")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/saleOrderSync")

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

@@ -60,6 +60,12 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amstransplans/purchasePlanAdd")
     Map<String, Object> purchasePlanAdd(Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/ams/amstransplans/purchasePlanUpdate")
+    Map<String, Object> purchasePlanUpdate(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransplans/purchasePlanChange")
+    Map<String, Object> purchasePlanChange(Map<String, Object> map);
+
     @PostMapping("api/v1/ams/amsorders/saleOrderSync")
     Map<String, Object> saleOrderSync(@RequestBody(required = false) Map<String, Object> map);
 

src/main/resources/application-dev.yml

@@ -51,7 +51,7 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:localhost:8095}
   RmsFeign:
-    url: ${RMSFEIGN_URL:localhost:8060}
+    url: ${RMSFEIGN_URL:172.16.90.214:8060}
   IntegrationFeign:
     url: ${INTEGRATIONFEIGN_URL:localhost:8066}
   OTMSFeign:
@@ -61,7 +61,7 @@ openfeign:
 #远程调用
 feign:
   hystrix:
-    enabled: true #开启熔断，熔断时间和feign超时时间必须一致，否则时间短的生效
+    enabled: false #开启熔断，熔断时间和feign超时时间必须一致，否则时间短的生效
   client:
     config:
       default:  #默认配置,连接时间要短，读取时间要长

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

@@ -110,6 +110,7 @@
             select
             RC.COMPANY_ID "companyId",
             RC.COMPANY_NAME "companyName",
+            RC.COMPANY_TYPE "companyType",
             RC.SSO_ID "ssoId",
             RC.SSO_CODE "ssoCode",
             RC.COMPANY_ID "id",

src/main/resources/log4j.properties

@@ -1,8 +1,7 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,stdout,RUNNING,errorfile
+log4j.rootCategory=DEBUG,stdout,RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Threshold = INFO
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
 
@@ -21,7 +20,7 @@ log4j.appender.RUNNING = org.apache.log4j.DailyRollingFileAppender
 log4j.appender.RUNNING.File =/logs/log/running.log
 log4j.appender.RUNNING.Append = true
 log4j.appender.RUNNING.Threshold = INFO
-log4j.appender.RUNNING.DatePattern='.'yyyy-MM-dd.
+log4j.appender.RUNNING.DatePattern='.'yyyy-MM-dd
 log4j.appender.RUNNING.layout = org.apache.log4j.PatternLayout
 log4j.appender.RUNNING.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n