.

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

@@ -528,12 +528,13 @@
   
   <!-- 修改货位表的出入库状态 -->
   <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}
+    update basic_warehouse set crk_status=#{status},updatetime=NOW() 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
+    AND history_status=0 AND seal_status='1' 
+    ORDER BY STR_TO_DATE(filling_time, "%Y-%m-%d") DESC
   </select>
 </mapper>

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

@@ -8,6 +8,8 @@ import java.util.Map;
 import javax.annotation.Resource;
 
 import org.apache.commons.lang.ObjectUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSONArray;
@@ -19,6 +21,8 @@ import com.chinaitop.utils.ParameterUtil;
 @Service
 public class BasicWarehouseWebServiceImpl implements BasicWarehouseWebService {
 
+	final static Logger logger = LoggerFactory.getLogger(BasicWarehouse.class);
+
 	@Resource
 	private BasicWarehouseMapper warehouseMapper;
 
@@ -27,6 +31,8 @@ public class BasicWarehouseWebServiceImpl implements BasicWarehouseWebService {
 	public String uploadCfStatus(String json) {
 		Map<String, Object> result = new HashMap<String, Object>();
 
+		String date = ParameterUtil.getSysDateTime();
+		logger.info("时间："+date+"，出入库状态回写接口，出入库系统调用，接收参数是："+json);
 		try {
 			if (null != json) {
 				/* 将获取到的json串转换成json数组 */
@@ -42,8 +48,14 @@ public class BasicWarehouseWebServiceImpl implements BasicWarehouseWebService {
 						continue;
 					}
 
+					//仓房ID(云南没有油罐的业务，不用判断是否是油罐)
+					String houseId = ObjectUtils.toString(json_object.get("chId"), "");
 					//货位ID(云南没有油罐的业务，不用判断是否是油罐)
 					String wareId = ObjectUtils.toString(json_object.get("hwId"), "");
+					//如果是油罐，那么调过
+					if (houseId.equals(wareId)) {
+						continue;
+					}
 					//单位ID
 					String orgId = ObjectUtils.toString(json_object.get("org_Id"), "");
 					//货位状态值1空仓,2入库中,3封仓,4出库中,9其它
@@ -86,10 +98,12 @@ public class BasicWarehouseWebServiceImpl implements BasicWarehouseWebService {
 			}
 			result.put("success", "true");
 			result.put("msg", "上传成功");
+			logger.info("时间："+date+"，出入库状态回写接口，出入库系统调用，调用成功！");
 		} catch (NumberFormatException e) {
 			e.printStackTrace();
 			result.put("success", "false");
 			result.put("msg", "上传失败");
+			logger.info("时间："+date+"，出入库状态回写接口，出入库系统调用，调用失败！");
 		}
 		finally {
 			JSONArray jsonArray = new JSONArray();

src/main/resources/generatorConfig.xml

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