Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

oa

Browse Source
master
zhaoxiaolin 4 months ago
parent 393983493a
commit e33b29e349
8 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File

6
op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/ProLine.java → op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/ProLineDTO.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.op.system.api.domain.mes;
//线体成型机类
public class ProLine {
public class ProLineDTO {
private String key;
private String label;
private String lineCode;
@ -83,11 +83,11 @@ public class ProLine {
this.label = label;
}
public ProLine(String key, String label) {
public ProLineDTO(String key, String label) {
this.key = key;
this.label = label;
}
public ProLine() {
public ProLineDTO() {
}
}

2
op-modules/op-open/src/main/java/com/op/open/controller/OpenController.java
Unescape Escape View File

@ -115,6 +115,8 @@ public class OpenController extends BaseController {
if (StringUtils.isBlank(qcCheckTaskProduce.getFactoryCode())) {
return error("[factoryCode]不能为空");
}
//工单未
//添加检测任务
int flag = openService.insertQcCheckTaskProduce(qcCheckTaskProduce);
if(flag != -100){

2
op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
Unescape Escape View File

@ -99,6 +99,7 @@
</if>
and pow.del_flag = '0'
</where>
order by pow.product_date desc
</select>
<select id="getLevelWorkOrderList" parameterType="ProOrderWorkorder" resultMap="ProOrderWorkorderResult">
select pow.workorder_id, pow.workorder_code, pow.workorder_name, pow.order_id, pow.order_code,
@ -193,6 +194,7 @@
</if>
and pow.del_flag = '0'
</where>
order by pow.product_date desc
</select>
<select id="selectProOrderWorkorderByWorkorderId" parameterType="String" resultMap="ProOrderWorkorderResult">
select pow.workorder_id, pow.workorder_code, pow.workorder_name, pow.order_id, pow.order_code, pow.product_id,

9
op-modules/op-quality/src/main/java/com/op/quality/controller/QcStaticTableController.java
Unescape Escape View File

@ -7,15 +7,13 @@ import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import com.op.common.core.domain.ExcelCol;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.poi.ExcelMapUtil;
import com.op.quality.domain.*;
import com.op.system.api.domain.mes.ProLine;
import com.op.system.api.domain.mes.ProLineDTO;
import com.op.system.api.domain.quality.ChartDTO;
import com.op.system.api.domain.quality.ChartSeriesDTO;
import com.op.system.api.domain.quality.FactoryDto;
@ -25,8 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@ -36,7 +32,6 @@ import com.op.common.log.enums.BusinessType;
import com.op.common.security.annotation.RequiresPermissions;
import com.op.quality.service.IQcStaticTableService;
import com.op.common.core.web.controller.BaseController;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.core.utils.poi.ExcelUtil;
import com.op.common.core.web.page.TableDataInfo;
@ -654,7 +649,7 @@ public class QcStaticTableController extends BaseController {
}
@GetMapping("/getProdLineList")
public List<ProLine> getProdLineList() {
public List<ProLineDTO> getProdLineList() {
return qcStaticTableService.getProdLineList();
}

5
op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java
Unescape Escape View File

@ -1,11 +1,10 @@
package com.op.quality.mapper;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.op.quality.domain.*;
import com.op.system.api.domain.mes.ProLine;
import com.op.system.api.domain.mes.ProLineDTO;
import com.op.system.api.domain.quality.FactoryDto;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Mapper;
@ -113,7 +112,7 @@ public interface QcStaticTableMapper {
List<QcCPKInfo> getCpkTypeList(QcCPKInfo qcCPKInfo);
List<ProLine> getProdLineList();
List<ProLineDTO> getProdLineList();
@MapKey("yearMonth")
Map<String,QcStaticTable> getDLDataDay(QcCPKInfo qcCPKInfo);

4
op-modules/op-quality/src/main/java/com/op/quality/service/IQcStaticTableService.java
Unescape Escape View File

@ -8,7 +8,7 @@ import com.op.quality.domain.QcCPKInfo;
import com.op.quality.domain.QcCheckDetail;
import com.op.quality.domain.QcCheckType;
import com.op.quality.domain.QcStaticTable;
import com.op.system.api.domain.mes.ProLine;
import com.op.system.api.domain.mes.ProLineDTO;
import com.op.system.api.domain.quality.ChartSeriesDTO;
import com.op.system.api.domain.quality.FactoryDto;
@ -77,5 +77,5 @@ public interface IQcStaticTableService {
QcCPKInfo getTableCPKTitle(QcCPKInfo qcCPKInfo);
QcCPKInfo getTableCPKList(QcCPKInfo qcCPKInfo);
List<ProLine> getProdLineList();
List<ProLineDTO> getProdLineList();
}

5
op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java
Unescape Escape View File

@ -9,7 +9,6 @@ import java.time.LocalDate;
import java.time.Month;
import java.time.YearMonth;
import java.time.format.DateTimeFormatter;
import java.time.format.TextStyle;
import java.util.*;
import java.util.stream.Collectors;
@ -18,7 +17,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.utils.StringUtils;
import com.op.quality.domain.*;
import com.op.quality.mapper.QMSFileMapper;
import com.op.system.api.domain.mes.ProLine;
import com.op.system.api.domain.mes.ProLineDTO;
import com.op.system.api.domain.quality.ChartDTO;
import com.op.system.api.domain.quality.ChartSeriesDTO;
import com.op.system.api.domain.quality.FactoryDto;
@ -1353,7 +1352,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
@Override
@DS("#header.poolName")
public List<ProLine> getProdLineList() {
public List<ProLineDTO> getProdLineList() {
return qcStaticTableMapper.getProdLineList();
}

2
op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml
Unescape Escape View File

@ -938,7 +938,7 @@
and sdd.dict_value = qpcu.material_code
where qpcu.del_flag = '0' and qpcu.material_code = #{cpkType}
</select>
<select id="getProdLineList" resultType="com.op.system.api.domain.mes.ProLine">
<select id="getProdLineList" resultType="com.op.system.api.domain.mes.ProLineDTO">
select equipment_code lineCode,equipment_name lineName from base_equipment
where del_flag = '0' and equipment_type_code = 'equ_type_bzx'
</select>

Write Preview
Loading…
Cancel
Save