|
|
@@ -532,7 +532,7 @@ public class MESDataServiceImpl implements MESDataService {
|
|
|
//将数据存入一个表里面去操作
|
|
|
int id_ = baseDao.getSeqId("TEMP_PALLETS_SEQ");
|
|
|
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_,weight_,palletno_) values("+id_+","+map.get("weight")+",'"+map.get("kbcode")+"')");
|
|
|
for(Map<Object,Object> bar : barlist) {
|
|
|
sqls.add("insert into temp_Loadingpallets(id_,code_) values("+id_+",'"+bar.get("bcode")+"')");
|
|
|
}
|
|
|
@@ -571,12 +571,12 @@ public class MESDataServiceImpl implements MESDataService {
|
|
|
if(!StringUtil.hasText(map.get("kbcode"))){
|
|
|
return "传参异常,卡板编号【kbcode】不能为空!";
|
|
|
}
|
|
|
- if(!StringUtil.hasText(map.get("type"))){
|
|
|
+ /*if(!StringUtil.hasText(map.get("type"))){
|
|
|
return "传参异常,类型【type】不能为空!";
|
|
|
}
|
|
|
if(!"彩盒".equals(map.get("type").toString()) && !"外箱".equals(map.get("type").toString()) && !"中箱".equals(map.get("type").toString()) ){
|
|
|
return "传参异常,类型:"+map.get("type")+",只能是彩盒或中箱或外箱!";
|
|
|
- }
|
|
|
+ }*/
|
|
|
if(!StringUtil.hasText(map.get("detail"))){
|
|
|
return "传参异常,需装栈板明细【detail】不能为空!";
|
|
|
}
|
|
|
@@ -618,7 +618,7 @@ public class MESDataServiceImpl implements MESDataService {
|
|
|
//将数据存入一个表里面去操作
|
|
|
int id_ = baseDao.getSeqId("TEMP_PALLETS_SEQ");
|
|
|
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_) values("+id_+")");
|
|
|
for(Map<Object,Object> bar : barlist) {
|
|
|
sqls.add("insert into temp_Loadingpallets(id_,code_) values("+id_+",'"+bar.get("bcode")+"')");
|
|
|
}
|
|
|
@@ -645,9 +645,9 @@ public class MESDataServiceImpl implements MESDataService {
|
|
|
if(!StringUtil.hasText(map.get("type"))){
|
|
|
return "传参异常,类型【type】不能为空!";
|
|
|
}
|
|
|
- if(!"彩盒".equals(map.get("type").toString()) && !"外箱".equals(map.get("type").toString()) && !"栈板".equals(map.get("type").toString())){
|
|
|
+ /*if(!"彩盒".equals(map.get("type").toString()) && !"外箱".equals(map.get("type").toString()) && !"栈板".equals(map.get("type").toString())){
|
|
|
return "传参异常,类型:"+map.get("type")+",只能是彩盒或者外箱或者栈板!";
|
|
|
- }
|
|
|
+ }*/
|
|
|
if(!StringUtil.hasText(map.get("detail"))){
|
|
|
return "传参异常,需装栈板明细【detail】不能为空!";
|
|
|
}
|