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

Merge remote-tracking branch 'origin/master'

Browse Source
master
陈恒杰 2 months ago
parent b0ec800699 ad3deabd83
commit 439ad9bc23
3 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File

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

@ -139,9 +139,9 @@ public class MesLineAssistantQtyServiceImpl implements IMesLineAssistantQtyServi
mesLineAssistant.setPostId("10000168");
BigDecimal groupleadeHour = mesLineAssistantQtyMapper.getKqHourMaps(mesLineAssistant);
groupleadeHour = groupleadeHour.subtract(new BigDecimal("1.5"));
mesLineAssistant.setPostId("10000478");
BigDecimal materialHour= mesLineAssistantQtyMapper.getKqHourMaps(mesLineAssistant);
materialHour = materialHour.subtract(new BigDecimal("1.5"));
// mesLineAssistant.setPostId("10000478");
// BigDecimal materialHour= mesLineAssistantQtyMapper.getKqHourMaps(mesLineAssistant);
// materialHour = materialHour.subtract(new BigDecimal("1.5"));
mesLineAssistant.setPostId("10000271");
BigDecimal pillMgrHour = mesLineAssistantQtyMapper.getKqHourMaps(mesLineAssistant);
pillMgrHour = pillMgrHour.subtract(new BigDecimal("1.5"));
@ -192,17 +192,17 @@ public class MesLineAssistantQtyServiceImpl implements IMesLineAssistantQtyServi
// .multiply(new BigDecimal("0.01"))
// .toString()
// );
//物料员用人=当日人数*工时占比
assistdto.setMaterialQty(new BigDecimal(manQty.getMaterialQty()==null?0L:manQty.getMaterialQty())
.multiply(new BigDecimal(assistdto.getHourRatio().replace("%","")))
.multiply(new BigDecimal("0.01"))
.toString()
);
//物料员工时=当日考勤小时数*工时占比
assistdto.setMaterialHour(
materialHour.multiply(new BigDecimal(assistdto.getHourRatio().replace("%","")))
.multiply(new BigDecimal("0.01"))
.toString());
// //物料员用人=当日人数*工时占比
// assistdto.setMaterialQty(new BigDecimal(manQty.getMaterialQty()==null?0L:manQty.getMaterialQty())
// .multiply(new BigDecimal(assistdto.getHourRatio().replace("%","")))
// .multiply(new BigDecimal("0.01"))
// .toString()
// );
// //物料员工时=当日考勤小时数*工时占比
// assistdto.setMaterialHour(
// materialHour.multiply(new BigDecimal(assistdto.getHourRatio().replace("%","")))
// .multiply(new BigDecimal("0.01"))
// .toString());
//药管员用人=当日人数*工时占比
assistdto.setPillMgrQty(new BigDecimal(manQty.getPillMgrQty()==null?0L:manQty.getPillMgrQty())
.multiply(new BigDecimal(assistdto.getHourRatio().replace("%","")))
@ -255,15 +255,17 @@ public class MesLineAssistantQtyServiceImpl implements IMesLineAssistantQtyServi
assistdto0.setProductHour(allProHours.toString());
assistdto0.setHourRatio("100%");
assistdto0.setAssistHourSum(
monitorHour.add(groupleadeHour).add(materialHour).add(pillMgrHour).add(pillDisHour).toString()
monitorHour.add(groupleadeHour)
//.add(materialHour)
.add(pillMgrHour).add(pillDisHour).toString()
);
MesLineAssistantQty manQty = assistMaps.get(mesLineAssistant.getProductDateStr());
assistdto0.setMonitorQty(manQty.getMonitorQty()==null?"0":manQty.getMonitorQty().toString());
assistdto0.setMonitorHour(monitorHour==null?"0":monitorHour.toString());
assistdto0.setGroupleaderQty(manQty.getGroupleaderQty()==null?"0":String.valueOf(dtos.size()));
assistdto0.setGroupLeaderHour(groupleadeHour==null?"0":allProHours.toString());
assistdto0.setMaterialQty(manQty.getMaterialQty()==null?"0":manQty.getMaterialQty().toString());
assistdto0.setMaterialHour(materialHour==null?"0":materialHour.toString());
//assistdto0.setMaterialQty(manQty.getMaterialQty()==null?"0":manQty.getMaterialQty().toString());
//assistdto0.setMaterialHour(materialHour==null?"0":materialHour.toString());
assistdto0.setPillMgrQty(manQty.getPillMgrQty()==null?"0":manQty.getPillMgrQty().toString());
assistdto0.setPillMgrHour(pillMgrHour==null?"0":pillMgrHour.toString());
assistdto0.setPillDisQty(manQty.getPillDisQty()==null?"0":manQty.getPillDisQty().toString());

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

@ -863,6 +863,9 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
//给折线图取上下限制
if(qcStaticTable.getProjectNoArray()!=null){
qcStaticTable.setProjectNo(qcStaticTable.getProjectNoArray()[0]);
// QcStaticTable upandown = new QcStaticTable();//qcStaticTableMapper.getUpAndDown(qcStaticTable);
// upandown.setUpperDiff(new BigDecimal(0));
// upandown.setDownDiff(new BigDecimal(260));
QcStaticTable upandown = qcStaticTableMapper.getUpAndDown(qcStaticTable);
if(upandown!=null){
@ -889,7 +892,11 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
if (avgdto != null) {
String avgArrayStr = avgdto.getQuality().replace("[", "")
.replace("]", "")
.replace("\"", "");
.replace("\"", "")
.replace("1:", "")
.replace("2:", "")
.replace("3:", "")
.replace("4:", "");
List<String> avgArray0 = Arrays.asList(avgArrayStr.split(","));
List<String> avgArray = new ArrayList<>();
for(String avg:avgArray0){
@ -2082,6 +2089,9 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
dtos.add(dto1);
}
Map<String,String> dtoHz = new HashMap<>();
return dtos;
}

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

@ -953,8 +953,8 @@
<select id="getCpkTypeList" resultType="com.op.quality.domain.QcCPKInfo">
select qpcu.material_code cpkType,
sdd.dict_label cpkTypeName,
qpcu.up_val upperDiff,
qpcu.down_val downDiff
ISNULL(qpcu.up_val,0) upperDiff,
ISNULL(qpcu.down_val,0) downDiff
from qc_product_cpk_upDown qpcu
left join lanju_op_cloud.dbo.sys_dict_data sdd on sdd.dict_type = 'qms_category'
and sdd.dict_value = qpcu.material_code

Write Preview
Loading…
Cancel
Save