lvzhikai %!s(int64=4) %!d(string=hai) anos
pai
achega
0b6e23c600

+ 8 - 1
src/main/java/com/chinaitop/HystrixClientFallback.java

@@ -1,9 +1,11 @@
1
 package com.chinaitop;
1
 package com.chinaitop;
2
 
2
 
3
+import com.chinaitop.depot.storage.service.FeignAgileService;
3
 import com.chinaitop.depot.storage.service.FeignBasicService;
4
 import com.chinaitop.depot.storage.service.FeignBasicService;
4
 import org.slf4j.Logger;
5
 import org.slf4j.Logger;
5
 import org.slf4j.LoggerFactory;
6
 import org.slf4j.LoggerFactory;
6
 import org.springframework.stereotype.Component;
7
 import org.springframework.stereotype.Component;
8
+import org.springframework.web.bind.annotation.RequestParam;
7
 
9
 
8
 import java.util.Map;
10
 import java.util.Map;
9
 
11
 
@@ -13,7 +15,7 @@ import java.util.Map;
13
  * @create 2020-07-20 15:16
15
  * @create 2020-07-20 15:16
14
  */
16
  */
15
 @Component
17
 @Component
16
-public class HystrixClientFallback implements FeignBasicService {
18
+public class HystrixClientFallback implements FeignBasicService,FeignAgileService {
17
     private final static Logger logger = LoggerFactory.getLogger(HystrixClientFallback.class);
19
     private final static Logger logger = LoggerFactory.getLogger(HystrixClientFallback.class);
18
 
20
 
19
     @Override
21
     @Override
@@ -30,4 +32,9 @@ public class HystrixClientFallback implements FeignBasicService {
30
     public void updateWarehouseCrkStatus(Integer wareId, String crk_status) {
32
     public void updateWarehouseCrkStatus(Integer wareId, String crk_status) {
31
         logger.info("warehouseId: " + wareId + "warehouseStatus" + crk_status);
33
         logger.info("warehouseId: " + wareId + "warehouseStatus" + crk_status);
32
     }
34
     }
35
+
36
+    @Override
37
+    public Map<String, Object> getDateByChHwh(Integer orgId, Integer houseId, Integer wareHouseId) {
38
+        return null;
39
+    }
33
 }
40
 }

+ 2 - 2
src/main/java/com/chinaitop/depot/storage/controller/StorageChangeStoragehouseRopController.java

@@ -162,12 +162,12 @@ public class StorageChangeStoragehouseRopController {
162
 	@RequestMapping(value="/save", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
162
 	@RequestMapping(value="/save", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
163
 	@ApiOperation(value="省平台审批结束到库级平台保存数据", notes = "保存")
163
 	@ApiOperation(value="省平台审批结束到库级平台保存数据", notes = "保存")
164
 	@ApiImplicitParams({
164
 	@ApiImplicitParams({
165
-		@ApiImplicitParam(name = "save", value = "新增数据", paramType = "query")
165
+		@ApiImplicitParam(name = "change", value = "新增数据", paramType = "query")
166
 	})
166
 	})
167
     public Map<String, Object> save(String change){
167
     public Map<String, Object> save(String change){
168
 		Map<String, Object> modelMap = new HashMap<String, Object>();
168
 		Map<String, Object> modelMap = new HashMap<String, Object>();
169
 		modelMap = storageChangeStoragehouseRopService.add(change);  
169
 		modelMap = storageChangeStoragehouseRopService.add(change);  
170
         return modelMap;
170
         return modelMap;
171
     }
171
     }
172
-	
172
+
173
 }
173
 }

+ 3 - 0
src/main/java/com/chinaitop/depot/storage/controller/StorageChangeStoragehouseTaskController.java

@@ -625,6 +625,9 @@ public class StorageChangeStoragehouseTaskController {
625
 	
625
 	
626
 	@RequestMapping(value="/UpdateDcStatus", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
626
 	@RequestMapping(value="/UpdateDcStatus", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
627
 	@ApiOperation(value = "倒仓申请提交数据到省平台审批修改数据", notes = "倒仓申请提交数据到省平台审批修改数据")
627
 	@ApiOperation(value = "倒仓申请提交数据到省平台审批修改数据", notes = "倒仓申请提交数据到省平台审批修改数据")
628
+	@ApiImplicitParams({
629
+			@ApiImplicitParam(name = "DcData", value = "新增数据", paramType = "query")
630
+	})
628
 	public String UpdateDcStatus(String DcData) {
631
 	public String UpdateDcStatus(String DcData) {
629
 		String retS = "Success";
632
 		String retS = "Success";
630
 		StorageChangeStoragehouseTaskDetail detail = new StorageChangeStoragehouseTaskDetail();
633
 		StorageChangeStoragehouseTaskDetail detail = new StorageChangeStoragehouseTaskDetail();