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;
@@ -171,25 +172,43 @@ public class ReceiveNoticeController {
     })
 	public Map<String, Object> scRkxzzbd(String sptId, String crklx, String ysid) {
 		Map<String, Object> map = new HashMap<>();
+		String jssj = "sptId="+sptId+"&crklx="+crklx+"&ysid="+ysid;
 		try {
 			map = receiveNoticeService.scRkxzzbd(sptId, crklx, ysid);
-			systemOutsideDataService.addlogger("rkxzzbd", sptId, map.toString());
+			systemOutsideDataService.addlogger("rkxzzbd", jssj, map.toString());
 		} catch (Exception e) {
 			logger.error("性质转变单生成异常");
 			logger.error(e.getMessage());
 			map.put("status", "error");
 			map.put("msg", "接口异常，请联系管理员！");
-			systemOutsideDataService.addlogger("rkxzzbd", sptId, map.toString());
+			systemOutsideDataService.addlogger("rkxzzbd", jssj, map.toString());
 		}
 		return map;
 	}
-    
-	/*@RequestMapping(value="/test", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
-    @ApiOperation(value="测试接口", notes = "")
+
+	@RequestMapping(value="/updateNoticeReceiveAuditState", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="接收市平台调用修改入库性质转变单状态和划转时间", notes = "")
+	@ApiImplicitParams({
+        @ApiImplicitParam(name = "cblx", value = "储备类型(1市储，2区储)", paramType = "query"),
+        @ApiImplicitParam(name = "ysid", value = "市平台验收数据ID", paramType = "query"),
+        @ApiImplicitParam(name = "hzsj", value = "划转时间", paramType = "query")
+    })
+	public void updateNoticeReceiveAuditState(String cblx, String ysid, String hzsj) {
+		try {
+			String param = "cblx="+cblx+"&ysid="+ysid+"&hzsj="+hzsj;
+			systemOutsideDataService.addlogger("update_rkxzzbd_zt_and_hzsj", param, null);
+			receiveNoticeService.updateNoticeReceiveAuditState(cblx, ysid, hzsj);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	@RequestMapping(value="/retSptMeagess", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="给给市平台发送性质转变单5部审批完的通知", notes = "")
 	@ApiImplicitParams({
         @ApiImplicitParam(name = "datas", value = "数据对象", paramType = "query")
     })
-	public Map<String, Object> test(String datas) {
+	public Map<String, Object> retSptMeagess(String datas) {
 		Map<String, Object> map = new HashMap<>();
 		try {
 			ObjectMapper mapper = new ObjectMapper();
@@ -202,7 +221,7 @@ public class ReceiveNoticeController {
 			map.put("msg", "接口异常，请联系管理员！");
 		}
 		return map;
-	}*/
+	}
 	
 	@RequestMapping(value="/testT", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
     @ApiOperation(value="测试接口", notes = "")

src/main/java/com/chinaitop/depot/business/model/BusinessNoticeReceiveExample.java

@@ -1465,6 +1465,16 @@ public class BusinessNoticeReceiveExample {
             addCriterion("receive_time not between", value1, value2, "receiveTime");
             return (Criteria) this;
         }
+
+        public Criteria andCblxEqualTo(String value) {
+            addCriterion("cblx =", value, "cblx");
+            return (Criteria) this;
+        }
+        
+        public Criteria andYsidEqualTo(String value) {
+            addCriterion("ysid =", value, "ysid");
+            return (Criteria) this;
+        }
     }
 
     /**

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

@@ -58,4 +58,12 @@ public interface ReceiveNoticeService {
 	 * @param receiveNotice
 	 */
 	public void updateQualitycheckHwxz(BusinessNoticeReceive receiveNotice);
+
+	/**
+	 * 修改入库性质转变单状态
+	 * @param cblx 储备类型(1市储，2区储)
+	 * @param ysid 市平台验收数据ID
+	 * @param hzsj 划转时间
+	 */
+	void updateNoticeReceiveAuditState(String cblx, String ysid, String hzsj);
 }

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

@@ -530,19 +530,17 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
         	businessNoticeReceiveMapper.updateByPrimaryKeySelective(receiveNotice);
 
         }
-       //增加审批表数据
+        //增加审批表数据
     	businessApprovalService.add(businessApproval);
 
-    	//必须是入库，并且不是通知单，只是性质转变单
-    	if ("1".equals(receiveNotice.getIsNotice()) && "1".equals(receiveNotice.getIsSheet()) && "1".equals(receiveNotice.getCrktype())) {
-    		boolean flag = restLsxz(receiveNotice.getId());
-    		
-    		if (flag) {
-    			//转储成功后把信息给市平台
-    			retSptMeagess(receiveNotice);
-    			//把对应的粮情卡所挂载的粮食性质改为储备粮
-    			updateQualitycheckHwxz(receiveNotice);
-    		}
+    	System.out.println("5".equals(receiveNotice.getAuditState().toString()));
+    	System.out.println("1".equals(receiveNotice.getIsNotice().toString()));
+    	System.out.println("0".equals(receiveNotice.getIsSheet().toString()));
+    	System.out.println("1".equals(receiveNotice.getCrktype()));
+    	//必须是入库，库级和市级都审批完成，并且不是通知单，只是性质转变单
+    	if ("5".equals(receiveNotice.getAuditState().toString()) && "1".equals(receiveNotice.getIsNotice().toString()) && "0".equals(receiveNotice.getIsSheet().toString()) && "1".equals(receiveNotice.getCrktype())) {
+			//转储成功后把信息给市平台
+			retSptMeagess(receiveNotice);
     	}
 	}
 
@@ -595,20 +593,22 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 		boolean flag = false;
 
 		BusinessNoticeReceive receiveNotice = businessNoticeReceiveMapper.selectByPrimaryKey(id);
-		Object[] parameters = new Object[9];
+		Object[] parameters = new Object[11];
 		parameters[0] = receiveNotice.getOrgId() + "";
 		parameters[1] = receiveNotice.getGrainKind() + "";
-		//parameters[2] = null;
+		//parameters[2] = null;//明细品种
 		parameters[3] = receiveNotice.getHouseId() + "";
 		if (StringUtils.isNotBlank(receiveNotice.getWareHouseId()+"")) {//粮仓
 			parameters[4] = receiveNotice.getWareHouseId() + "";
 		} else {
 			parameters[4] = receiveNotice.getHouseId() + "";//油罐
 		}
-		parameters[5] = receiveNotice.getHzqlsxzdm() + "";//要转换的粮食性质
-		parameters[6] = receiveNotice.getGrainAttribute() + "";//原来的粮食性质
+		parameters[5] = receiveNotice.getHzqlsxzdm() + "";//变更后粮油性质
+		parameters[6] = receiveNotice.getGrainAttribute() + "";//变更前粮油性质x
 		parameters[7] = Integer.parseInt(receiveNotice.getLssl())*1000 + "";//数量
-		parameters[8] = 1 + ""; //1:新增；2：修改；3：删除
+		parameters[8] = receiveNotice.getLsxzzbdh(); //文件号(性质转变单号)
+		//parameters[9] = null;//损益原因
+		parameters[10] = 1 + ""; //1:新增；2：修改；3：删除
 
 		String crkurl = depotSystemFeignService.getUrl(receiveNotice.getOrgId().toString(), "2");
 	    if (StringUtils.isNotBlank(crkurl)) {
@@ -655,12 +655,12 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 	@Override
 	public Map<String, Object> updateReceiveNotice(String notice) throws Exception {
 		Map<String, Object> map = new HashMap<>();
-		
+
 		BusinessNoticeReceive businessNoticeReceive = formatObject(notice);
 		businessNoticeReceiveMapper.updateByPrimaryKeySelective(businessNoticeReceive);
 		map.put("status", 200);
 		map.put("msg", "操作成功");
-		
+
 		return map;
 	}
 
@@ -740,15 +740,21 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
             	result_map.put("status", "error");
                 return result_map;
             }
-            
-            Map<String, Object> kcmap = feignAgileService.getDateByChHwh(businessNoticeReceive.getOrgId(), businessNoticeReceive.getHouseId(), businessNoticeReceive.getWareHouseId());
-            logger.info("根据orgId="+businessNoticeReceive.getOrgId()+"，houseId="+businessNoticeReceive.getHouseId()+",warehouseId="+businessNoticeReceive.getWareHouseId()+"  获取到的库存数据如下：");
+
+            Map<String, Object> kcmap = null;
+            if (null == businessNoticeReceive.getWareHouseId()) {
+            	kcmap = feignAgileService.getDateByChHwh(businessNoticeReceive.getOrgId(), businessNoticeReceive.getHouseId(), businessNoticeReceive.getHouseId());
+            	logger.info("根据orgId="+businessNoticeReceive.getOrgId()+"，houseId="+businessNoticeReceive.getHouseId()+",warehouseId="+businessNoticeReceive.getHouseId()+"  获取到的库存数据如下：");
+            } else {
+            	kcmap = feignAgileService.getDateByChHwh(businessNoticeReceive.getOrgId(), businessNoticeReceive.getHouseId(), businessNoticeReceive.getWareHouseId());
+            	logger.info("根据orgId="+businessNoticeReceive.getOrgId()+"，houseId="+businessNoticeReceive.getHouseId()+",warehouseId="+businessNoticeReceive.getWareHouseId()+"  获取到的库存数据如下：");
+            }
 			logger.info(kcmap+"");
-			if (null != kcmap) {
+			if (null != kcmap && !"0".equals(kcmap.get("hwxz"))) {
 				String inputTime = kcmap.get("rq")+""; //入库时间
 	            Double kcsl = (Double) kcmap.get("kcsl");//千克
 	            Date date = null;
-	            if(inputTime!=null){
+	            if(StringUtils.isNotBlank(inputTime)){
 	                date = ParameterUtil.string2datetime(inputTime);
 	                businessNoticeReceive.setInputTime(date);//入库时间
 	            }
@@ -779,7 +785,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 	            Date thisdate = new Date();
 	            sbf.append("RKXZZBD").append(String.format("%03d", businessNoticeReceive.getOrgId())).append(ParameterUtil.getDateYMDHMS(thisdate));
 	            businessNoticeReceive.setLsxzzbdh(sbf.toString());//粮食性质转变单单号
-	            businessNoticeReceive.setHzrq(thisdate);//划转时间
+	            //businessNoticeReceive.setHzrq(thisdate);//划转时间
 	            businessNoticeReceive.setCount(businessNoticeReceive.getLssl()); //计划数量（吨）
 	            businessNoticeReceive.setInApplication(1); //启用
 	            businessNoticeReceive.setAuditState(0);//下达未审批
@@ -803,4 +809,25 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 		return result_map;
 	}
 
+	@Override
+	public void updateNoticeReceiveAuditState(String cblx, String ysid, String hzsj) {
+		BusinessNoticeReceiveExample example = new BusinessNoticeReceiveExample();
+        Criteria createCriteria = example.createCriteria();
+        createCriteria.andCblxEqualTo(cblx);
+        createCriteria.andYsidEqualTo(ysid);
+        List<BusinessNoticeReceive> list = businessNoticeReceiveMapper.selectByExample(example);
+        if (null != list && list.size() > 0) {
+        	BusinessNoticeReceive obj = list.get(0);
+        	obj.setAuditState(6);//入库的审批通过
+        	obj.setHzrq(ParameterUtil.string2datetime(hzsj));//划转时间
+        	businessNoticeReceiveMapper.updateByPrimaryKey(obj);
+
+        	//把对应的粮情卡所挂载的粮食性质改为储备粮
+			updateQualitycheckHwxz(obj);
+
+        	boolean flag = restLsxz(obj.getId());
+        	System.out.println("性质转变单调用出入库接口结果:"+flag);
+        }
+	}
+
 }

src/main/java/com/chinaitop/depot/utils/createKC.java

@@ -2,11 +2,15 @@ package com.chinaitop.depot.utils;
 
 import javax.xml.namespace.QName;
 
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory;
 import org.apache.cxf.service.model.BindingInfo;
 import org.apache.cxf.service.model.BindingOperationInfo;
 
+import com.alibaba.fastjson.JSON;
+
 import net.sf.json.JSONObject;
 
 public class createKC {
@@ -32,8 +36,11 @@ public class createKC {
 		Object[] res = null;
 		String ret = "";
 		try {
+			System.out.println("webservice调用url是："+url);
 			res = client.invoke(opName, parameters);
+			System.out.println("webservice调用发送的消息："+ArrayUtils.toString(parameters, ","));
 			JSONObject object = JSONObject.fromObject(res[0]);
+			System.out.println("webservice调用返回消息："+JSON.toJSONString(object));
 			ret = object.getString("success");
 		} catch (Exception e) {
 			e.printStackTrace();