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