杨万里 3 months ago
commit 9cb9725e4d

@ -3,6 +3,7 @@ package com.op.device.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.op.device.domain.query.EquOrderMonthQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -96,4 +97,15 @@ public class EquOrderController extends BaseController {
public AjaxResult remove(@PathVariable String[] orderIds) {
return equOrderService.deleteEquOrderByOrderIds(orderIds);
}
/**
* ID
*/
@GetMapping("/month-list")
@Log(title = "查询月设备工单", businessType = BusinessType.QUERY)
public AjaxResult deviceOrderMonthList(EquOrderMonthQuery query) {
return AjaxResult.success(equOrderService.getDeviceOrderMonthList(query));
}
}

@ -0,0 +1,49 @@
package com.op.device.domain.query;
/**
* remark
*
* @author 019117
* @date
*/
public class EquOrderMonthQuery {
/**
*
* **/
private String equipmentCode;
/**
*
* **/
private String queryDate;
/**
*
* **/
private String planType;
public String getEquipmentCode() {
return equipmentCode;
}
public void setEquipmentCode(String equipmentCode) {
this.equipmentCode = equipmentCode;
}
public String getQueryDate() {
return queryDate;
}
public void setQueryDate(String queryDate) {
this.queryDate = queryDate;
}
public String getPlanType() {
return planType;
}
public void setPlanType(String planType) {
this.planType = planType;
}
}

@ -0,0 +1,88 @@
package com.op.device.domain.vo;
/**
* remark
*
* @author 019117
* @date
*/
public class EquOrderMonthVo {
/**
*
* **/
private String checkItem;
/**
*
* **/
private String checkDate;
/**
*
* **/
private String checkResult;
/**
*
* **/
private String checkPerson;
/**
*
* **/
private String confirmPerson;
/**
*
* **/
private String exceptionHandle;
public String getCheckItem() {
return checkItem;
}
public void setCheckItem(String checkItem) {
this.checkItem = checkItem;
}
public String getCheckDate() {
return checkDate;
}
public void setCheckDate(String checkDate) {
this.checkDate = checkDate;
}
public String getCheckResult() {
return checkResult;
}
public void setCheckResult(String checkResult) {
this.checkResult = checkResult;
}
public String getCheckPerson() {
return checkPerson;
}
public void setCheckPerson(String checkPerson) {
this.checkPerson = checkPerson;
}
public String getConfirmPerson() {
return confirmPerson;
}
public void setConfirmPerson(String confirmPerson) {
this.confirmPerson = confirmPerson;
}
public String getExceptionHandle() {
return exceptionHandle;
}
public void setExceptionHandle(String exceptionHandle) {
this.exceptionHandle = exceptionHandle;
}
}

@ -6,6 +6,8 @@ import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.device.domain.EquOrder;
import com.op.device.domain.Equipment;
import com.op.device.domain.dto.PDADTO;
import com.op.device.domain.query.EquOrderMonthQuery;
import com.op.device.domain.vo.EquOrderMonthVo;
import org.apache.ibatis.annotations.Mapper;
/**
@ -192,4 +194,9 @@ public interface EquOrderMapper {
String getGroupLine(String auxiliaryEquipmentCode);
String selectEquipment(String equipmentCode);
/**
* ID
*/
List<EquOrderMonthVo> getDeviceOrderMonthList(EquOrderMonthQuery query);
}

@ -4,6 +4,8 @@ import java.util.List;
import com.op.common.core.web.domain.AjaxResult;
import com.op.device.domain.EquOrder;
import com.op.device.domain.query.EquOrderMonthQuery;
import com.op.device.domain.vo.EquOrderMonthVo;
/**
* Service
@ -59,4 +61,10 @@ public interface IEquOrderService {
* @return
*/
public int deleteEquOrderByOrderId(String orderId);
/**
* ID
*/
List<EquOrderMonthVo> getDeviceOrderMonthList(EquOrderMonthQuery query);
}

@ -20,6 +20,8 @@ import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.security.utils.SecurityUtils;
import com.op.device.domain.*;
import com.op.device.domain.query.EquOrderMonthQuery;
import com.op.device.domain.vo.EquOrderMonthVo;
import com.op.device.mapper.*;
import com.op.system.api.RemoteOpenService;
import com.op.system.api.domain.SysNoticeGroup;
@ -565,6 +567,17 @@ public class EquOrderServiceImpl implements IEquOrderService {
return equOrderMapper.deleteEquOrderByOrderId(orderId);
}
/**
* ID
*
* @param query
*/
@Override
@DS("#header.poolName")
public List<EquOrderMonthVo> getDeviceOrderMonthList(EquOrderMonthQuery query) {
return equOrderMapper.getDeviceOrderMonthList(query);
}
/**
*
*

@ -544,4 +544,40 @@
and del_flag = '0'
</select>
<select id="getDeviceOrderMonthList" parameterType="com.op.device.domain.query.EquOrderMonthQuery" resultType="com.op.device.domain.vo.EquOrderMonthVo">
SELECT
os.standard_name checkItem,
STRING_AGG(DATEPART(day, eo.create_time), ',') WITHIN GROUP (ORDER BY eo.create_time) AS checkDate,
STRING_AGG(os.detail_reach, ',') WITHIN GROUP (ORDER BY eo.create_time) AS checkResult,
'' checkPerson,
'' confirmPerson
FROM
equ_order eo
LEFT JOIN equ_order_standard os ON eo.order_code = os.order_code
WHERE
eo.equipment_code = #{equipmentCode}
AND CONVERT(varchar(7), eo.create_time, 120) = #{queryDate}
AND eo.update_time IS NOT NULL
AND eo.plan_type = #{planType}
GROUP BY
os.standard_name
UNION ALL
SELECT
'other' checkItem,
STRING_AGG(DATEPART(day, eo.create_time), ',') WITHIN GROUP (ORDER BY eo.create_time) AS checkDate,
'' checkResult,
STRING_AGG ( eo.plan_person_name, ',' ) WITHIN GROUP ( ORDER BY eo.create_time ) AS checkPerson,
STRING_AGG ( eo.plan_person_name, ',' ) WITHIN GROUP ( ORDER BY eo.create_time ) AS confirmPerson
FROM
equ_order eo
WHERE
eo.equipment_code = #{equipmentCode}
AND CONVERT(varchar(7), eo.create_time, 120) = #{queryDate}
AND eo.update_time IS NOT NULL
AND eo.plan_type = #{planType}
GROUP BY
eo.plan_type
</select>
</mapper>

@ -185,6 +185,8 @@ public class BaseMonitorInfo extends BaseEntity {
private String addressCode;
private String connCode;
/**
*
*/
@ -471,6 +473,14 @@ public class BaseMonitorInfo extends BaseEntity {
this.addressCode = addressCode;
}
public String getConnCode() {
return connCode;
}
public void setConnCode(String connCode) {
this.connCode = connCode;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

@ -95,12 +95,12 @@ public class BaseMonitorInfo1ServiceImpl implements IBaseMonitorInfo1Service {
}
//判断该通信地址是否已绑定设备
if (StringUtils.isNotBlank(baseMonitorInfo.getAddressCode())) {
if (StringUtils.isNotBlank(baseMonitorInfo.getConnCode())) {
BaseMonitorInfo temp = new BaseMonitorInfo();
temp.setAddressCode(baseMonitorInfo.getAddressCode());
temp.setConnCode(baseMonitorInfo.getConnCode());
List<BaseMonitorInfo> list = baseMonitorInfoMapper.selectBaseMonitorInfoList(temp);
if (!CollectionUtils.isEmpty(list)){
throw new ServiceException("通信地址重复:" + baseMonitorInfo.getAddressCode());
throw new ServiceException("通信地址重复:" + baseMonitorInfo.getConnCode());
}
}

@ -251,7 +251,6 @@ public class RecordDnbInstantServiceImpl implements IRecordDnbInstantService {
public void getNhEnergyDetail() {
Map<String,String> params = new HashMap<>();
params.put("dateType","mi15");
//获取当前时间的前后5分钟
Date nowTime = DateUtils.getNowDate();
String startTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,DateUtils.addMinutes(nowTime,-20));
String endTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,DateUtils.addMinutes(nowTime,-10));
@ -329,7 +328,7 @@ public class RecordDnbInstantServiceImpl implements IRecordDnbInstantService {
try {
for (RecordDnbInstant item : list) {
BaseMonitorInfo temp = new BaseMonitorInfo();
temp.setAddressCode(item.getMonitorId());
temp.setConnCode(item.getMonitorId());
List<BaseMonitorInfo> BaseList = baseMonitorInfoMapper.selectBaseMonitorInfoList(temp);
for (BaseMonitorInfo base : BaseList) {
item.setMonitorId(base.getMonitorId());
@ -389,7 +388,7 @@ public class RecordDnbInstantServiceImpl implements IRecordDnbInstantService {
dnb.setRecordTime(new Date());
dnb.setPointTime(removeLeadingZeros(DateUtils.parseDateToStr("HH",DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,startTime))));
BaseMonitorInfo temp = new BaseMonitorInfo();
temp.setAddressCode(dnb.getMonitorId());
temp.setConnCode(dnb.getMonitorId());
List<BaseMonitorInfo> BaseList = baseMonitorInfoMapper.selectBaseMonitorInfoList(temp);
for (BaseMonitorInfo base : BaseList) {
dnb.setMonitorId(base.getMonitorId());

@ -38,13 +38,14 @@
<result property="roomName" column="room_name"/>
<result property="physicalCode" column="physical_code"/>
<result property="addressCode" column="address_code"/>
<result property="connCode" column="conn_code"/>
</resultMap>
<sql id="selectBaseMonitorInfoVo">
select objid, parent_id, monitor_id, monitor_name, monitor_addr, monitor_type, monitor_status,
collect_device_id, ancestors, grade, build_id, subentry_id, business_id, meter_type_id,
meter_id, correct_value, pt, ct, is_ammeter, is_key_monitor, is_circuit, dept_id, user_id,
create_by, create_time, update_by, update_time, public_share_type,monitor_hierarchy,room_code,room_name,physical_code,address_code from base_monitor_info
create_by, create_time, update_by, update_time, public_share_type,monitor_hierarchy,room_code,room_name,physical_code,address_code, conn_code from base_monitor_info
</sql>
<select id="selectBaseMonitorInfoList" parameterType="BaseMonitorInfo" resultMap="BaseMonitorInfoResult">
@ -79,6 +80,7 @@
<if test="physicalCode != null ">and physical_code = #{physicalCode}</if>
<if test="roomCode != null ">and room_code = #{roomCode}</if>
<if test="addressCode != null ">and address_code = #{addressCode}</if>
<if test="connCode != null ">and conn_code = #{connCode}</if>
</where>
</select>
@ -146,6 +148,7 @@
<if test="roomName != null">room_name,</if>
<if test="physicalCode != null">physical_code,</if>
<if test="addressCode != null">address_code,</if>
<if test="connCode != null">conn_code,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="parentId != null">#{parentId},</if>
@ -180,6 +183,7 @@
<if test="roomName != null">#{roomName},</if>
<if test="physicalCode != null">#{physicalCode},</if>
<if test="addressCode != null">#{addressCode},</if>
<if test="connCode != null">#{connCode},</if>
</trim>
</insert>
@ -218,6 +222,7 @@
<if test="roomName != null">room_name = #{roomName},</if>
<if test="physicalCode != null">physical_code = #{physicalCode},</if>
<if test="addressCode != null">address_code = #{addressCode},</if>
<if test="connCode != null">conn_code = #{connCode},</if>
</trim>
where objid = #{objid}
</update>

@ -7,6 +7,7 @@ import com.op.common.core.web.domain.AjaxResult;
import com.op.common.core.web.page.TableDataInfo;
import com.op.common.log.annotation.Log;
import com.op.common.log.enums.BusinessType;
import com.op.quality.domain.QcCheckSampleSignTask;
import com.op.quality.domain.QcCheckSampleTask;
import com.op.quality.domain.query.QcCheckSampleTaskQuery;
import com.op.quality.service.IQcCheckSampleTaskService;
@ -40,6 +41,25 @@ public class QcCheckSampleTaskController extends BaseController {
return getDataTable(list);
}
/**
*
* **/
@GetMapping("/signList")
public TableDataInfo signList(QcCheckSampleTaskQuery query) {
startPage();
List<QcCheckSampleSignTask> list = qcCheckSampleTaskService.selectQcCheckSampleSignTaskList(query);
return getDataTable(list);
}
/** 导出留样登记表 **/
@Log(title = "导出留样登记表", businessType = BusinessType.EXPORT)
@PostMapping("/sign/export")
public void exportQcCheckSampleSign(HttpServletResponse response, QcCheckSampleTaskQuery query) {
List<QcCheckSampleSignTask> list = qcCheckSampleTaskService.selectQcCheckSampleSignTaskList(query);
ExcelUtil<QcCheckSampleSignTask> util = new ExcelUtil<QcCheckSampleSignTask>(QcCheckSampleSignTask.class);
util.exportExcel(response, list, "导出留样登记表");
}
/** 获取待复检样品列表 **/
@GetMapping("/wait-list")

@ -0,0 +1,108 @@
package com.op.quality.domain;
import com.op.common.core.annotation.Excel;
import java.util.Date;
/**
* remark
*
* @author 019117
* @date
*/
public class QcCheckSampleSignTask {
/** id **/
private String id;
/** 排序 **/
private String sort;
/** 样品名称 **/
@Excel(name = "样品名称")
private String materialName;
/** 生产批号 **/
@Excel(name = "生产批号")
private String incomeBatchNo;
/** 留样时间 **/
@Excel(name = "留样时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date sampleTime;
/** 留样数量 **/
@Excel(name = "留样数量")
private String sampleNum;
/** 取样人 **/
@Excel(name = "取样人")
private String sampleUserName;
/*** 取样地点 ***/
@Excel(name = "取样地点")
private String gainSampleAddress;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getSort() {
return sort;
}
public void setSort(String sort) {
this.sort = sort;
}
public String getMaterialName() {
return materialName;
}
public void setMaterialName(String materialName) {
this.materialName = materialName;
}
public String getIncomeBatchNo() {
return incomeBatchNo;
}
public void setIncomeBatchNo(String incomeBatchNo) {
this.incomeBatchNo = incomeBatchNo;
}
public Date getSampleTime() {
return sampleTime;
}
public void setSampleTime(Date sampleTime) {
this.sampleTime = sampleTime;
}
public String getSampleNum() {
return sampleNum;
}
public void setSampleNum(String sampleNum) {
this.sampleNum = sampleNum;
}
public String getSampleUserName() {
return sampleUserName;
}
public void setSampleUserName(String sampleUserName) {
this.sampleUserName = sampleUserName;
}
public String getGainSampleAddress() {
return gainSampleAddress;
}
public void setGainSampleAddress(String gainSampleAddress) {
this.gainSampleAddress = gainSampleAddress;
}
}

@ -1,5 +1,6 @@
package com.op.quality.mapper;
import com.op.quality.domain.QcCheckSampleSignTask;
import com.op.quality.domain.QcCheckSampleTask;
import com.op.quality.domain.query.QcCheckSampleTaskQuery;
import org.apache.ibatis.annotations.Mapper;
@ -21,6 +22,11 @@ public interface QcCheckSampleTaskMapper {
* **/
List<QcCheckSampleTask> selectQcCheckSampleTaskList(QcCheckSampleTaskQuery query);
/**
*
* **/
List<QcCheckSampleSignTask> selectQcCheckSampleSignTaskList(QcCheckSampleTaskQuery query);
/**
*
* **/

@ -1,6 +1,7 @@
package com.op.quality.service;
import com.op.common.core.web.domain.AjaxResult;
import com.op.quality.domain.QcCheckSampleSignTask;
import com.op.quality.domain.QcCheckSampleTask;
import com.op.quality.domain.query.QcCheckSampleTaskQuery;
@ -18,6 +19,11 @@ public interface IQcCheckSampleTaskService {
* **/
List<QcCheckSampleTask> selectQcCheckSampleTaskList(QcCheckSampleTaskQuery query);
/**
*
* **/
List<QcCheckSampleSignTask> selectQcCheckSampleSignTaskList(QcCheckSampleTaskQuery query);
/**
*

@ -5,6 +5,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.core.web.domain.AjaxResult;
import com.op.quality.domain.QcCheckSampleSignTask;
import com.op.quality.domain.QcCheckSampleTask;
import com.op.quality.domain.query.QcCheckSampleTaskQuery;
import com.op.quality.mapper.QcCheckSampleTaskMapper;
@ -34,9 +35,6 @@ public class QcCheckSampleTaskServiceImpl implements IQcCheckSampleTaskService {
@Resource
private QcCheckSampleTaskMapper qcCheckSampleTaskMapper;
@Resource
private RemoteUserService remoteUserService;
/**
*
* **/
@ -46,6 +44,16 @@ public class QcCheckSampleTaskServiceImpl implements IQcCheckSampleTaskService {
return qcCheckSampleTaskMapper.selectQcCheckSampleTaskList(query);
}
/**
*
* **/
@Override
@DS("#header.poolName")
public List<QcCheckSampleSignTask> selectQcCheckSampleSignTaskList(QcCheckSampleTaskQuery query) {
return qcCheckSampleTaskMapper.selectQcCheckSampleSignTaskList(query);
}
/**
*
*

@ -1185,6 +1185,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
//首检后新增留样检验任务
//判断是否是首检
if("checkTypeSC".equals(qcCheckTaskIncome.getCheckType())){
QcCheckSampleTask sampleTask = new QcCheckSampleTask();
sampleTask.setId(IdUtils.fastSimpleUUID());
sampleTask.setMaterialName(qcCheckTaskIncome.getMaterialName());
@ -1194,9 +1195,6 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
if (incomeBatchNo.length() == 24){
//国内物料去掉前面时间
incomeBatchNo = incomeBatchNo.substring(8,24);
} else if (incomeBatchNo.length() < 24){
//海外物料取创建时间
incomeBatchNo = DateUtils.parseDateToStr(DateUtils.YYYYMMDD,qcCheckTaskIncome.getCreateTime());
}
}

@ -33,11 +33,10 @@
<select id="selectQcCheckSampleTaskList" parameterType="com.op.quality.domain.query.QcCheckSampleTaskQuery"
resultMap="QcCheckSampleDefectResult">
select
SELECT
id,
material_name,
income_batch_no,
work_order_code_sap,
sample_time,
sample_num,
sample_address,
@ -52,9 +51,7 @@
third_check_user_code,
third_check_user_name,
third_check_result,
third_check_time,
sample_user_code,
sample_user_name
third_check_time
from qc_check_sample_task task
<where>
<if test="queryDate != null and queryDate != ''">
@ -76,6 +73,40 @@
order by task.sample_time desc,task.create_time desc
</select>
<select id="selectQcCheckSampleSignTaskList" parameterType="com.op.quality.domain.query.QcCheckSampleTaskQuery"
resultType="com.op.quality.domain.QcCheckSampleSignTask">
SELECT
task.id,
task.material_name materialName,
task.income_batch_no incomeBatchNo,
task.sample_time sampleTime,
task.sample_num sampleNum,
task.sample_user_name sampleUserName,
o.workorder_name gainSampleAddress
FROM
qc_check_sample_task task
LEFT JOIN pro_order_workorder o ON o.workorder_code_sap = task.work_order_code_sap
<where>
<if test="queryDate != null and queryDate != ''">
and CONVERT(VARCHAR(10), task.create_time ,23) <![CDATA[ = ]]> #{queryDate}
</if>
<if test="startSampleDate != null and startSampleDate != ''">
and CONVERT(VARCHAR(10), task.sample_time ,23) <![CDATA[ >= ]]> #{startSampleDate}
</if>
<if test="endSampleDate != null and endSampleDate != ''">
and CONVERT(VARCHAR(10), task.sample_time ,23) <![CDATA[ <= ]]> #{endSampleDate}
</if>
<if test="materialName != null and materialName != ''">
and task.material_name like concat('%', #{materialName}, '%')
</if>
<if test="workOrderCodeSap != null and workOrderCodeSap != ''">
and task.work_order_code_sap = #{workOrderCodeSap}
</if>
</where>
ORDER BY
task.sample_time DESC, task.create_time DESC
</select>
<select id="selectQcWaitCheckSampleTaskList" parameterType="com.op.quality.domain.query.QcCheckSampleTaskQuery"
resultMap="QcCheckSampleDefectResult">

Loading…
Cancel
Save