Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

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

@@ -74,8 +74,13 @@ public class TmstruckLeaveFactoryResultController extends BaseRESTfulController
                                           Integer pageNum,
                                           Integer pageSize,
                                           Integer orderType,
-                                          String con){
+                                          String con, String carrierSsoId){
         mapValue.put("orderTypee", orderType);
+        if(carrierSsoId != null){
+            if(!"null".equals(carrierSsoId)){
+                mapValue.put("carrierSsoId", carrierSsoId);
+            }
+        }
         //框计算
         if(con != null){
             if(!"undefined".equals(con)){

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

@@ -75,7 +75,7 @@ public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMea
     //通过订单ID获取零星订单父级收货单位
     Integer getLxRealReceiveIdByOrderId(BigDecimal orderId);
 
-    //通过订单ID获取零星订单父级收发货单位
+    //通过订单ID获取零星订单父级发货单位
     Integer getLxRealSendUnitIdByOrderId(BigDecimal orderId);
 
     //查询零星订单收货单位ID

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

@@ -84,8 +84,10 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         //发送数据给计量系统 必要数据 orderTypee：订单类型  resultTotalId： 总实绩Id   orderId
         //获取当前订单是属于哪个厂区订单
         Integer receiveId = 0 ;
+        Integer supplierId = 0 ;
         if(DataChange.dataToBigDecimal(map.get("orderTypee")).intValue() == 10){
             receiveId = tmstruckMeasureCommissionMapper.getReceiveIdByRequirementOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
+
         }else{
             receiveId = tmstruckMeasureCommissionMapper.getReceiveIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
         }
@@ -134,7 +136,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         int i = 0;
         if(orderType == 12) {
             //查询进厂收货单位
-            Integer receiveId = tmstruckMeasureCommissionMapper.getPtLxReceiveIdByOrderId(orderId);
+            Integer receiveId = tmstruckMeasureCommissionMapper.getLxRealReceiveIdByOrderId(orderId);
             if(receiveId == 1){
                 //给达钢发送委托
 
@@ -143,7 +145,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 i = sendDXMeasureCommissionMes(map);
             }
         }else if(orderType == 13){
-            Integer sendId = tmstruckMeasureCommissionMapper.getPtLxSendUnitIdByOrderId(orderId);
+            Integer sendId = tmstruckMeasureCommissionMapper.getLxRealSendUnitIdByOrderId(orderId);
             if(sendId == 1){
                 //给达钢发送委托
 
@@ -153,10 +155,21 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             }
 
         }else if(orderType == 15){
-            //如果是15类型的订单寻找订单父级发货单位  (现只有出厂)
+            //进厂,收货单位
+            //如果是15类型的订单寻找订单父级发货单位  (现只有进厂)
+            Integer receiveId = tmstruckMeasureCommissionMapper.getLxRealReceiveIdByOrderId(orderId);
+            if(receiveId == 1){
+                //给达钢发送委托1
+
+            }else if (receiveId == 2){
+                //给达兴发送委托
+                i = sendDXMeasureCommissionMes(map);
+            }
+        }else if(orderType == 16){
+            //出厂,发货单位
             Integer sendUnitId = tmstruckMeasureCommissionMapper.getLxRealSendUnitIdByOrderId(orderId);
             if(sendUnitId == 1){
-                //给达钢发送委托
+                //给达钢发送委托1
 
             }else if (sendUnitId == 2){
                 //给达兴发送委托

src/main/resources/application-dev.yml

@@ -37,7 +37,7 @@ openfeign:
   QmsFeign:
     url: ${QMSFEIGN_URL:172.16.33.162:8017}
   ImFeign:
-    url: ${IMFEIGN_URL:172.16.33.166:8055}
+    url: ${IMFEIGN_URL:172.16.33.162:8055}
 
 server:
   port: 8008

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

@@ -12,7 +12,8 @@
 <!--查询采购统计报表-->
     <select id="getAllPurchaseFLRLReport" parameterType="map" resultType="java.util.Map">
         select *
-        from (select OO.ORDER_NUMBER            "orderNumber",
+        from (select
+                     OO.ORDER_NUMBER            "orderNumber",
                      RC.CAPACITY_NUMBER         "capacityNumber",
                      TER.RESULT_ENTRY_GATE_TIME "resultEntryGateTime",
                      TWR.RESULT_NET_WEIGHT      "resultNetWeight",
@@ -27,6 +28,9 @@
                      RTCMAO.TRUCK_CALCULATE_NUMBER  "grossCalculateNum",
                      RTCPI.TRUCK_CALCULATE_NUMBER   "tareCalculateNum",
                      TWR.RESULT_GROSS_WEIGHT_TIME   "resultGrossWeightTime",
+                        <if test="orderTypee == 17 or orderTypee == 18">
+                            RS.SUPPLIER_NAME           "supplierName",
+                        </if>
                      TWR.RESULT_TARE_WEIGHT_TIME    "resultTareWeightTime"
               from OMSTRUCK_ORDER OO
                        left join TMSTRUCK_TOTAL_RESULT TTR
@@ -57,6 +61,12 @@
                                  on TRR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                        left join TMSTRUCK_QUALITY_RESULT TQR
                                  on TQR.TOTAL_RESULT_ID = TTR.RESULT_TOTAL_ID
+                       <if test="orderTypee == 17 or orderTypee == 18">
+                           left join AMS_PURCHASE_ORDER APO
+                                on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+                           left join RMS_SUPPLIER RS
+                                on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+                       </if>
               where OO.ORDER_STATUS in (5, 8, 9, 1, 2)
                 and OO.ORDER_TYPE = #{orderTypee}
              )

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

@@ -471,6 +471,7 @@
                 TLFR.RESULT_OUT_MODE "resultOutMode",
                 TLFR.RESULT_OUT_GATE_TIME "resultOutGateTime",
                 TLFR.RESULT_TRUCK_SNAPSHOT_PICTURE "resultTruckSnapshotPicture"
+
         from TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
         left join TMSTRUCK_TOTAL_RESULT TTR
             on TTR.RESULT_TOTAL_ID = TLFR.RESULT_TOTAL_ID
@@ -486,10 +487,17 @@
             on RM.MATERIAL_ID = OOM.MATERIAL_ID
         left join RMS_CAPACITY RC
             on RC.CAPACITY_ID = OO.CAPACITY_ID
+        <if test="carrierSsoId != null">
+            left join RMS_CARRIER RCA
+                on RCA.CARRIER_ID = RC.CARRIER_ID
+        </if>
         left join RMS_GATEPOST RG
             on RG.GATEPOST_ID = TLFR.GATEPOST_ID
 
         where RESULT_OUT_GATE_TIME is not null and OO.ORDER_TYPE = #{orderTypee}
+            <if test="carrierSsoId != null">
+                and RCA.CARRIER_SSO_ID = #{carrierSsoId}
+            </if>
         )
         <where>
             <if test="purchaseOrderNo != null">