|
@@ -1548,7 +1548,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
|
|
|
//String uniqueCode = productType + BizConstant.MARK_SEPARATOR + order.getOrderNo() + BizConstant.MARK_SEPARATOR + task.getTaskNo() + BizConstant.MARK_SEPARATOR + bom.getBomAlias() + BizConstant.MARK_SEPARATOR + orderMeterialInfo.get("bomBatchNo") + BizConstant.MARK_SEPARATOR + String.format("%06d", tWorkpiece.getSerialNo());
|
|
|
//例:子盘ID&夹具ID&订单编号&任务编号&产品代号&产品类型&产品批次号&节点ID
|
|
|
//上料前未确认子盘夹具
|
|
|
- if(order.getIsMes()==1){
|
|
|
+ if(order.getIsMes()!=null){
|
|
|
|
|
|
try{
|
|
|
ObjectMapper objectMapper = new ObjectMapper();
|
|
@@ -1897,7 +1897,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
|
|
|
difference+=dif;
|
|
|
}
|
|
|
}
|
|
|
- useTimeMap.put(ip,difference);
|
|
|
+ useTimeMap.put(ip,difference > 0 ? difference : 0);
|
|
|
|
|
|
});
|
|
|
|
|
@@ -1983,7 +1983,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
|
|
|
double value2 = Double.parseDouble(min);
|
|
|
|
|
|
// 计算差值
|
|
|
- double difference = value1 - value2;
|
|
|
+ double difference = (value1 - value2) > 0 ? (value1 - value2) : value1;
|
|
|
|
|
|
|
|
|
double result = ((difference+beforeUseTime) / (60));
|