|
|
|
@ -5,9 +5,7 @@ package org.nl.wms.basedata_manage.service.impl; |
|
|
|
import cn.hutool.core.date.DateUtil; |
|
|
|
import cn.hutool.core.util.ObjectUtil; |
|
|
|
import cn.hutool.core.util.StrUtil; |
|
|
|
import com.alibaba.fastjson.JSON; |
|
|
|
import com.alibaba.fastjson.JSONArray; |
|
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|
|
|
@ -16,14 +14,12 @@ import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.nl.common.domain.query.PageQuery; |
|
|
|
import org.nl.common.utils.IdUtil; |
|
|
|
import org.nl.common.utils.SecurityUtils; |
|
|
|
import org.nl.wms.basedata_manage.service.IStructattrService; |
|
|
|
import org.nl.wms.basedata_manage.service.IMdPbClassstandardService; |
|
|
|
import org.nl.wms.basedata_manage.service.StructrelamaterialService; |
|
|
|
import org.nl.wms.basedata_manage.service.dao.Structattr; |
|
|
|
import org.nl.wms.basedata_manage.service.dao.Structrelamaterial; |
|
|
|
import org.nl.wms.basedata_manage.service.dao.mapper.StructattrMapper; |
|
|
|
import org.nl.wms.basedata_manage.service.dao.mapper.StructrelamaterialMapper; |
|
|
|
import org.nl.wms.basedata_manage.service.dto.QueryPageParam; |
|
|
|
import org.springframework.data.domain.Pageable; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
@ -42,71 +38,26 @@ public class StructrelamaterialServiceImpl extends ServiceImpl<Structrelamateria |
|
|
|
|
|
|
|
@Resource |
|
|
|
private StructrelamaterialMapper structrelamaterialMapper; |
|
|
|
@Autowired |
|
|
|
private IMdPbClassstandardService iMdPbClassstandardService; |
|
|
|
|
|
|
|
@Override |
|
|
|
public IPage<Structrelamaterial> pageQuery(Map whereJson, PageQuery page) { |
|
|
|
String search = (String) whereJson.get("search"); |
|
|
|
String material_type_id = (String) whereJson.get("material_type_id"); |
|
|
|
String class_idStr = (String) whereJson.get("class_idStr"); |
|
|
|
QueryPageParam param = new QueryPageParam(); |
|
|
|
//处理物料当前节点的所有子节点
|
|
|
|
if (!StrUtil.isEmpty(material_type_id)) { |
|
|
|
//map.put("material_type_id", material_type_id);
|
|
|
|
//String classIds = classstandardService.getChildIdStr(material_type_id);
|
|
|
|
//map.put("classIds", classIds);
|
|
|
|
if (StrUtil.isNotEmpty(material_type_id)) { |
|
|
|
List<String> classIds = iMdPbClassstandardService.getAllChildIdSet(material_type_id); |
|
|
|
param.setClassIds(classIds); |
|
|
|
} else if (ObjectUtil.isNotEmpty(class_idStr)) { |
|
|
|
// String classIds = classstandardService.getAllChildIdStr(class_idStr);
|
|
|
|
//map.put("classIds", classIds);
|
|
|
|
List<String> classIds = iMdPbClassstandardService.getAllChildIdSet(class_idStr); |
|
|
|
param.setClassIds(classIds); |
|
|
|
} |
|
|
|
QueryPageParam param = new QueryPageParam(); |
|
|
|
param.setSearch(search); |
|
|
|
|
|
|
|
param.setSect_id((String) whereJson.get("sect_id")); |
|
|
|
param.setStor_id((String) whereJson.get("stor_id")); |
|
|
|
IPage<Structrelamaterial> pages = new Page<>(page.getPage() + 1, page.getSize()); |
|
|
|
return structrelamaterialMapper.pagequery(pages, param); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<Structrelamaterial> queryAll(Map whereJson) { |
|
|
|
List<Structrelamaterial> list = structrelamaterialMapper.selectList(null); |
|
|
|
return list; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Structrelamaterial findById(String id) { |
|
|
|
return structrelamaterialMapper.selectById(id); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Structrelamaterial findByCode(String code) { |
|
|
|
return structrelamaterialMapper.selectById(code); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void create(Structrelamaterial dto) { |
|
|
|
String currentUserId = SecurityUtils.getCurrentUserId(); |
|
|
|
String nickName = SecurityUtils.getCurrentNickName(); |
|
|
|
String now = DateUtil.now(); |
|
|
|
|
|
|
|
dto.setMaterset_id(IdUtil.getStringId()); |
|
|
|
dto.setSet_id(currentUserId); |
|
|
|
dto.setSet_name(nickName); |
|
|
|
dto.setSet_time(now); |
|
|
|
|
|
|
|
structrelamaterialMapper.insert(dto); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void update(Structrelamaterial dto) { |
|
|
|
String currentUserId = SecurityUtils.getCurrentUserId(); |
|
|
|
String nickName = SecurityUtils.getCurrentNickName(); |
|
|
|
String now = DateUtil.now(); |
|
|
|
|
|
|
|
dto.setSet_id(currentUserId); |
|
|
|
dto.setSet_name(nickName); |
|
|
|
dto.setSet_time(now); |
|
|
|
|
|
|
|
structrelamaterialMapper.updateById(dto); |
|
|
|
return structrelamaterialMapper.pagequery(pages, param, param.getClassIds()); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@ -117,38 +68,37 @@ public class StructrelamaterialServiceImpl extends ServiceImpl<Structrelamateria |
|
|
|
|
|
|
|
@Override |
|
|
|
public void insertSet(Map whereJson) { |
|
|
|
/* Long currentUserId = SecurityUtils.getCurrentUserId(); |
|
|
|
String nickName = SecurityUtils.getNickName(); |
|
|
|
String currentUserId = SecurityUtils.getCurrentUserId(); |
|
|
|
String nickName = SecurityUtils.getCurrentNickName(); |
|
|
|
String now = DateUtil.now(); |
|
|
|
WQLObject mater = WQLObject.getWQLObject("ST_IVT_StructRelaMaterial"); |
|
|
|
|
|
|
|
String sect_id = (String) whereJson.get("sect_id"); |
|
|
|
ArrayList<HashMap> class_rows = (ArrayList<HashMap>) whereJson.get("class_rows"); |
|
|
|
|
|
|
|
for (int i = 0; i < class_rows.size(); i++) { |
|
|
|
HashMap<String, String> class_row = class_rows.get(i); |
|
|
|
JSONObject material_set = mater.query("sect_id = '" + sect_id + "' AND material_type_id = '" + class_row.get("class_id") + "'") |
|
|
|
.uniqueResult(0); |
|
|
|
LambdaQueryWrapper<Structrelamaterial> lambda = new LambdaQueryWrapper(); |
|
|
|
lambda.eq(Structrelamaterial::getSect_id,sect_id); |
|
|
|
lambda.eq(Structrelamaterial::getMaterial_type_id,class_row.get("class_id")); |
|
|
|
Structrelamaterial material_set = structrelamaterialMapper.selectOne(lambda); |
|
|
|
if (material_set != null) { |
|
|
|
HashMap<String, String> update_map = new HashMap<>(); |
|
|
|
update_map.put("set_id", currentUserId + ""); |
|
|
|
update_map.put("set_name", nickName); |
|
|
|
update_map.put("set_time", now); |
|
|
|
mater.update(update_map, "sect_id = '" + sect_id + "' AND material_type_id = '" + class_row.get("class_id") + "'"); |
|
|
|
material_set.setSet_id(currentUserId); |
|
|
|
material_set.setSet_name(nickName); |
|
|
|
material_set.setSet_time(now); |
|
|
|
material_set.setSect_id(sect_id); |
|
|
|
material_set.setMaterial_type_id(class_row.get("class_id")); |
|
|
|
structrelamaterialMapper.updateById(material_set); |
|
|
|
} else { |
|
|
|
JSONObject jo = new JSONObject(); |
|
|
|
jo.put("sect_id", sect_id); |
|
|
|
jo.put("material_type_id", class_row.get("class_id")); |
|
|
|
jo.put("set_id", currentUserId + ""); |
|
|
|
jo.put("set_name", nickName); |
|
|
|
jo.put("set_time", now); |
|
|
|
mater.insert(jo); |
|
|
|
material_set = new Structrelamaterial(); |
|
|
|
material_set.setSet_id(currentUserId); |
|
|
|
material_set.setSet_name(nickName); |
|
|
|
material_set.setSet_time(now); |
|
|
|
material_set.setSect_id(sect_id); |
|
|
|
material_set.setMaterial_type_id(class_row.get("class_id")); |
|
|
|
material_set.setMaterset_id(IdUtil.getStringId()); |
|
|
|
structrelamaterialMapper.insert(material_set); |
|
|
|
} |
|
|
|
}*/ |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public void delSet(Map whereJson) { |
|
|
|
String materset_id = (String) whereJson.get("materset_id"); |
|
|
|
structrelamaterialMapper.deleteById(materset_id); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
