1

src/main/java/com/chinaitop/depot/pushs/service/PushsService.java

@@ -1,12 +1,22 @@
 package com.chinaitop.depot.pushs.service;
 
-
-
 public interface PushsService {
-	
-	
-	//出入库取库级平台倒仓通知单数据
+
+	/**
+	 * 出入库取库级平台倒仓通知单数据
+	 * @param orgId 
+	 * @param ids 倒仓申请单号集合字符串
+	 * @return
+	 */
 	String getChangeDatas(String orgId, String ids);
-	//出入库将倒仓通知单记录传回库级平台进行展示
+
+	/**
+	 * 倒仓进度数据接收(出入库调用ws接口给推送)
+	 * @param orgId 组织机构ID
+	 * @param applyNo 倒仓申请单号
+	 * @param foodStatus 完成状态
+	 * @param goalNumber 完成数量(公斤)
+	 * @return
+	 */
 	String updateChangeStorageHouse(String orgId, String applyNo, String foodStatus, String goalNumber);
 }

src/main/java/com/chinaitop/depot/pushs/service/impl/PushServiceImpl.java

@@ -2,7 +2,6 @@ package com.chinaitop.depot.pushs.service.impl;
 
 
 
-import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -22,23 +21,23 @@ import com.chinaitop.depot.storage.mapper.StorageChangeStoragehouseRopMapper;
 import com.chinaitop.depot.storage.model.StorageChangeStoragehouseDefault;
 import com.chinaitop.depot.storage.model.StorageChangeStoragehouseDefaultExample;
 import com.chinaitop.depot.storage.model.StorageChangeStoragehouseDefaultExample.Criteria;
+import com.chinaitop.depot.storage.service.SystemOutsideDataService;
 import com.chinaitop.depot.storage.model.StorageChangeStoragehouseRop;
 import com.chinaitop.depot.storage.model.StorageChangeStoragehouseRopExample;
-import com.chinaitop.depot.storage.service.StorageChangeStoragehouseRopService;
 import com.chinaitop.depot.storage.utils.ParameterUtil;
 import com.chinaitop.depot.unissoft.model.ResponseEntity;
-import com.fasterxml.jackson.databind.ObjectMapper;
 
 @Service
 public class PushServiceImpl implements PushsService{
-	
-    final static Logger logger  =  LoggerFactory.getLogger(PushServiceImpl.class );
 
+    final static Logger logger  =  LoggerFactory.getLogger(PushServiceImpl.class );
 
 	@Resource
 	private StorageChangeStoragehouseDefaultMapper storageChangeStoragehouseDefaultMapper;
 	@Resource
 	private StorageChangeStoragehouseRopMapper storageChangeStoragehouseRopMapper;
+	@Resource 
+	private SystemOutsideDataService systemOutsideDataService;
 
 	@Transactional(rollbackFor = Exception.class)
 	@Override
@@ -59,29 +58,29 @@ public class PushServiceImpl implements PushsService{
 		mapData.put("mainData", mainList);
 		return JSON.toJSONString(ResponseEntity.ok(mapData));
 	}
-	
-	
+
 	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public String updateChangeStorageHouse(String orgId, String applyNo, String foodStatus, String goalNumber) {
 		String retS = "Success";
-			ObjectMapper mapper = new ObjectMapper();
+		StringBuffer sbf = new StringBuffer(50);
+		sbf.append("orgId="+orgId).append("&applyNo="+applyNo).append("&foodStatus="+foodStatus).append("&goalNumber="+goalNumber);
+
+		try {
 			StorageChangeStoragehouseDefaultExample StorageChangeStoragehouseDefaultExample = new StorageChangeStoragehouseDefaultExample();
 			Criteria Criteria = StorageChangeStoragehouseDefaultExample.createCriteria();
-			StorageChangeStoragehouseRopExample StorageChangeStoragehouseRopExample = new StorageChangeStoragehouseRopExample();
-			StorageChangeStoragehouseRopExample.Criteria criteria = StorageChangeStoragehouseRopExample.createCriteria();
-			StorageChangeStoragehouseRop StorageChangeStoragehouseRop = new StorageChangeStoragehouseRop();
-
 			Criteria.andOrgIdEqualTo(Integer.parseInt(orgId));
 			Criteria.andApplyNoEqualTo(applyNo);
-			criteria.andOrgIdEqualTo(Integer.parseInt(orgId));
-			criteria.andApplyNoEqualTo(applyNo);
 			List<StorageChangeStoragehouseDefault> list = storageChangeStoragehouseDefaultMapper.selectByExample(StorageChangeStoragehouseDefaultExample);
 			if(list == null || list.size() ==0 ) {
-				return retS = "该数据不存在!";
+				retS = "该数据不存在!";
+				systemOutsideDataService.addlogger("dcjdsjjs", sbf.toString(), retS);
+				return retS;
 			}else {
-			try {
-			for(StorageChangeStoragehouseDefault o : list){
+				StorageChangeStoragehouseDefault o = list.get(0);
+				
+				StorageChangeStoragehouseRop StorageChangeStoragehouseRop = new StorageChangeStoragehouseRop();
+				StorageChangeStoragehouseRop = new StorageChangeStoragehouseRop();
 				StorageChangeStoragehouseRop.setApplyFirm(o.getApplyFirm());   //申请倒仓企业
 				StorageChangeStoragehouseRop.setChangehouseNo(o.getChangehouseNo());  //倒仓通知单编号
 				StorageChangeStoragehouseRop.setApplyTime(o.getApplyTime());   //申请日期
@@ -105,18 +104,24 @@ public class PushServiceImpl implements PushsService{
 				StorageChangeStoragehouseRop.setOutAfter(o.getOutAfter());  //倒出后保管方式
 				StorageChangeStoragehouseRop.setOrgId(Integer.parseInt(orgId));   //单位ID
 				StorageChangeStoragehouseRop.setApplyNo(applyNo);  //申请单号
-			}
-			List<StorageChangeStoragehouseRop> ropList = storageChangeStoragehouseRopMapper.selectByExample(StorageChangeStoragehouseRopExample);
-			if(ropList == null || ropList.size() ==0 ){
-				storageChangeStoragehouseRopMapper.insertSelective(StorageChangeStoragehouseRop);
-			}else{
-				storageChangeStoragehouseRopMapper.updateByPrimaryKeySelective(StorageChangeStoragehouseRop);
+
+				StorageChangeStoragehouseRopExample StorageChangeStoragehouseRopExample = new StorageChangeStoragehouseRopExample();
+				StorageChangeStoragehouseRopExample.Criteria criteria = StorageChangeStoragehouseRopExample.createCriteria();
+				criteria.andOrgIdEqualTo(Integer.parseInt(orgId));
+				criteria.andApplyNoEqualTo(applyNo);
+				List<StorageChangeStoragehouseRop> ropList = storageChangeStoragehouseRopMapper.selectByExample(StorageChangeStoragehouseRopExample);
+				if(ropList == null || ropList.size() ==0 ){
+					storageChangeStoragehouseRopMapper.insertSelective(StorageChangeStoragehouseRop);
+				}else{
+					storageChangeStoragehouseRopMapper.updateByPrimaryKeySelective(StorageChangeStoragehouseRop);
 				}
+			}
+			systemOutsideDataService.addlogger("dcjdsjjs", sbf.toString(), retS);
 		} catch (Exception e) {
-			return retS = "error";
+			retS = "系统异常，请联系管理员";
+			systemOutsideDataService.addlogger("dcjdsjjs", sbf.toString(), retS);
 		}
 		return retS;
-			}
 	}
 
 }

src/main/java/com/chinaitop/depot/storage/controller/StorageChangeStoragehouseRopController.java

@@ -22,6 +22,7 @@ import com.chinaitop.depot.storage.model.StorageChangeStoragehouseDefaultExample
 import com.chinaitop.depot.storage.model.StorageChangeStoragehouseRop;
 import com.chinaitop.depot.storage.model.StorageChangeStoragehouseRopExample;
 import com.chinaitop.depot.storage.service.StorageChangeStoragehouseRopService;
+import com.chinaitop.depot.storage.service.SystemOutsideDataService;
 import com.chinaitop.depot.storage.utils.ParameterUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -35,12 +36,14 @@ import io.swagger.annotations.ApiOperation;
 @RequestMapping(value = "/StorageChangeStoragehouseRopController")
 @Api(value = "StorageChangeStoragehouseRopController", description = "倒仓作业类")
 public class StorageChangeStoragehouseRopController {
-	
+
 	@Resource 
 	private StorageChangeStoragehouseRopService storageChangeStoragehouseRopService;
-	
+	@Resource 
+	private SystemOutsideDataService systemOutsideDataService;
+
 	final static Logger logger = LoggerFactory.getLogger(StorageChangeStoragehouseRop.class);
-	
+
 	@RequestMapping(value = "/getList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
 	@ApiOperation(value = "查询倒仓列表", notes = "查询倒仓信息列表，支持分页")
 	@ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
@@ -88,8 +91,7 @@ public class StorageChangeStoragehouseRopController {
 		PageInfo<StorageChangeStoragehouseDefault> pageInfo = new PageInfo<StorageChangeStoragehouseDefault>(list);
 		return pageInfo;
 	}
-	
-	@SuppressWarnings("unlikely-arg-type")
+
 	@RequestMapping(value = "/findRopData", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
 	@ApiOperation(value = "查询倒仓通知单", notes = "查询倒仓通知单")
 	@ApiImplicitParams({ @ApiImplicitParam(name = "changehouseNo", value = "倒仓通知单号", paramType = "query"),
@@ -112,8 +114,7 @@ public class StorageChangeStoragehouseRopController {
 		modelMap.put("ChangeStoragehouseRop", list);
 		return modelMap;
 	}
-	
-	@SuppressWarnings("unlikely-arg-type")
+
 	@RequestMapping(value = "/getListRop", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
 	@ApiOperation(value = "倒仓进度列表查询", notes = "倒仓进度列表查询，支持分页")
 	@ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
@@ -150,8 +151,7 @@ public class StorageChangeStoragehouseRopController {
 		PageInfo<StorageChangeStoragehouseRop> pageInfo = new PageInfo<StorageChangeStoragehouseRop>(list);
 		return pageInfo;
 	}
-	
-	@SuppressWarnings("unlikely-arg-type")
+
 	@RequestMapping(value = "/showDataR", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
 	@ApiOperation(value = "倒仓进度明细查询", notes = "倒仓进度明细查询")
 	@ApiImplicitParams({ @ApiImplicitParam(name = "changehouseNo", value = "通知单号", paramType = "query"),
@@ -174,17 +174,24 @@ public class StorageChangeStoragehouseRopController {
 		modelMap.put("ChangeStoragehouseRopList", list);
 		return modelMap;
 	}
-	
-	
+
 	@RequestMapping(value="/save", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
 	@ApiOperation(value="保存数据", notes = "保存")
-	  @ApiImplicitParams({
-	  @ApiImplicitParam(name = "save", value = "新增数据", paramType = "query") 
-	  })
+	@ApiImplicitParams({
+	    @ApiImplicitParam(name = "save", value = "新增数据", paramType = "query") 
+	})
     public Map<String, Object> save(String change){
 		Map<String, Object> modelMap = new HashMap<String, Object>();
 		logger.info("接收的到仓通知单数据如下：\r\n\t"+change);
-		modelMap = storageChangeStoragehouseRopService.add(change);  
+		try {
+			modelMap = storageChangeStoragehouseRopService.add(change);
+			systemOutsideDataService.addlogger("dctzdjs", change, modelMap.toString());
+		} catch (Exception e) {
+			modelMap.put("status", "error");
+        	modelMap.put("msg", "接口异常,请联系管理员！");
+        	logger.error(e.getMessage(), e);
+        	systemOutsideDataService.addlogger("dctzdjs", change, modelMap.toString());
+		}  
         return modelMap;
     }
 }

src/main/java/com/chinaitop/depot/storage/mapper/StorageChangeStoragehouseDefaultMapper.xml

@@ -25,6 +25,7 @@
     <result column="food_number" property="foodNumber" jdbcType="VARCHAR" />
     <result column="out_after" property="outAfter" jdbcType="VARCHAR" />
     <result column="oper_staff" property="operStaff" jdbcType="VARCHAR" />
+    <result column="jhwjbh" property="jhwjbh" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -88,7 +89,7 @@
     changehouse_no, org_id, apply_no, apply_time, out_storehouse, out_storehouse_name, 
     out_warehouse, out_warehouse_name, food_war, food_nature, bit_weigh, out_before, 
     apply_firm, create_time, over_time, into_storehouse, into_storehouse_name, into_warehouse, 
-    into_warehouse_name, detail_war, food_number, out_after, oper_staff
+    into_warehouse_name, detail_war, food_number, out_after, oper_staff, jhwjbh
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseDefaultExample" >
     select
@@ -118,7 +119,7 @@
       apply_firm, create_time, over_time, 
       into_storehouse, into_storehouse_name, into_warehouse, 
       into_warehouse_name, detail_war, food_number, 
-      out_after, oper_staff)
+      out_after, oper_staff, jhwjbh)
     values (#{changehouseNo,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{applyNo,jdbcType=VARCHAR}, 
       #{applyTime,jdbcType=TIMESTAMP}, #{outStorehouse,jdbcType=INTEGER}, #{outStorehouseName,jdbcType=VARCHAR}, 
       #{outWarehouse,jdbcType=INTEGER}, #{outWarehouseName,jdbcType=VARCHAR}, #{foodWar,jdbcType=INTEGER}, 
@@ -126,7 +127,7 @@
       #{applyFirm,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{overTime,jdbcType=TIMESTAMP}, 
       #{intoStorehouse,jdbcType=INTEGER}, #{intoStorehouseName,jdbcType=VARCHAR}, #{intoWarehouse,jdbcType=INTEGER}, 
       #{intoWarehouseName,jdbcType=VARCHAR}, #{detailWar,jdbcType=INTEGER}, #{foodNumber,jdbcType=VARCHAR}, 
-      #{outAfter,jdbcType=VARCHAR}, #{operStaff,jdbcType=VARCHAR})
+      #{outAfter,jdbcType=VARCHAR}, #{operStaff,jdbcType=VARCHAR}, #{jhwjbh,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseDefault" >
     insert into storage_change_storagehouse_default
@@ -200,6 +201,9 @@
       <if test="operStaff != null" >
         oper_staff,
       </if>
+      <if test="jhwjbh != null">
+        jhwjbh,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="changehouseNo != null" >
@@ -271,6 +275,9 @@
       <if test="operStaff != null" >
         #{operStaff,jdbcType=VARCHAR},
       </if>
+      <if test="jhwjbh != null">
+        #{jhwjbh,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageChangeStoragehouseDefaultExample" resultType="java.lang.Integer" >
@@ -351,6 +358,9 @@
       <if test="record.operStaff != null" >
         oper_staff = #{record.operStaff,jdbcType=VARCHAR},
       </if>
+      <if test="record.jhwjbh != null">
+        jhwjbh = #{record.jhwjbh,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -380,7 +390,8 @@
       detail_war = #{record.detailWar,jdbcType=INTEGER},
       food_number = #{record.foodNumber,jdbcType=VARCHAR},
       out_after = #{record.outAfter,jdbcType=VARCHAR},
-      oper_staff = #{record.operStaff,jdbcType=VARCHAR}
+      oper_staff = #{record.operStaff,jdbcType=VARCHAR},
+      jhwjbh = #{record.jhwjbh,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>

src/main/java/com/chinaitop/depot/storage/mapper/SystemOutsideDataMapper.java

@@ -0,0 +1,32 @@
+package com.chinaitop.depot.storage.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.chinaitop.depot.storage.model.SystemOutsideData;
+import com.chinaitop.depot.storage.model.SystemOutsideDataExample;
+
+public interface SystemOutsideDataMapper {
+    int countByExample(SystemOutsideDataExample example);
+
+    int deleteByExample(SystemOutsideDataExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(SystemOutsideData record);
+
+    int insertSelective(SystemOutsideData record);
+
+    List<SystemOutsideData> selectByExample(SystemOutsideDataExample example);
+
+    SystemOutsideData selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") SystemOutsideData record, @Param("example") SystemOutsideDataExample example);
+
+    int updateByExample(@Param("record") SystemOutsideData record, @Param("example") SystemOutsideDataExample example);
+
+    int updateByPrimaryKeySelective(SystemOutsideData record);
+
+    int updateByPrimaryKey(SystemOutsideData record);
+}

src/main/java/com/chinaitop/depot/storage/mapper/SystemOutsideDataMapper.xml

@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.chinaitop.depot.storage.mapper.SystemOutsideDataMapper">
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.storage.model.SystemOutsideData">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="titles" jdbcType="VARCHAR" property="titles" />
+    <result column="jssj" jdbcType="VARCHAR" property="jssj" />
+    <result column="fhsj" jdbcType="VARCHAR" property="fhsj" />
+    <result column="input_time" jdbcType="TIMESTAMP" property="inputTime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, titles, jssj, fhsj, input_time
+  </sql>
+  <select id="selectByExample" parameterType="com.chinaitop.depot.storage.model.SystemOutsideDataExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from system_outside_data
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from system_outside_data
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from system_outside_data
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.storage.model.SystemOutsideDataExample">
+    delete from system_outside_data
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.storage.model.SystemOutsideData">
+    insert into system_outside_data (id, titles, jssj, 
+      fhsj, input_time)
+    values (#{id,jdbcType=VARCHAR}, #{titles,jdbcType=VARCHAR}, #{jssj,jdbcType=VARCHAR}, 
+      #{fhsj,jdbcType=VARCHAR}, #{inputTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.SystemOutsideData">
+    insert into system_outside_data
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="titles != null">
+        titles,
+      </if>
+      <if test="jssj != null">
+        jssj,
+      </if>
+      <if test="fhsj != null">
+        fhsj,
+      </if>
+      <if test="inputTime != null">
+        input_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="titles != null">
+        #{titles,jdbcType=VARCHAR},
+      </if>
+      <if test="jssj != null">
+        #{jssj,jdbcType=VARCHAR},
+      </if>
+      <if test="fhsj != null">
+        #{fhsj,jdbcType=VARCHAR},
+      </if>
+      <if test="inputTime != null">
+        #{inputTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.SystemOutsideDataExample" resultType="java.lang.Integer">
+    select count(*) from system_outside_data
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update system_outside_data
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.titles != null">
+        titles = #{record.titles,jdbcType=VARCHAR},
+      </if>
+      <if test="record.jssj != null">
+        jssj = #{record.jssj,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fhsj != null">
+        fhsj = #{record.fhsj,jdbcType=VARCHAR},
+      </if>
+      <if test="record.inputTime != null">
+        input_time = #{record.inputTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update system_outside_data
+    set id = #{record.id,jdbcType=VARCHAR},
+      titles = #{record.titles,jdbcType=VARCHAR},
+      jssj = #{record.jssj,jdbcType=VARCHAR},
+      fhsj = #{record.fhsj,jdbcType=VARCHAR},
+      input_time = #{record.inputTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.storage.model.SystemOutsideData">
+    update system_outside_data
+    <set>
+      <if test="titles != null">
+        titles = #{titles,jdbcType=VARCHAR},
+      </if>
+      <if test="jssj != null">
+        jssj = #{jssj,jdbcType=VARCHAR},
+      </if>
+      <if test="fhsj != null">
+        fhsj = #{fhsj,jdbcType=VARCHAR},
+      </if>
+      <if test="inputTime != null">
+        input_time = #{inputTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.storage.model.SystemOutsideData">
+    update system_outside_data
+    set titles = #{titles,jdbcType=VARCHAR},
+      jssj = #{jssj,jdbcType=VARCHAR},
+      fhsj = #{fhsj,jdbcType=VARCHAR},
+      input_time = #{inputTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

src/main/java/com/chinaitop/depot/storage/model/StorageChangeStoragehouseDefault.java

@@ -51,6 +51,8 @@ public class StorageChangeStoragehouseDefault {
 
     private String operStaff;
 
+    private String jhwjbh;
+
     /**
      * 倒仓通知单编号
      * @return changehouse_no 倒仓通知单编号
@@ -418,4 +420,21 @@ public class StorageChangeStoragehouseDefault {
     public void setOperStaff(String operStaff) {
         this.operStaff = operStaff == null ? null : operStaff.trim();
     }
+
+    /**
+     * 计划文件编号(国家局需要,市平台下发)
+     * @return
+     */
+	public String getJhwjbh() {
+		return jhwjbh;
+	}
+
+	/**
+	 * 计划文件编号(国家局需要,市平台下发)
+	 * @param jhwjbh
+	 */
+	public void setJhwjbh(String jhwjbh) {
+		this.jhwjbh = jhwjbh;
+	}
+
 }

src/main/java/com/chinaitop/depot/storage/model/SystemOutsideData.java

@@ -0,0 +1,95 @@
+package com.chinaitop.depot.storage.model;
+
+import java.util.Date;
+
+public class SystemOutsideData {
+    private String id;
+
+    private String titles;
+
+    private String jssj;
+
+    private String fhsj;
+
+    private Date inputTime;
+
+    /**
+     * 主键唯一ID
+     * @return id 主键唯一ID
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * 主键唯一ID
+     * @param id 主键唯一ID
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * 功能标志
+     * @return titles 功能标志
+     */
+    public String getTitles() {
+        return titles;
+    }
+
+    /**
+     * 功能标志
+     * @param titles 功能标志
+     */
+    public void setTitles(String titles) {
+        this.titles = titles == null ? null : titles.trim();
+    }
+
+    /**
+     * 接收数据
+     * @return jssj 接收数据
+     */
+    public String getJssj() {
+        return jssj;
+    }
+
+    /**
+     * 接收数据
+     * @param jssj 接收数据
+     */
+    public void setJssj(String jssj) {
+        this.jssj = jssj == null ? null : jssj.trim();
+    }
+
+    /**
+     * 返回数据
+     * @return fhsj 返回数据
+     */
+    public String getFhsj() {
+        return fhsj;
+    }
+
+    /**
+     * 返回数据
+     * @param fhsj 返回数据
+     */
+    public void setFhsj(String fhsj) {
+        this.fhsj = fhsj == null ? null : fhsj.trim();
+    }
+
+    /**
+     * 数据保存时间
+     * @return input_time 数据保存时间
+     */
+    public Date getInputTime() {
+        return inputTime;
+    }
+
+    /**
+     * 数据保存时间
+     * @param inputTime 数据保存时间
+     */
+    public void setInputTime(Date inputTime) {
+        this.inputTime = inputTime;
+    }
+}

src/main/java/com/chinaitop/depot/storage/model/SystemOutsideDataExample.java

@@ -0,0 +1,559 @@
+package com.chinaitop.depot.storage.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class SystemOutsideDataExample {
+    /**
+     * system_outside_data
+     */
+    protected String orderByClause;
+
+    /**
+     * system_outside_data
+     */
+    protected boolean distinct;
+
+    /**
+     * system_outside_data
+     */
+    protected List<Criteria> oredCriteria;
+
+    public SystemOutsideDataExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * system_outside_data 2023-10-08
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitlesIsNull() {
+            addCriterion("titles is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitlesIsNotNull() {
+            addCriterion("titles is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitlesEqualTo(String value) {
+            addCriterion("titles =", value, "titles");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitlesNotEqualTo(String value) {
+            addCriterion("titles <>", value, "titles");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitlesGreaterThan(String value) {
+            addCriterion("titles >", value, "titles");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitlesGreaterThanOrEqualTo(String value) {
+            addCriterion("titles >=", value, "titles");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitlesLessThan(String value) {
+            addCriterion("titles <", value, "titles");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitlesLessThanOrEqualTo(String value) {
+            addCriterion("titles <=", value, "titles");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitlesLike(String value) {
+            addCriterion("titles like", value, "titles");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitlesNotLike(String value) {
+            addCriterion("titles not like", value, "titles");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitlesIn(List<String> values) {
+            addCriterion("titles in", values, "titles");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitlesNotIn(List<String> values) {
+            addCriterion("titles not in", values, "titles");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitlesBetween(String value1, String value2) {
+            addCriterion("titles between", value1, value2, "titles");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitlesNotBetween(String value1, String value2) {
+            addCriterion("titles not between", value1, value2, "titles");
+            return (Criteria) this;
+        }
+
+        public Criteria andJssjIsNull() {
+            addCriterion("jssj is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJssjIsNotNull() {
+            addCriterion("jssj is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJssjEqualTo(String value) {
+            addCriterion("jssj =", value, "jssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJssjNotEqualTo(String value) {
+            addCriterion("jssj <>", value, "jssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJssjGreaterThan(String value) {
+            addCriterion("jssj >", value, "jssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJssjGreaterThanOrEqualTo(String value) {
+            addCriterion("jssj >=", value, "jssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJssjLessThan(String value) {
+            addCriterion("jssj <", value, "jssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJssjLessThanOrEqualTo(String value) {
+            addCriterion("jssj <=", value, "jssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJssjLike(String value) {
+            addCriterion("jssj like", value, "jssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJssjNotLike(String value) {
+            addCriterion("jssj not like", value, "jssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJssjIn(List<String> values) {
+            addCriterion("jssj in", values, "jssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJssjNotIn(List<String> values) {
+            addCriterion("jssj not in", values, "jssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJssjBetween(String value1, String value2) {
+            addCriterion("jssj between", value1, value2, "jssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andJssjNotBetween(String value1, String value2) {
+            addCriterion("jssj not between", value1, value2, "jssj");
+            return (Criteria) this;
+        }
+
+        public Criteria andFhsjIsNull() {
+            addCriterion("fhsj is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFhsjIsNotNull() {
+            addCriterion("fhsj is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFhsjEqualTo(String value) {
+            addCriterion("fhsj =", value, "fhsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andFhsjNotEqualTo(String value) {
+            addCriterion("fhsj <>", value, "fhsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andFhsjGreaterThan(String value) {
+            addCriterion("fhsj >", value, "fhsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andFhsjGreaterThanOrEqualTo(String value) {
+            addCriterion("fhsj >=", value, "fhsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andFhsjLessThan(String value) {
+            addCriterion("fhsj <", value, "fhsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andFhsjLessThanOrEqualTo(String value) {
+            addCriterion("fhsj <=", value, "fhsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andFhsjLike(String value) {
+            addCriterion("fhsj like", value, "fhsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andFhsjNotLike(String value) {
+            addCriterion("fhsj not like", value, "fhsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andFhsjIn(List<String> values) {
+            addCriterion("fhsj in", values, "fhsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andFhsjNotIn(List<String> values) {
+            addCriterion("fhsj not in", values, "fhsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andFhsjBetween(String value1, String value2) {
+            addCriterion("fhsj between", value1, value2, "fhsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andFhsjNotBetween(String value1, String value2) {
+            addCriterion("fhsj not between", value1, value2, "fhsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputTimeIsNull() {
+            addCriterion("input_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputTimeIsNotNull() {
+            addCriterion("input_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputTimeEqualTo(Date value) {
+            addCriterion("input_time =", value, "inputTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputTimeNotEqualTo(Date value) {
+            addCriterion("input_time <>", value, "inputTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputTimeGreaterThan(Date value) {
+            addCriterion("input_time >", value, "inputTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("input_time >=", value, "inputTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputTimeLessThan(Date value) {
+            addCriterion("input_time <", value, "inputTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputTimeLessThanOrEqualTo(Date value) {
+            addCriterion("input_time <=", value, "inputTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputTimeIn(List<Date> values) {
+            addCriterion("input_time in", values, "inputTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputTimeNotIn(List<Date> values) {
+            addCriterion("input_time not in", values, "inputTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputTimeBetween(Date value1, Date value2) {
+            addCriterion("input_time between", value1, value2, "inputTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputTimeNotBetween(Date value1, Date value2) {
+            addCriterion("input_time not between", value1, value2, "inputTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * system_outside_data
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * system_outside_data 2023-10-08
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/chinaitop/depot/storage/service/StorageChangeStoragehouseRopService.java

@@ -18,6 +18,12 @@ public interface StorageChangeStoragehouseRopService {
 
 	void insertChangeStorageHouse(StorageChangeStoragehouseRop storageChangeStoragehouseRop);
 
-	Map<String, Object> add(String change);
+	/**
+	 * 接收市平台下发的倒仓通知单
+	 * @param change
+	 * @return
+	 * @throws Exception
+	 */
+	Map<String, Object> add(String change) throws Exception;
 
 }

src/main/java/com/chinaitop/depot/storage/service/SystemOutsideDataService.java

@@ -0,0 +1,24 @@
+package com.chinaitop.depot.storage.service;
+
+import java.util.List;
+
+import com.chinaitop.depot.storage.model.SystemOutsideData;
+
+public interface SystemOutsideDataService {
+
+	/**
+	 * 数据新增
+	 * @param titles
+	 * @param jssj
+	 * @param fhsj
+	 */
+	void addlogger(String titles, String jssj, String fhsj);
+
+	/**
+	 * 查询列表
+	 * @param titles
+	 * @param inputTime
+	 * @return
+	 */
+	List<SystemOutsideData> findByCondition(String titles, String inputTime);
+}

src/main/java/com/chinaitop/depot/storage/service/impl/StorageChangeStoragehouseRopServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSONObject;
@@ -20,7 +21,7 @@ import com.chinaitop.depot.storage.service.FeignBasicService;
 import com.chinaitop.depot.storage.service.StorageChangeStoragehouseRopService;
 @Service
 public class StorageChangeStoragehouseRopServiceImpl implements StorageChangeStoragehouseRopService {
-	
+
 	@Resource
 	private StorageChangeStoragehouseRopMapper storageChangeStoragehouseRopMapper;
 	@Resource
@@ -29,9 +30,6 @@ public class StorageChangeStoragehouseRopServiceImpl implements StorageChangeSto
 	private FeignBasicService feignBasicService;
 	@Resource
 	private FeignAgileService feignAgileService;
-	/*
-	 * 倒仓列表查询
-	 */
 
 	@Override
 	public List<StorageChangeStoragehouseDefault> selectByExample(
@@ -48,80 +46,96 @@ public class StorageChangeStoragehouseRopServiceImpl implements StorageChangeSto
 	@Override
 	public void insertChangeStorageHouse(StorageChangeStoragehouseRop storageChangeStoragehouseRop) {
 		storageChangeStoragehouseRopMapper.insertSelective(storageChangeStoragehouseRop);
-		
 	}
 
 	@Override
-	public Map<String, Object> add(String change) {
+	public Map<String, Object> add(String change) throws Exception {
 		Map<String, Object> modelMap = new HashMap<String, Object>();
-        try {
-            
-            // JSON字符串转对象
-            JSONObject jsonObject = JSONObject.parseObject(change);
-            StorageChangeStoragehouseDefault storageChangeStoragehouseDefault = new StorageChangeStoragehouseDefault();
-            storageChangeStoragehouseDefault.setChangehouseNo(jsonObject.getString("changehouseNo")); //接收虚拟倒仓通知单编号
-        	storageChangeStoragehouseDefault.setApplyNo(jsonObject.getString("applyNo"));   //申请单号
-            String applyFirmName = storageChangeStoragehouseDefaultMapper.selectOrgName(jsonObject.getString("applyFirm"));
-        	storageChangeStoragehouseDefault.setApplyFirm(applyFirmName); //申请倒仓企业
-        	storageChangeStoragehouseDefault.setApplyTime(jsonObject.getDate("apply_time")); //申请倒仓时间
-        	storageChangeStoragehouseDefault.setBitWeigh("需要称重"); //  是否称重
-        	storageChangeStoragehouseDefault.setCreateTime(jsonObject.getDate("createTime")); //接收时间
-            storageChangeStoragehouseDefault.setOverTime(jsonObject.getDate("over_time"));  //结束时间
-        	storageChangeStoragehouseDefault.setFoodNumber(jsonObject.getString("foodNumber")); //粮食数量
-            storageChangeStoragehouseDefault.setOperStaff(jsonObject.getString("operStaff")); //操作人员
-        	storageChangeStoragehouseDefault.setOutAfter(jsonObject.getString("out_after")); //倒出后保管方式
-        	storageChangeStoragehouseDefault.setOutBefore(jsonObject.getString("out_before")); //倒出前保管方式
-        	
-            //根据倒入仓房编码查询倒入仓房、货位、组织机构数据
-        	 String hwbmin = jsonObject.getString("cfbmin");
-             Map<String, Object> inWareDataMap = feignBasicService.getWareDataByHwbm(hwbmin);
-             Integer houseId = (Integer) inWareDataMap.get("houseId");
-             Map<String, Object> inhouseDataMap = feignBasicService.getStoreDataByHouseId(houseId);
-             String inStorehouseName = (String) inhouseDataMap.get("StorehouseName");
-             //货位
-             Integer wareHouseId = (Integer) inWareDataMap.get("wareHouseId");
-             String wareHouseName = (String) inWareDataMap.get("warehouseName");
-             Integer orgId = (Integer) inWareDataMap.get("orgId");
-             storageChangeStoragehouseDefault.setIntoStorehouse(houseId); //倒入仓房
-             storageChangeStoragehouseDefault.setIntoStorehouseName(inStorehouseName); //倒入仓房名称
-             //货位
-             storageChangeStoragehouseDefault.setIntoWarehouse(wareHouseId); //倒入货位
-             storageChangeStoragehouseDefault.setIntoWarehouseName(wareHouseName); //倒入货位名称
-             storageChangeStoragehouseDefault.setOrgId(orgId);  //组织id
-             //根据倒出仓房编码查询倒出仓房、货位、组织机构数据 
-             String hwbmout = jsonObject.getString("cfbmout");
-             Map<String, Object> outwareDataMap = feignBasicService.getWareDataByHwbm(hwbmout);
-             Integer houseOutId = (Integer) outwareDataMap.get("houseId");
-             Map<String, Object> outhouseDataMap = feignBasicService.getStoreDataByHouseId(houseOutId);
-             String storehouseName = (String) outhouseDataMap.get("StorehouseName");
-             //货位
-             Integer wareOutHouseId = (Integer) outwareDataMap.get("wareHouseId");
-             String wareOutHouseName = (String) outwareDataMap.get("warehouseName");
-             storageChangeStoragehouseDefault.setOutStorehouse(houseOutId); //倒出仓房
-             storageChangeStoragehouseDefault.setOutStorehouseName(storehouseName); //倒出仓房名称
-             
-             storageChangeStoragehouseDefault.setOutWarehouse(wareOutHouseId); //倒出货位
-             storageChangeStoragehouseDefault.setOutWarehouseName(wareOutHouseName); //倒出货位名称
-             //根据仓房、货位、orgId获取粮食品种等信息
-             Map<String, Object> map = feignAgileService.getDateByChHwh(orgId, houseOutId, wareOutHouseId);
-             Integer  a = (Integer ) map.get("hwxz"); //粮油性质
-			 String grainAttribute = a.toString();
-             Integer grainKind = (Integer) map.get("pz"); //品种
-             Integer grainDetailKind = (Integer) map.get("mxpz"); //明细品种
-             
-             storageChangeStoragehouseDefault.setFoodWar(grainKind); //品种
-             storageChangeStoragehouseDefault.setDetailWar(grainDetailKind); //明细品种
-             storageChangeStoragehouseDefault.setFoodNature(grainAttribute); //粮油性质
-             
-             storageChangeStoragehouseDefaultMapper.insert(storageChangeStoragehouseDefault);
-        	
-            modelMap.put("status", "success");
-        } catch (Exception e) {
-            e.printStackTrace();
-            modelMap.put("status", "error");
-            modelMap.put("msg", "保存失败！");
-        } 
-		
+		StringBuffer sbf = new StringBuffer(50);
+
+        // JSON字符串转对象
+        JSONObject jsonObject = JSONObject.parseObject(change);
+        StorageChangeStoragehouseDefault storageChangeStoragehouseDefault = new StorageChangeStoragehouseDefault();
+        if (StringUtils.isNotBlank(jsonObject.getString("changehouseNo"))) {
+        	storageChangeStoragehouseDefault.setChangehouseNo(jsonObject.getString("changehouseNo")); //接收虚拟倒仓通知单编号
+        } else {
+        	sbf.append("倒仓通知单编号changehouseNo不能为空,");
+        }
+    	storageChangeStoragehouseDefault.setApplyNo(jsonObject.getString("applyNo"));   //申请单号
+        String applyFirmName = storageChangeStoragehouseDefaultMapper.selectOrgName(jsonObject.getString("applyFirm"));
+    	storageChangeStoragehouseDefault.setApplyFirm(applyFirmName); //申请倒仓企业
+    	storageChangeStoragehouseDefault.setApplyTime(jsonObject.getDate("apply_time")); //申请倒仓时间
+    	storageChangeStoragehouseDefault.setBitWeigh("需要称重"); //  是否称重
+    	storageChangeStoragehouseDefault.setCreateTime(jsonObject.getDate("createTime")); //接收时间
+        storageChangeStoragehouseDefault.setOverTime(jsonObject.getDate("over_time"));  //结束时间
+    	storageChangeStoragehouseDefault.setFoodNumber(jsonObject.getString("foodNumber")); //粮食数量
+        storageChangeStoragehouseDefault.setOperStaff(jsonObject.getString("operStaff")); //操作人员
+    	storageChangeStoragehouseDefault.setOutAfter(jsonObject.getString("out_after")); //倒出后保管方式
+    	storageChangeStoragehouseDefault.setOutBefore(jsonObject.getString("out_before")); //倒出前保管方式
+    	storageChangeStoragehouseDefault.setJhwjbh(jsonObject.getString("dcsqbh")); //倒仓协议编号
+
+        //根据倒入仓房编码查询倒入仓房、货位、组织机构数据
+    	Integer orgId = null;
+    	String hwbmin = jsonObject.getString("cfbmin");
+        Map<String, Object> inWareDataMap = feignBasicService.getWareDataByHwbm(hwbmin);
+        if ("0".equals(inWareDataMap.get("houseId").toString()) || "0".equals(inWareDataMap.get("wareHouseId").toString())) {
+        	sbf.append("根据cfbmin的值"+hwbmin+"未获取到对应仓房货位信息,");
+        } else {
+        	//倒入仓房
+        	Integer houseId = (Integer) inWareDataMap.get("houseId");
+        	storageChangeStoragehouseDefault.setIntoStorehouse(houseId); //倒入仓房
+        	String inStorehouseName = (String) inWareDataMap.get("storehouseName");
+        	storageChangeStoragehouseDefault.setIntoStorehouseName(inStorehouseName); //倒入仓房名称
+        	//倒入货位
+            Integer wareHouseId = (Integer) inWareDataMap.get("wareHouseId");
+            String wareHouseName = (String) inWareDataMap.get("warehouseName");
+            storageChangeStoragehouseDefault.setIntoWarehouse(wareHouseId); //倒入货位
+            storageChangeStoragehouseDefault.setIntoWarehouseName(wareHouseName); //倒入货位名称
+            //组织机构ID
+            orgId = (Integer) inWareDataMap.get("orgId");
+            storageChangeStoragehouseDefault.setOrgId(orgId);  //组织id
+        }
+
+        //根据倒出仓房编码查询倒出仓房、货位、组织机构数据 
+        String hwbmout = jsonObject.getString("cfbmout");
+        Map<String, Object> outwareDataMap = feignBasicService.getWareDataByHwbm(hwbmout);
+        if ("0".equals(outwareDataMap.get("houseId").toString()) || "0".equals(outwareDataMap.get("wareHouseId").toString())) {
+        	sbf.append("根据cfbmout的值"+hwbmout+"未获取到对应仓房货位信息,");
+        } else {
+        	//倒出仓房
+        	Integer houseOutId = (Integer) outwareDataMap.get("houseId");
+        	storageChangeStoragehouseDefault.setOutStorehouse(houseOutId); //倒出仓房
+        	String storehouseName = (String) outwareDataMap.get("StorehouseName");
+        	storageChangeStoragehouseDefault.setOutStorehouseName(storehouseName); //倒出仓房名称
+        	//倒出货位
+        	Integer wareOutHouseId = (Integer) outwareDataMap.get("wareHouseId");
+        	String wareOutHouseName = (String) outwareDataMap.get("warehouseName");
+        	storageChangeStoragehouseDefault.setOutWarehouse(wareOutHouseId); //倒出货位
+        	storageChangeStoragehouseDefault.setOutWarehouseName(wareOutHouseName); //倒出货位名称
+
+        	//根据仓房、货位、orgId获取粮食品种等信息
+        	Map<String, Object> map = feignAgileService.getDateByChHwh(orgId, houseOutId, wareOutHouseId);
+        	if ("0".equals(map.get("pz").toString())) {
+        		Integer grainKind = (Integer) map.get("pz"); //品种
+        		storageChangeStoragehouseDefault.setFoodWar(grainKind); //品种
+        		String grainAttribute = map.get("hwxz").toString();//粮油性质
+        		storageChangeStoragehouseDefault.setFoodNature(grainAttribute); //粮油性质
+        		Integer grainDetailKind = (Integer) map.get("mxpz"); //明细品种
+        		storageChangeStoragehouseDefault.setDetailWar(grainDetailKind); //明细品种
+        	} else {
+        		sbf.append("根据倒出货位的值"+wareOutHouseId+"未获取到对应的库存信息,");
+        	}
+        }
+
+        if (sbf.toString().length() > 0) {
+        	modelMap.put("status", "error");
+            modelMap.put("msg", sbf.toString());
+        } else {
+        	modelMap.put("status", "success");
+        	modelMap.put("msg", "保存成功");
+        	storageChangeStoragehouseDefaultMapper.insert(storageChangeStoragehouseDefault);
+        }
+
 		return modelMap;
 	}
 }

src/main/java/com/chinaitop/depot/storage/service/impl/SystemOutsideDataServiceImpl.java

@@ -0,0 +1,53 @@
+package com.chinaitop.depot.storage.service.impl;
+
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.stereotype.Service;
+
+import com.chinaitop.depot.storage.mapper.SystemOutsideDataMapper;
+import com.chinaitop.depot.storage.model.SystemOutsideData;
+import com.chinaitop.depot.storage.model.SystemOutsideDataExample;
+import com.chinaitop.depot.storage.model.SystemOutsideDataExample.Criteria;
+import com.chinaitop.depot.storage.service.SystemOutsideDataService;
+import com.chinaitop.depot.storage.utils.ParameterUtil;
+
+@Service
+public class SystemOutsideDataServiceImpl implements SystemOutsideDataService {
+
+	@Resource
+	private SystemOutsideDataMapper systemOutsideDataMapper;
+
+	@Override
+	public void addlogger(String titles, String jssj, String fhsj) {
+		SystemOutsideData data = new SystemOutsideData();
+		data.setId(UUID.randomUUID().toString().replace("-", ""));
+		data.setTitles(titles);
+		data.setJssj(jssj);
+		data.setFhsj(fhsj);
+		data.setInputTime(new Date());
+		systemOutsideDataMapper.insert(data);
+	}
+
+	@Override
+	public List<SystemOutsideData> findByCondition(String titles, String inputTime) {
+		SystemOutsideDataExample example = new SystemOutsideDataExample();
+		Criteria criteria = example.createCriteria();
+		if (StringUtils.isNotBlank(titles)) {
+			criteria.andTitlesEqualTo(titles);
+		}
+		if (StringUtils.isNotBlank(inputTime)) {
+			String starttime = inputTime+" 00:00:00";
+			String endtime = inputTime+" 23:59:59";
+			criteria.andInputTimeBetween(ParameterUtil.string2datetime(starttime), ParameterUtil.string2datetime(endtime));
+		}
+		example.setOrderByClause("input_time desc");
+		List<SystemOutsideData> list = systemOutsideDataMapper.selectByExample(example);
+		return list;
+	}
+
+}

src/main/java/com/chinaitop/depot/unissoft/webservice/ChangeHouseIdeIServicempl.java

@@ -19,7 +19,6 @@ public class ChangeHouseIdeIServicempl implements ChangeHouseIdeService {
 	@Override
 	public String uploadChangeData(String orgId, String applyNo, String foodStatus, String goalNumber) {
 
-
 		return PushsService.updateChangeStorageHouse(orgId, applyNo, foodStatus, goalNumber);
 	}