2021年11月28日22:03:50

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

@@ -71,10 +71,5 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
 
     //通过运输订单id获取路段顺序号、物资类型、计量实绩主键、line_id
     Map<String, BigDecimal> selectByOrderId(BigDecimal orderId);
-    /**
-     * 通过物料、性质判断所去的汽车衡
-     */
-    BigDecimal getTruckCalculateNumber(@Param("materialTypeId") BigDecimal materialTypeId, @Param("bigDecimal") BigDecimal bigDecimal);
 
-    List<BigDecimal> getNextStep(@Param("lineId") BigDecimal lineId, @Param("orderLineSequence") int orderLineSequence);
 }

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

@@ -35,6 +35,9 @@ public class RulesServiceImpl implements IRulesService {
      * @return
      */
     public int calculateGatepost(Map<String, Object> map){
+        if(map != null){ //物资问题原因 计算不了门岗
+            return 1;
+        }
         BigDecimal materialId = utilsMapper.queryOrderMesByOrderId((String) map.get("orderNumber"));
         Map<String, Object> map1 = new HashMap<>();
         map1.put("materialId", materialId);
@@ -84,6 +87,10 @@ public class RulesServiceImpl implements IRulesService {
      * @return 汽车衡
      */
     public int calculateWeighbridge(Map<String, Object> map){
+        //物资类型：无法计算汽车衡 返回所有1
+        if(map != null){
+            return 1;
+        }
         List<Integer> calculateList = queryTruckCalculate(map);
         //暂时不考虑优先级 随机进行取值
         int size = calculateList.size();

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

@@ -174,7 +174,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 3:
                 //计算计皮汽车衡并更新计量实绩
                 i += tmstruckWeightResultService.calculateTruckCalculateByOne(map, 1);
-                //焦炭 水渣 只会有一种物资
+                //焦炭 水渣 等只会有一种物资
                 i += tmstruckMeasureCommissionService.addPiMeasureCommission(map); //添加计皮委托
                 break;
             case 5:
@@ -210,7 +210,6 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         switch (orderType.intValue()){
             case 1:
             case 4:
-            case 11:
                 i += updateEnFactoryResultByMJ(map); //添加进厂实绩
                 i += tmstruckMeasureCommissionService.addPiMeasureCommission(map); //添加计皮委托
                 break;
@@ -226,6 +225,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                 break;
             case 10: // 采购内转（老区-厂内）
                 break;
+            case 11:
         }
         return i;
     }

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

@@ -464,8 +464,4 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         return updateWeightResult(oIdAndMidMap);
     }
 
-
-    public List<BigDecimal> getNextStep(BigDecimal lineId, int orderLineSequence) {
-        return tmstruckWeightResultMapper.getNextStep(lineId,orderLineSequence);
-    }
 }

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

@@ -80,7 +80,7 @@ public class UtilsServiceImpl implements IUtilsService {
     public int updateOrderLineSequence(Map<String, Object> map){
         BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
         if(orderId.intValue() == 0){
-            //如果没有传入运输订单Id则应该传入了运输订单号
+            //如果没有传入运输订单Id则需要传入了运输订单号
             orderId = utilsMapper.getOrderIdByOrderNumber((String) map.get("orderNumber"));
         }
         Integer lineSequence = getLineSequenceByOrderId(orderId);

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

@@ -1039,36 +1039,6 @@
         order by twr.weight_task_result_id desc
     </select>
 
-    <!--  * 通过物料、性质判断所去的汽车衡-->
-    <select id="getTruckCalculateNumber" resultType="java.math.BigDecimal">
-        select rtc.truck_calculate_id
-        from rms_truck_calculate_material rtcm
-                 left join rms_truck_calculate rtc on rtcm.truck_calculate_id = rtc.truck_calculate_id
-        where rtcm.material_type_id = #{materialTypeId}
-          and rtc.nature = #{nature}
-          and rownum = 1
-        order by rtc.truck_calculate_priority
-    </select>
-
-    <!--    //返回下一步路段顺序号对应的终点type
-      BigDecimal getNextStep(BigDecimal lineId, int i);-->
-    <select id="getNextStep" resultType="java.math.BigDecimal">
-        select rls.segment_end_node_type
-        from rms_line_segemnt rls
-        where rls.line_id = #{lineId}
-          and rls.segment_sqe = #{orderLineSequence}
-        union
-        select rls.segment_end_node_type
-        from rms_line_segemnt rls
-        where rls.line_id = 1
-          and rls.segment_sqe = #{orderLineSequence} + 1
-        union
-        select rls.segment_end_node_type
-        from rms_line_segemnt rls
-        where rls.line_id = 1
-          and rls.segment_sqe = #{orderLineSequence} + 2
-
-    </select>
 
     <!-- 查询销售所有计皮实绩 -->
     <select id="getXSAllJiPiResult" parameterType="java.util.Map" resultType="java.util.Map">