luobang 2 anos atrás
pai
commit
244ef0055e

+ 2 - 1
src/main/java/com/steerinfo/dil/controller/AMScontroller.java

@@ -12,6 +12,7 @@ import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.lang.reflect.MalformedParameterizedTypeException;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
@@ -2118,7 +2119,7 @@ public class AMScontroller{
     @ApiOperation("excel导入批量新增销售订单")
     @PostMapping("addSteelSaleOrderList")
     public Map<String,Object> addSteelSaleOrderList(@RequestBody List<Map<String,Object>> mapList){
-        return amsFeign.addSteelSaleOrderList(mapList);
+        return  amsFeign.addSteelSaleOrderList(mapList);
     }
 
     @ApiOperation("excel导入批量新增销售订单")

+ 2 - 0
src/main/java/com/steerinfo/dil/controller/QMSController.java

@@ -6,6 +6,7 @@ import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -293,6 +294,7 @@ public class QMSController extends BaseRESTfulController {
     }
 
 
+
 //    @ApiOperation(value="查询进厂排队详情")
 //    @ApiImplicitParams({
 //            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),

+ 6 - 0
src/main/java/com/steerinfo/dil/controller/UniversalController.java

@@ -1103,4 +1103,10 @@ public class UniversalController extends BaseRESTfulController {
     public RESTfulResult updateDispachSwitch(@RequestBody Map<String,Object> map){
         return success(universalMapper.updateDispachSwitch(map));
     }
+
+    @ApiOperation("动态调整放行限制")
+    @GetMapping("/getReleaseFlag")
+    public String getReleaseFlag() {
+        return universalMapper.getReleaseFlag();
+    }
 }

+ 3 - 0
src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -273,4 +273,7 @@ public interface UniversalMapper {
     Map<String, Object> getDispachSwitch();
 
     int updateDispachSwitch(Map<String, Object> map);
+
+    String getReleaseFlag();
+
 }

+ 1 - 1
src/main/resources/application-prod.yml

@@ -8,7 +8,7 @@ spring:
     name: dil-api
   mvc:
     async:
-      request-timeout: 8000
+      request-timeout: 10000
 
 openfeign:
   ColumnDataFeign:

+ 3 - 0
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -1451,6 +1451,9 @@
         SELECT IS_OK "isOk" FROM AMS_DISPATCH_SWITCH
         fetch NEXT 1 rows only
     </select>
+    <select id="getReleaseFlag" resultType="string">
+        SELECT VERSION_VALUE FROM DIL_VERSION WHERE VERSION_ID = 6
+    </select>
 
     <update id="updateDispachSwitch">
         UPDATE AMS_DISPATCH_SWITCH SET IS_OK=#{isOk}