tijiao

src/main/java/com/steerinfo/dil/service/impl/TmstruckLoadResultServiceImpl.java

@@ -213,7 +213,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         //装货时查询是否含有净重
         Integer netWeight = tmstruckUnloadResultMapper.getNetWeightByTotalId(resultTotalId);
         if(orderType == 11 || orderType == 15 || orderType == 16){
-            //判断是否有装货实绩
+            //判断是否有装货实绩,如果有装货实绩,则更新
             BigDecimal resultId = tmstruckLoadResultMapper.getResultId(resultTotalId);
             if (resultId==null) {
                 int sqe = DataChange.dataToBigDecimal(mesMap.get("Sqe")).intValue();
@@ -229,11 +229,22 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
                 utilsService.pushMesToWebsocket(capacityNumber, "装货");
             }else {
                 //已装货的实绩
-                map.put("resultId",resultId);
-            }
-             i += addCapacityRemark(map);
-            if (i==-5){
-                return  -5;
+                //map.put("resultId",resultId);
+                tmstruckLoadResult.setResultId(resultId);
+                if(map.get("personnelSsoId") != null){
+                    //通过SSo主键查询人员管理主键
+                    Integer personnelId = utilsMapper.getPersonnelIdBySsoId((String) map.get("personnelSsoId"));
+                    if(personnelId != null){
+                        tmstruckLoadResult.setLoaderId(new BigDecimal(personnelId));
+                    }else{
+                        String capacityName = utilsMapper.getCapacityNameBySsoId((String) map.get("personnelSsoId"));
+                        if(capacityName != null){
+                            tmstruckLoadResult.setCapacityRemark(capacityName);
+                        }
+                    }
+                }
+                i += tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
+
             }
             //根据运输订单查找需求备注
             Map<String,Object>  remarkMap=tmstruckTimeTaskResultMapper.selectInwardDueTimeByOrderId(orderId);
@@ -350,6 +361,11 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             Integer personnelId = utilsMapper.getPersonnelIdBySsoId((String) map.get("personnelSsoId"));
             if(personnelId != null){
                 tmstruckLoadResult.setLoaderId(new BigDecimal(personnelId));
+            }else{
+                String capacityName = utilsMapper.getCapacityNameBySsoId((String) map.get("personnelSsoId"));
+                if(capacityName != null){
+                    tmstruckLoadResult.setCapacityRemark(capacityName);
+                }
             }
         }
         tmstruckLoadResult.setInsertUpdateRemark((String) map.get("insertUpdateRemark"));