.

pom.xml

@@ -142,6 +142,16 @@
             <artifactId>httpclient</artifactId>
             <version>4.5.6</version>
         </dependency>
+        <!--添加webservice-->
+		<dependency>
+		   <groupId>org.apache.cxf</groupId>
+		   <artifactId>cxf-spring-boot-starter-jaxws</artifactId>
+		   <version>3.2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web-services</artifactId>
+        </dependency>
 	</dependencies>
 
 	<dependencyManagement>

src/main/java/com/chinaitop/depot/basic/controller/BasicWarehouseController.java

@@ -306,4 +306,28 @@ public class BasicWarehouseController {
 			}
 		}
 	}
+
+	@RequestMapping(value="/updateWarehouseCrkStatus", method=RequestMethod.POST)
+	@ApiOperation(value="修改货位的出入库状态值", notes = "修改货位的出入库状态值")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "wareId", value = "货位ID", paramType = "form"),
+		@ApiImplicitParam(name = "crk_status", value = "出入库状态(1空仓,2入库中,3封仓,4出库中,9其它)", paramType = "form")
+	})
+	public void updateWarehouseCrkStatus(Integer wareId, String crk_status) {
+
+		try {
+			if (null != wareId && null != crk_status && !"".equals(crk_status)) {
+				BasicWarehouse warehouse = new BasicWarehouse();
+				warehouse.setWarehouseId(wareId);
+				warehouse.setCrkStatus(crk_status);
+				
+				//修改数据
+				basicWarehouseService.update(warehouse);
+			} else {
+				System.out.println("更新出入库状态值crk_status出错，参数：货位ID="+wareId+"，出入库状态值="+crk_status);
+			}
+		} catch (NumberFormatException e) {
+			e.printStackTrace();
+		}
+	}
 }

src/main/java/com/chinaitop/depot/basic/mapper/BasicWarehouseMapper.java

@@ -3,6 +3,8 @@ package com.chinaitop.depot.basic.mapper;
 import com.chinaitop.depot.basic.model.BasicWarehouse;
 import com.chinaitop.depot.basic.model.BasicWarehouseExample;
 import java.util.List;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Param;
 
 public interface BasicWarehouseMapper {
@@ -27,4 +29,6 @@ public interface BasicWarehouseMapper {
     int updateByPrimaryKeySelective(BasicWarehouse record);
 
     int updateByPrimaryKey(BasicWarehouse record);
+
+	void updateWareStatus(Map<String, Object> param);
 }

src/main/java/com/chinaitop/depot/basic/mapper/BasicWarehouseMapper.xml

@@ -1,51 +1,52 @@
-<?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.basic.mapper.BasicWarehouseMapper" >
-  <resultMap id="BaseResultMap" type="com.chinaitop.depot.basic.model.BasicWarehouse" >
-    <id column="warehouse_id" property="warehouseId" jdbcType="INTEGER" />
-    <result column="depot_id" property="depotId" jdbcType="INTEGER" />
-    <result column="depot_name" property="depotName" jdbcType="VARCHAR" />
-    <result column="storehouse_id" property="storehouseId" jdbcType="INTEGER" />
-    <result column="warehouse_code" property="warehouseCode" jdbcType="VARCHAR" />
-    <result column="warehouse_name" property="warehouseName" jdbcType="VARCHAR" />
-    <result column="warehouse_use_time" property="warehouseUseTime" jdbcType="TIMESTAMP" />
-    <result column="warehouse_status" property="warehouseStatus" jdbcType="INTEGER" />
-    <result column="store_way" property="storeWay" jdbcType="INTEGER" />
-    <result column="length" property="length" jdbcType="DECIMAL" />
-    <result column="width" property="width" jdbcType="DECIMAL" />
-    <result column="heigth" property="heigth" jdbcType="DECIMAL" />
-    <result column="contact_number" property="contactNumber" jdbcType="VARCHAR" />
-    <result column="warehouse_capacity" property="warehouseCapacity" jdbcType="DECIMAL" />
-    <result column="dutyStoreman" property="dutystoreman" jdbcType="VARCHAR" />
-    <result column="remark" property="remark" jdbcType="VARCHAR" />
-    <result column="ware_img" property="wareImg" jdbcType="VARCHAR" />
-    <result column="createName" property="createname" jdbcType="VARCHAR" />
-    <result column="updateName" property="updatename" jdbcType="VARCHAR" />
-    <result column="createDate" property="createdate" jdbcType="TIMESTAMP" />
-    <result column="updateDate" property="updatedate" jdbcType="TIMESTAMP" />
-    <result column="del_flag" property="delFlag" jdbcType="INTEGER" />
-    <result column="org_id" property="orgId" jdbcType="INTEGER" />
-    <result column="library_type" property="libraryType" jdbcType="VARCHAR" />
+<?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.basic.mapper.BasicWarehouseMapper">
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.basic.model.BasicWarehouse">
+    <id column="warehouse_id" jdbcType="INTEGER" property="warehouseId" />
+    <result column="depot_id" jdbcType="INTEGER" property="depotId" />
+    <result column="depot_name" jdbcType="VARCHAR" property="depotName" />
+    <result column="storehouse_id" jdbcType="INTEGER" property="storehouseId" />
+    <result column="warehouse_code" jdbcType="VARCHAR" property="warehouseCode" />
+    <result column="warehouse_name" jdbcType="VARCHAR" property="warehouseName" />
+    <result column="warehouse_use_time" jdbcType="TIMESTAMP" property="warehouseUseTime" />
+    <result column="warehouse_status" jdbcType="INTEGER" property="warehouseStatus" />
+    <result column="store_way" jdbcType="INTEGER" property="storeWay" />
+    <result column="length" jdbcType="DECIMAL" property="length" />
+    <result column="width" jdbcType="DECIMAL" property="width" />
+    <result column="heigth" jdbcType="DECIMAL" property="heigth" />
+    <result column="contact_number" jdbcType="VARCHAR" property="contactNumber" />
+    <result column="warehouse_capacity" jdbcType="DECIMAL" property="warehouseCapacity" />
+    <result column="dutyStoreman" jdbcType="VARCHAR" property="dutystoreman" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="ware_img" jdbcType="VARCHAR" property="wareImg" />
+    <result column="createName" jdbcType="VARCHAR" property="createname" />
+    <result column="updateName" jdbcType="VARCHAR" property="updatename" />
+    <result column="createDate" jdbcType="TIMESTAMP" property="createdate" />
+    <result column="updateDate" jdbcType="TIMESTAMP" property="updatedate" />
+    <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
+    <result column="org_id" jdbcType="INTEGER" property="orgId" />
+    <result column="library_type" jdbcType="VARCHAR" property="libraryType" />
+    <result column="crk_status" jdbcType="VARCHAR" property="crkStatus" />
   </resultMap>
-  <sql id="Example_Where_Clause" >
-    <where >
-      <foreach collection="oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
+  <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" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -56,25 +57,25 @@
       </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="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
+  <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" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -85,402 +86,418 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Base_Column_List" >
+  <sql id="Base_Column_List">
     warehouse_id, depot_id, depot_name, storehouse_id, warehouse_code, warehouse_name, 
-    warehouse_use_time, warehouse_status, store_way, length, width, heigth, contact_number,  
-    warehouse_capacity, dutyStoreman,remark, ware_img, createName, updateName, createDate, updateDate, 
-    del_flag, org_id, library_type
+    warehouse_use_time, warehouse_status, store_way, length, width, heigth, contact_number, 
+    warehouse_capacity, dutyStoreman, remark, ware_img, createName, updateName, createDate, 
+    updateDate, del_flag, org_id, library_type, crk_status
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.basic.model.BasicWarehouseExample" >
+  <select id="selectByExample" parameterType="com.chinaitop.depot.basic.model.BasicWarehouseExample" resultMap="BaseResultMap">
     select
-    <if test="distinct" >
+    <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
     from basic_warehouse
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
-    <if test="orderByClause != null" >
+    <if test="orderByClause != null">
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
     <include refid="Base_Column_List" />
     from basic_warehouse
     where warehouse_id = #{warehouseId,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from basic_warehouse
     where warehouse_id = #{warehouseId,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.chinaitop.depot.basic.model.BasicWarehouseExample" >
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.basic.model.BasicWarehouseExample">
     delete from basic_warehouse
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.chinaitop.depot.basic.model.BasicWarehouse" >
+  <insert id="insert" parameterType="com.chinaitop.depot.basic.model.BasicWarehouse">
     insert into basic_warehouse (warehouse_id, depot_id, depot_name, 
       storehouse_id, warehouse_code, warehouse_name, 
-      warehouse_use_time, warehouse_status, store_way, length, width, heigth, contact_number,
-      warehouse_capacity, dutyStoreman, remark, 
-      ware_img, createName, updateName, 
-      createDate, updateDate, del_flag, 
-      org_id, library_type)
+      warehouse_use_time, warehouse_status, store_way, 
+      length, width, heigth, 
+      contact_number, warehouse_capacity, dutyStoreman, 
+      remark, ware_img, createName, 
+      updateName, createDate, updateDate, 
+      del_flag, org_id, library_type, 
+      crk_status)
     values (#{warehouseId,jdbcType=INTEGER}, #{depotId,jdbcType=INTEGER}, #{depotName,jdbcType=VARCHAR}, 
       #{storehouseId,jdbcType=INTEGER}, #{warehouseCode,jdbcType=VARCHAR}, #{warehouseName,jdbcType=VARCHAR}, 
       #{warehouseUseTime,jdbcType=TIMESTAMP}, #{warehouseStatus,jdbcType=INTEGER}, #{storeWay,jdbcType=INTEGER}, 
-      #{length,jdbcType=DECIMAL},#{width,jdbcType=DECIMAL},#{heigth,jdbcType=DECIMAL},#{contactNumber,jdbcType=VARCHAR}, 
-      #{warehouseCapacity,jdbcType=DECIMAL}, #{dutystoreman,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, 
-      #{wareImg,jdbcType=VARCHAR}, #{createname,jdbcType=VARCHAR}, #{updatename,jdbcType=VARCHAR}, 
-      #{createdate,jdbcType=TIMESTAMP}, #{updatedate,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=INTEGER}, 
-      #{orgId,jdbcType=INTEGER}, #{libraryType,jdbcType=VARCHAR})
+      #{length,jdbcType=DECIMAL}, #{width,jdbcType=DECIMAL}, #{heigth,jdbcType=DECIMAL}, 
+      #{contactNumber,jdbcType=VARCHAR}, #{warehouseCapacity,jdbcType=DECIMAL}, #{dutystoreman,jdbcType=VARCHAR}, 
+      #{remark,jdbcType=VARCHAR}, #{wareImg,jdbcType=VARCHAR}, #{createname,jdbcType=VARCHAR}, 
+      #{updatename,jdbcType=VARCHAR}, #{createdate,jdbcType=TIMESTAMP}, #{updatedate,jdbcType=TIMESTAMP}, 
+      #{delFlag,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER}, #{libraryType,jdbcType=VARCHAR}, 
+      #{crkStatus,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.chinaitop.depot.basic.model.BasicWarehouse" >
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.basic.model.BasicWarehouse">
     insert into basic_warehouse
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="warehouseId != null" >
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="warehouseId != null">
         warehouse_id,
       </if>
-      <if test="depotId != null" >
+      <if test="depotId != null">
         depot_id,
       </if>
-      <if test="depotName != null" >
+      <if test="depotName != null">
         depot_name,
       </if>
-      <if test="storehouseId != null" >
+      <if test="storehouseId != null">
         storehouse_id,
       </if>
-      <if test="warehouseCode != null" >
+      <if test="warehouseCode != null">
         warehouse_code,
       </if>
-      <if test="warehouseName != null" >
+      <if test="warehouseName != null">
         warehouse_name,
       </if>
-      <if test="warehouseUseTime != null" >
+      <if test="warehouseUseTime != null">
         warehouse_use_time,
       </if>
-      <if test="warehouseStatus != null" >
+      <if test="warehouseStatus != null">
         warehouse_status,
       </if>
-      <if test="storeWay != null" >
+      <if test="storeWay != null">
         store_way,
       </if>
-      <if test="length != null" >
+      <if test="length != null">
         length,
       </if>
-      <if test="width != null" >
+      <if test="width != null">
         width,
       </if>
-      <if test="heigth != null" >
+      <if test="heigth != null">
         heigth,
       </if>
-      <if test="contactNumber != null" >
+      <if test="contactNumber != null">
         contact_number,
       </if>
-      <if test="warehouseCapacity != null" >
+      <if test="warehouseCapacity != null">
         warehouse_capacity,
       </if>
-      <if test="dutystoreman != null" >
+      <if test="dutystoreman != null">
         dutyStoreman,
       </if>
-      <if test="remark != null" >
+      <if test="remark != null">
         remark,
       </if>
-      <if test="wareImg != null" >
+      <if test="wareImg != null">
         ware_img,
       </if>
-      <if test="createname != null" >
+      <if test="createname != null">
         createName,
       </if>
-      <if test="updatename != null" >
+      <if test="updatename != null">
         updateName,
       </if>
-      <if test="createdate != null" >
+      <if test="createdate != null">
         createDate,
       </if>
-      <if test="updatedate != null" >
+      <if test="updatedate != null">
         updateDate,
       </if>
-      <if test="delFlag != null" >
+      <if test="delFlag != null">
         del_flag,
       </if>
-      <if test="orgId != null" >
+      <if test="orgId != null">
         org_id,
       </if>
-      <if test="libraryType != null" >
+      <if test="libraryType != null">
         library_type,
       </if>
+      <if test="crkStatus != null">
+        crk_status,
+      </if>
     </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="warehouseId != null" >
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="warehouseId != null">
         #{warehouseId,jdbcType=INTEGER},
       </if>
-      <if test="depotId != null" >
+      <if test="depotId != null">
         #{depotId,jdbcType=INTEGER},
       </if>
-      <if test="depotName != null" >
+      <if test="depotName != null">
         #{depotName,jdbcType=VARCHAR},
       </if>
-      <if test="storehouseId != null" >
+      <if test="storehouseId != null">
         #{storehouseId,jdbcType=INTEGER},
       </if>
-      <if test="warehouseCode != null" >
+      <if test="warehouseCode != null">
         #{warehouseCode,jdbcType=VARCHAR},
       </if>
-      <if test="warehouseName != null" >
+      <if test="warehouseName != null">
         #{warehouseName,jdbcType=VARCHAR},
       </if>
-      <if test="warehouseUseTime != null" >
+      <if test="warehouseUseTime != null">
         #{warehouseUseTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="warehouseStatus != null" >
+      <if test="warehouseStatus != null">
         #{warehouseStatus,jdbcType=INTEGER},
       </if>
-      <if test="storeWay != null" >
+      <if test="storeWay != null">
         #{storeWay,jdbcType=INTEGER},
       </if>
-      <if test="length != null" >
+      <if test="length != null">
         #{length,jdbcType=DECIMAL},
       </if>
-      <if test="width != null" >
+      <if test="width != null">
         #{width,jdbcType=DECIMAL},
       </if>
-      <if test="heigth != null" >
+      <if test="heigth != null">
         #{heigth,jdbcType=DECIMAL},
       </if>
-      <if test="contactNumber != null" >
+      <if test="contactNumber != null">
         #{contactNumber,jdbcType=VARCHAR},
       </if>
-      <if test="warehouseCapacity != null" >
+      <if test="warehouseCapacity != null">
         #{warehouseCapacity,jdbcType=DECIMAL},
       </if>
-      <if test="dutystoreman != null" >
+      <if test="dutystoreman != null">
         #{dutystoreman,jdbcType=VARCHAR},
       </if>
-      <if test="remark != null" >
+      <if test="remark != null">
         #{remark,jdbcType=VARCHAR},
       </if>
-      <if test="wareImg != null" >
+      <if test="wareImg != null">
         #{wareImg,jdbcType=VARCHAR},
       </if>
-      <if test="createname != null" >
+      <if test="createname != null">
         #{createname,jdbcType=VARCHAR},
       </if>
-      <if test="updatename != null" >
+      <if test="updatename != null">
         #{updatename,jdbcType=VARCHAR},
       </if>
-      <if test="createdate != null" >
+      <if test="createdate != null">
         #{createdate,jdbcType=TIMESTAMP},
       </if>
-      <if test="updatedate != null" >
+      <if test="updatedate != null">
         #{updatedate,jdbcType=TIMESTAMP},
       </if>
-      <if test="delFlag != null" >
+      <if test="delFlag != null">
         #{delFlag,jdbcType=INTEGER},
       </if>
-      <if test="orgId != null" >
+      <if test="orgId != null">
         #{orgId,jdbcType=INTEGER},
       </if>
-      <if test="libraryType != null" >
+      <if test="libraryType != null">
         #{libraryType,jdbcType=VARCHAR},
       </if>
+      <if test="crkStatus != null">
+        #{crkStatus,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.chinaitop.depot.basic.model.BasicWarehouseExample" resultType="java.lang.Integer" >
+  <select id="countByExample" parameterType="com.chinaitop.depot.basic.model.BasicWarehouseExample" resultType="java.lang.Integer">
     select count(*) from basic_warehouse
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
-  <update id="updateByExampleSelective" parameterType="map" >
+  <update id="updateByExampleSelective" parameterType="map">
     update basic_warehouse
-    <set >
-      <if test="record.warehouseId != null" >
+    <set>
+      <if test="record.warehouseId != null">
         warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
       </if>
-      <if test="record.depotId != null" >
+      <if test="record.depotId != null">
         depot_id = #{record.depotId,jdbcType=INTEGER},
       </if>
-      <if test="record.depotName != null" >
+      <if test="record.depotName != null">
         depot_name = #{record.depotName,jdbcType=VARCHAR},
       </if>
-      <if test="record.storehouseId != null" >
+      <if test="record.storehouseId != null">
         storehouse_id = #{record.storehouseId,jdbcType=INTEGER},
       </if>
-      <if test="record.warehouseCode != null" >
+      <if test="record.warehouseCode != null">
         warehouse_code = #{record.warehouseCode,jdbcType=VARCHAR},
       </if>
-      <if test="record.warehouseName != null" >
+      <if test="record.warehouseName != null">
         warehouse_name = #{record.warehouseName,jdbcType=VARCHAR},
       </if>
-      <if test="record.warehouseUseTime != null" >
+      <if test="record.warehouseUseTime != null">
         warehouse_use_time = #{record.warehouseUseTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.warehouseStatus != null" >
+      <if test="record.warehouseStatus != null">
         warehouse_status = #{record.warehouseStatus,jdbcType=INTEGER},
       </if>
-      <if test="record.storeWay != null" >
+      <if test="record.storeWay != null">
         store_way = #{record.storeWay,jdbcType=INTEGER},
       </if>
-      <if test="record.length != null" >
+      <if test="record.length != null">
         length = #{record.length,jdbcType=DECIMAL},
       </if>
-      <if test="record.width != null" >
+      <if test="record.width != null">
         width = #{record.width,jdbcType=DECIMAL},
       </if>
-      <if test="record.heigth != null" >
+      <if test="record.heigth != null">
         heigth = #{record.heigth,jdbcType=DECIMAL},
       </if>
-      <if test="record.contactNumber != null" >
+      <if test="record.contactNumber != null">
         contact_number = #{record.contactNumber,jdbcType=VARCHAR},
       </if>
-      <if test="record.warehouseCapacity != null" >
+      <if test="record.warehouseCapacity != null">
         warehouse_capacity = #{record.warehouseCapacity,jdbcType=DECIMAL},
       </if>
-      <if test="record.dutystoreman != null" >
+      <if test="record.dutystoreman != null">
         dutyStoreman = #{record.dutystoreman,jdbcType=VARCHAR},
       </if>
-      <if test="record.remark != null" >
+      <if test="record.remark != null">
         remark = #{record.remark,jdbcType=VARCHAR},
       </if>
-      <if test="record.wareImg != null" >
+      <if test="record.wareImg != null">
         ware_img = #{record.wareImg,jdbcType=VARCHAR},
       </if>
-      <if test="record.createname != null" >
+      <if test="record.createname != null">
         createName = #{record.createname,jdbcType=VARCHAR},
       </if>
-      <if test="record.updatename != null" >
+      <if test="record.updatename != null">
         updateName = #{record.updatename,jdbcType=VARCHAR},
       </if>
-      <if test="record.createdate != null" >
+      <if test="record.createdate != null">
         createDate = #{record.createdate,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.updatedate != null" >
+      <if test="record.updatedate != null">
         updateDate = #{record.updatedate,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.delFlag != null" >
+      <if test="record.delFlag != null">
         del_flag = #{record.delFlag,jdbcType=INTEGER},
       </if>
-      <if test="record.orgId != null" >
+      <if test="record.orgId != null">
         org_id = #{record.orgId,jdbcType=INTEGER},
       </if>
-      <if test="record.libraryType != null" >
+      <if test="record.libraryType != null">
         library_type = #{record.libraryType,jdbcType=VARCHAR},
       </if>
+      <if test="record.crkStatus != null">
+        crk_status = #{record.crkStatus,jdbcType=VARCHAR},
+      </if>
     </set>
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExample" parameterType="map" >
+  <update id="updateByExample" parameterType="map">
     update basic_warehouse
     set warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
-    depot_id = #{record.depotId,jdbcType=INTEGER},
-    depot_name = #{record.depotName,jdbcType=VARCHAR},
-    storehouse_id = #{record.storehouseId,jdbcType=INTEGER},
-    warehouse_code = #{record.warehouseCode,jdbcType=VARCHAR},
-    warehouse_name = #{record.warehouseName,jdbcType=VARCHAR},
-    warehouse_use_time = #{record.warehouseUseTime,jdbcType=TIMESTAMP},
-    warehouse_status = #{record.warehouseStatus,jdbcType=INTEGER},
-    store_way = #{record.storeWay,jdbcType=INTEGER},
-    length = #{record.length,jdbcType=DECIMAL},
-    width = #{record.width,jdbcType=DECIMAL},
-    heigth = #{record.heigth,jdbcType=DECIMAL},
-    contact_number = #{record.contactNumber,jdbcType=VARCHAR},
-    warehouse_capacity = #{record.warehouseCapacity,jdbcType=DECIMAL},
-    dutyStoreman = #{record.dutystoreman,jdbcType=VARCHAR},
-    remark = #{record.remark,jdbcType=VARCHAR},
-    ware_img = #{record.wareImg,jdbcType=VARCHAR},
-    createName = #{record.createname,jdbcType=VARCHAR},
-    updateName = #{record.updatename,jdbcType=VARCHAR},
-    createDate = #{record.createdate,jdbcType=TIMESTAMP},
-    updateDate = #{record.updatedate,jdbcType=TIMESTAMP},
-    del_flag = #{record.delFlag,jdbcType=INTEGER},
-    org_id = #{record.orgId,jdbcType=INTEGER},
-    library_type = #{record.libraryType,jdbcType=VARCHAR}
-    <if test="_parameter != null" >
+      depot_id = #{record.depotId,jdbcType=INTEGER},
+      depot_name = #{record.depotName,jdbcType=VARCHAR},
+      storehouse_id = #{record.storehouseId,jdbcType=INTEGER},
+      warehouse_code = #{record.warehouseCode,jdbcType=VARCHAR},
+      warehouse_name = #{record.warehouseName,jdbcType=VARCHAR},
+      warehouse_use_time = #{record.warehouseUseTime,jdbcType=TIMESTAMP},
+      warehouse_status = #{record.warehouseStatus,jdbcType=INTEGER},
+      store_way = #{record.storeWay,jdbcType=INTEGER},
+      length = #{record.length,jdbcType=DECIMAL},
+      width = #{record.width,jdbcType=DECIMAL},
+      heigth = #{record.heigth,jdbcType=DECIMAL},
+      contact_number = #{record.contactNumber,jdbcType=VARCHAR},
+      warehouse_capacity = #{record.warehouseCapacity,jdbcType=DECIMAL},
+      dutyStoreman = #{record.dutystoreman,jdbcType=VARCHAR},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      ware_img = #{record.wareImg,jdbcType=VARCHAR},
+      createName = #{record.createname,jdbcType=VARCHAR},
+      updateName = #{record.updatename,jdbcType=VARCHAR},
+      createDate = #{record.createdate,jdbcType=TIMESTAMP},
+      updateDate = #{record.updatedate,jdbcType=TIMESTAMP},
+      del_flag = #{record.delFlag,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      library_type = #{record.libraryType,jdbcType=VARCHAR},
+      crk_status = #{record.crkStatus,jdbcType=VARCHAR}
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.basic.model.BasicWarehouse" >
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.basic.model.BasicWarehouse">
     update basic_warehouse
-    <set >
-      <if test="depotId != null" >
+    <set>
+      <if test="depotId != null">
         depot_id = #{depotId,jdbcType=INTEGER},
       </if>
-      <if test="depotName != null" >
+      <if test="depotName != null">
         depot_name = #{depotName,jdbcType=VARCHAR},
       </if>
-      <if test="storehouseId != null" >
+      <if test="storehouseId != null">
         storehouse_id = #{storehouseId,jdbcType=INTEGER},
       </if>
-      <if test="warehouseCode != null" >
+      <if test="warehouseCode != null">
         warehouse_code = #{warehouseCode,jdbcType=VARCHAR},
       </if>
-      <if test="warehouseName != null" >
+      <if test="warehouseName != null">
         warehouse_name = #{warehouseName,jdbcType=VARCHAR},
       </if>
-      <if test="warehouseUseTime != null" >
+      <if test="warehouseUseTime != null">
         warehouse_use_time = #{warehouseUseTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="warehouseStatus != null" >
+      <if test="warehouseStatus != null">
         warehouse_status = #{warehouseStatus,jdbcType=INTEGER},
       </if>
-      <if test="storeWay != null" >
+      <if test="storeWay != null">
         store_way = #{storeWay,jdbcType=INTEGER},
       </if>
-      <if test="length != null" >
+      <if test="length != null">
         length = #{length,jdbcType=DECIMAL},
       </if>
-      <if test="width != null" >
+      <if test="width != null">
         width = #{width,jdbcType=DECIMAL},
       </if>
-      <if test="heigth != null" >
+      <if test="heigth != null">
         heigth = #{heigth,jdbcType=DECIMAL},
       </if>
-      <if test="contactNumber != null" >
+      <if test="contactNumber != null">
         contact_number = #{contactNumber,jdbcType=VARCHAR},
       </if>
-      <if test="warehouseCapacity != null" >
+      <if test="warehouseCapacity != null">
         warehouse_capacity = #{warehouseCapacity,jdbcType=DECIMAL},
       </if>
-      <if test="dutystoreman != null" >
+      <if test="dutystoreman != null">
         dutyStoreman = #{dutystoreman,jdbcType=VARCHAR},
       </if>
-      <if test="remark != null" >
+      <if test="remark != null">
         remark = #{remark,jdbcType=VARCHAR},
       </if>
-      <if test="wareImg != null" >
+      <if test="wareImg != null">
         ware_img = #{wareImg,jdbcType=VARCHAR},
       </if>
-      <if test="createname != null" >
+      <if test="createname != null">
         createName = #{createname,jdbcType=VARCHAR},
       </if>
-      <if test="updatename != null" >
+      <if test="updatename != null">
         updateName = #{updatename,jdbcType=VARCHAR},
       </if>
-      <if test="createdate != null" >
+      <if test="createdate != null">
         createDate = #{createdate,jdbcType=TIMESTAMP},
       </if>
-      <if test="updatedate != null" >
+      <if test="updatedate != null">
         updateDate = #{updatedate,jdbcType=TIMESTAMP},
       </if>
-      <if test="delFlag != null" >
+      <if test="delFlag != null">
         del_flag = #{delFlag,jdbcType=INTEGER},
       </if>
-      <if test="orgId != null" >
+      <if test="orgId != null">
         org_id = #{orgId,jdbcType=INTEGER},
       </if>
-      <if test="libraryType != null" >
+      <if test="libraryType != null">
         library_type = #{libraryType,jdbcType=VARCHAR},
       </if>
+      <if test="crkStatus != null">
+        crk_status = #{crkStatus,jdbcType=VARCHAR},
+      </if>
     </set>
     where warehouse_id = #{warehouseId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.basic.model.BasicWarehouse" >
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.basic.model.BasicWarehouse">
     update basic_warehouse
     set depot_id = #{depotId,jdbcType=INTEGER},
       depot_name = #{depotName,jdbcType=VARCHAR},
@@ -504,7 +521,14 @@
       updateDate = #{updatedate,jdbcType=TIMESTAMP},
       del_flag = #{delFlag,jdbcType=INTEGER},
       org_id = #{orgId,jdbcType=INTEGER},
-      library_type = #{libraryType,jdbcType=VARCHAR}
+      library_type = #{libraryType,jdbcType=VARCHAR},
+      crk_status = #{crkStatus,jdbcType=VARCHAR}
     where warehouse_id = #{warehouseId,jdbcType=INTEGER}
-  </update>
+  </update>
+  
+  <!-- 修改货位表的出入库状态 -->
+  <select id="updateWareStatus" parameterType="java.util.Map">
+    update basic_warehouse set crk_status=#{status} where 1=1 and warehouse_id=#{wareId} and org_id=#{orgId}
+  </select>
+
 </mapper>

src/main/java/com/chinaitop/depot/basic/model/BasicWarehouse.java

@@ -1,246 +1,474 @@
-package com.chinaitop.depot.basic.model;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class BasicWarehouse {
-    private Integer warehouseId;
-
-    private Integer depotId;
-
-    private String depotName;
-
-    private Integer storehouseId;
-
-    private String warehouseCode;
-
-    private String warehouseName;
-
-    private Date warehouseUseTime;
-
-    private Integer warehouseStatus;
-
-    private Integer storeWay;
-
-    private BigDecimal length;
-    
-    private BigDecimal width;
-    
-    private BigDecimal heigth;
-
-    private String contactNumber;
-    
-    private BigDecimal warehouseCapacity;
-
-    private String dutystoreman;
-
-    private String remark;
-
-    private String wareImg;
-
-    private String createname;
-
-    private String updatename;
-
-    private Date createdate;
-
-    private Date updatedate;
-
-    private Integer delFlag;
-
-    private Integer orgId;
-
-    private String libraryType;
-
-    public Integer getWarehouseId() {
-        return warehouseId;
-    }
-
-    public void setWarehouseId(Integer warehouseId) {
-        this.warehouseId = warehouseId;
-    }
-
-    public Integer getDepotId() {
-        return depotId;
-    }
-
-    public void setDepotId(Integer depotId) {
-        this.depotId = depotId;
-    }
-
-    public String getDepotName() {
-        return depotName;
-    }
-
-    public void setDepotName(String depotName) {
-        this.depotName = depotName == null ? null : depotName.trim();
-    }
-
-    public Integer getStorehouseId() {
-        return storehouseId;
-    }
-
-    public void setStorehouseId(Integer storehouseId) {
-        this.storehouseId = storehouseId;
-    }
-
-    public String getWarehouseCode() {
-        return warehouseCode;
-    }
-
-    public void setWarehouseCode(String warehouseCode) {
-        this.warehouseCode = warehouseCode == null ? null : warehouseCode.trim();
-    }
-
-    public String getWarehouseName() {
-        return warehouseName;
-    }
-
-    public void setWarehouseName(String warehouseName) {
-        this.warehouseName = warehouseName == null ? null : warehouseName.trim();
-    }
-
-    public Date getWarehouseUseTime() {
-        return warehouseUseTime;
-    }
-
-    public void setWarehouseUseTime(Date warehouseUseTime) {
-        this.warehouseUseTime = warehouseUseTime;
-    }
-
-    public Integer getWarehouseStatus() {
-        return warehouseStatus;
-    }
-
-    public void setWarehouseStatus(Integer warehouseStatus) {
-        this.warehouseStatus = warehouseStatus;
-    }
-
-    public Integer getStoreWay() {
-        return storeWay;
-    }
-
-    public void setStoreWay(Integer storeWay) {
-        this.storeWay = storeWay;
-    }
-
-    public BigDecimal getLength() {
-		return length;
-	}
-
-	public void setLength(BigDecimal length) {
-		this.length = length;
-	}
-
-	public BigDecimal getWidth() {
-		return width;
-	}
-
-	public void setWidth(BigDecimal width) {
-		this.width = width;
-	}
-
-	public BigDecimal getHeigth() {
-		return heigth;
-	}
-
-	public void setHeigth(BigDecimal heigth) {
-		this.heigth = heigth;
-	}
-
-	public String getContactNumber() {
-		return contactNumber;
-	}
-
-	public void setContactNumber(String contactNumber) {
-		this.contactNumber = contactNumber == null ? null : contactNumber.trim();
-	}
-
-	public BigDecimal getWarehouseCapacity() {
-        return warehouseCapacity;
-    }
-
-    public void setWarehouseCapacity(BigDecimal warehouseCapacity) {
-        this.warehouseCapacity = warehouseCapacity;
-    }
-
-    public String getDutystoreman() {
-        return dutystoreman;
-    }
-
-    public void setDutystoreman(String dutystoreman) {
-        this.dutystoreman = dutystoreman == null ? null : dutystoreman.trim();
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark == null ? null : remark.trim();
-    }
-
-    public String getWareImg() {
-        return wareImg;
-    }
-
-    public void setWareImg(String wareImg) {
-        this.wareImg = wareImg == null ? null : wareImg.trim();
-    }
-
-    public String getCreatename() {
-        return createname;
-    }
-
-    public void setCreatename(String createname) {
-        this.createname = createname == null ? null : createname.trim();
-    }
-
-    public String getUpdatename() {
-        return updatename;
-    }
-
-    public void setUpdatename(String updatename) {
-        this.updatename = updatename == null ? null : updatename.trim();
-    }
-
-    public Date getCreatedate() {
-        return createdate;
-    }
-
-    public void setCreatedate(Date createdate) {
-        this.createdate = createdate;
-    }
-
-    public Date getUpdatedate() {
-        return updatedate;
-    }
-
-    public void setUpdatedate(Date updatedate) {
-        this.updatedate = updatedate;
-    }
-
-    public Integer getDelFlag() {
-        return delFlag;
-    }
-
-    public void setDelFlag(Integer delFlag) {
-        this.delFlag = delFlag;
-    }
-
-    public Integer getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(Integer orgId) {
-        this.orgId = orgId;
-    }
-
-    public String getLibraryType() {
-        return libraryType;
-    }
-
-    public void setLibraryType(String libraryType) {
-        this.libraryType = libraryType == null ? null : libraryType.trim();
-    }
+package com.chinaitop.depot.basic.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class BasicWarehouse {
+    private Integer warehouseId;
+
+    private Integer depotId;
+
+    private String depotName;
+
+    private Integer storehouseId;
+
+    private String warehouseCode;
+
+    private String warehouseName;
+
+    private Date warehouseUseTime;
+
+    private Integer warehouseStatus;
+
+    private Integer storeWay;
+
+    private BigDecimal length;
+
+    private BigDecimal width;
+
+    private BigDecimal heigth;
+
+    private String contactNumber;
+
+    private BigDecimal warehouseCapacity;
+
+    private String dutystoreman;
+
+    private String remark;
+
+    private String wareImg;
+
+    private String createname;
+
+    private String updatename;
+
+    private Date createdate;
+
+    private Date updatedate;
+
+    private Integer delFlag;
+
+    private Integer orgId;
+
+    private String libraryType;
+
+    private Date updatetime;
+
+    private String crkStatus;
+
+    /**
+     * 货位ID
+     * @return warehouse_id 货位ID
+     */
+    public Integer getWarehouseId() {
+        return warehouseId;
+    }
+
+    /**
+     * 货位ID
+     * @param warehouseId 货位ID
+     */
+    public void setWarehouseId(Integer warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    /**
+     * 所属粮库ID
+     * @return depot_id 所属粮库ID
+     */
+    public Integer getDepotId() {
+        return depotId;
+    }
+
+    /**
+     * 所属粮库ID
+     * @param depotId 所属粮库ID
+     */
+    public void setDepotId(Integer depotId) {
+        this.depotId = depotId;
+    }
+
+    /**
+     * 所属粮库名称
+     * @return depot_name 所属粮库名称
+     */
+    public String getDepotName() {
+        return depotName;
+    }
+
+    /**
+     * 所属粮库名称
+     * @param depotName 所属粮库名称
+     */
+    public void setDepotName(String depotName) {
+        this.depotName = depotName == null ? null : depotName.trim();
+    }
+
+    /**
+     * 仓房ID
+     * @return storehouse_id 仓房ID
+     */
+    public Integer getStorehouseId() {
+        return storehouseId;
+    }
+
+    /**
+     * 仓房ID
+     * @param storehouseId 仓房ID
+     */
+    public void setStorehouseId(Integer storehouseId) {
+        this.storehouseId = storehouseId;
+    }
+
+    /**
+     * 货位编码
+     * @return warehouse_code 货位编码
+     */
+    public String getWarehouseCode() {
+        return warehouseCode;
+    }
+
+    /**
+     * 货位编码
+     * @param warehouseCode 货位编码
+     */
+    public void setWarehouseCode(String warehouseCode) {
+        this.warehouseCode = warehouseCode == null ? null : warehouseCode.trim();
+    }
+
+    /**
+     * 货位名称
+     * @return warehouse_name 货位名称
+     */
+    public String getWarehouseName() {
+        return warehouseName;
+    }
+
+    /**
+     * 货位名称
+     * @param warehouseName 货位名称
+     */
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName == null ? null : warehouseName.trim();
+    }
+
+    /**
+     * 货位启用日期
+     * @return warehouse_use_time 货位启用日期
+     */
+    public Date getWarehouseUseTime() {
+        return warehouseUseTime;
+    }
+
+    /**
+     * 货位启用日期
+     * @param warehouseUseTime 货位启用日期
+     */
+    public void setWarehouseUseTime(Date warehouseUseTime) {
+        this.warehouseUseTime = warehouseUseTime;
+    }
+
+    /**
+     * 货位状态
+     * @return warehouse_status 货位状态
+     */
+    public Integer getWarehouseStatus() {
+        return warehouseStatus;
+    }
+
+    /**
+     * 货位状态
+     * @param warehouseStatus 货位状态
+     */
+    public void setWarehouseStatus(Integer warehouseStatus) {
+        this.warehouseStatus = warehouseStatus;
+    }
+
+    /**
+     * 储粮方式
+     * @return store_way 储粮方式
+     */
+    public Integer getStoreWay() {
+        return storeWay;
+    }
+
+    /**
+     * 储粮方式
+     * @param storeWay 储粮方式
+     */
+    public void setStoreWay(Integer storeWay) {
+        this.storeWay = storeWay;
+    }
+
+    /**
+     * 长度（米）
+     * @return length 长度（米）
+     */
+    public BigDecimal getLength() {
+        return length;
+    }
+
+    /**
+     * 长度（米）
+     * @param length 长度（米）
+     */
+    public void setLength(BigDecimal length) {
+        this.length = length;
+    }
+
+    /**
+     * 宽度（米）
+     * @return width 宽度（米）
+     */
+    public BigDecimal getWidth() {
+        return width;
+    }
+
+    /**
+     * 宽度（米）
+     * @param width 宽度（米）
+     */
+    public void setWidth(BigDecimal width) {
+        this.width = width;
+    }
+
+    /**
+     * 高度（米）
+     * @return heigth 高度（米）
+     */
+    public BigDecimal getHeigth() {
+        return heigth;
+    }
+
+    /**
+     * 高度（米）
+     * @param heigth 高度（米）
+     */
+    public void setHeigth(BigDecimal heigth) {
+        this.heigth = heigth;
+    }
+
+    /**
+     * 联系电话
+     * @return contact_number 联系电话
+     */
+    public String getContactNumber() {
+        return contactNumber;
+    }
+
+    /**
+     * 联系电话
+     * @param contactNumber 联系电话
+     */
+    public void setContactNumber(String contactNumber) {
+        this.contactNumber = contactNumber == null ? null : contactNumber.trim();
+    }
+
+    /**
+     * 货位容量（数字，单位吨）
+     * @return warehouse_capacity 货位容量（数字，单位吨）
+     */
+    public BigDecimal getWarehouseCapacity() {
+        return warehouseCapacity;
+    }
+
+    /**
+     * 货位容量（数字，单位吨）
+     * @param warehouseCapacity 货位容量（数字，单位吨）
+     */
+    public void setWarehouseCapacity(BigDecimal warehouseCapacity) {
+        this.warehouseCapacity = warehouseCapacity;
+    }
+
+    /**
+     * 责任保管员
+     * @return dutyStoreman 责任保管员
+     */
+    public String getDutystoreman() {
+        return dutystoreman;
+    }
+
+    /**
+     * 责任保管员
+     * @param dutystoreman 责任保管员
+     */
+    public void setDutystoreman(String dutystoreman) {
+        this.dutystoreman = dutystoreman == null ? null : dutystoreman.trim();
+    }
+
+    /**
+     * 备注
+     * @return remark 备注
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * 备注
+     * @param remark 备注
+     */
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    /**
+     * 货位图
+     * @return ware_img 货位图
+     */
+    public String getWareImg() {
+        return wareImg;
+    }
+
+    /**
+     * 货位图
+     * @param wareImg 货位图
+     */
+    public void setWareImg(String wareImg) {
+        this.wareImg = wareImg == null ? null : wareImg.trim();
+    }
+
+    /**
+     * 创建人
+     * @return createName 创建人
+     */
+    public String getCreatename() {
+        return createname;
+    }
+
+    /**
+     * 创建人
+     * @param createname 创建人
+     */
+    public void setCreatename(String createname) {
+        this.createname = createname == null ? null : createname.trim();
+    }
+
+    /**
+     * 更新人
+     * @return updateName 更新人
+     */
+    public String getUpdatename() {
+        return updatename;
+    }
+
+    /**
+     * 更新人
+     * @param updatename 更新人
+     */
+    public void setUpdatename(String updatename) {
+        this.updatename = updatename == null ? null : updatename.trim();
+    }
+
+    /**
+     * 创建日期
+     * @return createDate 创建日期
+     */
+    public Date getCreatedate() {
+        return createdate;
+    }
+
+    /**
+     * 创建日期
+     * @param createdate 创建日期
+     */
+    public void setCreatedate(Date createdate) {
+        this.createdate = createdate;
+    }
+
+    /**
+     * 更新日期
+     * @return updateDate 更新日期
+     */
+    public Date getUpdatedate() {
+        return updatedate;
+    }
+
+    /**
+     * 更新日期
+     * @param updatedate 更新日期
+     */
+    public void setUpdatedate(Date updatedate) {
+        this.updatedate = updatedate;
+    }
+
+    /**
+     * 删除状态(1.正常，2.删除)
+     * @return del_flag 删除状态(1.正常，2.删除)
+     */
+    public Integer getDelFlag() {
+        return delFlag;
+    }
+
+    /**
+     * 删除状态(1.正常，2.删除)
+     * @param delFlag 删除状态(1.正常，2.删除)
+     */
+    public void setDelFlag(Integer delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    /**
+     * 
+     * @return org_id 
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 
+     * @param orgId 
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 库类型，0.主粮库，1.代储点粮库
+     * @return library_type 库类型，0.主粮库，1.代储点粮库
+     */
+    public String getLibraryType() {
+        return libraryType;
+    }
+
+    /**
+     * 库类型，0.主粮库，1.代储点粮库
+     * @param libraryType 库类型，0.主粮库，1.代储点粮库
+     */
+    public void setLibraryType(String libraryType) {
+        this.libraryType = libraryType == null ? null : libraryType.trim();
+    }
+
+    /**
+     * 
+     * @return updatetime 
+     */
+    public Date getUpdatetime() {
+        return updatetime;
+    }
+
+    /**
+     * 
+     * @param updatetime 
+     */
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
+
+    /**
+     * 出入库状态(1空仓,2入库中,3封仓,4出库中,9其它)
+     * @return crk_status 出入库状态(1空仓,2入库中,3封仓,4出库中,9其它)
+     */
+    public String getCrkStatus() {
+        return crkStatus;
+    }
+
+    /**
+     * 出入库状态(1空仓,2入库中,3封仓,4出库中,9其它)
+     * @param crkStatus 出入库状态(1空仓,2入库中,3封仓,4出库中,9其它)
+     */
+    public void setCrkStatus(String crkStatus) {
+        this.crkStatus = crkStatus == null ? null : crkStatus.trim();
+    }
 }

src/main/java/com/chinaitop/depot/unissoft/model/ResponseEntity.java

@@ -0,0 +1,96 @@
+package com.chinaitop.depot.unissoft.model;
+
+import java.io.Serializable;
+
+//返回基类
+public class ResponseEntity<T> implements Serializable {
+
+    private static final long serialVersionUID = -2825436079063723409L;
+
+    //成功
+    private static final String OK = "200";
+    //失败
+    private static final String FAILED = "600";
+    private static final String BUSSINESS_FAILED = "550";
+    private static final String UNAUTHENTICATION = "401";
+
+    private String retCode;
+    private String message;
+    private T data;
+
+    public String getRetCode() {
+        return retCode;
+    }
+
+    public void setRetCode(String retCode) {
+        this.retCode = retCode;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+
+    private static <T> ResponseEntity<T> buildResponse(String retCode, String message, T data){
+        ResponseEntity<T> responseEntity = new ResponseEntity<T>();
+        responseEntity.retCode = retCode;
+        responseEntity.message = message;
+        responseEntity.data = data;
+        return responseEntity;
+    }
+
+    public static <T> ResponseEntity<T> ok(){
+        return buildResponse(ResponseEntity.OK,"success",null);
+    }
+    public static <T> ResponseEntity<T> ok(T data){
+        return buildResponse(ResponseEntity.OK,"success",data);
+
+    }
+    public static <T> ResponseEntity<T> ok(String message, T data){
+        return buildResponse(ResponseEntity.OK,message,data);
+    }
+
+
+    public static <T> ResponseEntity<T> failed(String message){
+        return buildResponse(ResponseEntity.FAILED,message,null);
+    }
+
+    public static <T> ResponseEntity<T> businessFailed(String message){
+        return buildResponse(ResponseEntity.BUSSINESS_FAILED,message,null);
+    }
+
+    public static <T> ResponseEntity<T> unauthentication(String message){
+        return buildResponse(ResponseEntity.UNAUTHENTICATION,message,null);
+    }
+
+    private String state;
+    private String msg;
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+}
+

src/main/java/com/chinaitop/depot/unissoft/serviceconfig/CxfConfig.java

@@ -0,0 +1,37 @@
+package com.chinaitop.depot.unissoft.serviceconfig;
+
+import javax.xml.ws.Endpoint;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.bus.spring.SpringBus;
+import org.apache.cxf.jaxws.EndpointImpl;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.chinaitop.depot.unissoft.webservice.BasicWarehouseWebService;
+import com.chinaitop.depot.unissoft.webservice.BasicWarehouseWebServiceImpl;
+
+@Configuration
+public class CxfConfig {
+    /*@Bean
+    public ServletRegistrationBean dispatcherServlet() {
+        return new ServletRegistrationBean(new CXFServlet(),"/business/*");
+    }*/
+    @Bean(name = Bus.DEFAULT_BUS_ID)
+    public SpringBus springBus() {
+        return new SpringBus();
+    }
+
+    //货位管理
+    @Bean
+    public BasicWarehouseWebService basicWarehouseWebService() {
+        return new BasicWarehouseWebServiceImpl();
+    }
+    @Bean
+    public Endpoint uploadCfStatus() {
+        EndpointImpl endpoint = new EndpointImpl(springBus(), basicWarehouseWebService());
+        endpoint.publish("/basicWarehouseWebService");
+        return endpoint;
+    }
+
+}

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

@@ -0,0 +1,15 @@
+package com.chinaitop.depot.unissoft.webservice;
+
+import javax.jws.WebParam;
+import javax.jws.WebService;
+
+@WebService
+public interface BasicWarehouseWebService {
+
+	/**
+	 * 修改货位的出入库状态（webservice调用）
+	 * @param basicWarehouse
+	 * @return
+	 */
+	String uploadCfStatus(@WebParam(name = "json") String json);
+}

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

@@ -0,0 +1,70 @@
+package com.chinaitop.depot.unissoft.webservice;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.lang.ObjectUtils;
+import org.springframework.stereotype.Service;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.chinaitop.depot.basic.mapper.BasicWarehouseMapper;
+
+@Service
+public class BasicWarehouseWebServiceImpl implements BasicWarehouseWebService {
+
+	@Resource
+	private BasicWarehouseMapper warehouseMapper;
+
+	@Override
+	@SuppressWarnings("all")
+	public String uploadCfStatus(String json) {
+		Map<String, Object> result = new HashMap<String, Object>();
+
+		try {
+			if (null != json) {
+				/* 将获取到的json串转换成json数组 */
+				JSONArray json_array = JSONArray.parseArray(json);
+				JSONObject json_object = null;
+
+				/* 遍历json数组，获取数组中值 */
+				for (Iterator iterator = json_array.iterator(); iterator.hasNext();) {
+
+					/* 获取json对象 */
+					json_object = (JSONObject) iterator.next();
+					if (json_object == null) {
+						continue;
+					}
+
+					//货位ID
+					String wareId = ObjectUtils.toString(json_object.get("hwId"), "");
+					//单位ID
+					String orgId = ObjectUtils.toString(json_object.get("org_Id"), "");
+					//货位状态值1空仓,2入库中,3封仓,4出库中,9其它
+					String status = ObjectUtils.toString(json_object.get("status"), "");
+
+					//修改数据
+					Map<String, Object> param = new HashMap<String, Object>();
+					param.put("wareId", Integer.parseInt(wareId));
+					param.put("orgId", Integer.parseInt(orgId));
+					param.put("status", status);
+					warehouseMapper.updateWareStatus(param);
+				}
+			}
+			result.put("success", "true");
+			result.put("msg", "上传成功");
+		} catch (NumberFormatException e) {
+			e.printStackTrace();
+			result.put("success", "false");
+			result.put("msg", "上传失败");
+		} finally {
+			JSONArray jsonArray = new JSONArray();
+			jsonArray.add(result);
+			return jsonArray.toString();
+		}
+	}
+
+}

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

@@ -16,7 +16,7 @@ public class GeneratorSqlmap {
 		List<String> warnings = new ArrayList<String>();
 		boolean overwrite = true;
 		//指定 逆向工程配置文件(写自己电脑的路径)F:\LsProject\depot-basic\src\main\resources
-		File configFile = new File("F:\\LsProject\\depot-basic\\src\\main\\resources\\generatorConfig.xml");
+		File configFile = new File("D:\\git_10.10.1.25\\depot-basic-yunnan\\src\\main\\resources\\generatorConfig.xml");
 		ConfigurationParser cp = new ConfigurationParser(warnings);
 		Configuration config = cp.parseConfiguration(configFile);
 		DefaultShellCallback callback = new DefaultShellCallback(overwrite);

src/main/resources/generatorConfig.xml

@@ -14,7 +14,7 @@
 		<!--数据库连接的信息：驱动类、连接地址、用户名、密码 -->
 		<jdbcConnection 
 			driverClass="com.mysql.jdbc.Driver"
-			connectionURL="jdbc:mysql://192.168.80.25:3306/depot" 
+			connectionURL="jdbc:mysql://192.168.123.38:3306/depot_yunnan" 
 			userId="root"
 			password="123456">
 		</jdbcConnection>
@@ -50,9 +50,9 @@
 		</javaClientGenerator>
 		
 		<!-- 指定要反向生成的数据库表 -->
-		<table schema="" tableName="basic_process_main"></table>
-		<table schema="" tableName="basic_process_sub"></table>
-		<table schema="" tableName="basic_process_contrail"></table>
+		<table schema="" tableName="basic_warehouse"></table>
+<!-- 		<table schema="" tableName="basic_process_sub"></table> -->
+<!-- 		<table schema="" tableName="basic_process_contrail"></table> -->
 
 	</context>
 </generatorConfiguration>