.

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

@@ -31,4 +31,11 @@ public interface BasicWarehouseMapper {
     int updateByPrimaryKey(BasicWarehouse record);
 
 	void updateWareStatus(Map<String, Object> param);
+
+	/**
+	 * 查询一个仓房的封仓时间
+	 * @param param
+	 * @return
+	 */
+	List<Map<String, String>> queryFcdate(Map<String, Object> param);
 }

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

@@ -530,5 +530,10 @@
   <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>
-
+
+  <!-- 查询封仓时间 -->
+  <select id="queryFcdate" parameterType="java.util.Map" resultType="java.util.Map">
+    SELECT filling_time from storage_foodbasicinfo WHERE warehouse_id=${wareId} 
+    AND history_status=0 AND seal_status='1' ORDER BY filling_time DESC
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/job/service/impl/ScheduleJobServiceImpl.java

@@ -38,17 +38,17 @@ public class ScheduleJobServiceImpl implements ScheduleJobService {
 	 */
 	@PostConstruct
 	public void init() {
-	    ScheduleJobExample scheduleJobExample = new ScheduleJobExample();
-		List<ScheduleJob> scheduleJobList = scheduleJobMapper.selectByExample(scheduleJobExample);
-		for(ScheduleJob scheduleJob : scheduleJobList){
-			CronTrigger cronTrigger = ScheduleUtils.getCronTrigger(scheduler, scheduleJob.getId());
-            //如果不存在，则创建
-            if(cronTrigger == null) {
-                ScheduleUtils.createScheduleJob(scheduler, scheduleJob);
-            }else {
-                ScheduleUtils.updateScheduleJob(scheduler, scheduleJob);
-            }
-		}
+//	    ScheduleJobExample scheduleJobExample = new ScheduleJobExample();
+//		List<ScheduleJob> scheduleJobList = scheduleJobMapper.selectByExample(scheduleJobExample);
+//		for(ScheduleJob scheduleJob : scheduleJobList){
+//			CronTrigger cronTrigger = ScheduleUtils.getCronTrigger(scheduler, scheduleJob.getId());
+//            //如果不存在，则创建
+//            if(cronTrigger == null) {
+//                ScheduleUtils.createScheduleJob(scheduler, scheduleJob);
+//            }else {
+//                ScheduleUtils.updateScheduleJob(scheduler, scheduleJob);
+//            }
+//		}
 	}
 	
 	@Override

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

@@ -2,6 +2,7 @@ package com.chinaitop.depot.unissoft.webservice;
 
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 import javax.annotation.Resource;
@@ -12,6 +13,8 @@ import org.springframework.stereotype.Service;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.basic.mapper.BasicWarehouseMapper;
+import com.chinaitop.depot.basic.model.BasicWarehouse;
+import com.chinaitop.utils.ParameterUtil;
 
 @Service
 public class BasicWarehouseWebServiceImpl implements BasicWarehouseWebService {
@@ -39,19 +42,46 @@ public class BasicWarehouseWebServiceImpl implements BasicWarehouseWebService {
 						continue;
 					}
 
-					//货位ID
+					//货位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"), "");
+					//业务时间
+					String ywsj = ObjectUtils.toString(json_object.get("cjsj"), "");
 
 					//修改数据
 					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);
+					param.put("ywsj", ywsj);
+					
+					/**
+					 * 1、查询当前仓房货位有没有封仓；
+					 * 2、如果封仓了，并且封仓时间在业务时间之前：那么就不回写当前传过来的状态，这个数据是在封仓前产生的
+					 * 3、如果封仓了，并且封仓时间在业务时间之后：那么就回写当前传过来的状态，这个数据是在封仓后产生的
+					 */
+					//查询当前货位状态
+					BasicWarehouse warehouse = warehouseMapper.selectByPrimaryKey(Integer.parseInt(wareId));
+					if (null != warehouse && "3".equals(warehouse.getCrkStatus())) {
+						//查询封仓时间
+						List<Map<String, String>> map = warehouseMapper.queryFcdate(param);
+						if (null != map && map.size() > 0) {
+							String fcsj = map.get(0).get("filling_time")+" 00:00:00";
+							//判断封仓时间在不在业务时间之前
+							if (ParameterUtil.string2datetime(fcsj).after(ParameterUtil.string2datetime(ywsj))) {
+								continue;
+							} else {
+								//回写状态
+								warehouseMapper.updateWareStatus(param);
+							}
+						}
+					} else {
+						//回写状态
+						warehouseMapper.updateWareStatus(param);
+					}
 				}
 			}
 			result.put("success", "true");
@@ -60,7 +90,8 @@ public class BasicWarehouseWebServiceImpl implements BasicWarehouseWebService {
 			e.printStackTrace();
 			result.put("success", "false");
 			result.put("msg", "上传失败");
-		} finally {
+		}
+		finally {
 			JSONArray jsonArray = new JSONArray();
 			jsonArray.add(result);
 			return jsonArray.toString();