1

src/main/java/com/chinaitop/depot/feign/FeignBusinessService.java

@@ -13,9 +13,9 @@ import com.chinaitop.depot.utils.HelloServiceHystrix;
 public interface FeignBusinessService {
 
 
-    @RequestMapping(value = "/depot/business/receiveNotice/saveDataRk", method = RequestMethod.POST)
+    /*@RequestMapping(value = "/depot/business/receiveNotice/saveDataRk", method = RequestMethod.POST)
 	void saveDataRk(@RequestParam(value = "orgId") String orgId, @RequestParam(value = "storehouseId") Integer storehouseId, 
 			@RequestParam(value = "warehouseId") Integer warehouseId, @RequestParam(value = "grainVarietyName") String grainVarietyName, 
 			@RequestParam(value = "rksl") BigDecimal rksl,
-			@RequestParam(value = "lsxzzbdh") String lsxzzbdh);
+			@RequestParam(value = "lsxzzbdh") String lsxzzbdh);*/
 }

src/main/java/com/chinaitop/depot/grainSituationCard/mapper/StorageGrainCardMapper.xml

@@ -896,7 +896,7 @@
     where a.type_update = 0
       and a.flag_type is null
       and a.history_status=0
-      and a.process_state=2
+      and a.process_state=3
       and a.org_id = #{orgId}
       and a.house_id = #{houseId}
       and a.warehouse_id = #{warehouseId}
@@ -918,7 +918,7 @@
     where sq.type_update = 0
       and sq.flag_type is null
       and sq.history_status=0
-      and sq.process_state=2
+      and sq.process_state=3
       and sq.org_id = #{orgId}
       and sq.house_id = #{houseId}
     order by sq.check_time desc

src/main/java/com/chinaitop/depot/grainSituationCard/service/impl/StorageGrainCardServiceImpl.java

@@ -240,45 +240,6 @@ public class StorageGrainCardServiceImpl implements StorageGrainCardService {
                     	this.updateByExampleSelective(grainCard);
                     }
                 }
-                /*
-                 * 性质转变单新增数据
-                */
-                logger.info("传给business的数据为: orgId：" + orgId+"storehouseId："+storehouseId+"warehouseId:"+warehouseId+"grainCard.getGrainVarietyName():"+
-                		grainCard.getGrainVarietyName()+"grainCard.getRksl():"+grainCard.getRksl()+"grainCard.getLsxzzbdh():"+grainCard.getLsxzzbdh());
-               String grainVarietyName = grainCard.getGrainVarietyName();
-               BigDecimal rksl = grainCard.getRksl();
-               String lsxzzbdh = grainCard.getLsxzzbdh();
-               String xyh = grainCard.getSpareOne();//协议号
-               //FeignBusinessService.saveDataRk(orgId,storehouseId,warehouseId,grainVarietyName,rksl,lsxzzbdh);
-               
-               /**
-                * restTemplate调用
-                */
-               //String url = "http://localhost:9002/depot/business/receiveNotice/saveDataRkByRest";
-               String url = "http://10.223.3.62:9002/depot/business/receiveNotice/saveDataRkByRest";//生产环境
-               //String url = "http://172.16.0.16:9002/depot/business/receiveNotice/saveDataRkByRest";//测试环境
-               
-               // 请求头设置,x-www-form-urlencoded格式的数据
-               HttpHeaders headers = new HttpHeaders();
-               headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
-
-               //提交参数设置
-               MultiValueMap<String, String> mapRest = new LinkedMultiValueMap<>();
-               mapRest.add("orgId", orgId.toString());
-               mapRest.add("storehouseId", storehouseId.toString());
-               mapRest.add("warehouseId", warehouseId.toString());
-               mapRest.add("grainVarietyName", grainVarietyName);
-               mapRest.add("rksl", rksl.toString());
-               mapRest.add("lsxzzbdh", lsxzzbdh);
-               mapRest.add("xyh", xyh);
-               
-               // 组装请求体
-               HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<MultiValueMap<String, String>>(mapRest, headers);
-                           
-               // 发送post请求，并打印结果，以String类型接收响应结果JSON字符串
-               String result = restTemplate.postForObject(url, request, String.class);
-               System.out.println("restTemplate传参结果入库验收增加性质转变单"+result);
-                		
             }
         }
 

src/main/java/com/chinaitop/depot/grainSituationCard/service/impl/StorageQualityCardServiceImpl.java

@@ -53,7 +53,7 @@ public class StorageQualityCardServiceImpl implements StorageQualityCardService
                     qalityCard.setFlagType(2);
                 }
                 qalityCard.setOrgId(orgId);
-                qalityCard.setProcessState(2);
+                qalityCard.setProcessState(3);
                 //粮情卡主表id
                 qalityCard.setQuailtyCardId(cardNum);
 

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

@@ -15,11 +15,11 @@ public class HelloServiceHystrix implements FeignBusinessService{
 
 	public static final Logger logger = LoggerFactory.getLogger(HelloServiceHystrix.class);
 
-	@Override
+	/*@Override
 	public void saveDataRk(String orgId, Integer storehouseId, Integer warehouseId, String grainVarietyName,
 			BigDecimal rksl, String lsxzzbdh) {
 		// TODO Auto-generated method stub
 		logger.info("传参失败(入库性质转变单)!");
-	}
+	}*/
 	
 }