Merge remote-tracking branch 'origin/master' into master

src/main/java/com/chinaitop/DepotQualitycheckApplication.java

@@ -1,6 +1,5 @@
 package com.chinaitop;
 
-import com.github.pagehelper.autoconfigure.PageHelperAutoConfiguration;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -11,7 +10,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @EnableEurekaClient
 @EnableFeignClients
 @EnableDiscoveryClient
-@SpringBootApplication(exclude = PageHelperAutoConfiguration.class)//配置mybatis的配置文件使用，否则报多个分页插件
+@SpringBootApplication//配置mybatis的配置文件使用，否则报多个分页插件
 @MapperScan(basePackages = {"com.chinaitop.depot.*.mapper"})
 public class DepotQualitycheckApplication {
 

src/main/java/com/chinaitop/depot/storage/controller/StorageDumpController.java

@@ -8,6 +8,8 @@ import java.util.Map;
 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;
@@ -34,6 +36,7 @@ import io.swagger.annotations.ApiOperation;
 @RequestMapping(value="/StorageDumpController")
 @Api(value= "StorageDumpController", description = "转储管理控制类")
 public class StorageDumpController {
+	final static Logger logger = LoggerFactory.getLogger(StorageDump.class);
 
 	@Resource
 	private StorageDumpService storageDumpService;
@@ -190,6 +193,7 @@ public class StorageDumpController {
 				parameters[8] = 1 + ""; //1:新增；2：修改；3：删除
 				crk_adr = crk_ip+url;
 				String str = createKC.createKC("ChangeGrainAttribute", crk_adr, parameters);
+				logger.info("时间："+ ParameterUtil.getSysDateTime()+"，转储提交调用出入库接口，地址是："+crk_adr+"，参数："+parameters+"，返回结果："+str);
 				/* *****end******/
 				//只有成功生成库存才可以保存，否则不可以保存
 				if ("true".equals(str)) {
@@ -204,6 +208,7 @@ public class StorageDumpController {
 
 			modelMap.put("status", "success");
 		} catch (Exception e) {
+			logger.info("时间："+ ParameterUtil.getSysDateTime()+"，转储提交调用出入库接口报错了");
 			e.printStackTrace();
 			modelMap.put("status", "error");
 			modelMap.put("msg", "保存失败，库存同步异常，请联系管理员！");