Yangwl
/
lanju-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

巡检检验任务修复

Browse Source
master
zhaoxiaolin 3 months ago
parent fd5e4d25e5
commit da076a23fc
8 changed files with 72 additions and 37 deletions
Show Stats Download Patch File Download Diff File

2
op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineAssistantQtyServiceImpl.java
Unescape Escape View File

@ -132,6 +132,7 @@ public class MesLineAssistantQtyServiceImpl implements IMesLineAssistantQtyServi
return dtos;
}
//班长10000150 车间组长10000168 物料员10000478 药管员10000271 配药员10000155
// (-中午休息1.5h)
mesLineAssistant.setPostId("10000150");
BigDecimal monitorHour = mesLineAssistantQtyMapper.getKqHourMaps(mesLineAssistant);
mesLineAssistant.setPostId("10000168");
@ -151,6 +152,7 @@ public class MesLineAssistantQtyServiceImpl implements IMesLineAssistantQtyServi
allProHours = allProHours.add(hours);
}
for(MesLineAssistantQtyVo assistdto:dtos){
//工时占比
assistdto.setHourRatio(new BigDecimal(assistdto.getProductHour())

2
op-modules/op-mes/src/main/resources/mapper/mes/MesLineAssistantQtyMapper.xml
Unescape Escape View File

@ -125,7 +125,7 @@
<select id="getKqHourMaps" resultType="java.math.BigDecimal">
select sum(
case when DATEDIFF ( hour , stime.time0 , etime.time0 ) is null then '0'
else DATEDIFF ( hour , stime.time0 , etime.time0 ) end) productHour
else DATEDIFF ( hour , stime.time0 , etime.time0 )-1.5 end) productHour
from lanju_op_cloud.dbo.sys_user su
left join lanju_op_cloud.dbo.sys_user_post sup on su.user_id = sup.user_id
left join (

71
op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckUnqualified.java
Unescape Escape View File

@ -27,53 +27,75 @@ public class QcCheckUnqualified extends BaseEntity {
*/
@Excel(name = "归属任务编码")
private String taskId;
@Excel(name = "订单编码")
private String orderNo;
@Excel(name = "批次号")
private String incomeBatchNo;
@Excel(name = "质检项目")
private String checkName;
@Excel(name = "物料编码")
private String materialCode;
@Excel(name = "物料名称")
private String materialName;
@Excel(name = "订单数量")
private String quality;
@Excel(name = "单位")
private String unit;
@Excel(name = "不合格数量")
private String noOkQuality;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "不合格时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private String checkTime;
@Excel(name = "不合格描述")
private String attr1;
@Excel(name = "oa流程ID")
private String requestid;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "发起OA时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
@Excel(name = "状态",readConverterExp = "0=未处理,1=已提交,2=提交失败")
private String startOaStatus;
/**
* 0未处理
*/
@Excel(name = "0未处理")
//@Excel(name = "0未处理")
private String status;
/**
* 下一节点编码
*/
@Excel(name = "下一节点编码")
//@Excel(name = "下一节点编码")
private String nextNodeCode;
/**
* 下一节点名称
*/
@Excel(name = "下一节点名称")
//@Excel(name = "下一节点名称")
private String nextNodeName;
/**
* 预留字段1
*/
@Excel(name = "预留字段1")
private String attr1;
/**
* 预留字段2
*/
@Excel(name = "预留字段2")
//@Excel(name = "预留字段2")
private String attr2;
/**
* 预留字段3
*/
@Excel(name = "预留字段3")
//@Excel(name = "预留字段3")
private String attr3;
/**
* 预留字段4
*/
@Excel(name = "预留字段4")
//@Excel(name = "预留字段4")
private String attr4;
/**
* 工厂编码
*/
@Excel(name = "工厂编码")
//@Excel(name = "工厂编码")
private String factoryCode;
/**
@ -87,35 +109,26 @@ public class QcCheckUnqualified extends BaseEntity {
private String type;
private String checkType;
private String checkName;
private String checkNo;
private String incomeBatchNo;
private String orderNo;
private String materialCode;
private String materialName;
private String quality;
private String unit;
private String supplierCode;
private String supplierName;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "检验时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
//@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
//@Excel(name = "检验时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date incomeTime;
private String checkLoc;
private String checkStatus;
private String checkManCode;
private String checkManName;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "检验时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private String checkTime;
private String checkResult;
private String requestid;
private String typeCode;
private String sampleQuality;
private String noOkQuality;
private String startManCode;
private String startManName;
private Date startTime;
private String startOaStatus;
private String startOaMsg;
private String materialType;//来料类别
private String materialFrom;//物料来源

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

@ -230,6 +230,7 @@ public class QcCheckReportIncomeServiceImpl implements IQcCheckReportIncomeServi
dto.setProjectRuleName(projectRuleName0.replace("[",""));
}
}
dto.setRuleName(dto.getRuleName().replaceAll("\\[.*?\\]", ""));
}
return dtos;
@ -241,4 +242,13 @@ public class QcCheckReportIncomeServiceImpl implements IQcCheckReportIncomeServi
return null;
}
public static String removeBracketedContent(String input) {
return input.replaceAll("\\[.*?\\]", "");
}
public static void main(String[] args) {
String input = "这是一个 [示例] 字符串，包含 [需要去除] 的内容。";
String result = removeBracketedContent(input);
System.out.println(result);
}
}

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

@ -242,6 +242,7 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService
QcCheckTaskIncome qcCheckTaskIncome = new QcCheckTaskIncome();
qcCheckTaskIncome.setCheckType(qcCheckTaskProduce.getCheckType());
qcCheckTaskIncome.setMaterialCode(qcCheckTaskProduce.getMaterialCode());
qcCheckTaskIncome.setCheckLoc(qcCheckTaskProduce.getCheckLoc());
users = qcCheckTaskIncomeMapper.getCheckUserBelongLine(qcCheckTaskIncome);
if(CollectionUtils.isEmpty(users)){
users = qcCheckTaskIncomeMapper.getUserByCheckType(qcCheckTaskProduce.getCheckType());

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

@ -773,8 +773,10 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
String avgArrayStr = avgdto.getQuality().replace("[", "")
.replace("]", "")
.replace("\"", "")
.replace("\"", "")
.replaceAll("[\\u4e00-\\u9fa5]+", "")
.replace("/", "");
.replace("/", "")
.replace("／", "");
List<String> avgArray = Arrays.asList(avgArrayStr.split(","));
if(avgArray.size()==0){
continue;
@ -786,8 +788,9 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
addVal = addVal.add(new BigDecimal(avgVal.substring(2)));
s+=1;
}else{
if(StringUtils.isNotBlank(removeBeforeColon(avgVal))){
addVal = addVal.add(new BigDecimal(removeBeforeColon(avgVal)));
String avgstr = removeBeforeColon(avgVal);
if(StringUtils.isNotBlank(avgstr)){
addVal = addVal.add(new BigDecimal(avgstr));
s+=1;
}
}
@ -797,7 +800,12 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
avg = addVal.divide(new BigDecimal(s), 2, BigDecimal.ROUND_HALF_UP);
}
result.put("mcode" + m + "Pcode" + n, avg);
detailResult.put("mcode" + m + "Pcode" + n + "Detail", avgArrayStr.replace(",", "\n"));
detailResult.put("mcode" + m + "Pcode" + n + "Detail",
avgArrayStr.replace(",", "\n").replace("1:","")
.replace("2:","")
.replace("3:","")
.replace("4:","")
);
} else {
result.put("mcode" + m + "Pcode" + n, "0.00");
detailResult.put("mcode" + m + "Pcode" + n + "Detail", "");

1
op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml
Unescape Escape View File

@ -436,6 +436,7 @@
select
pow.factory_code factoryCode,
pow.workorder_code workorderCode,
pow.workorder_name checkLoc,
pow.product_code materialCode,
pow.product_name materialName,
pow.quantity_split quality,

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

@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectQcCheckUnqualifiedList" parameterType="QcCheckUnqualified" resultType="com.op.quality.domain.QcCheckUnqualified">
select qcu.id,qcu.task_id taskId,qcu.status,qcu.next_node_code nextNodeCode,qcu.next_node_name nextNodeName,qcu.remark,
select qcu.id,qcu.task_id taskId,qcu.status,qcu.next_node_code nextNodeCode,qcu.next_node_name nextNodeName,qcu.remark attr1,
qcu.create_time createTime,qcu.start_oa_status startOaStatus,qcu.start_oa_msg startOaMsg,qcu.requestid requestid,
qcu.start_time startTime,
qct.check_type checkType,qtn.check_name checkName,qct.check_no checkNo,qct.income_batch_no incomeBatchNo,qct.order_no orderNo,

Write Preview
Loading…
Cancel
Save