Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRAIN-API into dev

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

@@ -72,6 +72,7 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
             BigDecimal purchaseOrderId = tmstrainLoadingResultMapper.getPurchaseOrderId(batchId);
             tmstrainLoadingResult.setPurchaseOrderRailPlanId(purchaseOrderId);
         }
+
         //添加常规字段
         addRegularField(tmstrainLoadingResult);
         int count = 0;
@@ -81,9 +82,34 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
             BigDecimal maxId = tmstrainLoadingResultMapper.selectMaxId();
             //生成主键id
             tmstrainLoadingResult.setResultId(maxId);
-            count += tmstrainLoadingResultMapper.insertSelective(tmstrainLoadingResult);
-            totalWeight += tmstrainLoadingResult.getResultBillableTonnage().doubleValue();
+
+            //获得车皮号
+            String LoadwagonNo=tmstrainLoadingResult.getResultWagonNo();
+            String number=LoadwagonNo.substring(0,2);
+            if (number.equals("14"))
+            {
+                String No=LoadwagonNo.substring(0,3);
+                if (No.equals("143")||No.equals("140")||No.equals("141")||No.equals("142")){
+                    tmstrainLoadingResult.setResultBillableTonnage(new BigDecimal(60));
+                }
+                else if (No.equals("145")){
+                    tmstrainLoadingResult.setResultBillableTonnage(new BigDecimal(61));
+                }
+            }
+            else  if(number.equals("45")||number.equals("46")){
+                tmstrainLoadingResult.setResultBillableTonnage(new BigDecimal(60));
+            }
+            else if(number.equals("42")||number.equals("47")||number.equals("48")||number.equals("49")){
+                tmstrainLoadingResult.setResultBillableTonnage(new BigDecimal(61));
+            }
+            else  if(number.equals("15")||number.equals("16")||number.equals("17")||number.equals("18")){
+                tmstrainLoadingResult.setResultBillableTonnage(new BigDecimal(70));
+            }
+             count += tmstrainLoadingResultMapper.insertSelective(tmstrainLoadingResult);
+             totalWeight += tmstrainLoadingResult.getResultBillableTonnage().doubleValue();
+
         }
+
         //如果订单类型为采购进口矿火运（万州港---老区轨道衡 || 万州港--老区轨道衡）
         if(tmstrainLoadingResult.getResultType().intValue() == 1){
             tmstrainLoadingResult.setResultBillableTonnage(new BigDecimal(totalWeight.toString()));

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

@@ -868,6 +868,7 @@
 
   <select id="selectByResultId" parameterType="java.math.BigDecimal" resultType="java.util.LinkedHashMap">
     select
+      APO.PURCHASE_ORDER_NO "purchaseOrderNo",
       t_load.RESULT_WAGON_NO "resultWagonNo",
       t_load.RESULT_BILLABLE_TONNAGE "resultBillableTonnage",
       t_load.RESULT_ISCLEAR "resultIsclear",
@@ -876,8 +877,11 @@
       t_load.ARRIVAL_STATION_ID "arrivalStationId",
       t_load.RESULT_LOADING_DATE "resultLoadingDate",
       t_load.BATCH_ID "batchId",
-      t_load.RESULT_REMARKS "resultRemarks"
+      t_load.RESULT_REMARKS "resultRemarks",
+      t_load.RESULT_WAGON_NO "resultWagonNo"
     from TMSTRAIN_LOADING_RESULT t_load
+    left join AMS_PURCHASE_ORDER APO
+    on APO.PURCHASE_ORDER_ID = t_load.PURCHASE_ORDER_RAIL_PLAN_ID
     where t_load.RESULT_ID = #{resultId}
   </select>