修改

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

@@ -737,4 +737,54 @@ public class StatisticalReportController extends BaseRESTfulController {
         return success(report);
     }
 
+    @ApiOperation(value="查询销售钢材派单报表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(423)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getInwardSaleSteelOrder")
+    public RESTfulResult getInwardSaleSteelOrder(@RequestBody(required=false) Map<String,Object> map,
+                                                  String startTime,
+                                                  String endTime,
+                                                  String carrierSsoId,
+                                                  String receiveName,
+                                                  String materialName,
+                                                  String specification,
+                                                  String remark,
+                                                  String capacityNo,
+                                                  String carrierName,
+                                                  String consigneeName,
+                                                  String saler
+    ){
+        DataChange.queryDataByDateTimeYestDay(startTime, endTime, map, sdfDateTime);//根据时间段查询数据
+        if(carrierSsoId != null){
+            if(!"null".equals(carrierSsoId) && carrierSsoId != null){
+                map.put("carrierSsoId", carrierSsoId);
+            }
+        }
+        if (receiveName != null && !"null".equals(receiveName)) {
+            map.put("receivName","%" + receiveName + "%");
+        }
+        if (remark != null && !"".equals(remark) && !"null".equals(remark)) {
+            map.put("remark","%" + remark + "%");
+        }
+        if (capacityNo != null && !"".equals(capacityNo) && !"null".equals(capacityNo)) {
+            map.put("capacityNum","%" + capacityNo + "%");
+        }
+        if (carrierName != null && !"".equals(carrierName) && !"null".equals(carrierName)) {
+            map.put("carrierNames","%" + carrierName + "%");
+        }
+        if (consigneeName != null && !"".equals(consigneeName) && !"null".equals(consigneeName)) {
+            map.put("consigneeNames","%" + consigneeName + "%");
+        }
+        if (saler != null && !"".equals(saler) && !"null".equals(saler)) {
+            map.put("salers",saler);
+        }
+        //分页数据
+        List<Map<String, Object>> report = statisticalReportService.getInwardSaleSteelOrder(map);
+        return success(report);
+    }
 }

src/main/java/com/steerinfo/dil/mapper/StatisticalReportMapper.java

@@ -77,4 +77,6 @@ public interface StatisticalReportMapper {
     List<Map<String, Object>> getSaleSteelReport(Map<String, Object> mapValue);
 
     List<Map<String, Object>> getInwardSaleSteelReport(Map<String, Object> map);
+
+    List<Map<String, Object>> getInwardSaleSteelOrder(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/service/IStatisticalReportService.java

@@ -72,5 +72,7 @@ public interface IStatisticalReportService {
     List<Map<String, Object>> getSaleSteelReport(Map<String, Object> mapValue);
 
     List<Map<String, Object>> getInwardSaleSteelReport(Map<String, Object> map);
+
+    List<Map<String, Object>> getInwardSaleSteelOrder(Map<String, Object> map);
 }
 

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

@@ -261,4 +261,9 @@ public class StatisticalReportImpl implements IStatisticalReportService {
     public List<Map<String, Object>> getInwardSaleSteelReport(Map<String, Object> map) {
         return statisticalReportMapper.getInwardSaleSteelReport(map);
     }
+
+    @Override
+    public List<Map<String, Object>> getInwardSaleSteelOrder(Map<String, Object> map) {
+        return statisticalReportMapper.getInwardSaleSteelOrder(map);
+    }
 }

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

@@ -2254,4 +2254,34 @@
         order by ASO.SALE_ORDER_ID DESC, OO.ORDER_ID  DESC
     </select>
 
+    <select id="getInwardSaleSteelOrder" resultType="java.util.Map">
+        SELECT
+            ASO.SALE_ORDER_ID "saleOrderId",
+            ASM.SALE_MATERIAL_ID "saleMaterialId",
+            ASO.SALE_NUMBER "saleOrderNo",
+            ASM.MATERIAL_NUMBER "materialNum",
+            ASM.EAS_PRIMARY_ID "closeEntryId",
+            ASM.DELETED "deletedStatus",
+            RM.MATERIAL_ID "materialId",
+            RM.MATERIAL_NAME "materialName",
+            RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "materialSpe",
+            RAS.ARRIVAL_NAME "sendStationName",
+            RAS2.ARRIVAL_NAME "toTheStationName",
+            TPAR.SEND_STATION_ID "sendStationId",
+            ASM.MATERIAL_WEIGHT "materialWeight",
+            rc.CONSIGNEE_COMPANY_NAME "consigneeName",
+            RS.SHIPPER_NAME "shipperName"
+        FROM
+            AMS_SALE_ORDER ASO
+                LEFT JOIN AMS_SALE_MATERIAL ASM ON ASO.SALE_ORDER_ID = ASM.SALE_ORDER_ID
+                LEFT JOIN RMS_MATERIAL rm ON rm.MATERIAL_ID = ASM.MATERIAL_ID
+                left join TMSTRAIN_PLEASE_APPROVE_RESULT TPAR ON TPAR.RAIL_PLAN_ID = ASO.SALE_ORDER_ID
+                LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS ON RAS.ARRIVAL_ID = TPAR.SEND_STATION_ID
+                LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS2 ON RAS.ARRIVAL_ID = TPAR.TO_THE_STATION_ID
+                left join RMS_CONSIGNEE RC ON ASO.receive_id = RC.CONSIGNEE_ID
+                left join RMS_SHIPPER RS  ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+        WHERE ASO.SALE_TYPE=4
+          AND ASO.DELETED = 0
+    </select>
+
 </mapper>