出入库状态更新功能完善

pom.xml

@@ -23,35 +23,8 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
 		<spring-cloud.version>Finchley.M8</spring-cloud.version>
-		
-		<!-- swagger2markup添加 -->
-<!-- 		<swagger2markup.version>1.2.0</swagger2markup.version> -->
-<!--         <asciidoctor.input.directory>${project.basedir}/src/docs/asciidoc</asciidoctor.input.directory> -->
-<!--         <swagger.output.dir>${project.build.directory}/swagger</swagger.output.dir> -->
-<!--         <swagger.snippetOutput.dir>${project.build.directory}/asciidoc/snippets</swagger.snippetOutput.dir> -->
-<!--         <generated.asciidoc.directory>${project.build.directory}/asciidoc/generated</generated.asciidoc.directory> -->
-<!--         <asciidoctor.html.output.directory>${project.build.directory}/asciidoc/html</asciidoctor.html.output.directory> -->
-<!--         <asciidoctor.pdf.output.directory>${project.build.directory}/asciidoc/pdf</asciidoctor.pdf.output.directory> -->
-<!--         <swagger.input>${swagger.output.dir}/swagger.json</swagger.input> -->
-<!--         <jackson.version>2.9.6</jackson.version> -->
-	</properties>
 
-	<!-- swagger2markup添加 -->
-<!-- 	<pluginRepositories> -->
-<!--         <pluginRepository> -->
-<!--             <id>jcenter-snapshots</id> -->
-<!--             <name>jcenter</name> -->
-<!--             <url>http://oss.jfrog.org/artifactory/oss-snapshot-local/</url> -->
-<!--         </pluginRepository> -->
-<!--         <pluginRepository> -->
-<!--             <id>jcenter-releases</id> -->
-<!--             <name>jcenter</name> -->
-<!--             <url>http://jcenter.bintray.com</url> -->
-<!--             <snapshots> -->
-<!--                 <enabled>false</enabled> -->
-<!--             </snapshots> -->
-<!--         </pluginRepository> -->
-<!--     </pluginRepositories> -->
+	</properties>
 
 	<dependencies>
 		<dependency>

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

@@ -10,6 +10,8 @@ import java.util.UUID;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -54,6 +56,7 @@ import io.swagger.annotations.ApiOperation;
 @Api(value= "BasicStorehouseController", description = "仓房管理控制类")
 public class BasicStorehouseController {
 
+	final static Logger logger = LoggerFactory.getLogger(BasicStorehouse.class);
 	@Resource
 	private BasicStorehouseService basicStorehouseService;
 	@Resource
@@ -572,4 +575,28 @@ public class BasicStorehouseController {
         map.put("StorehouseName", StorehouseName);
         return map;
     }
+
+    @RequestMapping(value="/getSptStorehouseHttpService", method = RequestMethod.POST)
+	@ApiOperation(value="接收市局企业端传过来的仓房数据")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "json_str", value = "单位数据json格式字符串", paramType = "form")
+	})
+	public Map<String, Object> getSptStorehouseHttpService(String json_str, HttpServletRequest request) {
+
+		logger.info("时间："+ParameterUtil.getSysDateTime()+"，企业端传过来的仓房数据是："+json_str);
+
+		Map<String, Object> modelMap = new HashMap<>();
+
+		try {
+			basicStorehouseService.getSptStorehouse(json_str);
+			modelMap.put("status", "0");
+			modelMap.put("msg", "传输成功");
+		} catch (Exception e) {
+			modelMap.put("status", "1");
+			modelMap.put("msg", "库级解析或保存失败！");
+			e.printStackTrace();
+		}
+
+		return modelMap;
+	}
 }

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

@@ -10,6 +10,8 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang.ObjectUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,6 +25,8 @@ import com.chinaitop.depot.basic.model.BasicTankExample;
 import com.chinaitop.depot.basic.service.BasicTankService;
 import com.chinaitop.depot.common.service.ImportServiceImpl;
 import com.chinaitop.utils.BasicTankDataSynchronization;
+import com.chinaitop.utils.ParameterUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 
@@ -43,6 +47,8 @@ import io.swagger.annotations.ApiOperation;
 @Api(value= "BasicTankController", description = "油罐管理控制类")
 public class BasicTankController {
 
+	final static Logger logger = LoggerFactory.getLogger(BasicTank.class);
+
     @Resource
     private BasicTankService basicTankService;
 
@@ -272,4 +278,28 @@ public class BasicTankController {
   			}
   		}
   	}
+
+  	@RequestMapping(value="/getSptTankHttpService", method = RequestMethod.POST)
+	@ApiOperation(value="接收市局企业端传过来的油罐数据")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "json_str", value = "单位数据json格式字符串", paramType = "form")
+	})
+	public Map<String, Object> getSptTankHttpService(String json_str, HttpServletRequest request) {
+
+		logger.info("时间："+ParameterUtil.getSysDateTime()+"，企业端传过来的油罐数据是："+json_str);
+
+		Map<String, Object> modelMap = new HashMap<>();
+
+		try {
+			basicTankService.getSptTank(json_str);
+			modelMap.put("status", "0");
+			modelMap.put("msg", "传输成功");
+		} catch (Exception e) {
+			modelMap.put("status", "1");
+			modelMap.put("msg", "库级解析或保存失败！");
+			e.printStackTrace();
+		}
+
+		return modelMap;
+	}
 }

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

@@ -21,11 +21,13 @@ import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.basic.model.BasicStorehouse;
+import com.chinaitop.depot.basic.model.BasicTank;
 import com.chinaitop.depot.basic.model.BasicWarehouse;
 import com.chinaitop.depot.basic.model.BasicWarehouseExample;
 import com.chinaitop.depot.basic.model.BasicWarehouseExample.Criteria;
 import com.chinaitop.depot.basic.model.BasicWarehouseVO;
 import com.chinaitop.depot.basic.service.BasicStorehouseService;
+import com.chinaitop.depot.basic.service.BasicTankService;
 import com.chinaitop.depot.basic.service.BasicWarehouseService;
 import com.chinaitop.depot.basic.service.impl.BasicStorehouseServiceImpl;
 import com.chinaitop.depot.basic.service.impl.BasicWarehouseServiceImpl;
@@ -59,17 +61,10 @@ public class BasicWarehouseController {
 	
 	@Resource
 	private BasicStorehouseService basicStorehouseService;
-	/**
-	 * 按条件查询 货位 信息
-	 * 
-	 * @param pageNum 页数
-	 * @param pageSize 每页显示的条数
-	 * @param storehouseId 仓房号
-	 * @param warehouseName 货位名
-	 * @param graindepotId 单位ID
-	 * @param libraryType 粮库类型
-	 * @return
-	 */
+
+	@Resource
+	private BasicTankService basicTankService;
+
 	@RequestMapping(value="/getList", method = RequestMethod.GET)
 	@ApiOperation(value="查询 货位 信息列表", notes = "查询 货位 信息列表，支持分页")
 	@ApiImplicitParams({
@@ -395,8 +390,13 @@ public class BasicWarehouseController {
 		Map<String, Object> param = null;
 
 		String date = ParameterUtil.getSysDateTime();
-		logger.info("时间："+date+"，出入库状态回写接口，封仓调用，接收参数是："+wareJson);
+		logger.info("时间："+date+"，出入库状态回写接口，封仓和成品粮出入库调用，接收参数是："+wareJson);
 
+		/**
+		 * 逻辑说明：本接口只有库级平台粮情专卡提交和成品粮出入库的分仓保管账菜单录入数据提交时调用
+		 * 1、粮情专卡提交调用时：只有一个状态，那就是3(封仓状态)，处理时直接修改成3
+		 * 2、成品粮分仓保管账菜单入库数据提交时调用：直接修改为入库状态2，或者出库状态4
+		 */
 		try {
 			if (null != wareJson) {
 				/* 将获取到的json串转换成json数组 */
@@ -418,20 +418,52 @@ public class BasicWarehouseController {
 					String orgId = ObjectUtils.toString(json_object.get("orgId"), "");
 					//货位状态值1空仓,2入库中,3封仓,4出库中,9其它
 					String status = ObjectUtils.toString(json_object.get("crk_status"), "");
+					//业务类型：2代表油罐，1代表仓房
+					String ywlx = ObjectUtils.toString(json_object.get("ywlx"), "");
 
 					//修改数据
 					param = new HashMap<String, Object>();
 					param.put("wareId", Integer.parseInt(wareId));
 					param.put("orgId", Integer.parseInt(orgId));
 					param.put("status", status);
-					basicWarehouseService.updateWareStatus(param);
+					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);
+					}
 					logger.info("时间："+date+"，出入库状态回写接口，封仓调用，调用成功！");
 				}
 			}
-		} catch (NumberFormatException e) {
+		} catch (Exception e) {
 			logger.info("时间："+date+"，出入库状态回写接口，封仓调用，调用失败！");
 			e.printStackTrace();
 		}
 	}
 
+	@RequestMapping(value="/getSptWarehouseHttpService", method = RequestMethod.POST)
+	@ApiOperation(value="接收市局企业端传过来的货位数据")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "json_str", value = "单位数据json格式字符串", paramType = "form")
+	})
+	public Map<String, Object> getSptWarehouseHttpService(String json_str, HttpServletRequest request) {
+
+		logger.info("时间："+ParameterUtil.getSysDateTime()+"，企业端传过来的货位数据是："+json_str);
+
+		Map<String, Object> modelMap = new HashMap<>();
+
+		try {
+			basicWarehouseService.getSptWarehouse(json_str);
+			modelMap.put("status", "0");
+			modelMap.put("msg", "传输成功");
+		} catch (Exception e) {
+			modelMap.put("status", "1");
+			modelMap.put("msg", "库级解析或保存失败！");
+			e.printStackTrace();
+		}
+
+		return modelMap;
+	}
 }

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

@@ -46,4 +46,9 @@ public interface BasicWarehouseMapper {
 	 * @return
 	 */
 	List<Map<String, Object>> queryFenCangData(Map<String, Object> param);
+
+	/**
+	 * 修改原粮粮情卡归档状态
+	 */
+	void updateLqkGd(Map<String, Object> param);
 }

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

@@ -607,4 +607,19 @@
 	</if>
 	)  datalist order by accept_date desc
   </select>
+  <!-- 修改原粮的粮情卡为归档状态 -->
+  <select id="updateLqkGd" parameterType="java.util.Map">
+    update storage_grain_card 
+    set sfgd='0',gdsj=sysdate 
+    where 1=1 and sfgd='1'
+    <if test="storehouseId != null">
+	and storehouse_id=#{storehouseId}
+	</if>
+	<if test="wareId != null">
+	and warehouse_id=#{wareId}
+	</if>
+	<if test="orgId != null">
+	and org_id=#{orgId}
+	</if>
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/basic/service/BasicStorehouseService.java

@@ -120,4 +120,10 @@ public interface BasicStorehouseService {
 
 	//更新单位表中仓房数和货位数
 	public void editOrgChNum(Integer orgId) throws Exception;
+
+	/**
+	 * 接收市局企业端传过来的仓房数据
+	 * @param json_str 仓房数据json字符串
+	 */
+	public void getSptStorehouse(String json_str) throws Exception;
 }

src/main/java/com/chinaitop/depot/basic/service/BasicTankService.java

@@ -45,4 +45,17 @@ public interface BasicTankService {
 	 * @throws Exception
 	 */
 	Map<String, Object> updateOrSave(HttpServletRequest request, String tankJson, Integer orgId) throws Exception;
+
+	/**
+	 * 接收市局企业端传过来的油罐数据
+	 * @param json_str 油罐数据json字符串
+	 * @throws Exception
+	 */
+	void getSptTank(String json_str) throws Exception;
+
+	/**
+	 * 修改油罐的出入库状态
+	 * @param tankJson
+	 */
+	void updateTankCrkStatus(BasicTank basicTank) throws Exception;
 }

src/main/java/com/chinaitop/depot/basic/service/BasicWarehouseService.java

@@ -75,4 +75,11 @@ public interface BasicWarehouseService {
 	 */
 	void saveOrUpdate(BasicStorehouse basicStorehouse, String warehouseJson) throws Exception;
 
+	/**
+	 * 接收市局企业端传过来的货位数据
+	 * @param json_str 货位数据json字符串
+	 * @throws Exception
+	 */
+	void getSptWarehouse(String json_str) throws Exception;
+
 }

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

@@ -713,4 +713,10 @@ public class BasicStorehouseServiceImpl implements BasicStorehouseService {
 		basic.editOrgCfAndHwNum(map);
 	}
 
+	@Override
+	public void getSptStorehouse(String json_str) throws Exception {
+		JSONObject house_json = JSONObject.parseObject(json_str);
+		String orgId = ObjectUtils.toString(house_json.get("org_Id"), "");
+	}
+
 }

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

@@ -434,4 +434,16 @@ public class BasicTankServiceImpl implements BasicTankService {
 
         return modelMap;
 	}
+
+	@Override
+	public void getSptTank(String json_str) throws Exception {
+		JSONObject tank_json = JSONObject.parseObject(json_str);
+		String orgId = ObjectUtils.toString(tank_json.get("org_Id"), "");
+	}
+
+	@Override
+	public void updateTankCrkStatus(BasicTank basicTank) throws Exception {
+
+        basicTankMapper.updateByPrimaryKeySelective(basicTank);
+	}
 }

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

@@ -7,8 +7,10 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
+import org.apache.commons.lang.ObjectUtils;
 import org.springframework.stereotype.Service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.basic.mapper.BasicWarehouseMapper;
 import com.chinaitop.depot.basic.model.BasicStorehouse;
 import com.chinaitop.depot.basic.model.BasicWarehouse;
@@ -163,4 +165,10 @@ public class BasicWarehouseServiceImpl implements BasicWarehouseService {
 		}
 	}
 
+	@Override
+	public void getSptWarehouse(String json_str) throws Exception {
+		JSONObject ware_json = JSONObject.parseObject(json_str);
+		String orgId = ObjectUtils.toString(ware_json.get("org_Id"), "");
+	}
+
 }

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

@@ -125,6 +125,13 @@ public class BasicWarehouseWebServiceImpl implements BasicWarehouseWebService {
 							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 {//粮食仓房下的货位
 						//查询当前货位状态
@@ -149,6 +156,12 @@ public class BasicWarehouseWebServiceImpl implements BasicWarehouseWebService {
 						} 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);
+							}
 						}
 					}