刷新出入库状态功能优化

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

@@ -420,19 +420,34 @@ public class BasicWarehouseController {
 					String status = ObjectUtils.toString(json_object.get("crk_status"), "");
 					//业务类型：2代表油罐，1代表仓房
 					String ywlx = ObjectUtils.toString(json_object.get("ywlx"), "");
+					//粮油类型(0:原粮,1:成品粮)
+					String lylx = ObjectUtils.toString(json_object.get("lylx"), "");
 
 					//修改数据
 					param = new HashMap<String, Object>();
 					param.put("wareId", Integer.parseInt(wareId));
 					param.put("orgId", Integer.parseInt(orgId));
 					param.put("status", status);
-					if ("2".equals(ywlx)) {
-						BasicTank bank = new BasicTank();
-						bank.setId(wareId);
-						bank.setCrkStatus(status);
-						basicTankService.updateTankCrkStatus(bank);
-					} else if ("1".equals(ywlx)) {
-						basicWarehouseService.updateWareStatus(param);
+					param.put("lylx", lylx);
+					if ("2".equals(ywlx)) {//油罐
+						BasicTank banks = basicTankService.findByPrimary(wareId);
+						//检查保存的粮油类型是否对应(成品粮或者原粮)
+						if (lylx.equals(banks.getLylx()) || "".equals(banks.getLylx()) || null == banks.getLylx()) {
+							BasicTank bank = new BasicTank();
+							bank.setId(wareId);
+							bank.setCrkStatus(status);
+							if ("1".equals(status)) {//如果是空仓则把粮油类型置为空
+								bank.setLylx("");
+							} else {
+								bank.setLylx(lylx);
+							}
+							basicTankService.updateTankCrkStatus(bank);
+						}
+					} else if ("1".equals(ywlx)) {//粮仓
+						BasicWarehouse ware = basicWarehouseService.findByParmaryKey(Integer.parseInt(wareId));
+						if (lylx.equals(ware.getLylx()) || "".equals(ware.getLylx()) || null == ware.getLylx()) {
+							basicWarehouseService.updateWareStatus(param);
+						}
 					}
 					logger.info("时间："+date+"，出入库状态回写接口，封仓调用，调用成功！");
 				}

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

@@ -30,8 +30,9 @@
     <result column="tanklib_chart" property="tanklibChart" jdbcType="VARCHAR" />
     <result column="basic_truck_type" property="basicTruckType" jdbcType="VARCHAR" />
     <result column="crk_status" property="crkStatus" jdbcType="VARCHAR" />
-    <result column="ygdm" property="crkStatus" jdbcType="VARCHAR" />
-    <result column="ygajdm" property="crkStatus" jdbcType="VARCHAR" />
+    <result column="ygdm" property="ygdm" jdbcType="VARCHAR" />
+    <result column="ygajdm" property="ygajdm" jdbcType="VARCHAR" />
+    <result column="lylx" property="lylx" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -95,7 +96,7 @@
     id, storageTank_code, storageTank_name, org_code, tank_capacity, createDate, facilities_type, 
     heating_type, tank_type, diameter, height, buildDate, check_way, weld_way, tank_apply, 
     tank_status, library_type, org_id, del_flag, updatetime, bottom_area, design_height, 
-    oil_height, insport_height, tank_chart, tanklib_chart, basic_truck_type, crk_status, ygdm, ygajdm
+    oil_height, insport_height, tank_chart, tanklib_chart, basic_truck_type, crk_status, ygdm, ygajdm, lylx
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.basic.model.BasicTankExample" >
     select
@@ -136,7 +137,7 @@
       tank_status, library_type, org_id, 
       del_flag, updatetime, bottom_area, 
       design_height, oil_height, insport_height, 
-      tank_chart, tanklib_chart, basic_truck_type, crk_status, ygdm, ygajdm
+      tank_chart, tanklib_chart, basic_truck_type, crk_status, ygdm, ygajdm, lylx
       )
     values (#{id,jdbcType=VARCHAR}, #{storagetankCode,jdbcType=VARCHAR}, #{storagetankName,jdbcType=VARCHAR}, 
       #{orgCode,jdbcType=VARCHAR}, #{tankCapacity,jdbcType=DECIMAL}, #{createdate,jdbcType=TIMESTAMP}, 
@@ -147,7 +148,7 @@
       #{delFlag,jdbcType=INTEGER}, #{updatetime,jdbcType=TIMESTAMP}, #{bottomArea,jdbcType=DECIMAL}, 
       #{designHeight,jdbcType=DECIMAL}, #{oilHeight,jdbcType=DECIMAL}, #{insportHeight,jdbcType=DECIMAL}, 
       #{tankChart,jdbcType=VARCHAR}, #{tanklibChart,jdbcType=VARCHAR}, #{basicTruckType,jdbcType=VARCHAR},
-      #{crkStatus,jdbcType=VARCHAR},#{ygdm,jdbcType=VARCHAR},#{ygajdm,jdbcType=VARCHAR}
+      #{crkStatus,jdbcType=VARCHAR},#{ygdm,jdbcType=VARCHAR},#{ygajdm,jdbcType=VARCHAR}, #{lylx,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.basic.model.BasicTank" >
@@ -243,6 +244,9 @@
       <if test="ygajdm != null">
       	ygajdm,
       </if>
+      <if test="lylx != null">
+        lylx,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -335,6 +339,9 @@
       <if test="ygajdm != null">
         #{ygajdm,jdbcType=VARCHAR},
       </if>
+      <if test="lylx != null">
+        #{lylx,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.basic.model.BasicTankExample" resultType="java.lang.Integer" >
@@ -436,6 +443,9 @@
       <if test="record.ygajdm != null">
         ygajdm = #{record.ygajdm,jdbcType=VARCHAR},
       </if>
+      <if test="record.lylx != null">
+        lylx = #{record.lylx,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -472,7 +482,8 @@
       basic_truck_type = #{record.basicTruckType,jdbcType=VARCHAR},
       crk_status = #{record.crkStatus,jdbcType=VARCHAR},
       ygdm = #{record.ygdm,jdbcType=VARCHAR},
-      ygajdm = #{record.ygajdm,jdbcType=VARCHAR}
+      ygajdm = #{record.ygajdm,jdbcType=VARCHAR},
+      lylx = #{record.lylx,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -567,6 +578,9 @@
       <if test="ygajdm != null">
         ygajdm = #{ygajdm,jdbcType=VARCHAR},
       </if>
+      <if test="lylx != null">
+        lylx = #{lylx,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -600,7 +614,8 @@
       basic_truck_type = #{basicTruckType,jdbcType=VARCHAR},
       crk_status = #{crkStatus,jdbcType=VARCHAR},
       ygdm = #{ygdm,jdbcType=VARCHAR},
-      ygajdm = #{ygajdm,jdbcType=VARCHAR}
+      ygajdm = #{ygajdm,jdbcType=VARCHAR},
+      lylx = #{lylx,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 

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

@@ -29,6 +29,7 @@
     <result column="contact_number" jdbcType="VARCHAR" property="contactNumber" />
     <result column="crk_status" jdbcType="VARCHAR" property="crkStatus" />
     <result column="hwdm" jdbcType="VARCHAR" property="hwdm" />
+    <result column="lylx" jdbcType="VARCHAR" property="lylx" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -92,7 +93,7 @@
     warehouse_id, depot_id, depot_name, storehouse_id, warehouse_code, warehouse_name, 
     warehouse_use_time, warehouse_status, store_way, warehouse_capacity, dutystoreman, 
     remark, ware_img, createname, updatename, createdate, updatedate, del_flag, org_id, 
-    library_type, hwbm, length, width, heigth, contact_number, crk_status, hwdm
+    library_type, hwbm, length, width, heigth, contact_number, crk_status, hwdm, lylx
   </sql>
   <select id="selectByExample" parameterType="com.chinaitop.depot.basic.model.BasicWarehouseExample" resultMap="BaseResultMap">
     select
@@ -136,7 +137,7 @@
       createdate, updatedate, del_flag, 
       org_id, library_type, 
       hwbm, length, width, 
-      heigth, contact_number, crk_status, hwdm
+      heigth, contact_number, crk_status, hwdm, lylx
       )
     values (#{warehouseId,jdbcType=INTEGER}, #{depotId,jdbcType=INTEGER}, #{depotName,jdbcType=VARCHAR}, 
       #{storehouseId,jdbcType=INTEGER}, #{warehouseCode,jdbcType=VARCHAR}, #{warehouseName,jdbcType=VARCHAR}, 
@@ -147,7 +148,7 @@
       #{orgId,jdbcType=INTEGER}, #{libraryType,jdbcType=VARCHAR}, 
       #{hwbm,jdbcType=VARCHAR}, #{length,jdbcType=DECIMAL}, #{width,jdbcType=DECIMAL}, 
       #{heigth,jdbcType=DECIMAL}, #{contactNumber,jdbcType=VARCHAR}, #{crkStatus,jdbcType=VARCHAR}, 
-      #{hwdm,jdbcType=VARCHAR}
+      #{hwdm,jdbcType=VARCHAR}, #{lylx,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.basic.model.BasicWarehouse">
@@ -237,6 +238,9 @@
       <if test="hwdm != null">
         hwdm,
       </if>
+      <if test="lylx != null">
+        lylx,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="warehouseId != null">
@@ -320,6 +324,9 @@
       <if test="hwdm != null">
         #{hwdm,jdbcType=VARCHAR},
       </if>
+      <if test="lylx != null">
+        #{lylx,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.basic.model.BasicWarehouseExample" resultType="java.lang.Integer">
@@ -412,6 +419,9 @@
       <if test="record.hwdm != null">
         hwdm = #{record.hwdm,jdbcType=VARCHAR},
       </if>
+      <if test="record.lylx != null">
+        lylx = #{record.lylx,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -445,7 +455,8 @@
       heigth = #{record.heigth,jdbcType=DECIMAL},
       contact_number = #{record.contactNumber,jdbcType=VARCHAR},
       crk_status = #{record.crkStatus,jdbcType=VARCHAR},
-      hwdm = #{record.hwdm,jdbcType=VARCHAR}
+      hwdm = #{record.hwdm,jdbcType=VARCHAR},
+      lylx = #{record.lylx,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -531,6 +542,9 @@
       <if test="hwdm != null">
         hwdm = #{hwdm,jdbcType=VARCHAR},
       </if>
+      <if test="lylx != null">
+        lylx = #{lylx,jdbcType=VARCHAR},
+      </if>
     </set>
     where warehouse_id = #{warehouseId,jdbcType=INTEGER}
   </update>
@@ -561,7 +575,8 @@
       heigth = #{heigth,jdbcType=DECIMAL},
       contact_number = #{contactNumber,jdbcType=VARCHAR},
       crk_status = #{crkStatus,jdbcType=VARCHAR},
-      hwdm = #{hwdm,jdbcType=VARCHAR}
+      hwdm = #{hwdm,jdbcType=VARCHAR},
+      lylx = #{lylx,jdbcType=VARCHAR}
     where warehouse_id = #{warehouseId,jdbcType=INTEGER}
   </update>
 

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

@@ -68,6 +68,8 @@ public class BasicTank {
 
     private String ygajdm;
 
+    private String lylx;
+
     /**
      * 油罐id
      * @return id 油罐id
@@ -539,4 +541,20 @@ public class BasicTank {
 	public void setYgajdm(String ygajdm) {
 		this.ygajdm = ygajdm;
 	}
+
+	/**
+	 * 粮油类型(0:原粮,1:成品粮)
+	 * @return 粮油类型
+	 */
+	public String getLylx() {
+		return lylx;
+	}
+
+	/**
+	 * 粮油类型(0:原粮,1:成品粮)
+	 * @param lylx 粮油类型
+	 */
+	public void setLylx(String lylx) {
+		this.lylx = lylx == null ? null : lylx.trim();
+	}
 }

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

@@ -59,6 +59,8 @@ public class BasicWarehouse {
     private String crkStatus;
     
     private String hwdm;
+    
+    private String lylx;
 
     /**
      * null
@@ -499,4 +501,20 @@ public class BasicWarehouse {
 	public void setHwdm(String hwdm) {
 		this.hwdm = hwdm;
 	}
+
+	/**
+	 * 粮油类型(0:原粮,1:成品粮)
+	 * @return 粮油类型
+	 */
+	public String getLylx() {
+		return lylx;
+	}
+
+	/**
+	 * 粮油类型(0:原粮,1:成品粮)
+	 * @param lylx 粮油类型
+	 */
+	public void setLylx(String lylx) {
+		this.lylx = lylx == null ? null : lylx.trim();
+	}
 }

src/main/java/com/chinaitop/depot/basic/service/impl/BasicWarehouseServiceImpl.java

@@ -1,6 +1,7 @@
 package com.chinaitop.depot.basic.service.impl;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -137,7 +138,17 @@ public class BasicWarehouseServiceImpl implements BasicWarehouseService {
 
 	@Override
 	public void updateWareStatus(Map<String, Object> param) {
-		mapper.updateWareStatus(param);
+		String status = param.get("status").toString();
+		BasicWarehouse ware = new BasicWarehouse();
+		ware.setWarehouseId(Integer.parseInt(param.get("wareId").toString()));
+		ware.setCrkStatus(status);
+		ware.setUpdatetime(new Date());
+		if ("1".equals(status)) {//如果是空仓，将粮油类型设置为空
+			ware.setLylx("");
+		} else {
+			ware.setLylx(param.get("lylx").toString());
+		}
+		mapper.updateByPrimaryKeySelective(ware);
 	}
 
 	@Override

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

@@ -23,6 +23,7 @@ import com.chinaitop.depot.basic.model.BasicStorehouse;
 import com.chinaitop.depot.basic.model.BasicTank;
 import com.chinaitop.depot.basic.model.BasicTankHw;
 import com.chinaitop.depot.basic.model.BasicWarehouse;
+import com.chinaitop.depot.basic.service.BasicWarehouseService;
 import com.chinaitop.utils.ParameterUtil;
 
 @Service
@@ -35,7 +36,10 @@ public class BasicWarehouseWebServiceImpl implements BasicWarehouseWebService {
 	
 	@Resource
 	private BasicWarehouseMapper warehouseMapper;
-	
+
+	@Resource
+	private BasicWarehouseService basicWarehouseService;
+
 	@Resource
 	private BasicTankMapper tankMapper;
 
@@ -90,77 +94,59 @@ public class BasicWarehouseWebServiceImpl implements BasicWarehouseWebService {
 					 */
 					
 					//如果仓房ID跟货位ID一样那么说明这个数据是属于油罐的，否则就是仓房下的货位
-					if (houseId.equals(wareId)) {//油罐数据
+					BasicStorehouse storeh = storehouseMapper.selectByPrimaryKey(Integer.parseInt(houseId));
+					if ("1".equals(storeh.getDatatype())) {//油罐数据
 						BasicTank basicTank = tankMapper.selectByPrimaryKey(wareId);
-						param.put("houseCode", basicTank.getStoragetankCode());
-						param.remove("wareId");
-						//param.put("wareId", null);
-						if (null != basicTank && "3".equals(basicTank.getCrkStatus())) {
-							//查询封仓时间
-							List<Map<String, Object>> lqk_map = warehouseMapper.queryFenCangData(param);
-							if (null != lqk_map && lqk_map.size() > 0) {
-								String fcsj = lqk_map.get(0).get("accept_date")+"";
-								//判断封仓时间在不在业务时间之前
-								if (ParameterUtil.string2datetime(fcsj).after(ParameterUtil.string2datetime(ywsj))) {
-									continue;
-								} else {
-									//回写油罐的出入库状态
-									basicTank.setCrkStatus(status);
-									basicTank.setUpdatetime(new Date());
-									tankMapper.updateByPrimaryKey(basicTank);
-									BasicTankHw tankHw = new BasicTankHw();
-									tankHw.setId(Integer.parseInt(wareId));
-									tankHw.setCrkStatus(status);
-									tankHw.setZhgxsj(new Date());
-									tankHwMapper.updateByPrimaryKeySelective(tankHw);
+						//当前油罐只要不是放着成品油那就允许修改
+						//粮油类型(0:原粮,1:成品粮)
+						if (null == basicTank.getLylx() || "".equals(basicTank.getLylx()) || "0".equals(basicTank.getLylx())) {
+							param.put("houseCode", basicTank.getStoragetankCode());
+							param.remove("wareId");
+							//param.put("wareId", null);
+							if (null != basicTank && "3".equals(basicTank.getCrkStatus())) {
+								//查询封仓时间
+								List<Map<String, Object>> lqk_map = warehouseMapper.queryFenCangData(param);
+								if (null != lqk_map && lqk_map.size() > 0) {
+									String fcsj = lqk_map.get(0).get("accept_date")+"";
+									//判断封仓时间在不在业务时间之前
+									if (ParameterUtil.string2datetime(fcsj).after(ParameterUtil.string2datetime(ywsj))) {
+										continue;
+									} else {
+										//回写油罐的出入库状态
+										this.updateTankCrkStatus(param, basicTank);
+									}
 								}
+							} else {
+								//回写油罐的出入库状态
+								this.updateTankCrkStatus(param, basicTank);
 							}
-						} else {
-							//回写油罐的出入库状态
-							basicTank.setCrkStatus(status);
-							basicTank.setUpdatetime(new Date());
-							tankMapper.updateByPrimaryKey(basicTank);
-							BasicTankHw tankHw = new BasicTankHw();
-							tankHw.setId(Integer.parseInt(wareId));
-							tankHw.setCrkStatus(status);
-							tankHw.setZhgxsj(new Date());
-							tankHwMapper.updateByPrimaryKeySelective(tankHw);
-							//如果是出库，则把对应的粮情卡设置为归档
-							if ("4".equals(status)) {
-								Map<String, Object> lqkmap = new HashMap<String, Object>();
-								lqkmap.put("storehouseId", wareId);
-								lqkmap.put("orgId", orgId);
-								warehouseMapper.updateLqkGd(lqkmap);
-							}
+							
 						}
 					} else {//粮食仓房下的货位
 						//查询当前货位状态
 						BasicWarehouse warehouse = warehouseMapper.selectByPrimaryKey(Integer.parseInt(wareId));
-						
-						if (null != warehouse && "3".equals(warehouse.getCrkStatus())) {
-							param.put("wareCode", warehouse.getWarehouseCode());
-							BasicStorehouse basicStorehouse = storehouseMapper.selectByPrimaryKey(warehouse.getStorehouseId());
-							param.put("houseCode", basicStorehouse.getStorehouseCode());
-							//查询封仓时间
-							List<Map<String, Object>> lqk_map = warehouseMapper.queryFenCangData(param);
-							if (null != lqk_map && lqk_map.size() > 0) {
-								String fcsj = lqk_map.get(0).get("accept_date")+"";
-								//判断封仓时间在不在业务时间之前
-								if (ParameterUtil.string2datetime(fcsj).after(ParameterUtil.string2datetime(ywsj))) {
-									continue;
-								} else {
-									//回写状态
-									warehouseMapper.updateWareStatus(param);
+						//当前粮仓只要不是放着成品油那就允许修改
+						//粮油类型(0:原粮,1:成品粮)
+						if (null == warehouse.getLylx() || "".equals(warehouse.getLylx()) || "0".equals(warehouse.getLylx())) {
+							if (null != warehouse && "3".equals(warehouse.getCrkStatus())) {
+								param.put("wareCode", warehouse.getWarehouseCode());
+								//BasicStorehouse basicStorehouse = storehouseMapper.selectByPrimaryKey(warehouse.getStorehouseId());
+								param.put("houseCode", storeh.getStorehouseCode());
+								//查询封仓时间
+								List<Map<String, Object>> lqk_map = warehouseMapper.queryFenCangData(param);
+								if (null != lqk_map && lqk_map.size() > 0) {
+									String fcsj = lqk_map.get(0).get("accept_date")+"";
+									//判断封仓时间在不在业务时间之前
+									if (ParameterUtil.string2datetime(fcsj).after(ParameterUtil.string2datetime(ywsj))) {
+										continue;
+									} else {
+										//回写状态
+										this.updateWareCrkStatus(param);
+									}
 								}
-							}
-						} else {
-							//回写状态
-							warehouseMapper.updateWareStatus(param);
-							if ("4".equals(status)) {
-								Map<String, Object> lqkmap = new HashMap<String, Object>();
-								lqkmap.put("wareId", wareId);
-								lqkmap.put("orgId", orgId);
-								warehouseMapper.updateLqkGd(lqkmap);
+							} else {
+								//回写状态
+								this.updateWareCrkStatus(param);
 							}
 						}
 					}
@@ -182,4 +168,59 @@ public class BasicWarehouseWebServiceImpl implements BasicWarehouseWebService {
 		}
 	}
 
+	/**
+	 * 原粮修改出入库状态
+	 * @param param
+	 */
+	private void updateWareCrkStatus(Map<String, Object> param) {
+		String status = param.get("status").toString();
+		BasicWarehouse ware = new BasicWarehouse();
+		ware.setWarehouseId(Integer.parseInt(param.get("wareId").toString()));
+		ware.setCrkStatus(status);
+		if ("1".equals(status)) {//空仓
+			ware.setLylx("");
+		} else {
+			ware.setLylx("0");
+		}
+		ware.setUpdatetime(new Date());
+		warehouseMapper.updateByPrimaryKeySelective(ware);
+
+		if ("4".equals(status) || "1".equals(status)) {
+			Map<String, Object> lqkmap = new HashMap<String, Object>();
+			lqkmap.put("wareId", param.get("wareId"));
+			lqkmap.put("orgId", param.get("orgId"));
+			warehouseMapper.updateLqkGd(lqkmap);
+		}
+	}
+
+	/**
+	 * 修改油罐的出入库状态
+	 * @param param
+	 * @param basicTank 
+	 */
+	private void updateTankCrkStatus(Map<String, Object> param, BasicTank basicTank) {
+		String status = param.get("status").toString();
+		Integer wareId = Integer.parseInt(basicTank.getId());
+		basicTank.setCrkStatus(status);
+		basicTank.setUpdatetime(new Date());
+		if ("1".equals(status)) {//空仓
+			basicTank.setLylx("");
+		} else {//入库
+			basicTank.setLylx("0");
+		}
+		tankMapper.updateByPrimaryKey(basicTank);
+		BasicTankHw tankHw = new BasicTankHw();
+		tankHw.setId(wareId);
+		tankHw.setCrkStatus(status);
+		tankHw.setZhgxsj(new Date());
+		tankHwMapper.updateByPrimaryKeySelective(tankHw);
+		//如果是出库，则把对应的粮情卡设置为归档
+		if ("4".equals(status) || "1".equals(status)) {//出库或者空仓
+			Map<String, Object> lqkmap = new HashMap<String, Object>();
+			lqkmap.put("storehouseId", wareId);
+			lqkmap.put("orgId", param.get("orgId"));
+			warehouseMapper.updateLqkGd(lqkmap);
+		}
+	}
+
 }