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

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

@@ -28,7 +28,7 @@ public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMea
     //通过总实绩ID查询没有净重的计量实绩
     Integer selectNoNetWeightResult(BigDecimal resultTotalId);
 
-    //通过订单ID查询收货单位ID
+    //通过订单ID查询组织对单位ID
     Integer getReceiveIdByOrderId(BigDecimal orderId);
 
     //通过订单ID查询发货单位ID

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

@@ -87,11 +87,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")));
         }
         if(receiveId == 1){

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

@@ -833,9 +833,9 @@
         where OO.ORDER_ID = #{orderId}
     </select>
 
-<!--   通过订单ID查询收货单位ID -->
+<!--   通过订单ID查询组织ID -->
     <select id="getReceiveIdByOrderId" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
-        select APO.RECEIVE_UNIT_ID
+        select APO.PURCHASING_ORGANIZATION_ID
         from OMSTRUCK_ORDER OO
         left join AMS_PURCHASE_ORDER APO
             on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID