Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -2831,5 +2831,11 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.changeOrderLine(map);
     }
 
+    @ApiOperation("根据车序号id查询主干数据")
+    @PostMapping("/getSaleSteelReportForFinance")
+    public Map<String,Object> getSaleSteelReportForFinance(@RequestParam BigDecimal saleOrderMaterialId){
+        return tmsTruckFeign.getSaleSteelReportForFinance(saleOrderMaterialId);
+    }
+
 
 }

src/main/java/com/steerinfo/dil/feign/TmsTruckFeign.java

@@ -833,6 +833,10 @@ public interface TmsTruckFeign {
     @PostMapping("api/v1/truckTms/tmstrucktotalresults/changeOrderLine")
     Map<String, Object> changeOrderLine(@RequestBody(required=false) Map<String,Object> mapValue);
 
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getSaleSteelReportForFinance")
+    Map<String, Object> getSaleSteelReportForFinance(BigDecimal saleOrderMaterialId);
+
 }
 
 

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

@@ -1017,6 +1017,7 @@
                WHERE  APO.PURCHASE_ORDER_ID IS NOT NULL
                and DB.RESULT_FOREIGN_SHIP_NAME like #{index}
                and DB.MATERIAL_ID = #{materialId}
+               and APO.DELETED = 0
     </select>
     <select id="getCapacityTel" resultType="java.util.Map" parameterType="decimal">
         SELECT RC.CAPACITY_TEL "capacityTel" FROM RMS_CAPACITY RC