'销售汽运结算'

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

@@ -77,15 +77,15 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
      */
     @Override
     public int insertSelective(BigDecimal orderId) throws Exception {
-        // 得到最大id
-        BigDecimal detailsId = selectMaxId();
-        String detailsNo = noUtil.setResultNo("QYXD", detailsId);
         List<Map<String,Object>> weightTaskResultIdList = bmstruckDetailsOrderMapper.getWeightTaskResultId(orderId);
         Map<String,Object> priceMap = getPriceId(orderId);
         if (priceMap == null || priceMap.size() == 0) {
             return 0;
         }
         BigDecimal priceId = (BigDecimal) priceMap.get("priceId");
+        if (priceId.intValue() == 0) {
+            return 0;
+        }
         int result = 0;
         for (Map<String, Object> map : weightTaskResultIdList) {
             BigDecimal weightTaskResultId = DataChange.dataToBigDecimal(map.get("weightTaskResultId"));
@@ -103,6 +103,9 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
             if (orderType.intValue() == 2 || orderType.intValue() == 1) {
                 bmstruckDetailsOrder.setWetherToStatement(new BigDecimal(0));
             }
+            // 得到最大id
+            BigDecimal detailsId = selectMaxId();
+            String detailsNo = noUtil.setResultNo("QYXD", detailsId);
             bmstruckDetailsOrder.setDetailsId(detailsId);
             bmstruckDetailsOrder.setWeightTaskResultId(weightTaskResultId);
             bmstruckDetailsOrder.setDetailsNo(detailsNo);

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

@@ -1221,7 +1221,6 @@
                 ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
             WHERE OO.ORDER_ID = #{orderId}
             order by twr.GROSS_SEGMENT_SQE desc)
-            where rownum = 1
     </select>
           <select id="getInwardWeightDetailsOrder" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT *