adsa

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

@@ -11,10 +11,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
@@ -774,4 +771,10 @@ public class StatisticalReportController extends BaseRESTfulController {
         List<Map<String, Object>> report = statisticalReportService.getInwardSaleSteelOrder(map);
         return success(report);
     }
+
+    @ApiOperation(value="根据车序号查询销售订单状态")
+    @PostMapping("/getSteelReportDetailsBySmId")
+    public RESTfulResult getSteelReportDetailsBySmId(@RequestParam BigDecimal saleOrderMaterialId){
+        return success(statisticalReportService.getSteelReportDetailsBySmId(saleOrderMaterialId));
+    }
 }

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

@@ -79,4 +79,9 @@ public interface StatisticalReportMapper {
     List<Map<String, Object>> getInwardSaleSteelReport(Map<String, Object> map);
 
     List<Map<String, Object>> getInwardSaleSteelOrder(Map<String, Object> map);
+
+    Map<String, Object> getSteelReportDetailsBySmId(BigDecimal saleOrderMaterialId);
+
+    List<Map<String, Object>> getSteelReportDetailsListBySmId(BigDecimal saleOrderMaterialId);
+
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -74,5 +75,7 @@ public interface IStatisticalReportService {
     List<Map<String, Object>> getInwardSaleSteelReport(Map<String, Object> map);
 
     List<Map<String, Object>> getInwardSaleSteelOrder(Map<String, Object> map);
+
+    Map<String,Object> getSteelReportDetailsBySmId(BigDecimal saleOrderMaterialId);
 }
 

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

@@ -282,4 +282,16 @@ public class StatisticalReportImpl implements IStatisticalReportService {
         }
         return results;
     }
+
+    @Override
+    public Map<String,Object> getSteelReportDetailsBySmId(BigDecimal saleOrderMaterialId) {
+        //获取主表数据
+        Map<String,Object> map = statisticalReportMapper.getSteelReportDetailsBySmId(saleOrderMaterialId);
+        //获取子表数据
+        List<Map<String,Object>> mapList = statisticalReportMapper.getSteelReportDetailsListBySmId(saleOrderMaterialId);
+        if (map != null){
+            map.put("mapList",mapList);
+        }
+        return map;
+    }
 }

src/main/resources/application-prod.yml

@@ -25,7 +25,7 @@ piction:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   BmsShipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmsTruckFeign:

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

@@ -1964,6 +1964,7 @@
                               ON RM.MATERIAL_ID = ASM.MATERIAL_ID
                     LEFT JOIN OMSTRUCK_ORDER OO
                               ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                              AND NVL(OO.ORDER_TYPE,0) in (0,1)
                     LEFT JOIN RMS_CAPACITY RCA
                               ON RCA.CAPACITY_ID = OO.CAPACITY_ID
                     LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
@@ -2283,5 +2284,121 @@
         ORDER BY
         oo.ORDER_ID DESC)
     </select>
+    <select id="getSteelReportDetailsBySmId" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+        SELECT distinct OO.ORDER_ID "orderId",
+        ASO.SALE_ORDER_ID "saleOrderId",
+        ASO.SALE_NUMBER "saleOrderNo",
+        RC.CONSIGNEE_COMPANY_NAME "consigneeName",
+        ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
+        RS.SHIPPER_NAME "shipperName",
+        RCA.CAPACITY_NUMBER "capacityNo",
+        NVL(OO.CAPACITY_ID,0)  "capacityIds",
+        OO.CAPACITY_ID "capacityId",
+        ASOM.SALE_ORDER_MATERIAL_TRUCK_NO "truckNo",
+        ASOM.SALE_ORDER_CONSIGNEE_TEL "consigneeTel",
+        OO.ORDER_LINE_SEQUENCE "lineSequence",
+        ASO.SALE_ORDER_ISSELF_MENTION "isSelfMention",
+        RSR.SALER_NAME "saler",
+        R_CARRIER.CARRIER_ABBREVIATION "carrierName",
+        OO.ORDER_NUMBER "orderNo",
+        RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
+        RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "addressPlace",
+        RRP.PLACE_ID "placeId",
+        RRP.ADDRESS_DELIVERY_ADDRESS "place",
+        RRA.ADDRESS_ID "shipperAddressId",
+        RRA.ADDRESS_PROVINCE "addressProvince",
+        RRA.ADDRESS_DISTRICT "addressDistrict",
+        RRA.ADDRESS_TOWN "addressTown",
+        OO.ORDER_LINE_SEQUENCE "lineSqe",
+        OO.DRIVER_TEL "capacityTel",
+        TLFR.RESULT_OUT_GATE_TIME    "outGateTime",
+        TER.RESULT_ENTRY_GATE_TIME   "entryGateTime",
+        TAR.RESULT_ARRIVAL_ADDRESS "arrivalAddress",
+        TRR.RESULT_ARRIVAL_ADDRESS "receiptAddress",
+        ASOM.SALE_DATE_OF_RECEIPT   "saleDateReceipt",
+        R_CARRIER.CARRIER_ID        "carrierId",
+        NVL(R_CARRIER.CARRIER_ID,0) "carrierIds",
+        OO.ORDER_STATUS              "carStatus",
+        DECODE(ASO.SALE_ORDER_STATUS,1,'销售订单已上报',
+        2,'销售已提交',
+        4,'财务已审批',
+        0,'销售订单未上报') "saleOrderStatus",
+        DECODE(OO.ORDER_STATUS ,2,'已完成',4,'已派发',5,'已接收',0,'未派发',7,'已关闭',8,'已关闭')
+        "orderStatus"
+        FROM AMS_SALE_ORDER ASO
+        LEFT JOIN RMS_CONSIGNEE RC
+        ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+        LEFT JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+        LEFT JOIN RMS_SALER RSR
+        ON RSR.SALER_ID = ASO.SALER_ID
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+        LEFT JOIN RMS_RECEIVE_PLACE RRP
+        ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+        ON RRA.ADDRESS_ID = RRP.ADDRESS_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 = ADSO.CARRIER_ID
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        AND NVL(OO.ORDER_TYPE,0) in (0,1)
+        LEFT JOIN RMS_CAPACITY RCA
+        ON RCA.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+        ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+        ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN TMSTRUCK_ARRIVAL_RESULT TAR
+        ON TAR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN TMStRUCK_RECEIPT_RESULT TRR
+        ON TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
+        WHERE ASO.SALE_TYPE = 1
+        AND ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+    </select>
+    <select id="getSteelReportDetailsListBySmId" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+        SELECT distinct
+        ASM.SALE_MATERIAL_ID "saleMaterialId",
+        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",
+        TWR.RESULT_GROSS_WEIGHT "grossWeight",
+        TWR.RESULT_GROSS_WEIGHT_TIME "grossWeightTime",
+        TWR.RESULT_TARE_WEIGHT       "tareWeight",
+        TWR.RESULT_TARE_WEIGHT_TIME  "tareWeightTime",
+        TWR.RESULT_NET_WEIGHT        "netWeight",
+        TLR.RESULT_LOAD_END_TIME     "loadTime"
+        FROM AMS_SALE_ORDER ASO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+        LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+        ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN AMS_SALE_MATERIAL ASM
+        ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        AND NVL(OO.ORDER_TYPE,0) in (0,1)
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        AND TWR.MATERIAL_ID = RM.MATERIAL_ID
+        LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+        ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        AND TLR.MATERIAL_ID = RM.MATERIAL_ID
+        WHERE ASO.SALE_TYPE = 1
+        AND ASO.DELETED = 0
+        and ASM.SALE_MATERIAL_ID IS NOT NULL
+        AND ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+    </select>
 
 </mapper>