tj

src/main/java/com/steerinfo/dil/controller/AmsContractTruckPriceController.java

@@ -331,10 +331,16 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
     public Map<String,Object> getInwardPriceBy(@RequestBody(required = false) Map<String,Object> mapvalue){
         //接受结算是内转计重还是计时还是计数
         String settleMentType = (String) mapvalue.get("requirementType");
+        String insertUpdateRemark = (String) mapvalue.get("insertUpdateRemark");
         BigDecimal type = null;
         if("计重".equals(settleMentType)){
-            //在单价表里内转计重是2
-            type = new BigDecimal(2);
+            if(insertUpdateRemark!=null && !"".equals(insertUpdateRemark) && insertUpdateRemark.contains("计时且过计量")){
+                //计重且计时，走计时流程
+                type = new BigDecimal(5);
+            }else{
+                //在单价表里内转计重是2
+                type = new BigDecimal(2);
+            }
         }else if("计时".equals(settleMentType)){
             //在单价表里内转计时是5
             type = new BigDecimal(5);

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

@@ -1017,7 +1017,9 @@
       on rtr.trans_range_id = actp.line_id
       where type = #{type}
       and actp.DELETED = 0
-      and acpm.DELETED = 0
+      <if test="type==2">
+        and acpm.DELETED = 0
+      </if>
       <if test="rangeId != null">
         and actp.LINE_ID = #{rangeId}
       </if>