2021年12月9日16:38:07唐小峰

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

@@ -34,7 +34,7 @@ public interface TmstruckEnfactoryResultMapper extends IBaseMapper<TmstruckEnfac
     BigDecimal selectMaxId();
 
     //通过车牌号和 运输订单 查询 与运输订单关联的实绩总表ID
-    Integer selectTotalResultIdByCpAndOn(Map<String, Object> map);
+    Map<String,Object> selectTotalResultIdByCpAndOn(Map<String, Object> map);
 
     //通过门岗名称查询门岗Id
     Integer selectGatepostIdByGatepostName(String gatepostName);

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
@@ -103,19 +102,28 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     @Transactional
     public int addCGLoadResult(Map<String,Object> map){
         //通过运输订单号 或 运单Id 查询实绩总表ID  此方法在 进厂作业mapper中
-        Integer totalId = tmstruckEnfactoryResultMapper.selectTotalResultIdByCpAndOn(map);
-        TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
+        Map<String,Object> orderMap = tmstruckEnfactoryResultMapper.selectTotalResultIdByCpAndOn(map);
+        BigDecimal totalId = (BigDecimal) orderMap.get("resultTotalId");
+        //通过实绩总表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(new BigDecimal(totalId));
+//        tmstruckLoadResult.setResultTotalId(totalId);
         String resultIsclear = (String) (map.get("resultIsclear"));
         tmstruckLoadResult.setResultIsclear(resultIsclear);
-        tmstruckLoadResult.setResultLoadStartTime(new Date((long) map.get("resultLoadStartTime")));
+        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
@@ -132,7 +140,9 @@ 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
 //        int i1 = utilsService.updateOrderStatus(map, 1);
         //修改运力状态为执行中 1
@@ -188,10 +198,11 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         //通过物资唯一编码查找物资Id
         BigDecimal materialId = tmstruckLoadResultMapper.getMaterialIdByMaterialCode(materialOnlyCode);
         //通过运输订单号查找总实绩ID
-        Integer resultTotalId = tmstruckEnfactoryResultMapper.selectTotalResultIdByCpAndOn(map);
-        map.put("resultTotalId", resultTotalId);
+        Map<String,Object> orderMap = tmstruckEnfactoryResultMapper.selectTotalResultIdByCpAndOn(map);
+        BigDecimal resultTotalId = (BigDecimal) orderMap.get("resultTotalId");
+        map.put("resultTotalId", resultTotalId.intValue());
         //通过总实绩ID与物资ID查找 装车实绩主键ID
-        Integer resultId = tmstruckLoadResultMapper.getLoadResultIdByMIdAndTotalId(resultTotalId, materialId.intValue());
+        Integer resultId = tmstruckLoadResultMapper.getLoadResultIdByMIdAndTotalId(resultTotalId.intValue(), materialId.intValue());
         TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
         tmstruckLoadResult.setStatus(new BigDecimal(0)); // 添加状态0:正常
         //编辑装车实绩主键ID对应的各个字段
@@ -221,7 +232,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         tmstruckLoadResult.setInsertUpdateRemark((String) map.get("insertUpdateRemark"));
         int i = tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
         //更新汽车衡
-        i += tmstruckWeightResultService.calculateTruckCalculate(map, resultTotalId);
+        i += tmstruckWeightResultService.calculateTruckCalculate(map, resultTotalId.intValue());
         //发送计毛委托 订单类型：1
 //        map.put("orderTypee", 1);
 //        tmstruckMeasureCommissionService.addMaoMeasureCommission(map);
@@ -237,10 +248,11 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
      */
     public int addXS2LoadResult(Map<String, Object> map){
         //通过运输订单号 查询 总实绩ID、订单类型
-        Integer resultTotalId = tmstruckEnfactoryResultMapper.selectTotalResultIdByCpAndOn(map);
+        Map<String,Object> orderMap = tmstruckEnfactoryResultMapper.selectTotalResultIdByCpAndOn(map);
+        BigDecimal resultTotalId = (BigDecimal) orderMap.get("resultTotalId");
         Integer orderType = tmstruckLoadResultMapper.selectOrderTypeByOrderNumber((String) map.get("orderNumber"));
         //查询装车实绩ID
-        Integer resultId = tmstruckLoadResultMapper.getLoadResultIdByMIdAndTotalId(resultTotalId, null);
+        Integer resultId = tmstruckLoadResultMapper.getLoadResultIdByMIdAndTotalId(resultTotalId.intValue(), null);
         TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
         tmstruckLoadResult.setResultId(new BigDecimal(resultId));
         tmstruckLoadResult.setStatus(new BigDecimal(0));
@@ -298,6 +310,9 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
      */
     @Override
     public int updateLoadResult(TmstruckLoadResult tmstruckLoadResult) {
+//        BigDecimal orderId = tmstruckLoadResultMapper.getOrderId(tmstruckLoadResult.getResultId());
+//        Map<String , Object> map = new
+//        omsFeign.pushMesToWebsocket(map);
         return tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
     }
 

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

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

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

@@ -151,7 +151,6 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
                 //通过订单ID查询物资Id
 //                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/bootstrap.yml

@@ -22,7 +22,7 @@ openfeign:
   BmsTruckFeign:
     url: ${BMSTRUCKFEIGN_URL:localhost:8076}
   WmshBoundFeign:
-    url: ${WMSHBOUNDFEIGN_URL:localhost:8070}
+    url: ${WMSHBOUNDFEIGN_URL:172.16.33.161:8070}
   WMSFeign:
     url: ${WMSHBOUNDFEIGN_URL:localhost:8093}
   OmsFeign:

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

@@ -626,8 +626,9 @@
     </select>
 
     <!--  通过车牌号并且状态不为2 或 运输订单 或运输订单ID  查询关联的实绩总表ID -->
-    <select id="selectTotalResultIdByCpAndOn" parameterType="java.util.Map" resultType="int">
-        select TTR.RESULT_TOTAL_ID "resultTotalId"
+    <select id="selectTotalResultIdByCpAndOn" parameterType="java.util.Map" resultType="java.util.Map">
+        select TTR.RESULT_TOTAL_ID "resultTotalId",
+               RC.CAPACITY_NUMBER "capacityNumber"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TTR.ORDER_ID = OO.ORDER_ID

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>