浏览代码

倒仓修改

lvzhikai 4 年之前
父节点
当前提交
0b6e23c600

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

@@ -1,9 +1,11 @@
1 1
 package com.chinaitop;
2 2
 
3
+import com.chinaitop.depot.storage.service.FeignAgileService;
3 4
 import com.chinaitop.depot.storage.service.FeignBasicService;
4 5
 import org.slf4j.Logger;
5 6
 import org.slf4j.LoggerFactory;
6 7
 import org.springframework.stereotype.Component;
8
+import org.springframework.web.bind.annotation.RequestParam;
7 9
 
8 10
 import java.util.Map;
9 11
 
@@ -13,7 +15,7 @@ import java.util.Map;
13 15
  * @create 2020-07-20 15:16
14 16
  */
15 17
 @Component
16
-public class HystrixClientFallback implements FeignBasicService {
18
+public class HystrixClientFallback implements FeignBasicService,FeignAgileService {
17 19
     private final static Logger logger = LoggerFactory.getLogger(HystrixClientFallback.class);
18 20
 
19 21
     @Override
@@ -30,4 +32,9 @@ public class HystrixClientFallback implements FeignBasicService {
30 32
     public void updateWarehouseCrkStatus(Integer wareId, String crk_status) {
31 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 162
 	@RequestMapping(value="/save", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
163 163
 	@ApiOperation(value="省平台审批结束到库级平台保存数据", notes = "保存")
164 164
 	@ApiImplicitParams({
165
-		@ApiImplicitParam(name = "save", value = "新增数据", paramType = "query")
165
+		@ApiImplicitParam(name = "change", value = "新增数据", paramType = "query")
166 166
 	})
167 167
     public Map<String, Object> save(String change){
168 168
 		Map<String, Object> modelMap = new HashMap<String, Object>();
169 169
 		modelMap = storageChangeStoragehouseRopService.add(change);  
170 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 626
 	@RequestMapping(value="/UpdateDcStatus", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
627 627
 	@ApiOperation(value = "倒仓申请提交数据到省平台审批修改数据", notes = "倒仓申请提交数据到省平台审批修改数据")
628
+	@ApiImplicitParams({
629
+			@ApiImplicitParam(name = "DcData", value = "新增数据", paramType = "query")
630
+	})
628 631
 	public String UpdateDcStatus(String DcData) {
629 632
 		String retS = "Success";
630 633
 		StorageChangeStoragehouseTaskDetail detail = new StorageChangeStoragehouseTaskDetail();