1

pom.xml

@@ -35,6 +35,10 @@
 			<artifactId>mybatis-spring-boot-starter</artifactId>
 			<version>1.3.1</version>
 		</dependency>
+		<dependency>  
+		    <groupId>org.springframework.boot</groupId>  
+		    <artifactId>spring-boot-starter-security</artifactId>  
+		</dependency>
 		
 		<dependency>
 			<groupId>mysql</groupId>

src/main/java/com/chinaitop/depot/DatePermissionInterceptor.java

@@ -80,8 +80,10 @@ public class DatePermissionInterceptor implements Interceptor {
 						!"com.chinaitop.depot.business.mapper.BusinessDeliveryStorageNoticeMapper.selectByExample".equals(mappedStatement.getId()) &&
 						!"com.chinaitop.depot.business.mapper.BusinessNoticeReceiveMapper.getUserRole_COUNT".equals(mappedStatement.getId()) &&
 						!"com.chinaitop.depot.business.mapper.BusinessMovelibraryMapper.selectList".equals(mappedStatement.getId())&&
-						!"com.chinaitop.depot.system.mapper.SysCodeMapper.selectByPrimaryKey".equals(mappedStatement.getId())
+						!"com.chinaitop.depot.system.mapper.SysCodeMapper.selectByPrimaryKey".equals(mappedStatement.getId()) && 
+						!"com.chinaitop.depot.system.mapper.SysCodeMapper.selectByPrimaryKey_COUNT".equals(mappedStatement.getId())
 						){
+					
 					//解析sql中的表名
 					Statement statement = CCJSqlParserUtil.parse(bouString);
 					Select selectStatement = (Select)statement;
@@ -116,8 +118,7 @@ public class DatePermissionInterceptor implements Interceptor {
 							}
 						}
 						
-						/*bouString = bouString.replaceAll(table, "(SELECT b.* from " + table
-						+ " b,user_business u WHERE b.org_id = u.org_id AND u .user_id ='"+userId+"' AND u.business_type = '"+table+"') ");*/
+						//bouString = bouString.replaceAll(table, "(SELECT b.* from " + table + " b,user_business u WHERE b.org_id = u.org_id AND u .user_id ='"+userId+"' AND u.business_type = '"+table+"') ");
 						
 					}
 				}

src/main/java/com/chinaitop/depot/WebSecurityConfig.java

@@ -0,0 +1,24 @@
+package com.chinaitop.depot;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+
+@Configuration
+@EnableWebSecurity
+public class WebSecurityConfig 
+extends WebSecurityConfigurerAdapter 
+{
+
+	@Override
+    protected void configure(HttpSecurity http) throws Exception {
+		http.authorizeRequests()
+		.antMatchers("/**")
+		.permitAll() //允许所有用户访问所有资源
+        .and()
+        .csrf().disable(); // 禁用CSRF（防止伪造的跨域攻击）
+
+        super.configure(http);
+    }
+}

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

@@ -224,10 +224,11 @@ public class BusinessContractController {
 	@ApiOperation(value="获取合同进度列表", notes = "查询数据列表，支持分页")
 	@ApiImplicitParams({
 		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
-		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query")
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+		@ApiImplicitParam(name = "orgId", value = "库ID", paramType = "query")
 	})
-    public PageInfo<BusinessContractAuditVO> getScheduleList(Integer pageNum, Integer pageSize, BusinessContract contract) {
-        PageInfo<BusinessContractAuditVO> pageInfo = contractService.getScheduleList(pageNum, pageSize, contract);
+    public PageInfo<BusinessContractAuditVO> getScheduleList(Integer pageNum, Integer pageSize, BusinessContract contract, Integer orgId) {
+        PageInfo<BusinessContractAuditVO> pageInfo = contractService.getScheduleList(pageNum, pageSize, contract, orgId);
         return pageInfo;
     }
     

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

@@ -124,8 +124,8 @@ public class BusinessDeliveryStorageNoticeController {
 		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
 		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query")
 	})
-    public PageInfo<BusinessDeliveryStorageNoticeAuditVO> getScheduleList(Integer pageNum, Integer pageSize, BusinessDeliveryStorageNotice deliveryStorageNotice) {
-        PageInfo<BusinessDeliveryStorageNoticeAuditVO> pageInfo = deliveryStorageNoticeService.getScheduleList(pageNum, pageSize, deliveryStorageNotice);
+    public PageInfo<BusinessDeliveryStorageNoticeAuditVO> getScheduleList(Integer pageNum, Integer pageSize, BusinessDeliveryStorageNotice deliveryStorageNotice, Integer orgId) {
+        PageInfo<BusinessDeliveryStorageNoticeAuditVO> pageInfo = deliveryStorageNoticeService.getScheduleList(pageNum, pageSize, deliveryStorageNotice, orgId);
         return pageInfo;
     }
     /**

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

@@ -114,10 +114,11 @@ public class BusinessPlanController {
     @ApiOperation(value="获取计划进度列表", notes = "查询数据列表，支持分页")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
-            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query")
+            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "库ID", paramType = "query")
     })
-    public PageInfo<BusinessPlanAuditVO> getScheduleList(Integer pageNum, Integer pageSize, BusinessPlan businessPlan) {
-        PageInfo<BusinessPlanAuditVO> pageInfo = businessPlanService.getScheduleList(pageNum, pageSize, businessPlan);
+    public PageInfo<BusinessPlanAuditVO> getScheduleList(Integer pageNum, Integer pageSize, BusinessPlan businessPlan, Integer orgId) {
+        PageInfo<BusinessPlanAuditVO> pageInfo = businessPlanService.getScheduleList(pageNum, pageSize, businessPlan, orgId);
         return pageInfo;
     }
 

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

@@ -167,8 +167,8 @@ public class ReceiveNoticeController {
     @ApiOperation(value="增加性质转变单数据(入库)", notes = "")
 	@ApiImplicitParams({
         @ApiImplicitParam(name = "sptId", value = "市库对接的货位ID", paramType = "query"),
-        @ApiImplicitParam(name = "crklx", value = "市库对接的货位ID", paramType = "query"),
-        @ApiImplicitParam(name = "ysid", value = "市库对接的货位ID", paramType = "query")
+        @ApiImplicitParam(name = "crklx", value = "储备类型(1市储，2区储)", paramType = "query"),
+        @ApiImplicitParam(name = "ysid", value = "市平台验收数据ID", paramType = "query")
     })
 	public Map<String, Object> scRkxzzbd(String sptId, String crklx, String ysid) {
 		Map<String, Object> map = new HashMap<>();

src/main/java/com/chinaitop/depot/business/controller/audit/BusinessProSheetAuditController.java

@@ -1,46 +1,34 @@
 package com.chinaitop.depot.business.controller.audit;
 
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.chinaitop.depot.act.model.HistoryList;
 import com.chinaitop.depot.act.service.ActTaskService;
-import com.chinaitop.depot.business.model.BusinessApproval;
-import com.chinaitop.depot.business.model.BusinessFile;
 import com.chinaitop.depot.business.model.BusinessNoticeReceive;
-import com.chinaitop.depot.business.model.BusinessPlan;
-import com.chinaitop.depot.business.model.BusinessStoreWareDetail;
-import com.chinaitop.depot.business.model.enums.StoreWareType;
-import com.chinaitop.depot.business.model.vo.BusinessPlanAuditVO;
 import com.chinaitop.depot.business.service.BusinessApprovalService;
-import com.chinaitop.depot.business.service.BusinessFileService;
-import com.chinaitop.depot.business.service.BusinessPlanService;
-import com.chinaitop.depot.business.service.BusinessStoreWareDetailService;
 import com.chinaitop.depot.business.service.FeignSystemService;
 import com.chinaitop.depot.business.service.ReceiveNoticeService;
-import com.chinaitop.depot.utils.activiti.StringUtils;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 性质转变单审批

src/main/java/com/chinaitop/depot/business/mapper/BusinessNoticeReceiveMapper.java

@@ -33,10 +33,4 @@ public interface BusinessNoticeReceiveMapper {
 
 	List<Map<String, String>> getUserRole(Integer userId);
 
-	/**
-	 * 查询一条第三方接口配置数据
-	 * @param param
-	 * @return
-	 */
-	Map<String, Object> getSysCodeUrl(Map<String, Object> param);
 }

src/main/java/com/chinaitop/depot/business/mapper/BusinessNoticeReceiveMapper.xml

@@ -782,8 +782,5 @@
 					user_id = #{userId,jdbcType=INTEGER}
 			)
   </select>
-  
-  <select id="getSysCodeUrl" parameterType="java.util.HashMap" resultType="java.util.HashMap">
-  	select * from sys_code WHERE org_id=#{orgId,jdbcType=INTEGER} and s_code=#{sCode,jdbcType=VARCHAR}
-  </select>
+
 </mapper>

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

@@ -10,7 +10,7 @@ public class BusinessNoticeReceive {
     private String lsxzzbdh;
     private String lssl;
     private Integer hzqlsxzdm;
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date hzrq;//划转日期
     private String ccshr;
     private String zjshr;

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

@@ -87,7 +87,7 @@ public interface BusinessContractService {
      * @return
      */
     PageInfo<BusinessContractAuditVO> getScheduleList(Integer pageNum,
-            Integer pageSize, BusinessContract contract);
+            Integer pageSize, BusinessContract contract, Integer orgId);
 
     /**
      * @param pageNum

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

@@ -69,7 +69,7 @@ public interface BusinessDeliveryStorageNoticeService {
      */
     PageInfo<BusinessDeliveryStorageNoticeAuditVO> getScheduleList(
             Integer pageNum, Integer pageSize,
-            BusinessDeliveryStorageNotice deliveryStorageNotice);
+            BusinessDeliveryStorageNotice deliveryStorageNotice, Integer orgId);
 
     /**
      * @param pageNum

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

@@ -69,7 +69,7 @@ public interface BusinessPlanService {
      * @return
      */
     PageInfo<BusinessPlanAuditVO> getScheduleList(Integer pageNum, Integer pageSize,
-            BusinessPlan businessPlan);
+            BusinessPlan businessPlan, Integer orgId);
 
     /**
      * @param pageNum

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

@@ -944,7 +944,7 @@ public class BusinessContractServiceImpl implements BusinessContractService {
      */
     @Override
     public PageInfo<BusinessContractAuditVO> getScheduleList(Integer pageNum,
-            Integer pageSize, BusinessContract contract) {
+            Integer pageSize, BusinessContract contract, Integer orgId) {
         // 可以查询所有人通过的合同,而且必须是没有被修改完成的，changing 不是2.
         BusinessContractExample example = new BusinessContractExample();
         Criteria createCriteria = example.createCriteria();
@@ -966,7 +966,13 @@ public class BusinessContractServiceImpl implements BusinessContractService {
             if (contract.getPlanBid() != null) {
                 createCriteria.andPlanBidEqualTo(contract.getPlanBid());
             }
-            
+            // 库id.
+            if (contract.getOrgId() != null) {
+                createCriteria.andOrgIdEqualTo(contract.getOrgId());
+            }
+        }
+        if (null != orgId) {
+        	createCriteria.andOrgIdEqualTo(orgId);
         }
         
         PageInfo<BusinessContractAuditVO> pageInfo = new PageInfo<BusinessContractAuditVO>();

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

@@ -819,7 +819,7 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
     @Override
     public PageInfo<BusinessDeliveryStorageNoticeAuditVO> getScheduleList(
             Integer pageNum, Integer pageSize,
-            BusinessDeliveryStorageNotice deliveryStorageNotice) {
+            BusinessDeliveryStorageNotice deliveryStorageNotice, Integer orgId) {
         // 可以查询所有人通过的通知单
         BusinessDeliveryStorageNoticeExample example = new BusinessDeliveryStorageNoticeExample();
         Criteria createCriteria = example.createCriteria();
@@ -848,8 +848,21 @@ public class BusinessDeliveryStorageNoticeServiceImpl implements BusinessDeliver
             if (deliveryStorageNotice.getRootContractBid() != null) {
                 createCriteria.andRootContractBidEqualTo(deliveryStorageNotice.getRootContractBid());
             }
+            
+         // 原始合同id.
+            if (deliveryStorageNotice.getRootContractBid() != null) {
+                createCriteria.andRootContractBidEqualTo(deliveryStorageNotice.getRootContractBid());
+            }
+            //库ID
+            if (deliveryStorageNotice.getOrgId() != null) {
+                createCriteria.andOrgIdEqualTo(deliveryStorageNotice.getOrgId());
+            }
         }
-        
+
+        if (null != orgId) {
+        	createCriteria.andOrgIdEqualTo(orgId);
+        }
+
         // 审批通过时间倒序.
         example.setOrderByClause("agree_time desc");
         

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

@@ -585,7 +585,7 @@ public class BusinessPlanServiceImpl implements BusinessPlanService {
     @Override
     @Transactional(readOnly = false)
     public PageInfo<BusinessPlanAuditVO> getScheduleList(Integer pageNum,
-            Integer pageSize, BusinessPlan businessPlan) {
+            Integer pageSize, BusinessPlan businessPlan, Integer orgId) {
         // 可以查询所有人通过的计划
         BusinessPlanExample example = new BusinessPlanExample();
         Criteria createCriteria = example.createCriteria();
@@ -596,12 +596,19 @@ public class BusinessPlanServiceImpl implements BusinessPlanService {
             if (StringUtils.isNotBlank(businessPlan.getPlanNumber())) {
                 createCriteria.andPlanNumberLike("%" + businessPlan.getPlanNumber() + "%");
             }
+            //库ID
+            if (null != businessPlan.getOrgId()) {
+                createCriteria.andOrgIdEqualTo(businessPlan.getOrgId());
+            }
             // 粮食品种
             /*if (businessPlan.getGrainKind() != null) {
                 createCriteria.andGrainKindEqualTo(businessPlan.getGrainKind());
             }*/
             
         }
+        if (null != orgId) {
+            createCriteria.andOrgIdEqualTo(orgId);
+        }
         PageInfo<BusinessPlanAuditVO> pageInfo = new PageInfo<BusinessPlanAuditVO>();
         // 审批通过时间倒序.
         example.setOrderByClause("agree_time desc");

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

@@ -71,7 +71,6 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 	@Override
 	public List<BusinessNoticeReceive> queryByExample(Integer pageNum, Integer pageSize,
 			BusinessNoticeReceive businessNoticeReceive,String cktzd,String lyflag) {
-		// TODO Auto-generated method stub
 		
 		BusinessNoticeReceiveExample example = new BusinessNoticeReceiveExample();
         Criteria createCriteria = example.createCriteria();
@@ -133,7 +132,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
         //审批通过的
         if(businessNoticeReceive.getAuditState() != null){
         	if(businessNoticeReceive.getAuditState().equals(14)){ //未审批结束的
-        		createCriteria.andAuditStateNotEqualTo(5);//5是审批结束的
+        		createCriteria.andAuditStateNotEqualTo(6);//6是入库性质转变单审批结束的
         	}else{
         		createCriteria.andAuditStateEqualTo(businessNoticeReceive.getAuditState());
         	}
@@ -334,63 +333,83 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                                 } else {
                                 	businessNoticeReceive.setIsSheet(0);
                                 }
+                                //businessNoticeReceive.setHzqlsxzdm(3052);//商品粮 转后,划转后粮食性质
+                				businessNoticeReceive.setLsxzzbdh(jsonObject.getString("tzdid"));//粮食性质转变单单号
+                				//SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");
+                				//businessNoticeReceive.setHzrq(new Date());//划转时间
+                				//businessNoticeReceive.setIsSheet(0);//是性质转变单
+
+                				String  lsyqsl = jsonObject.getString("lsyqsl");
+                				businessNoticeReceive.setCount(lsyqsl); //计划数量（吨）
+                				//businessNoticeReceive.setOutgoingPeriod(jsonObject.getString("ckqx")); //出库期限(日期格式)
+
+                				businessNoticeReceive.setInApplication(1); //启用
+                				businessNoticeReceive.setIsNotice(0);//0是可以引用的通知单
+                				businessNoticeReceive.setAuditState(5);//下达未审批
+                				businessNoticeReceive.setReceiveTime(new Date());//接收数据的时间
+                				//businessNoticeReceive.setSfzswtzd("0"); //接收通知单菜单不展示该数据
+                				businessNoticeReceiveMapper.insert(businessNoticeReceive);
                             } else {//出库类型
                                 //根据仓房、货位、orgId获取粮食品种等信息
                                 Map<String, Object> map = feignAgileService.getDateByChHwh(orgId, houseId, wareHouseId);
                                 logger.info("根据orgId="+orgId+"，houseId="+houseId+",warehouseId="+wareHouseId+"  获取到的库存数据如下：");
                     			logger.info(map+"");
-                                grainAttribute = (Integer) map.get("hwxz"); //粮油性质
-                                grainKind = (Integer) map.get("pz"); //品种
-                                Integer grainDetailKind = (Integer) map.get("mxpz"); //明细品种
-                                Integer grainGrade = (Integer) map.get("dj"); //等级
-                                String inputTime = map.get("rq")+""; //入库时间
-                                Integer scnf = Integer.parseInt(map.get("scnf")+"");
-                                Double kcsl = (Double) map.get("kcsl");//千克
-                                Date date = null;
-                                if(inputTime!=null){
-                                    date = ParameterUtil.string2datetime(inputTime);
-                                    businessNoticeReceive.setInputTime(date);//入库时间
-                                }
-                                businessNoticeReceive.setProductiveYear(scnf);//生产年份
-                                businessNoticeReceive.setGrainAnnual(scnf);//收获年度
-
-                                Integer grainProducingArea = (Integer) map.get("gb"); //产地
-
-                                businessNoticeReceive.setGrainKind(grainKind); //品种
-                                businessNoticeReceive.setGrainDetailKind(grainDetailKind); //明细品种
-                                businessNoticeReceive.setGrainGrade(grainGrade); //等级
-                                businessNoticeReceive.setGrainAttribute(grainAttribute); //粮油性质
-                                businessNoticeReceive.setGrainProducingArea(grainProducingArea);//产地
-                                
-                                /**
-                                 * 库存数量转化为吨
-                                 */
-                                BigDecimal s = new BigDecimal(1000);
-                                BigDecimal kcslBig = new BigDecimal(kcsl);
-                                BigDecimal kcslKg = kcslBig.divide(s);
-                                
-                                businessNoticeReceive.setLssl(kcslKg.toString());//库存数量
-                                
-                                businessNoticeReceive.setHzqlsxzdm(3052);//商品粮 转后,划转后粮食性质
-                                businessNoticeReceive.setLsxzzbdh(jsonObject.getString("tzdid"));//粮食性质转变单单号
-                                //SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");
-                                businessNoticeReceive.setHzrq(new Date());//划转时间
-                                businessNoticeReceive.setIsSheet(0);//是性质转变单
+                    			if (null != map && !"0".equals(map.get("hwxz").toString())) {
+                    				grainAttribute = (Integer) map.get("hwxz"); //粮油性质
+                    				grainKind = (Integer) map.get("pz"); //品种
+                    				Integer grainDetailKind = (Integer) map.get("mxpz"); //明细品种
+                    				Integer grainGrade = (Integer) map.get("dj"); //等级
+                    				String inputTime = map.get("rq")+""; //入库时间
+                    				Integer scnf = Integer.parseInt(map.get("scnf")+"");
+                    				Double kcsl = (Double) map.get("kcsl");//千克
+                    				Date date = null;
+                    				if(inputTime!=null){
+                    					date = ParameterUtil.string2datetime(inputTime);
+                    					businessNoticeReceive.setInputTime(date);//入库时间
+                    				}
+                    				businessNoticeReceive.setProductiveYear(scnf);//生产年份
+                    				businessNoticeReceive.setGrainAnnual(scnf);//收获年度
+                    				
+                    				Integer grainProducingArea = (Integer) map.get("gb"); //产地
+                    				
+                    				businessNoticeReceive.setGrainKind(grainKind); //品种
+                    				businessNoticeReceive.setGrainDetailKind(grainDetailKind); //明细品种
+                    				businessNoticeReceive.setGrainGrade(grainGrade); //等级
+                    				businessNoticeReceive.setGrainAttribute(grainAttribute); //粮油性质
+                    				businessNoticeReceive.setGrainProducingArea(grainProducingArea);//产地
+                    				
+                    				/**
+                    				 * 库存数量转化为吨
+                    				 */
+                    				BigDecimal s = new BigDecimal(1000);
+                    				BigDecimal kcslBig = new BigDecimal(kcsl);
+                    				BigDecimal kcslKg = kcslBig.divide(s);
+                    				
+                    				businessNoticeReceive.setLssl(kcslKg.toString());//库存数量
+
+                    				businessNoticeReceive.setHzqlsxzdm(3052);//商品粮 转后,划转后粮食性质
+                    				businessNoticeReceive.setLsxzzbdh(jsonObject.getString("tzdid"));//粮食性质转变单单号
+                    				//SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd :hh:mm:ss");
+                    				businessNoticeReceive.setHzrq(new Date());//划转时间
+                    				businessNoticeReceive.setIsSheet(0);//是性质转变单
+
+                    				String  lsyqsl = jsonObject.getString("lsyqsl");
+                    				businessNoticeReceive.setCount(lsyqsl); //计划数量（吨）
+                    				businessNoticeReceive.setOutgoingPeriod(jsonObject.getString("ckqx")); //出库期限(日期格式)
+
+                    				businessNoticeReceive.setInApplication(1); //启用
+                    				businessNoticeReceive.setIsNotice(0);//0是可以引用的通知单
+                    				businessNoticeReceive.setAuditState(0);//下达未审批
+                    				businessNoticeReceive.setReceiveTime(new Date());//接收数据的时间
+                    				//businessNoticeReceive.setSfzswtzd("0"); //接收通知单菜单不展示该数据
+                    				businessNoticeReceiveMapper.insert(businessNoticeReceive);
+                    			} else {
+                    				modelMap.put("msg", "根据所传信息没有查到对应库存信息");
+                    				modelMap.put("status", "error");
+                    			}
                             }
-                            String  lsyqsl = jsonObject.getString("lsyqsl");
-                            businessNoticeReceive.setCount(lsyqsl); //计划数量（吨）
-                            businessNoticeReceive.setOutgoingPeriod(jsonObject.getString("ckqx")); //出库期限(日期格式)
-
-                            businessNoticeReceive.setInApplication(1); //启用
-                            businessNoticeReceive.setIsNotice(0);//0是可以引用的通知单
-                            businessNoticeReceive.setAuditState(0);//下达未审批
-                            businessNoticeReceive.setReceiveTime(new Date());//接收数据的时间
-                            //businessNoticeReceive.setSfzswtzd("0"); //接收通知单菜单不展示该数据
-                            businessNoticeReceiveMapper.insert(businessNoticeReceive);
-                           
                         }
-
-                    }else{
+                    } else {
                         modelMap.put("msg", "cfbm编码为空");
                         modelMap.put("status", "error");
                     }
@@ -477,7 +496,6 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 
 	@Override
 	public void audit(BusinessNoticeReceive receiveNotice, Integer userId, String realName,String orgName,String content) {
-		// TODO Auto-generated method stub
 		
         //businessApproval.setContent(jsonUserInfo.getString("realName") + "提交"); //提交人
         
@@ -534,37 +552,12 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
     	businessApprovalService.add(businessApproval);
 
     	//必须是入库，库级和市级都审批完成，并且不是通知单，只是性质转变单
-    	if ("5".equals(receiveNotice.getAuditState().toString()) && "1".equals(receiveNotice.getIsNotice().toString()) && "0".equals(receiveNotice.getIsSheet().toString()) && "1".equals(receiveNotice.getCrktype())) {
-			//转储成功后把信息给市平台
-			//retSptMeagess(receiveNotice);
-    		try {
-    			Map<String, Object> sysCodeMap = new HashMap<>();
-    			sysCodeMap.put("orgId", 10);
-    			sysCodeMap.put("sCode", "xzzzxxts");
-    			Map<String, Object> resultMap = businessNoticeReceiveMapper.getSysCodeUrl(sysCodeMap);
-    			String path = "";
-    			if (null != resultMap) {
-    				path = resultMap.get("s_val").toString();
-    			}
-    			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());
-    				logger.info("给给市平台发送性质转变成功通知信息地址是："+path);
-
-    				//给市平台发送请求
-    				String result = HTTPUtils.doPost(path, params);
-
-    				//保存推送合同引用状态的消息和返回结果
-    				systemOutsideDataService.addlogger("xzzzxx_result", params.toString(), result);
-    			}
-    		} catch (Exception e) {
-    			e.printStackTrace();
-    		}
+    	if ("5".equals(receiveNotice.getAuditState().toString()) 
+    			&& "1".equals(receiveNotice.getIsNotice().toString()) 
+    			&& "0".equals(receiveNotice.getIsSheet().toString()) 
+    			&& "1".equals(receiveNotice.getCrktype())) {
+
+    		retSptMeagess(receiveNotice);
     	}
 	}
 
@@ -576,7 +569,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 
 
 	/**
-	 * 给给市平台发送性质转变成功通知
+	 * 给给市平台发送性质转变单审批完成的通知
 	 * @param receiveNotice
 	 */
 	@Override
@@ -585,14 +578,8 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 
 		//获取请求的URL地址
 		try {
-			Map<String, Object> sysCodeMap = new HashMap<>();
-			sysCodeMap.put("orgId", 10);
-			sysCodeMap.put("sCode", "xzzzxxts");
-			Map<String, Object> resultMap = businessNoticeReceiveMapper.getSysCodeUrl(sysCodeMap);
-			String path = "";
-			if (null != resultMap) {
-				path = resultMap.get("s_val").toString();
-			}
+			String path = sysCodeService.getSVal(10, "xzzzxxts");
+			System.out.println("查到的配置接口数据是："+path);
 			if (null != receiveNotice.getCblx() && null != receiveNotice.getYsid()) {
 
 				//组装请求参数
@@ -627,7 +614,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 		Object[] parameters = new Object[11];
 		parameters[0] = receiveNotice.getOrgId() + "";
 		parameters[1] = receiveNotice.getGrainKind() + "";
-		//parameters[2] = null;//明细品种
+		parameters[2] = receiveNotice.getGrainDetailKind()+"";//明细品种
 		parameters[3] = receiveNotice.getHouseId() + "";
 		if (StringUtils.isNotBlank(receiveNotice.getWareHouseId()+"")) {//粮仓
 			parameters[4] = receiveNotice.getWareHouseId() + "";
@@ -635,10 +622,16 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
 			parameters[4] = receiveNotice.getHouseId() + "";//油罐
 		}
 		parameters[5] = receiveNotice.getHzqlsxzdm() + "";//变更后粮油性质
-		parameters[6] = receiveNotice.getGrainAttribute() + "";//变更前粮油性质x
-		parameters[7] = Integer.parseInt(receiveNotice.getLssl())*1000 + "";//数量
+		parameters[6] = receiveNotice.getGrainAttribute() + "";//变更前粮油性质
+		/**
+		 * 库存数量转化为公斤
+		 */
+		BigDecimal s = new BigDecimal(1000);
+		BigDecimal kcslBig = new BigDecimal(receiveNotice.getLssl());
+		BigDecimal kcslKg = kcslBig.multiply(s);
+		parameters[7] = kcslKg.toString();//数量
 		parameters[8] = receiveNotice.getLsxzzbdh(); //文件号(性质转变单号)
-		//parameters[9] = null;//损益原因
+		parameters[9] = "入库性质转变单";//损益原因
 		parameters[10] = 1 + ""; //1:新增；2：修改；3：删除
 
 		String crkurl = depotSystemFeignService.getUrl(receiveNotice.getOrgId().toString(), "2");
@@ -856,8 +849,20 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
         	//把对应的粮情卡所挂载的粮食性质改为储备粮
 			updateQualitycheckHwxz(obj);
 
-        	boolean flag = restLsxz(obj.getId());
-        	System.out.println("性质转变单调用出入库接口结果:"+flag);
+			Map<String, Object> kcmap = null;
+			if (null == obj.getWareHouseId()) {
+            	kcmap = feignAgileService.getDateByChHwh(obj.getOrgId(), obj.getHouseId(), obj.getHouseId());
+            	logger.info("根据orgId="+obj.getOrgId()+"，houseId="+obj.getHouseId()+",warehouseId="+obj.getHouseId()+"  获取到的库存数据如下：");
+            } else {
+            	kcmap = feignAgileService.getDateByChHwh(obj.getOrgId(), obj.getHouseId(), obj.getWareHouseId());
+            	logger.info("根据orgId="+obj.getOrgId()+"，houseId="+obj.getHouseId()+",warehouseId="+obj.getWareHouseId()+"  获取到的库存数据如下：");
+            }
+			logger.info(kcmap+"");
+			//如果转前性质跟当前库存的性质一致，那就转储，否则不发送转储指令
+			if (null != kcmap && !obj.getHzqlsxzdm().toString().equals(kcmap.get("hwxz").toString())) {
+				boolean flag = restLsxz(obj.getId());
+				System.out.println("性质转变单调用出入库接口结果:"+flag);
+			}
         }
 	}
 

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

@@ -113,10 +113,10 @@ public class HTTPUtils {
                 in.close();
 
                 return sb.toString();
-            }
-            else{	//
+            } else{	//
+            	String ztm = "状态码：" + code;
                 System.out.println("状态码：" + code);
-                return null;
+                return ztm;
             }
         }
         catch(Exception e){

src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ feign:
 eureka:
   client:
     service-url:
-      defaultZone: http://localhost:9001/eureka/
+      defaultZone: http://tj_admin:Admin_1234@${eureka.instance.hostname}:9001/eureka/
   instance:
     hostname: 172.16.0.16
     prefer-ip-address: true
@@ -20,6 +20,10 @@ eureka:
     lease-expiration-duration-in-seconds: 30
     status-page-url: http://${eureka.instance.hostname}:9002/swagger-ui.html
 
+management:
+  server:
+    port: -1
+
 spring:
   application:
     name: depot-business
@@ -27,9 +31,11 @@ spring:
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
     url: jdbc:mysql://101.36.160.140:10311/depot-tj?useUnicode=true&characterEncoding=utf-8
-    #url: jdbc:mysql://111.164.113.173:667/depot?useUnicode=true&characterEncoding=utf-8
     username: root
     password: admin@1234
+    #url: jdbc:mysql://10.223.3.62:3306/depot?useUnicode=true&characterEncoding=utf-8
+    #username: root
+    #password: Gzp87#b7dW
   activiti:
     check-process-definitions: false
   # 缓存配置
@@ -66,16 +72,16 @@ spring:
 reportUrl: http://192.168.123.132:88/api
 
 web:
-  upload-path: /home/depot/depot-web/apache-tomcat-8.0.53/webapps/ROOT/WEB-INF/classes/static
+  upload-path: /home/depot/depot-web/depot-file
 cxf:
   path: /business
 
 #出入库接口 更改粮食性质
-crk-webservice: http://10.223.3.62:9025/Base/webServices/StoreChangeServer?wsdl
+crk-webservice: /Base/webServices/StoreChangeServer?wsdl
 
 logging:
   level:
-    com.chinaitop.depot.system.mapper: debug       
+    com.chinaitop.depot.system.mapper: debug