Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-RMS-API into dev

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

@@ -120,7 +120,7 @@ public class RmsCapacityController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "196", required = false, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "apiId", value = "397", required = false, dataType = "BigDecimal"),
     })
     @PostMapping(value = "/getCapacityList")
     public RESTfulResult getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,

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

@@ -87,6 +87,14 @@ public class RmsLineController extends BaseRESTfulController {
         return success(data);
     }
 
+
+    @ApiOperation(value="查询线路中的门岗汽车衡", notes="分页查询")
+    @PostMapping("/getGateCalculateMes")
+    public RESTfulResult getGateCalculateMes(Integer lineId){
+        Map<String, Object> lineGateCalculate = rmsLineMapper.getLineGateCalculate(lineId);
+        return success(lineGateCalculate);
+    }
+
     /**
      * @author huk
      * @return

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

@@ -27,4 +27,6 @@ public interface RmsLineMapper extends IBaseMapper<RmsLine, BigDecimal> {
     //根据运输线路主表id查询运输订单表是否存在有关联的数据
     int getOmstruckOrderNumber(BigDecimal lineId);
 
+    //查询线路上的门岗汽车衡
+    Map<String, Object> getLineGateCalculate(Integer lineId);
 }

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

@@ -715,7 +715,8 @@
     RC.CAPACITY_OWNERIS AS "capacityOwneris",
     RC.CAPACITY_VIP AS "capacityVip",
     RC.CAPACITY_BLACKLIST AS "capacityBlacklist",
-    RCA.CARRIER_NAME AS "carrierName"
+    RCA.CARRIER_NAME AS "carrierName",
+    RC.INSERT_UPDATE_REMARK "insertRemark"
     FROM RMS_CAPACITY RC
     LEFT JOIN RMS_CAPACITY_TYPE RCT
     ON RC.CAPACITY_TYPE_ID = RCT.CAPACITY_TYPE_ID
@@ -779,13 +780,18 @@
           "capacityBlacklist" in #{item}
         </foreach>
       </if>
-
       <if test="carrierName!= null">
         and
         <foreach collection="carrierName" item="item" open="(" separator="," close=")">
           "carrierName" in #{item}
         </foreach>
       </if>
+      <if test="insertRemark!= null">
+        and
+        <foreach collection="insertRemark" item="item" open="(" separator="," close=")">
+          "insertRemark" in #{item}
+        </foreach>
+      </if>
     </where>
     <include refid="orderBy"></include>
   </select>
@@ -797,8 +803,6 @@
       </if>
     </if>
   </sql>
-
-
   <select id="getCapacityById" resultType="java.util.LinkedHashMap" >
     SELECT
       RC.CAPACITY_ID AS "capacityId",

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

@@ -648,4 +648,51 @@
     FROM OMSTRUCK_ORDER
     WHERE LINE_ID = #{lineId}
   </select>
+
+<!-- 查询线路上的门岗汽车衡 -->
+  <select id="getLineGateCalculate" parameterType="int" resultType="java.util.Map">
+     select
+            (
+             select listagg(RG.GATEPOST_NAME, '/') within group (order by RG.GATEPOST_ID)
+             from RMS_GATEPOST RG
+             where RG.GATEPOST_ID in (
+               select RLGC.GATE_CAL_ID
+               from RMS_LINE_SEGEMNT RLS1
+                      left join RMS_LINE_GATEPOST_CALCULATE RLGC on RLGC.SEGMENT_ID = RLS1.SEGMENT_ID
+               where RLS1.SEGMENT_START_NODE_ID = 1
+                 and RLS1.LINE_ID = RL.LINE_ID)
+            )  "enfactoryGatepostName", --进厂门岗
+            (
+               select listagg(RG.GATEPOST_NAME, '/') within group (order by RG.GATEPOST_ID)
+               from RMS_GATEPOST RG
+               where RG.GATEPOST_ID in (
+                 select RLGC.GATE_CAL_ID
+                 from RMS_LINE_SEGEMNT RLS
+                        left join RMS_LINE_GATEPOST_CALCULATE RLGC on RLGC.SEGMENT_ID = RLS.SEGMENT_ID
+                 where RLS.SEGMENT_START_NODE_ID = 7
+                   and RLS.LINE_ID = RL.LINE_ID)
+            )  "outfactoryGatepostName", -- 出厂门岗
+             (
+              select listagg(RTC.TRUCK_CALCULATE_NUMBER, '/') within group (order by RTC.TRUCK_CALCULATE_ID)
+              from RMS_TRUCK_CALCULATE RTC
+              where RTC.TRUCK_CALCULATE_ID in (
+                select RLGC.GATE_CAL_ID
+                from RMS_LINE_SEGEMNT RLS
+                       left join RMS_LINE_GATEPOST_CALCULATE RLGC on RLGC.SEGMENT_ID = RLS.SEGMENT_ID
+                where RLS.SEGMENT_START_NODE_ID = 2
+                  and RLS.LINE_ID = RL.LINE_ID)
+             ) "grossNumber", --计毛汽车衡
+            (
+              select listagg(RTC.TRUCK_CALCULATE_NUMBER, '/') within group (order by RTC.TRUCK_CALCULATE_ID)
+              from RMS_TRUCK_CALCULATE RTC
+              where RTC.TRUCK_CALCULATE_ID in (
+                select RLGC.GATE_CAL_ID
+                from RMS_LINE_SEGEMNT RLS
+                       left join RMS_LINE_GATEPOST_CALCULATE RLGC on RLGC.SEGMENT_ID = RLS.SEGMENT_ID
+                where RLS.SEGMENT_START_NODE_ID = 3
+                  and RLS.LINE_ID = RL.LINE_ID)
+              )     "tareNumber" -- 计皮汽车衡
+     from RMS_LINE RL
+     where RL.LINE_ID = #{lineId}
+  </select>
 </mapper>