|
|
|
@ -105,89 +105,90 @@ public class QcCheckTaskMarketServiceImpl implements IQcCheckTaskMarketService {
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
@DS("#header.poolName")
|
|
|
|
@DS("#header.poolName")
|
|
|
|
public int insertQcCheckTaskMarket(QcCheckTaskMarket qcCheckTaskMarket) {
|
|
|
|
public int insertQcCheckTaskMarket(QcCheckTaskMarket qcCheckTaskMarket) {
|
|
|
|
String factoryCode = "";
|
|
|
|
try {
|
|
|
|
if (StringUtils.isNotBlank(qcCheckTaskMarket.getFactoryCode())) {
|
|
|
|
String factoryCode = "";
|
|
|
|
DynamicDataSourceContextHolder.push("ds_" + qcCheckTaskMarket.getFactoryCode());
|
|
|
|
if (StringUtils.isNotBlank(qcCheckTaskMarket.getFactoryCode())) {
|
|
|
|
factoryCode = qcCheckTaskMarket.getFactoryCode();
|
|
|
|
DynamicDataSourceContextHolder.push("ds_" + qcCheckTaskMarket.getFactoryCode());
|
|
|
|
} else {
|
|
|
|
factoryCode = qcCheckTaskMarket.getFactoryCode();
|
|
|
|
//获取当前所选工厂
|
|
|
|
} else {
|
|
|
|
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
|
|
|
|
//获取当前所选工厂
|
|
|
|
String key = "#header.poolName";
|
|
|
|
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
|
|
|
|
factoryCode = request.getHeader(key.substring(8)).replace("ds_", "");
|
|
|
|
String key = "#header.poolName";
|
|
|
|
}
|
|
|
|
factoryCode = request.getHeader(key.substring(8)).replace("ds_", "");
|
|
|
|
|
|
|
|
}
|
|
|
|
qcCheckTaskMarket.setCreateTime(DateUtils.getNowDate());
|
|
|
|
|
|
|
|
|
|
|
|
qcCheckTaskMarket.setCreateTime(DateUtils.getNowDate());
|
|
|
|
String bpDD = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate());
|
|
|
|
|
|
|
|
int liushuiNum = qcCheckTaskMarketMapper.getTodayMaxNum(qcCheckTaskMarket);
|
|
|
|
String bpDD = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate());
|
|
|
|
String liushuiStr = String.format("%04d", liushuiNum);
|
|
|
|
int liushuiNum = qcCheckTaskMarketMapper.getTodayMaxNum(qcCheckTaskMarket);
|
|
|
|
|
|
|
|
String liushuiStr = String.format("%04d", liushuiNum);
|
|
|
|
String createBy = SecurityUtils.getUsername();
|
|
|
|
|
|
|
|
Date nowDate = DateUtils.getNowDate();
|
|
|
|
String createBy = SecurityUtils.getUsername();
|
|
|
|
|
|
|
|
Date nowDate = DateUtils.getNowDate();
|
|
|
|
qcCheckTaskMarket.setCheckNo(bpDD + liushuiStr);
|
|
|
|
|
|
|
|
|
|
|
|
qcCheckTaskMarket.setCheckNo(bpDD + liushuiStr);
|
|
|
|
/**取检测项**/
|
|
|
|
|
|
|
|
QcCheckTypeProject qctp = new QcCheckTypeProject();
|
|
|
|
/**取检测项**/
|
|
|
|
qctp.setTypeId(qcCheckTaskMarket.getCheckType());//生产过程检验
|
|
|
|
QcCheckTypeProject qctp = new QcCheckTypeProject();
|
|
|
|
qctp.setMaterialCode(qcCheckTaskMarket.getMaterialCode());//特性
|
|
|
|
qctp.setTypeId(qcCheckTaskMarket.getCheckType());//生产过程检验
|
|
|
|
/**qc_check_type_project**/
|
|
|
|
qctp.setMaterialCode(qcCheckTaskMarket.getMaterialCode());//特性
|
|
|
|
List<QcCheckTaskDetail> items = qcCheckTypeProjectMapper.getTPByTypeMaterial(qctp);
|
|
|
|
/**qc_check_type_project**/
|
|
|
|
if (CollectionUtils.isEmpty(items)) {
|
|
|
|
List<QcCheckTaskDetail> items = qcCheckTypeProjectMapper.getTPByTypeMaterial(qctp);
|
|
|
|
/**qc_material_group_detail**/
|
|
|
|
if (CollectionUtils.isEmpty(items)) {
|
|
|
|
QcMaterialGroupDetail group = qcMaterialGroupDetailMapper.getGroupByMaterial(qcCheckTaskMarket.getMaterialCode());
|
|
|
|
/**qc_material_group_detail**/
|
|
|
|
if (group == null) {
|
|
|
|
QcMaterialGroupDetail group = qcMaterialGroupDetailMapper.getGroupByMaterial(qcCheckTaskMarket.getMaterialCode());
|
|
|
|
return 0;//没有找到检测项目
|
|
|
|
if (group == null) {
|
|
|
|
}
|
|
|
|
return 0;//没有找到检测项目
|
|
|
|
qctp.setGroupId(group.getGroupId());//共性
|
|
|
|
}
|
|
|
|
items = qcCheckTypeProjectMapper.getTPByTypeGroup(qctp);
|
|
|
|
qctp.setGroupId(group.getGroupId());//共性
|
|
|
|
}
|
|
|
|
items = qcCheckTypeProjectMapper.getTPByTypeGroup(qctp);
|
|
|
|
|
|
|
|
}
|
|
|
|
/**qc_check_task_detail**/
|
|
|
|
|
|
|
|
if (CollectionUtils.isEmpty(items)) {
|
|
|
|
/**qc_check_task_detail**/
|
|
|
|
return 0;//没有找到检测项目
|
|
|
|
if (CollectionUtils.isEmpty(items)) {
|
|
|
|
}
|
|
|
|
return 0;//没有找到检测项目
|
|
|
|
|
|
|
|
}
|
|
|
|
/**qc_check_task**/
|
|
|
|
|
|
|
|
String beLongId = IdUtils.fastSimpleUUID();
|
|
|
|
/**qc_check_task**/
|
|
|
|
qcCheckTaskMarket.setRecordId(beLongId);
|
|
|
|
String beLongId = IdUtils.fastSimpleUUID();
|
|
|
|
qcCheckTaskMarket.setFactoryCode(factoryCode);
|
|
|
|
qcCheckTaskMarket.setRecordId(beLongId);
|
|
|
|
qcCheckTaskMarket.setCreateTime(nowDate);
|
|
|
|
qcCheckTaskMarket.setFactoryCode(factoryCode);
|
|
|
|
qcCheckTaskMarket.setTypeCode("market");//大检验节点
|
|
|
|
qcCheckTaskMarket.setCreateTime(nowDate);
|
|
|
|
/**qc_task_user start**/
|
|
|
|
qcCheckTaskMarket.setTypeCode("market");//大检验节点
|
|
|
|
if (StringUtils.isNotBlank(qcCheckTaskMarket.getCheckManName())) {
|
|
|
|
/**qc_task_user start**/
|
|
|
|
String checkManName = qcCheckTaskMarket.getCheckManName();
|
|
|
|
if (StringUtils.isNotBlank(qcCheckTaskMarket.getCheckManName())) {
|
|
|
|
String checkManCode = qcCheckTaskMarket.getCheckManCode();
|
|
|
|
String checkManName = qcCheckTaskMarket.getCheckManName();
|
|
|
|
qcCheckTaskMarket.setCheckManName("");
|
|
|
|
String checkManCode = qcCheckTaskMarket.getCheckManCode();
|
|
|
|
qcCheckTaskMarket.setCheckManCode("");
|
|
|
|
qcCheckTaskMarket.setCheckManName("");
|
|
|
|
String[] splitNames = checkManName.split(",");
|
|
|
|
qcCheckTaskMarket.setCheckManCode("");
|
|
|
|
String[] splitCodes = checkManCode.split(",");
|
|
|
|
String[] splitNames = checkManName.split(",");
|
|
|
|
List<QcCheckTaskUser> qcCheckTaskUserList = new ArrayList<>();
|
|
|
|
String[] splitCodes = checkManCode.split(",");
|
|
|
|
for (int i = 0; i < splitNames.length; i++) {
|
|
|
|
List<QcCheckTaskUser> qcCheckTaskUserList = new ArrayList<>();
|
|
|
|
QcCheckTaskUser qcCheckTaskUser = new QcCheckTaskUser();
|
|
|
|
for (int i = 0; i < splitNames.length; i++) {
|
|
|
|
qcCheckTaskUser.setCheckManName(splitNames[i]);
|
|
|
|
QcCheckTaskUser qcCheckTaskUser = new QcCheckTaskUser();
|
|
|
|
qcCheckTaskUser.setCheckManCode(splitCodes[i]);
|
|
|
|
qcCheckTaskUser.setCheckManName(splitNames[i]);
|
|
|
|
qcCheckTaskUser.setCheckNo(qcCheckTaskMarket.getCheckNo());
|
|
|
|
qcCheckTaskUser.setCheckManCode(splitCodes[i]);
|
|
|
|
qcCheckTaskUser.setBelongTo(beLongId);
|
|
|
|
qcCheckTaskUser.setCheckNo(qcCheckTaskMarket.getCheckNo());
|
|
|
|
qcCheckTaskUserList.add(qcCheckTaskUser);
|
|
|
|
qcCheckTaskUser.setBelongTo(beLongId);
|
|
|
|
}
|
|
|
|
qcCheckTaskUserList.add(qcCheckTaskUser);
|
|
|
|
//检验人插入
|
|
|
|
}
|
|
|
|
qcCheckTaskUserService.insertQcCheckTaskUserList(qcCheckTaskUserList);
|
|
|
|
//检验人插入
|
|
|
|
}
|
|
|
|
qcCheckTaskUserService.insertQcCheckTaskUserList(qcCheckTaskUserList);
|
|
|
|
/** 不良品数据插入 */
|
|
|
|
}
|
|
|
|
if(qcCheckTaskMarket.getNoOkQuality()==null){
|
|
|
|
/** 不良品数据插入 */
|
|
|
|
BigDecimal noOkQuality = new BigDecimal(0);
|
|
|
|
if(qcCheckTaskMarket.getNoOkQuality()==null){
|
|
|
|
List<QcCheckTaskDefect> defectList = qcCheckTaskMarket.getDefects();
|
|
|
|
BigDecimal noOkQuality = new BigDecimal(0);
|
|
|
|
if (!CollectionUtils.isEmpty(defectList)) {
|
|
|
|
List<QcCheckTaskDefect> defectList = qcCheckTaskMarket.getDefects();
|
|
|
|
for (QcCheckTaskDefect defect : defectList) {
|
|
|
|
if (!CollectionUtils.isEmpty(defectList)) {
|
|
|
|
defect.setBelongTo(beLongId);
|
|
|
|
for (QcCheckTaskDefect defect : defectList) {
|
|
|
|
//qcCheckTaskDefectService.insertQcCheckTaskDefect(defect);
|
|
|
|
defect.setBelongTo(beLongId);
|
|
|
|
noOkQuality = noOkQuality.add(defect.getNoOkQuality() == null ? new BigDecimal("0") : defect.getNoOkQuality());
|
|
|
|
//qcCheckTaskDefectService.insertQcCheckTaskDefect(defect);
|
|
|
|
}
|
|
|
|
noOkQuality = noOkQuality.add(defect.getNoOkQuality() == null ? new BigDecimal("0") : defect.getNoOkQuality());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
qcCheckTaskMarket.setNoOkQuality(noOkQuality);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
qcCheckTaskMarket.setNoOkQuality(noOkQuality);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// /**qc_sample_rule**/
|
|
|
|
// /**qc_sample_rule**/
|
|
|
|
// QcCheckTaskIncome sampQua = new QcCheckTaskIncome();
|
|
|
|
// QcCheckTaskIncome sampQua = new QcCheckTaskIncome();
|
|
|
|
// sampQua.setCheckType(qcCheckTaskMarket.getCheckType());
|
|
|
|
// sampQua.setCheckType(qcCheckTaskMarket.getCheckType());
|
|
|
|
@ -196,20 +197,23 @@ public class QcCheckTaskMarketServiceImpl implements IQcCheckTaskMarketService {
|
|
|
|
// if(StringUtils.isNotBlank(sampNum)){
|
|
|
|
// if(StringUtils.isNotBlank(sampNum)){
|
|
|
|
// qcCheckTaskMarket.setSampleQuality(new BigDecimal(sampNum));
|
|
|
|
// qcCheckTaskMarket.setSampleQuality(new BigDecimal(sampNum));
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
/**qc_check_task**/
|
|
|
|
/**qc_check_task**/
|
|
|
|
qcCheckTaskMarketMapper.insertQcCheckTaskMarket(qcCheckTaskMarket);
|
|
|
|
qcCheckTaskMarketMapper.insertQcCheckTaskMarket(qcCheckTaskMarket);
|
|
|
|
|
|
|
|
|
|
|
|
/**qc_check_task_detail**/
|
|
|
|
/**qc_check_task_detail**/
|
|
|
|
for (QcCheckTaskDetail item : items) {
|
|
|
|
for (QcCheckTaskDetail item : items) {
|
|
|
|
item.setRecordId(IdUtils.fastSimpleUUID());
|
|
|
|
item.setRecordId(IdUtils.fastSimpleUUID());
|
|
|
|
item.setBelongTo(beLongId);
|
|
|
|
item.setBelongTo(beLongId);
|
|
|
|
item.setCreateTime(nowDate);
|
|
|
|
item.setCreateTime(nowDate);
|
|
|
|
item.setCreateBy(createBy);
|
|
|
|
item.setCreateBy(createBy);
|
|
|
|
item.setFactoryCode(factoryCode);
|
|
|
|
item.setFactoryCode(factoryCode);
|
|
|
|
item.setStatus("N");
|
|
|
|
item.setStatus("N");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return qcCheckTaskDetailMapper.addBatch(items);
|
|
|
|
|
|
|
|
}finally {
|
|
|
|
|
|
|
|
DynamicDataSourceContextHolder.poll();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return qcCheckTaskDetailMapper.addBatch(items);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
|
ShiChangzhou
5 months ago