luobang 2 anos atrás
pai
commit
7bba910f9e

+ 3 - 0
src/main/java/com/steerinfo/dil/mapper/UtilsMapper.java

@@ -140,4 +140,7 @@ public interface UtilsMapper {
 
     //查询总实绩的订单是否包含某个物资的数目
     int getMaterialNumByTotal(Map<String,Object> map);
+
+    BigDecimal getOrderSeq(BigDecimal orderId);
+
 }

+ 7 - 0
src/main/java/com/steerinfo/dil/service/impl/UtilsServiceImpl.java

@@ -100,10 +100,17 @@ public class UtilsServiceImpl implements IUtilsService {
             //如果没有传入运输订单Id则需要传入了运输订单号
             orderId = utilsMapper.getOrderIdByOrderNumber((String) map.get("orderNumber"));
         }
+        //根据订单查询里面订单里面的路段顺序号
+        BigDecimal orderLineSequence = utilsMapper.getOrderSeq(orderId);
+        //这是该实绩的路段顺序号
         BigDecimal segmentSqe = DataChange.dataToBigDecimal(map.get("segmentSqe"));
         if(segmentSqe.intValue() == 0){
             return 0;
         }
+        //如果订单里面路段顺序号 大于 实绩里面路段顺序号,则不更新
+        if (orderLineSequence.intValue() > segmentSqe.intValue()) {
+            segmentSqe = orderLineSequence;
+        }
         Map<String, Object> mesMap = new HashMap<>();
         mesMap.put("orderId", orderId);
         mesMap.put("orderLineSequence", segmentSqe);

+ 1 - 0
src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -3125,6 +3125,7 @@
     </select>
     <select id="getSteelReportDetailsListBySmId" resultType="java.util.Map" parameterType="java.math.BigDecimal">
         SELECT distinct
+        ASO.SALE_NUMBER "saleOrderNo",
         ASM.SALE_MATERIAL_ID "saleMaterialId",
         ASOM.SALE_ORDER_MATERIAL_TRUCK_NO "truckNo",
         ASM.MATERIAL_NUMBER "materialNumber",

+ 4 - 0
src/main/resources/com/steerinfo/dil/mapper/UtilsMapper.xml

@@ -394,4 +394,8 @@
                  LEFT JOIN RMS_MATERIAL RM ON RM .MATERIAL_ID = OOM .MATERIAL_ID
         WHERE TTR .RESULT_TOTAL_ID=#{resultTotalId} AND RM .MATERIAL_NAME LIKE CONCAT('%',CONCAT(#{con},'%'))
     </select>
+    <select id="getOrderSeq" resultType="java.math.BigDecimal">
+        SELECT OO.ORDER_LINE_SEQUENCE FROM OMSTRUCK_ORDER OO
+        where oo.ORDER_ID = #{orderId}
+    </select>
 </mapper>