gaodd 2 gadi atpakaļ
vecāks
revīzija
a654260849

+ 16 - 4
src/main/java/com/chinaitop/depot/business/controller/ReceiveNoticeController.java

@@ -12,9 +12,12 @@ import org.slf4j.LoggerFactory;
12 12
 import org.springframework.http.MediaType;
13 13
 import org.springframework.web.bind.annotation.RequestMapping;
14 14
 import org.springframework.web.bind.annotation.RequestMethod;
15
+import org.springframework.web.bind.annotation.RequestParam;
15 16
 import org.springframework.web.bind.annotation.RestController;
16 17
 
17 18
 import javax.annotation.Resource;
19
+
20
+import java.math.BigDecimal;
18 21
 import java.util.HashMap;
19 22
 import java.util.List;
20 23
 import java.util.Map;
@@ -138,12 +141,21 @@ public class ReceiveNoticeController {
138 141
 	@RequestMapping(value="/saveDataRk", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
139 142
     @ApiOperation(value="增加性质转变单数据(入库)", notes = "增加性质转变单数据(入库)")
140 143
 	@ApiImplicitParams({
141
-        @ApiImplicitParam(name = "paramMap", value = "接收的数据", paramType = "query")
144
+        @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query"),
145
+        @ApiImplicitParam(name = "storehouseId", value = "仓房", paramType = "query"),
146
+        @ApiImplicitParam(name = "warehouseId", value = "货位", paramType = "query"),
147
+        @ApiImplicitParam(name = "rksl", value = "入库数量", paramType = "query"),
148
+        @ApiImplicitParam(name = "grainVarietyName", value = "品种名称", paramType = "query")
142 149
     })
143
-    public void saveDataRk(Map<String, Object> paramMap) {
144
-		logger.info("接收到的参数是:\n"+paramMap);
145
-		receiveNoticeService.saveDataRk(paramMap);
150
+    public void saveDataRk(String orgId,Integer storehouseId,Integer warehouseId,String grainVarietyName,
151
+    		BigDecimal rksl,String lsxzzbdh) {
152
+		
153
+		logger.info("接收到的参数是:\n"+orgId);
154
+		receiveNoticeService.saveDataRk( orgId, storehouseId, warehouseId, grainVarietyName,
155
+	    		 rksl, lsxzzbdh);
146 156
     	
147 157
     }
158
+	
159
+	
148 160
     
149 161
 }

+ 5 - 1
src/main/java/com/chinaitop/depot/business/service/ReceiveNoticeService.java

@@ -1,6 +1,7 @@
1 1
 package com.chinaitop.depot.business.service;
2 2
 
3 3
 
4
+import java.math.BigDecimal;
4 5
 import java.util.List;
5 6
 import java.util.Map;
6 7
 
@@ -25,6 +26,9 @@ public interface ReceiveNoticeService {
25 26
 
26 27
 	int queryIsOrAudit(String xybh, String sptDataId,Integer flag);
27 28
 
28
-	void saveDataRk(Map<String, Object> paramMap);
29
+	//void saveDataRk(Map<String, Object> paramMap);
30
+
31
+	void saveDataRk(String orgId, Integer storehouseId, Integer warehouseId, String grainVarietyName, BigDecimal rksl,
32
+			String lsxzzbdh);
29 33
 			
30 34
 }

+ 10 - 9
src/main/java/com/chinaitop/depot/business/service/impl/ReceiveNoticeServiceImpl.java

@@ -469,16 +469,17 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
469 469
 
470 470
 
471 471
 	@Override
472
-	public void saveDataRk(Map<String, Object> paramMap) {
472
+	public void saveDataRk(String orgId, Integer storehouseId, Integer warehouseId, String grainVarietyName, BigDecimal rksl,
473
+			String lsxzzbdh) {
473 474
 		// TODO Auto-generated method stub
474 475
         
475 476
 		BusinessNoticeReceive businessNoticeReceive = new BusinessNoticeReceive();
476
-        String orgId = (String) paramMap.get("orgId");
477
-        Integer storehouseId =  (Integer) paramMap.get("storehouseId");
478
-        Integer warehouseId =  (Integer) paramMap.get("warehouseId");
479
-        String pzmc = (String) paramMap.get("pzmc");
480
-        String hzsl = (String) paramMap.get("hzsl");
481
-        String lsxzzbdh = (String) paramMap.get("lsxzzbdh");
477
+        //String orgId = (String) paramMap.get("orgId");
478
+        //Integer storehouseId =  (Integer) paramMap.get("storehouseId");
479
+        // warehouseId =  (Integer) paramMap.get("warehouseId");
480
+        //String pzmc = (String) paramMap.get("pzmc");
481
+       // String hzsl = (String) paramMap.get("hzsl");
482
+        //String lsxzzbdh = (String) paramMap.get("lsxzzbdh");
482 483
 		Map<String, Object> map = feignAgileService.getDateByChHwh(Integer.valueOf(orgId), storehouseId, warehouseId);
483 484
 		Integer grainKind = (Integer) map.get("pz"); //品种
484 485
         Double kcsl = (Double) map.get("kcsl");//千克
@@ -488,8 +489,8 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
488 489
         businessNoticeReceive.setOrgId(Integer.valueOf(orgId));
489 490
         businessNoticeReceive.setHouseId(storehouseId);
490 491
         businessNoticeReceive.setWareHouseId(warehouseId);
491
-        businessNoticeReceive.setCount(hzsl);
492
-        businessNoticeReceive.setPzmc(pzmc);
492
+        businessNoticeReceive.setCount(rksl.toString());
493
+        businessNoticeReceive.setPzmc(grainVarietyName);
493 494
         businessNoticeReceive.setGrainKind(grainKind);
494 495
         businessNoticeReceive.setGrainAttribute(3045); 
495 496
         businessNoticeReceive.setHzqlsxzdm(3052);