|
|
|
@ -139,14 +139,16 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService
|
|
|
|
|
qcCheckTaskProduce.setDelFlag("0");
|
|
|
|
|
qcCheckTaskProduce.setTypeCode("produce");
|
|
|
|
|
List<QcCheckTaskProduce> dtos = qcCheckTaskProduceMapper.selectQcCheckTaskProduceList(qcCheckTaskProduce);
|
|
|
|
|
for(QcCheckTaskProduce dto:dtos){
|
|
|
|
|
List<String> batchnos = qcStaticTableMapper.getBatchnos(dto.getOrderNo());
|
|
|
|
|
String ordernoStr = "";
|
|
|
|
|
for (String batchno : batchnos) {
|
|
|
|
|
ordernoStr += batchno + ";";
|
|
|
|
|
if(StringUtils.isNotBlank(qcCheckTaskProduce.getCheckType()) && qcCheckTaskProduce.getCheckType().equals("checkTypeSCXJ")){
|
|
|
|
|
for(QcCheckTaskProduce dto:dtos){
|
|
|
|
|
List<String> batchnos = qcStaticTableMapper.getBatchnos(dto.getOrderNo());
|
|
|
|
|
String ordernoStr = "";
|
|
|
|
|
for (String batchno : batchnos) {
|
|
|
|
|
ordernoStr += batchno + ";";
|
|
|
|
|
}
|
|
|
|
|
;
|
|
|
|
|
dto.setIncomeBatchNo(ordernoStr);
|
|
|
|
|
}
|
|
|
|
|
;
|
|
|
|
|
dto.setIncomeBatchNo(ordernoStr);
|
|
|
|
|
}
|
|
|
|
|
return dtos;
|
|
|
|
|
}
|
|
|
|
|