:

src/main/java/com/steerinfo/dil/mapper/TmstruckLoadResultMapper.java

@@ -101,4 +101,9 @@ public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult
     //查询所有正在进行进厂排队的销售订单
     List<Map<String, Object>> getSaleOrderOnQueue(Map<String, Object> map);
 
+    BigDecimal getResultId(BigDecimal totalId);
+
+    Integer getOrderType(BigDecimal totalId);
+
+
 }

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

@@ -94,7 +94,6 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         return null;
     }
 
-
     /**
      * 新增采购装车实绩  / 内转装车实绩
      * @param map  resultMeasuredTonnage ：计量吨位  portId：港口ID
@@ -105,18 +104,26 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         //通过运输订单号 或 运单Id 查询实绩总表ID  此方法在 进厂作业mapper中
         Map<String,Object> orderMap = tmstruckEnfactoryResultMapper.selectTotalResultIdByCpAndOn(map);
         BigDecimal totalId = (BigDecimal) orderMap.get("resultTotalId");
-        TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
+        //通过实绩总表ID查询装车实绩ID
+        BigDecimal loadResultId = tmstruckLoadResultMapper.getResultId(totalId);
+
+        TmstruckLoadResult tmstruckLoadResult = tmstruckLoadResultMapper.selectByPrimaryKey(loadResultId);
         //添加主键Id
-        tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
+//        tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
         //新增计量吨位 装车所装的重量
         BigDecimal resultMeasuredTonnage = DataChange.dataToBigDecimal(map.get("resultMeasuredTonnage"));
         tmstruckLoadResult.setResultMeasuredTonnage(resultMeasuredTonnage);
         tmstruckLoadResult.setStatus(new BigDecimal(0));
-        tmstruckLoadResult.setResultTotalId(totalId);
+//        tmstruckLoadResult.setResultTotalId(totalId);
         String resultIsclear = (String) (map.get("resultIsclear"));
         tmstruckLoadResult.setResultIsclear(resultIsclear);
         tmstruckLoadResult.setResultLoadEndTime(new Date((long) map.get("resultLoadStartTime")));
         tmstruckLoadResult.setInsertUpdateRemark((String) map.get("insertUpdateRemark"));
+        //根据订单ID查询订单类型
+        Integer orderType = tmstruckLoadResultMapper.getOrderType(totalId);
+        if(orderType == 8){
+            tmstruckLoadResult.setSegmentSqe(new BigDecimal(1));
+        }
         Object portId = map.get("portId"); //获取港口
         if(portId != null){
             //通过订单ID获取批次Id
@@ -133,7 +140,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
                 tmstruckLoadResult.setLoadingId(warehouseId); // 添加装货点为港口
             }
         }
-        int i = tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
+        int i = tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
         String capacityNumber = (String) orderMap.get("capacityNumber");
         utilsService.pushMesToWebsocket(capacityNumber,"装货！");
         //修改订单状态为执行中 1

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

@@ -184,6 +184,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 }
         }
         /*访问接口发送数据*/
+
         return sendMesToMeasure(measureCommission);
     }
 

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

@@ -149,9 +149,9 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
                 map.put("tarePlaceId", 6);
                 i += tmstruckWeightResultService.updateWeightResult(map);
                 //通过物资ID查询物资Id
-                List<Integer> materialIdList = utilsMapper.getMaterialIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
-                map.put("materialId", materialIdList.get(0));
-                i += tmstruckMeasureCommissionService.addPiMeasureCommission(map); //卸货完成后新增一条计皮委托 并发送计皮委托
+//                List<Integer> materialIdList = utilsMapper.getMaterialIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
+//                map.put("materialId", materialIdList.get(0));
+//                i += tmstruckMeasureCommissionService.addPiMeasureCommission(map); //卸货完成后新增一条计皮委托 并发送计皮委托
                 i += tmstruckReceiptResultService.addReceiptResult(map); //新增完卸车实绩后新增一条收货实绩
                 //计皮委托发送后更新出厂门岗
                 BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));

src/main/resources/com/steerinfo/dil/mapper/TmstruckLoadResultMapper.xml

@@ -1468,5 +1468,17 @@
         </if>
 
     </select>
+    <select id="getResultId" resultType="java.math.BigDecimal" parameterType="DeCimal">
+        select tlr.result_id "resultId" from tmstruck_load_result tlr
+        where tlr.result_total_id=#{totalId}
+    </select>
+
+        <select id="getOrderType" resultType="java.lang.Integer">
+                select oo.order_type
+          from tmstruck_total_result ttr
+          left join omstruck_order oo
+            on oo.order_id = ttr.order_id
+         where ttr.result_total_id = #{totalId}
+        </select>
 
 </mapper>