|
@@ -2,7 +2,6 @@ package com.uas.eis.serviceImpl;
|
|
|
|
|
|
|
|
import com.uas.eis.core.config.SpObserver;
|
|
import com.uas.eis.core.config.SpObserver;
|
|
|
import com.uas.eis.dao.BaseDao;
|
|
import com.uas.eis.dao.BaseDao;
|
|
|
-import com.uas.eis.dto.DataCenter;
|
|
|
|
|
import com.uas.eis.entity.ErrorMessage;
|
|
import com.uas.eis.entity.ErrorMessage;
|
|
|
import com.uas.eis.exception.ApiSystemException;
|
|
import com.uas.eis.exception.ApiSystemException;
|
|
|
import com.uas.eis.sdk.entity.ApiResult;
|
|
import com.uas.eis.sdk.entity.ApiResult;
|
|
@@ -531,7 +530,7 @@ public class MESDataServiceImpl implements MESDataService {
|
|
|
barlist = BaseUtil.parseGridStoreToMaps(map.get("detail").toString());
|
|
barlist = BaseUtil.parseGridStoreToMaps(map.get("detail").toString());
|
|
|
}
|
|
}
|
|
|
//将数据存入一个表里面去操作
|
|
//将数据存入一个表里面去操作
|
|
|
- int id_ = baseDao.getSeqId("TEMP_PALLETS");
|
|
|
|
|
|
|
+ int id_ = baseDao.getSeqId("TEMP_PALLETS_SEQ");
|
|
|
List<String> sqls = new ArrayList<>();
|
|
List<String> sqls = new ArrayList<>();
|
|
|
sqls.add("insert into temp_pallets(id_,type_,weight_,palletno_) values("+id_+",'"+map.get("type")+"',"+map.get("weight")+",'"+map.get("kbcode")+"')");
|
|
sqls.add("insert into temp_pallets(id_,type_,weight_,palletno_) values("+id_+",'"+map.get("type")+"',"+map.get("weight")+",'"+map.get("kbcode")+"')");
|
|
|
for(Map<Object,Object> bar : barlist) {
|
|
for(Map<Object,Object> bar : barlist) {
|
|
@@ -539,10 +538,12 @@ public class MESDataServiceImpl implements MESDataService {
|
|
|
}
|
|
}
|
|
|
baseDao.execute(sqls);
|
|
baseDao.execute(sqls);
|
|
|
List<String> result = baseDao.callProcedureWithOut("SP_NEWPALLET", new Object[] {id_},new Integer[] {1}, new Integer[] {2,3});
|
|
List<String> result = baseDao.callProcedureWithOut("SP_NEWPALLET", new Object[] {id_},new Integer[] {1}, new Integer[] {2,3});
|
|
|
- if (result.size() != 0 && result.get(1) != null) {
|
|
|
|
|
- return ApiResponse.successRsp("0",requestId,"新增栈板成功",result.get(1));
|
|
|
|
|
|
|
+ baseDao.execute("delete from temp_pallets where id_=?",id_);
|
|
|
|
|
+ baseDao.execute("delete from temp_Loadingpallets where id_=?",id_);
|
|
|
|
|
+ if (result.size() != 0 && result.get(0) != null) {
|
|
|
|
|
+ return ApiResponse.successRsp("0","新增栈板成功",requestId,result.get(0));
|
|
|
}else{
|
|
}else{
|
|
|
- return ApiResponse.successRsp("0",requestId,"新增失败"+result.get(2));
|
|
|
|
|
|
|
+ return ApiResponse.successRsp("2001","新增失败,"+result.get(1),requestId);
|
|
|
}
|
|
}
|
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
@@ -564,7 +565,7 @@ public class MESDataServiceImpl implements MESDataService {
|
|
|
if(!StringUtil.hasText(map.get("weight")) ){
|
|
if(!StringUtil.hasText(map.get("weight")) ){
|
|
|
return "传参异常,总重量【weight】不能为空!";
|
|
return "传参异常,总重量【weight】不能为空!";
|
|
|
}
|
|
}
|
|
|
- if(!StringUtils.isNumeric(map.get("weight").toString())){
|
|
|
|
|
|
|
+ if(!(map.get("weight") instanceof Number)){
|
|
|
return "传参异常,总重量:"+map.get("weight")+",必须是数值类型!";
|
|
return "传参异常,总重量:"+map.get("weight")+",必须是数值类型!";
|
|
|
}
|
|
}
|
|
|
if(!StringUtil.hasText(map.get("kbcode"))){
|
|
if(!StringUtil.hasText(map.get("kbcode"))){
|
|
@@ -615,7 +616,7 @@ public class MESDataServiceImpl implements MESDataService {
|
|
|
barlist = BaseUtil.parseGridStoreToMaps(map.get("detail").toString());
|
|
barlist = BaseUtil.parseGridStoreToMaps(map.get("detail").toString());
|
|
|
}
|
|
}
|
|
|
//将数据存入一个表里面去操作
|
|
//将数据存入一个表里面去操作
|
|
|
- int id_ = baseDao.getSeqId("TEMP_PALLETS");
|
|
|
|
|
|
|
+ int id_ = baseDao.getSeqId("TEMP_PALLETS_SEQ");
|
|
|
List<String> sqls = new ArrayList<>();
|
|
List<String> sqls = new ArrayList<>();
|
|
|
sqls.add("insert into temp_pallets(id_,type_) values("+id_+",'"+map.get("type")+"')");
|
|
sqls.add("insert into temp_pallets(id_,type_) values("+id_+",'"+map.get("type")+"')");
|
|
|
for(Map<Object,Object> bar : barlist) {
|
|
for(Map<Object,Object> bar : barlist) {
|
|
@@ -623,10 +624,12 @@ public class MESDataServiceImpl implements MESDataService {
|
|
|
}
|
|
}
|
|
|
baseDao.execute(sqls);
|
|
baseDao.execute(sqls);
|
|
|
List<String> result = baseDao.callProcedureWithOut("SP_UNBINDPALLET", new Object[] {id_},new Integer[] {1}, new Integer[] {2,3});
|
|
List<String> result = baseDao.callProcedureWithOut("SP_UNBINDPALLET", new Object[] {id_},new Integer[] {1}, new Integer[] {2,3});
|
|
|
- if (result.size() != 0 && result.get(1) != null) {
|
|
|
|
|
- return ApiResponse.successRsp("0",requestId,"解绑栈板成功",result.get(1));
|
|
|
|
|
|
|
+ baseDao.execute("delete from temp_pallets where id_=?",id_);
|
|
|
|
|
+ baseDao.execute("delete from temp_Loadingpallets where id_=?",id_);
|
|
|
|
|
+ if (result.size() != 0 && result.get(0) != null) {
|
|
|
|
|
+ return ApiResponse.successRsp("0","解绑栈板成功",requestId,result.get(0));
|
|
|
}else{
|
|
}else{
|
|
|
- return ApiResponse.successRsp("0",requestId,"解绑失败"+result.get(2));
|
|
|
|
|
|
|
+ return ApiResponse.successRsp("2001","解绑失败,"+result.get(1),requestId);
|
|
|
}
|
|
}
|
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|