1

src/main/java/com/chinaitop/depot/business/controller/ReceiveNoticeController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.chinaitop.depot.business.model.BusinessNoticeReceive;
 import com.chinaitop.depot.business.service.ReceiveNoticeService;
 import com.chinaitop.depot.business.service.SystemOutsideDataService;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageInfo;
 
 import io.swagger.annotations.Api;
@@ -184,4 +185,29 @@ public class ReceiveNoticeController {
 		return map;
 	}
     
+	/*@RequestMapping(value="/test", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="测试接口", notes = "")
+	@ApiImplicitParams({
+        @ApiImplicitParam(name = "datas", value = "数据对象", paramType = "query")
+    })
+	public Map<String, Object> test(String datas) {
+		Map<String, Object> map = new HashMap<>();
+		try {
+			ObjectMapper mapper = new ObjectMapper();
+			BusinessNoticeReceive receiveNotice = (BusinessNoticeReceive)mapper.readValue(datas, BusinessNoticeReceive.class);
+			receiveNoticeService.retSptMeagess(receiveNotice);
+		} catch (Exception e) {
+			logger.error("性质转变单生成异常");
+			logger.error(e.getMessage());
+			map.put("status", "error");
+			map.put("msg", "接口异常，请联系管理员！");
+		}
+		return map;
+	}
+	
+	@RequestMapping(value="/testT", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="测试接口", notes = "")
+	public void testT(String crklx, String ysid) {
+		System.out.println("crklx:---"+crklx+"--,ysid:---"+ysid);
+	}*/
 }

src/main/java/com/chinaitop/depot/business/service/ReceiveNoticeService.java

@@ -1,7 +1,6 @@
 package com.chinaitop.depot.business.service;
 
 
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -47,5 +46,11 @@ public interface ReceiveNoticeService {
 	 * @return
 	 */
 	Map<String, Object> scRkxzzbd(String sptId, String cblx, String ysid);
+
+	/**
+	 * 给给市平台发送性质转变成功通知
+	 * @param receiveNotice
+	 */
+	void retSptMeagess(BusinessNoticeReceive receiveNotice);
 			
 }

src/main/java/com/chinaitop/depot/business/service/impl/ReceiveNoticeServiceImpl.java

@@ -532,12 +532,56 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 
     	//必须是入库，并且不是通知单，只是性质转变单
     	if ("1".equals(receiveNotice.getIsNotice()) && "1".equals(receiveNotice.getIsSheet()) && "1".equals(receiveNotice.getCrktype())) {
-    		restLsxz(receiveNotice.getId());
+    		boolean flag = restLsxz(receiveNotice.getId());
+    		
+    		if (flag) {
+    			//转储成功后把信息给市平台
+    			retSptMeagess(receiveNotice);
+    		}
     	}
 	}
 
-	public void restLsxz(Integer id) {
-		/* 先调用出入库接口生成转储的业务的台账信息，生成失败不可保存转储数据***start */
+	/**
+	 * 给给市平台发送性质转变成功通知
+	 * @param receiveNotice
+	 */
+	@Override
+	public void retSptMeagess(BusinessNoticeReceive receiveNotice) {
+		String result = "";
+
+		//获取请求的URL地址
+		String path;
+		try {
+			path = sysCodeService.getSVal(10, "xzzzxxts");
+			if (null != receiveNotice.getCblx() && null != receiveNotice.getYsid()) {
+				
+				//组装请求参数
+				Map<String, String> params = new HashMap<>();
+				params.put("crklx", receiveNotice.getCblx());
+				params.put("ysid", receiveNotice.getYsid());
+				
+				logger.info("给给市平台发送性质转变成功通知信息："+params.toString());
+				
+				//给市平台发送请求
+				result = HTTPUtils.doPost(path, params);
+				
+				//保存推送合同引用状态的消息和返回结果
+				systemOutsideDataService.addlogger("xzzzxx_result", params.toString(), result);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * 调用出入库接口改变粮食性质
+	 * @param id 性质转变单数据ID
+	 * @return
+	 */
+	public boolean restLsxz(Integer id) {
+		
+		boolean flag = false;
+
 		BusinessNoticeReceive receiveNotice = businessNoticeReceiveMapper.selectByPrimaryKey(id);
 		Object[] parameters = new Object[9];
 		parameters[0] = receiveNotice.getOrgId() + "";
@@ -549,11 +593,11 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 		} else {
 			parameters[4] = receiveNotice.getHouseId() + "";//油罐
 		}
-		parameters[5] = receiveNotice.getHzqlsxzdm() + "";
-		parameters[6] = receiveNotice.getGrainAttribute() + "";
-		parameters[7] = Integer.parseInt(receiveNotice.getLssl())*1000 + "";
+		parameters[5] = receiveNotice.getHzqlsxzdm() + "";//要转换的粮食性质
+		parameters[6] = receiveNotice.getGrainAttribute() + "";//原来的粮食性质
+		parameters[7] = Integer.parseInt(receiveNotice.getLssl())*1000 + "";//数量
 		parameters[8] = 1 + ""; //1:新增；2：修改；3：删除
-		
+
 		String crkurl = depotSystemFeignService.getUrl(receiveNotice.getOrgId().toString(), "2");
 	    if (StringUtils.isNotBlank(crkurl)) {
 	    	String url_id = crkurl.substring(0, crkurl.lastIndexOf("Base")-1);
@@ -561,7 +605,11 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 	    	sbf.append(url_id).append(url);
 	    	String str = createKC.createKC("ChangeGrainAttribute", sbf.toString(), parameters);
 	    	systemOutsideDataService.addlogger("rkxzzb", JSON.toJSONString(parameters), str);
+	    	if ("true".equals(str)) {
+	    		flag = true;
+			}
 	    }
+	    return flag;
 	}
 
 	@Override
@@ -639,6 +687,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 
 
 
+	@SuppressWarnings("unused")
 	@Override
 	public Map<String, Object> scRkxzzbd(String sptId, String cblx, String ysid) {
 		Map<String, Object> result_map = new HashMap<>();
@@ -707,6 +756,12 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 	            BigDecimal kcslKg = kcslBig.divide(s);
 	            businessNoticeReceive.setLssl(kcslKg.toString());//库存数量
 	            
+	            if ("1".equals(cblx)) {//市储
+	            	businessNoticeReceive.setHzqlsxzdm(6877);
+	            }
+	            if ("2".equals(cblx)) {//区储
+	            	businessNoticeReceive.setHzqlsxzdm(6878);
+	            }
 	            businessNoticeReceive.setHzqlsxzdm(3052);//商品粮 转后,划转后粮食性质
 	            StringBuffer sbf = new StringBuffer(50);
 	            Date thisdate = new Date();
@@ -720,6 +775,9 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 	            businessNoticeReceive.setIsNotice(1);//0是可以引用的通知单,1不是
 	            businessNoticeReceive.setIsSheet(0);//0代表是性质转变单
 	            businessNoticeReceiveMapper.insert(businessNoticeReceive);
+	            
+	            result_map.put("msg", "操作成功");
+            	result_map.put("status", "success");
 			} else {
 				result_map.put("msg", "根据所传信息没有查到对应库存信息");
             	result_map.put("status", "error");