瀏覽代碼

修改问题提交

lvzhikai 4 年之前
父節點
當前提交
058a4e06ec
共有 2 個文件被更改,包括 5 次插入5 次删除
  1. 2 2
      pom.xml
  2. 3 3
      src/main/java/com/chinaitop/depot/unissoft/webservice/BasicWarehouseWebServiceImpl.java

+ 2 - 2
pom.xml

@@ -14,7 +14,7 @@
14
 	<parent>
14
 	<parent>
15
 		<groupId>org.springframework.boot</groupId>
15
 		<groupId>org.springframework.boot</groupId>
16
 		<artifactId>spring-boot-starter-parent</artifactId>
16
 		<artifactId>spring-boot-starter-parent</artifactId>
17
-		<version>2.1.2.RELEASE</version>
17
+		<version>2.0.4.RELEASE</version>
18
 		<relativePath/> <!-- lookup parent from repository -->
18
 		<relativePath/> <!-- lookup parent from repository -->
19
 	</parent>
19
 	</parent>
20
 
20
 
@@ -22,7 +22,7 @@
22
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
22
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
23
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
24
 		<java.version>1.8</java.version>
24
 		<java.version>1.8</java.version>
25
-		<spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
25
+		<spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
26
 	</properties>
26
 	</properties>
27
 
27
 
28
 	<dependencies>
28
 	<dependencies>

+ 3 - 3
src/main/java/com/chinaitop/depot/unissoft/webservice/BasicWarehouseWebServiceImpl.java

@@ -40,7 +40,7 @@ public class BasicWarehouseWebServiceImpl implements BasicWarehouseWebService {
40
 		Map<String, Object> result = new HashMap<String, Object>();
40
 		Map<String, Object> result = new HashMap<String, Object>();
41
 
41
 
42
 		String date = ParameterUtil.getSysDateTime();
42
 		String date = ParameterUtil.getSysDateTime();
43
-		logger.info("时间:"+date+",出入库状态回写接口,出入库系统调用,接收参数是:"+json);
43
+//		logger.info("时间:"+date+",出入库状态回写接口,出入库系统调用,接收参数是:"+json);
44
 		if (null != json) {
44
 		if (null != json) {
45
 			/* 将获取到的json串转换成json数组 */
45
 			/* 将获取到的json串转换成json数组 */
46
 			JSONArray json_array = JSONArray.parseArray(json);
46
 			JSONArray json_array = JSONArray.parseArray(json);
@@ -93,7 +93,7 @@ public class BasicWarehouseWebServiceImpl implements BasicWarehouseWebService {
93
 	public void ls(Map<String, Object> param) {
93
 	public void ls(Map<String, Object> param) {
94
 		//查询当前货位状态
94
 		//查询当前货位状态
95
 		BasicWarehouse warehouse = warehouseMapper.selectByPrimaryKey(Integer.parseInt(param.get("wareId")+""));
95
 		BasicWarehouse warehouse = warehouseMapper.selectByPrimaryKey(Integer.parseInt(param.get("wareId")+""));
96
-		if (null != warehouse && "3".equals(warehouse.getCrkStatus())) {
96
+		if (null != warehouse && "3".equals(warehouse.getCrkStatus()) && !ParameterUtil.isequal(warehouse.getCrkStatus(),param.get("status"))) {
97
 			//查询封仓时间
97
 			//查询封仓时间
98
 			List<Map<String, String>> map = warehouseMapper.queryFcdate(param);
98
 			List<Map<String, String>> map = warehouseMapper.queryFcdate(param);
99
 			if (null != map && map.size() > 0) {
99
 			if (null != map && map.size() > 0) {
@@ -115,7 +115,7 @@ public class BasicWarehouseWebServiceImpl implements BasicWarehouseWebService {
115
 	public void yg(Map<String, Object> param) {
115
 	public void yg(Map<String, Object> param) {
116
 		//查询当前货位状态
116
 		//查询当前货位状态
117
 		BasicTank warehouse = tankMapper.selectByPrimaryKey(param.get("wareId")+"");
117
 		BasicTank warehouse = tankMapper.selectByPrimaryKey(param.get("wareId")+"");
118
-		if (null != warehouse && "3".equals(warehouse.getCrkStatus())) {
118
+		if (null != warehouse && "3".equals(warehouse.getCrkStatus()) && !ParameterUtil.isequal(warehouse.getCrkStatus(),param.get("status"))) {
119
 			//查询封仓时间
119
 			//查询封仓时间
120
 			List<Map<String, String>> map = warehouseMapper.queryFcdate(param);
120
 			List<Map<String, String>> map = warehouseMapper.queryFcdate(param);
121
 			if (null != map && map.size() > 0) {
121
 			if (null != map && map.size() > 0) {