|
@@ -224,6 +224,25 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
|
|
|
if(orderType == 12 || orderType == 13){
|
|
|
dealWithLxOrder(map, stringObjectMap);
|
|
|
}
|
|
|
+ //根据线路ID去判断
|
|
|
+ try {
|
|
|
+ if(oneMap.get("lineId") != null) {
|
|
|
+ Map<String,Object> lastLineMap = tmstruckWeightResultMapper.getLineName(DataChange.dataToBigDecimal(oneMap.get("lineId")));
|
|
|
+ String lastLineName = lastLineMap.get("lastLineName").toString();
|
|
|
+ BigDecimal segmentSqe = DataChange.dataToBigDecimal(lastLineMap.get("segmentSqe"));
|
|
|
+ TmstruckWeightResult tmsTruckWeightResult1 = tmstruckWeightResultMapper.selectByPrimaryKey(tmstruckWeightResult.getWeightTaskResultId());
|
|
|
+ if("计毛".equals(lastLineName) && tmstruckWeightResult != null && tmstruckWeightResult.getResultGrossWeight() != null
|
|
|
+ && tmsTruckWeightResult1.getGrossSegmentSqe().compareTo(segmentSqe) == 0) {
|
|
|
+ omstruckOrderMapper.updateOrderStatus(DataChange.dataToBigDecimal(oneMap.get("orderIds")));
|
|
|
+ }
|
|
|
+ if("计皮".equals(lastLineName) && tmstruckWeightResult != null && tmstruckWeightResult.getResultTareWeight() != null
|
|
|
+ && tmsTruckWeightResult1.getTareSegmentSqe().compareTo(segmentSqe) == 0) {
|
|
|
+ omstruckOrderMapper.updateOrderStatus(DataChange.dataToBigDecimal(oneMap.get("orderIds")));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
//推送数据
|
|
|
try {
|
|
|
utilsService.pushMesToWebsocket((String) oneMap.get("capacityNumber"), "计量");
|