add

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

@@ -737,4 +737,35 @@ 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 remark,
+                                                  String capacityNo,
+                                                  String consigneeName
+
+    ){
+        DataChange.queryDataByDateTimeYestDay(startTime, endTime, map, sdfDateTime);//根据时间段查询数据
+        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 (consigneeName != null && !"".equals(consigneeName) && !"null".equals(consigneeName)) {
+            map.put("consigneeNames","%" + consigneeName + "%");
+        }
+        //分页数据
+        List<Map<String, Object>> report = statisticalReportService.getInwardSaleSteelOrder(map);
+        return success(report);
+    }
 }

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

@@ -89,7 +89,7 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
         if (orderType!=null) {
             mapValue.put("orderTypee", orderType);
         }
-        if (con!=null&&!"null".equals(con)){
+        if (con!=null&&!"null".equals(con)&&!"".equals(con)){
             mapValue.put("con",con);
         }
         if (userId!=null){

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/ITmstruckLeaveFactoryResultService.java

@@ -34,7 +34,7 @@ public interface ITmstruckLeaveFactoryResultService {
     //新增进厂实绩 派单时新增
     int addLeaveFactory(Map<String,Object> mapValue);
 
-    Map<String, Object> getTruckFactoryResult(String nu);
+    Map<String, Object> getTruckFactoryResult(String orderNumber);
 
     // APP查询出厂信息
     List<Map<String, Object>> getLeaveFactoryList(String orderNumber);

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/java/com/steerinfo/dil/service/impl/TmstruckLeaveFactoryResultServiceImpl.java

@@ -31,8 +31,6 @@ import java.util.*;
 @Service(value = "tmstruckLeaveFactoryResultService")
 public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFactoryResultService {
 
-    @Autowired
-    private ITmstruckLeaveFactoryResultService tmstruckLeaveFactoryResultService;
 
     @Autowired
     private TmstruckLeaveFactoryResultMapper tmstruckLeaveFactoryResultMapper;
@@ -105,8 +103,8 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
     }
 
     @Override
-    public Map<String, Object> getTruckFactoryResult(String nu) {
-        return tmstruckLeaveFactoryResultMapper.getTruckFactoryResult(nu);
+    public Map<String, Object> getTruckFactoryResult(String orderNumber) {
+        return tmstruckLeaveFactoryResultMapper.getTruckFactoryResult(orderNumber);
     }
 
     /**
@@ -240,13 +238,13 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                             tmstruckSmsRusultService.generaSendMessage(mobile,capacityNum,orderId);
                     }
                     //销售厂外监控
-                    Map<String, Object> parem=tmstruckLeaveFactoryResultService.getTruckFactoryResult(orderNumber);
+                    Map<String, Object> parem = getTruckFactoryResult(orderNumber);
                     parem.put("turnOf","0");
                     otmsFeign.createTotalResult(parem);
                     // 调用结算
                     bmsTruckFeign.addDetailsOrder(orderId);
                 }catch (Exception ex){
-
+                    System.out.println(ex.getMessage());
                 }
                 break;
             case 2:

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

@@ -329,7 +329,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             String warehouseName = utilsMapper.queryWarehouseName(DataChange.dataToBigDecimal(map.get("warehouseId")));
             map.put("warehouseName",warehouseName);
         }
-//        int i = tmstruckMeasureCommissionService.addMeasureCommissionForLoding(map);
+        i =  tmstruckMeasureCommissionService.addMeasureCommissionForLoding(map);
         return 1;
     }
 

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

@@ -582,6 +582,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("data", sendMap);
         String jsonData = null;
+
         try {
             jsonData = HTTPRequestUtils.send(daGangUrl, jsonObject, "utf-8");
         } catch (IOException e) {

src/main/resources/application-prod.yml

@@ -4,7 +4,6 @@ spring:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
     password: Dil123789
     username: dil
-
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-tms-truck-dev

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

@@ -2254,4 +2254,75 @@
         order by ASO.SALE_ORDER_ID DESC, OO.ORDER_ID  DESC
     </select>
 
+    <select id="getInwardSaleSteelOrder" resultType="java.util.Map">
+        SELECT * FROM (SELECT DISTINCT
+                           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 "sendStation",
+                           RAS2.ARRIVAL_NAME "toTheStation",
+                           TPAR.SEND_STATION_ID "sendStationId",
+                           ASM.MATERIAL_WEIGHT "materialWeight",
+                           rc.CONSIGNEE_COMPANY_NAME "consigneeName",
+                           RS.SHIPPER_NAME "shipperName",
+                           r_cap.capacity_id "capacityId",
+                           r_cap.capacity_number "capacityNo",
+                           r_carrier.carrier_id "carrierId",
+                           r_carrier.carrier_name "carrierName",
+                           oo.ORDER_ID "orderId",
+                           NVL( r_carrier.carrier_id, 0 ) "carrierIds",
+                           NVL( r_cap.capacity_id, 0 ) "capacityIds",
+                            RDOINDEP.ORG_NAME "transInDep",
+                           RDOOUTDEP.ORG_NAME "transOutDep",
+                           RISWINOF.INWARD_WAREHOUSE_NAME "transInWarehouse"
+                       FROM
+                           AMS_SALE_ORDER ASO
+                               LEFT JOIN AMS_SALE_MATERIAL ASM ON ASO.SALE_ORDER_ID = ASM.SALE_ORDER_ID
+                               LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM ON ASTM.MATERIAL_ID = ASM.SALE_MATERIAL_ID
+                               LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_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 = ASM.SALE_MATERIAL_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
+                               LEFT JOIN omstruck_order oo ON oo.order_plan_id = asom.sale_order_material_id
+                               LEFT JOIN ams_dispatch_sale_order adso ON adso.sale_order_material_id = asom.sale_order_material_id
+                               LEFT JOIN rms_carrier r_carrier ON r_carrier.carrier_id = 3642
+                               LEFT JOIN rms_capacity r_cap ON r_cap.capacity_id = oo.capacity_id
+                               LEFT JOIN RMS_DEP_ORG RDOINDEP ON RDOINDEP.ORG_CODE = ASO.TRANSFER_IN_DEP
+                               LEFT JOIN RMS_DEP_ORG RDOOUTDEP ON RDOOUTDEP.ORG_CODE = ASO.TRANSFER_OUT_DEP
+                               LEFT JOIN RMS_INWARD_STEEL_WAREHOUSE RISWINOF ON RISWINOF.INWARD_WAREHOUSE_CODE = ASM.TRANSFER_IN_OF_WAREHOUSE
+                       WHERE
+                           ASO.SALE_TYPE = 4
+                         AND ASO.DELETED = 0
+        <if test="oneDate != null">
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = ASO.INSERT_TIME
+        </if>
+        <if test="carrierSsoId != null">
+            and R_CARRIER.CARRIER_SSO_ID = #{carrierSsoId}
+        </if>
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  ASO.INSERT_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  ASO.INSERT_TIME
+        </if>
+        <if test="remark != null" >
+            and  RM.MATERIAL_NAME || RM.MATERIAL_MODEL || RM.MATERIAL_SPECIFICATION LIKE #{remark}
+        </if>
+        <if test="capacityNum != null">
+            and  r_cap.capacity_number like #{capacityNum}
+        </if>
+        <if test="consigneeNames != null">
+            and RC.CONSIGNEE_COMPANY_NAME like #{consigneeNames}
+        </if>
+        ORDER BY
+        oo.ORDER_ID DESC)
+    </select>
+
 </mapper>

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

@@ -710,10 +710,8 @@
              )
         where rownum = 1
     </select>
-    <select id="getTruckFactoryResult" resultType="java.util.Map">
-                
+    <select id="getTruckFactoryResult" resultType="java.util.Map" parameterType="string">
                 SELECT   * from(
-                
                  SELECT
                     -- 出厂时间
                     to_char(TLFR.RESULT_OUT_GATE_TIME,'yyyy-mm-dd hh24:mi:ss')  "resultOutGateTime",
@@ -739,10 +737,10 @@
                     RS.SUPPLIER_NAME  "supplierName" ,
                     -- 发货单位
                     RS2.SHIPPER_NAME "shipperName"
-                   
-                    
-                    
-                    
+
+
+
+
                 FROM
                     -- 出厂实绩
                     TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
@@ -762,17 +760,17 @@
                     LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON    ASOM.SALE_ORDER_MATERIAL_ID =OO.ORDER_PLAN_ID
                     --收货地址
                     left join RMS_RECEIVE_PLACE RRP  on ASOM.SALE_SHIPPING_ADDRESS_ID=RRP.PLACE_ID
-                    
+
                     left join RMS_RECEIVE_ADDRESS RRA on RRP.ADDRESS_ID=RRA.ADDRESS_ID
                     -- 收货单位
                     LEFT JOIN RMS_SHIPPER RS2 ON ASO.SHIPPER_ID = RS2.SHIPPER_ID
-                    
+
                 WHERE
                     -- 判断出厂实绩的出厂时间不为空
                     TLFR.RESULT_OUT_GATE_TIME IS NOT NULL
                     --   并且订单类型等于1（销售订单），2（焦炭发运计划），3（水渣发运计划）
                     AND OO.ORDER_TYPE =1 AND OO.ORDER_NUMBER=#{orderNumber}
-                    
+
                     )
     </select>
 

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

@@ -1472,7 +1472,8 @@
 
     SELECT *
     FROM (
-    SELECT RM.MATERIAL_NAME           "materialName",
+    SELECT
+    distinct RM.MATERIAL_NAME           "materialName",
     OO.ORDER_NUMBER            "orderNumber",
     RC.CAPACITY_NUMBER         "capacityNumber",
     OOM.ORDER_MATERIAL_NUMBER  "orderMaterialNumber",

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

@@ -878,7 +878,9 @@
     <select id="getInFactoryUnloadResult" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT *
         FROM (
-        SELECT TUR.RESULT_ID             "resultId",
+        SELECT
+               distinct
+               TUR.RESULT_ID             "resultId",
         OO.ORDER_NUMBER || RC.CAPACITY_NUMBER || RW.WAREHOUSE_NAME || RM.MATERIAL_NAME "mohu",
         OO.ORDER_NUMBER           "orderNumber",
         RC.CAPACITY_NUMBER        "capacityNumber",