修改单位，修改粮食性质，增加熔断

pom.xml

@@ -98,7 +98,12 @@
 		    <artifactId>commons-beanutils</artifactId>
 		    <version>1.9.1</version>
 		</dependency>
-		
+		<dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.2.1</version>
+        </dependency>
+        
 		<dependency>
 		    <groupId>org.apache.xmlgraphics</groupId>
 		    <artifactId>fop</artifactId>
@@ -119,6 +124,14 @@
 		    <version>1.2.37</version>
 		</dependency>
 		
+		<!-- JSONObject jar包 -->
+		<dependency>
+		    <groupId>net.sf.json-lib</groupId>    
+		    <artifactId>json-lib</artifactId>    
+		    <version>2.4</version>    
+		    <classifier>jdk15</classifier>    
+		</dependency>
+		
 		<!--添加webservice-->
 		<dependency>
 		   <groupId>org.apache.cxf</groupId>
@@ -163,10 +176,11 @@
         	<groupId>org.springframework.cloud</groupId>
         	<artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
-        <!-- <dependency>
-　　        <groupId>org.springframework.cloud</groupId>
-　　      	   <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency> -->
+        <dependency>
+		    <groupId>org.springframework.cloud</groupId>
+		    <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
+		</dependency>
+        
 
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -212,6 +226,12 @@
 		    <artifactId>httpclient</artifactId>
 		</dependency>
 		
+		<!-- 日志-->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
+        
 		<dependency>  
 	       <groupId>log4j</groupId>  
 	       <artifactId>log4j</artifactId>  

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

@@ -9,8 +9,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import com.chinaitop.depot.agile.model.BusinessScedule;
+import com.chinaitop.depot.utils.HelloServiceHystrix;
 
-@FeignClient(name = "depot-agile")
+@FeignClient(name = "depot-agile", fallback = HelloServiceHystrix.class)
 public interface FeignAgileService {
 
 

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

@@ -7,7 +7,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-@FeignClient(name = "depot-basic")
+import com.chinaitop.depot.utils.HelloServiceHystrix;
+
+@FeignClient(name = "depot-basic", fallback = HelloServiceHystrix.class)
 public interface FeignBasicService {
 
 

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

@@ -1034,7 +1034,10 @@ public class BusinessContractServiceImpl implements BusinessContractService {
                                 // 入库
                                 // 入库数量.
                             	String sumRksl = businessScedule.getSumWcsl();
-                                BigDecimal sumRkslD = new BigDecimal(sumRksl);
+                            	BigDecimal s = new BigDecimal(1000);
+                                BigDecimal sumCkslss = new BigDecimal(sumRksl);
+                   			    BigDecimal sumRkslD = sumCkslss.divide(s);
+                   			    
                                 // 出入库中的出库数量单位是公斤，合同中是吨，所以出入库数量要除以1000.
                                 //sumRkslD = sumRkslD.divide(new BigDecimal("1000"), 4, BigDecimal.ROUND_HALF_DOWN);
                                 
@@ -1055,7 +1058,11 @@ public class BusinessContractServiceImpl implements BusinessContractService {
                                 // 出库
                                 // 出库数量.
                             	String sumCksl = businessScedule.getSumWcsl();
-                                BigDecimal sumCkslD = new BigDecimal(sumCksl);
+                            	BigDecimal s = new BigDecimal(1000);
+                                BigDecimal sumCkslss = new BigDecimal(sumCksl);
+                   			    BigDecimal sumCkslD = sumCkslss.divide(s);
+                   			    
+                   			    
                                 // 出入库中的出库数量单位是公斤，合同中是吨，所以出入库数量要除以1000.
                                 //sumCkslD = sumCkslD.divide(new BigDecimal("1000"), 4, BigDecimal.ROUND_HALF_DOWN);
                                 

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

@@ -849,7 +849,7 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
                     for (BusinessScedule businessScedule : businessSceduleList) {
 	                    if(businessScedule!=null){
 	                    		
-	                    	if(businessScedule.getCrkLx()==null){//提货单
+	                    	/*if(businessScedule.getCrkLx()==null){//提货单
 	                    		if(businessDeliveryStorageNoticeV.getBillNumber().equals(businessScedule.getThdh())){
 	                    			 flag = true;
 	                    			// 在出入库系统中，获取完成数量
@@ -872,7 +872,9 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
 		                			businessSceduleList.remove(businessScedule);
 		                			// 跳出当前的出入库循环.
 		                			break;
-	                    	}else{//通知单
+	                    	}else{
+	                    		
+	                    	} */   //通知单
 	                    		if (businessDeliveryStorageNoticeV.getId().toString().equals(businessScedule.getTzdId())) {
 	                    			flag = true;
 	                    			// 在出入库系统中，存在该通知单对应的出入库数据，进行计算，得出完成比率.
@@ -881,7 +883,10 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
 	                    				// 入库
 	                    				// 入库数量.
 	                    				String sumRksl = businessScedule.getSumWcsl();
-	                    				BigDecimal sumRkslD = new BigDecimal(sumRksl);
+	                    				BigDecimal s = new BigDecimal(1000);
+	                                    BigDecimal sumRkslss = new BigDecimal(sumRksl);
+	                       			    BigDecimal sumRkslD = sumRkslss.divide(s);
+	                       			    
 	                    				// 赋值：设置完成数量. stripTrailingZeros() 去除结尾的0
 	                    				businessDeliveryStorageNoticeV.setCompleteAmount(sumRkslD.stripTrailingZeros().toPlainString());
 	                    				// 通知单要求数量.
@@ -898,7 +903,10 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
 	                    				// 出库
 	                    				// 出库数量.
 	                    				String sumCksl = businessScedule.getSumWcsl();
-	                    				BigDecimal sumCkslD = new BigDecimal(sumCksl);
+	                    				BigDecimal s = new BigDecimal(1000);
+	                                    BigDecimal sumCkslss = new BigDecimal(sumCksl);
+	                       			    BigDecimal sumCkslD = sumCkslss.divide(s);
+	                       			    
 	                    				
 	                    				// 赋值：设置完成数量. stripTrailingZeros() 去除结尾的0
 	                    				businessDeliveryStorageNoticeV.setCompleteAmount(sumCkslD.stripTrailingZeros().toPlainString());
@@ -919,7 +927,7 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
 	                    			// 跳出当前的出入库循环.
 	                    			break;
 	                    		}
-	                    	}
+	                    	//}
 	                    }
                    }
                     if (!flag) {

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

@@ -637,8 +637,10 @@ public class BusinessPlanServiceImpl implements BusinessPlanService {
                                 // 入库
                                 // 入库数量.
                             	String sumRksl = businessScedule.getSumWcsl();
-                                BigDecimal sumRkslD = new BigDecimal(sumRksl);
-                                
+                                BigDecimal s = new BigDecimal(1000);
+                                BigDecimal sumRkslss = new BigDecimal(sumRksl);
+                   			    BigDecimal sumRkslD = sumRkslss.divide(s);
+                   			 
                                 // 赋值：设置完成数量. stripTrailingZeros() 去除结尾的0
                                 businessPlanV.setCompleteAmount(sumRkslD.stripTrailingZeros().toPlainString());
                                 // 计划要求数量.
@@ -656,8 +658,10 @@ public class BusinessPlanServiceImpl implements BusinessPlanService {
                                 // 出库
                                 // 出库数量.
                             	String sumCksl = businessScedule.getSumWcsl();
-                                BigDecimal sumCkslD = new BigDecimal(sumCksl);
-                                
+                            	BigDecimal s = new BigDecimal(1000);
+                                BigDecimal sumCkslss = new BigDecimal(sumCksl);
+                   			    BigDecimal sumCkslD = sumCkslss.divide(s);
+                   			    
                                 // 赋值：设置完成数量. stripTrailingZeros() 去除结尾的0
                                 businessPlanV.setCompleteAmount(sumCkslD.stripTrailingZeros().toPlainString());
                                 

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

@@ -1,5 +1,6 @@
 package com.chinaitop.depot.business.service.impl;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -8,6 +9,7 @@ import java.util.Map;
 import javax.annotation.Resource;
 
 import org.apache.commons.lang.ObjectUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSONObject;
@@ -18,6 +20,7 @@ import com.chinaitop.depot.business.model.BusinessNoticeReceiveExample.Criteria;
 import com.chinaitop.depot.business.service.FeignAgileService;
 import com.chinaitop.depot.business.service.FeignBasicService;
 import com.chinaitop.depot.business.service.ReceiveNoticeService;
+import com.chinaitop.depot.utils.createKC;
 import com.github.pagehelper.PageHelper;
 
 @Service
@@ -30,7 +33,10 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 	@Resource
 	private FeignAgileService feignAgileService;
 	
-	
+	// 获取ip地址
+    @Value("${crk-webservice}")
+    private String url;
+    
 	@Override
 	public List<BusinessNoticeReceive> queryByExample(Integer pageNum, Integer pageSize,
 			BusinessNoticeReceive businessNoticeReceive,String cktzd,String lyflag) {
@@ -157,6 +163,8 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                     
                     String hwbm = jsonObject.getString("cfbm");
                     if(hwbm!=null){
+                    	Integer grainAttribute = 0 ;
+                    	Integer grainKind = 0;
                     	//根据仓房编码查询仓房、货位、组织机构数据
                         Map<String, Object> wareDataMap = feignBasicService.getWareDataByHwbm(hwbm);
                         Integer houseId = (Integer) wareDataMap.get("houseId");
@@ -165,25 +173,28 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                         businessNoticeReceive.setHouseId(houseId); //仓房
                         businessNoticeReceive.setWareHouseId(wareHouseId); //货位
                         businessNoticeReceive.setOrgId(orgId);  //组织id
-                        
-                        //根据仓房、货位、orgId获取粮食品种等信息
-                        Map<String, Object> map = feignAgileService.getDateByChHwh(orgId, houseId, wareHouseId);
-                        Integer grainAttribute = (Integer) map.get("hwxz"); //粮油性质
-                        Integer grainKind = (Integer) map.get("pz"); //品种
-                        Integer grainDetailKind = (Integer) map.get("mxpz"); //明细品种
-                        Integer grainGrade = (Integer) map.get("dj"); //等级
-                        
-                        businessNoticeReceive.setGrainKind(grainKind); //品种
-                        businessNoticeReceive.setGrainDetailKind(grainDetailKind); //明细品种
-                        businessNoticeReceive.setGrainGrade(grainGrade); //等级
-                        businessNoticeReceive.setGrainAttribute(grainAttribute); //粮油性质
-                        
+                    	if(ObjectUtils.toString(jsonObject.getString("ywlx")).equals("6")){//竞买的业务类型
+                    		if(jsonObject.getString("pz")!=null){
+                    			businessNoticeReceive.setGrainKind(Integer.valueOf(jsonObject.getString("pz"))); //接收的品种
+                    		}
+                    	}else{
+                          //根据仓房、货位、orgId获取粮食品种等信息
+                            Map<String, Object> map = feignAgileService.getDateByChHwh(orgId, houseId, wareHouseId);
+                             grainAttribute = (Integer) map.get("hwxz"); //粮油性质
+                             grainKind = (Integer) map.get("pz"); //品种
+                            Integer grainDetailKind = (Integer) map.get("mxpz"); //明细品种
+                            Integer grainGrade = (Integer) map.get("dj"); //等级
+                            businessNoticeReceive.setGrainKind(grainKind); //品种
+                            businessNoticeReceive.setGrainDetailKind(grainDetailKind); //明细品种
+                            businessNoticeReceive.setGrainGrade(grainGrade); //等级
+                            businessNoticeReceive.setGrainAttribute(grainAttribute); //粮油性质
+                    	}
                         String  lsyqsl = jsonObject.getString("lsyqsl");
-                        /*BigDecimal s = new BigDecimal(1000);
+                        BigDecimal s = new BigDecimal(1000);
             			 BigDecimal sumjhsl = new BigDecimal(lsyqsl);
             			 BigDecimal sumCkslss = sumjhsl.multiply(s);
             			 String count = sumCkslss.toString(); //吨转化为公斤
-           */ 			
+            			
                         businessNoticeReceive.setCount(lsyqsl); //计划数量（吨）
                         businessNoticeReceive.setOutgoingPeriod(jsonObject.getString("ckqx")); //出库期限(日期格式)
                        
@@ -192,7 +203,43 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                        businessNoticeReceive.setReceiveTime(new Date());//接收数据的时间
                        businessNoticeReceiveMapper.insert(businessNoticeReceive);
                    	
-                       modelMap.put("status", "success");
+                       /**
+                        * 修改粮食性质(轮换或者销售进行修改)
+                        *   parameters[0] = ;     //单位ID
+							parameters[1] = ;     //粮食品种
+							parameters[2] = null; //空就行
+							parameters[3] = ;     //仓房ID
+							parameters[4] = ;     //货位ID
+							parameters[5] = ;     //需要改变成的粮食性质
+							parameters[6] = ;     //原来的粮食性质
+							parameters[7] = ;     //库存数量或者要改变的数量
+							parameters[8]=;      //批准文号(山西用)
+							parameters[9]=;      //性质变动原因
+							parameters[10] = ;  //1:新增；2：修改；3：删除
+                        */
+                       if(!ObjectUtils.toString(jsonObject.getString("ywlx")).equals("6")){
+                    	   Object parameters[] = new Object[11];
+                    	   parameters[0] = orgId+"";//组织id
+                    	   parameters[1] = grainKind+"";//粮食品种
+                    	   parameters[2] = null;//
+                    	   parameters[3] = houseId+"";//仓房id
+                    	   parameters[4] = wareHouseId+"";//货位id
+                    	   parameters[5] = 6871+"";//需要改变成的粮食性质(其他商品粮)
+                    	   parameters[6] = grainAttribute+"";//原来的粮食性质
+                    	   parameters[7] = count+"";//原来的粮食性质
+                    	   parameters[8] = jsonObject.getString("tzdid")+"";//原来的粮食性质
+                    	   parameters[9] = "转储性质变动";
+                    	   parameters[10] = 2+"";
+           				   String str = createKC.createKC("ChangeGrainAttribute", url, parameters);
+	           			    if ("true".equals(str)) {
+	           			    	modelMap.put("status", "success");
+	        				} else {
+	        					modelMap.put("status", "error");
+	        					modelMap.put("msg", "保存失败，库存同步异常，请联系管理员！");
+	        					return modelMap;
+	        				}
+                       }
+                       
                     }else{
                     	modelMap.put("msg", "仓房编码为空");
                     	modelMap.put("status", "error");