修改

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

@@ -1595,6 +1595,11 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             orderType = BigDecimal.valueOf(25);
             mapValue.put("orderType", orderType);
         }
+        if(inwardType.equals("计次")){
+            mapValue.remove(orderType);
+            orderType = BigDecimal.valueOf(26);
+            mapValue.put("orderType", orderType);
+        }
         Integer carrierId = (Integer) mapValue.get("carrierId");
         AmstruckInwardPlan amstruckInwardPlan = amstruckInwardPlanMapper.selectByPrimaryKey(planId);
         amstruckInwardPlan.setPlanStatus(new BigDecimal(3));

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

@@ -731,6 +731,9 @@
                 LEFT JOIN RMS_UNIT_OF_MEASURE RUOM ON TTTR.RESULT_UOM_ID = RUOM.UNIT_OF_MEASURE_ID
         WHERE
                 TTTR.RESULT_VALUE IS NOT NULL and TTTR.RESULT_TIME_TYPE = 3 and TTTR.INSERT_USERNAME =#{userId}
+        <if test="orderType!=null">
+            AND OO.ORDER_TYPE=#{orderType}
+        </if>
         <include refid="orderBy">
         </include>
         <if test="orderField == null  ">