as

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

@@ -0,0 +1,30 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.feign.JoinFeign;
+import com.steerinfo.framework.controller.RESTfulResult;
+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 java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2022/2/24 18:09
+ */
+
+@RestController
+@RequestMapping("${api.version}/join")
+public class JoinController {
+
+    @Autowired
+    JoinFeign joinFeign;
+
+    @PostMapping("/receiveTmsTruckWeightResult")
+    public Map<String, Object> receiveTmsTruckWeightResult(@RequestBody(required = false) List<Map<String, Object>> mapList) {
+        return joinFeign.receiveTmsTruckWeightResult(mapList);
+    }
+}

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

@@ -527,6 +527,13 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiModelProperty(value = "边输边查批次")
+    @GetMapping("/getBatchByLike")
+    public RESTfulResult getBatchByLike(@RequestParam("index") String index) {
+        List<Map<String, Object>> list = universalMapper.getBatchByLike(index == null ? "" : index);
+        return success(list);
+    }
+
     @ApiModelProperty(value = "根据运力id查询所有承运商（下拉框）")
     @GetMapping("/getCarrierByCapacityId")
     public RESTfulResult getCarrierByCapacityId(@RequestParam("capacityId") Integer capacityId) {
@@ -572,4 +579,31 @@ public class UniversalController extends BaseRESTfulController {
         PageListAdd data = columnDataUtil.tableColumnData(apiId, columnList);
         return success(data);
     }
+
+    @ApiModelProperty(value = "获得港口下拉框")
+    @GetMapping("/getPortId")
+    public RESTfulResult getPortId() {
+        return success(universalService.getPortId());
+    }
+
+    @ApiModelProperty(value = "获取车牌号边输边查")
+    @GetMapping("/getCapacityNumber")
+    public RESTfulResult getCapacityNumber(String index) {
+        if(index.length() < 3){
+            return failed();
+        }
+        return success(universalService.getCapacityNumber(index));
+    }
+
+    @ApiModelProperty(value = "获得订单号及订单号下面物资")
+    @GetMapping("/getOrderNumber")
+    public RESTfulResult getOrderNumber(String capacityId) {
+        return success(universalService.getOrderNumber(capacityId));
+    }
+
+    @ApiModelProperty(value = "根据订单查询物资")
+    @GetMapping("/getMaterialIdByOrderId")
+    public RESTfulResult getMaterialIdByOrderId(Integer orderId) {
+        return success(universalService.getMaterialIdByOrderId(orderId));
+    }
 }

src/main/java/com/steerinfo/dil/feign/JoinFeign.java

@@ -0,0 +1,22 @@
+package com.steerinfo.dil.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2022/2/24 18:07
+ */
+
+@FeignClient(value = "dal-dazhou-join-api",url = "${openfeign.JoinFeign.url}")
+public interface JoinFeign {
+
+    @PostMapping("api/v1/join/tmstruckweightresult/receiveTmsTruckWeightResult")
+    Map<String, Object> receiveTmsTruckWeightResult(@RequestBody List<Map<String, Object>> mapList);
+
+}

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

@@ -101,6 +101,9 @@ public interface UniversalMapper {
     //边输边查发货单位
     List<Map<String, Object>> getCapacityByLike(String index);
 
+    //模糊查询批次品名
+    List<Map<String, Object>> getBatchByLike(String index);
+
     // 根据运力id查询所有承运商
     List<Map<String, Object>> getCarrierByCapacityId(BigDecimal capacityId);
 
@@ -116,4 +119,16 @@ public interface UniversalMapper {
 
     //边输边查用车单位
     List<Map<String, Object>> getRequireUnitName(String index);
+
+    //获得港口下拉框
+    List<Map<String, Object>> getPortId();
+
+    //根据车牌号查询正在运输的订单号
+    Map<String, Object> getOrderNumber(String num);
+
+    //查询车牌号
+    List<Map<String, Object>> getCapacityNumber(String num);
+
+    //根据订单Id查询物资
+    List<Map<String, Object>> getMaterialIdByOrderId(Integer orderId);
 }

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

@@ -88,4 +88,22 @@ public class UniversalServiceImpl implements UniversalService {
         map.put("capacityId",capacityId);
         return map;
     }
+
+    public List<Map<String, Object>> getPortId() {
+        return universalMapper.getPortId();
+    }
+
+    //获取订单号以及订单号下的物资
+    public Map<String, Object> getOrderNumber(String num) {
+        return universalMapper.getOrderNumber(num);
+    }
+
+    public List<Map<String, Object>> getCapacityNumber(String num) {
+        return universalMapper.getCapacityNumber(num);
+    }
+
+
+    public List<Map<String, Object>> getMaterialIdByOrderId(Integer orderId) {
+        return universalMapper.getMaterialIdByOrderId(orderId);
+    }
 }

src/main/resources/application-dev.yml

@@ -20,19 +20,20 @@ openfeign:
   QmsTruckFeign:
     url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8017}
   TmsTrainFeign:
-    url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
+    url: ${TMSTRAINFEIGN_URL:localhost:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:
-    url: ${WMSHFEIGN_URL:172.16.33.162:8013}
+    url: ${WMSHFEIGN_URL:localhost:8013}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.162:8016}
   RmsFeign:
     url: ${RMSFEIGN_URL:172.16.33.162:8014}
-
+  JoinFeign:
+    url: ${JOINFEIGGN_URL:localhost:8006}
 server:
   port: 8019

src/main/resources/application-prod.yml

@@ -31,9 +31,10 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
-    url: ${OMSFEIGN_URL:localhost:8095}
+    url: ${OMSFEIGN_URL:172.16.33.166:8095}
   RmsFeign:
     url: ${RMSFEIGN_URL:172.16.33.166:8060}
-
+  JoinFeign:
+    url: ${JOINFEIGGN_URL:172.16.33.166:8066}
 server:
   port: 8080

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

@@ -163,12 +163,12 @@
             <if test="index != null">
                 and (instr(RC.CAPACITY_NUMBER, #{index}) > 0 or instr(RCA.CARRIER_NAME, #{index}) > 0)
             </if>
+        )
+        <where>
             <if test="con != null">
-                where "capacityNumber" like #{con} or "carrierName" like #{con} or
+                "capacityNumber" like #{con} or "carrierName" like #{con} or
                 "remark" like #{con}
             </if>
-        )
-        <where>
             <if test="capacityNumber != null">
                 <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
                     "capacityNumber" like '%${item}%'
@@ -680,4 +680,50 @@
         FROM BMSTRUCK_FORMULA BF
         WHERE FORMULA_NAME LIKE #{con}
     </select>
+
+    <select id="getBatchByLike" parameterType="string" resultType="java.util.Map">
+        select *
+        from (
+                 select DB.BATCH_ID                                                         "batchId",
+                        DB.RESULT_FOREIGN_SHIP_NAME                                         "foreignShipName",
+                        CONCAT(DB.RESULT_FOREIGN_SHIP_NAME, '"' || RM.MATERIAL_NAME || '"') "value"
+                 from DIL_BATCH DB
+                          left join RMS_MATERIAL RM on RM.MATERIAL_ID = DB.MATERIAL_ID
+                 where DB.RESULT_FOREIGN_SHIP_NAME is not null
+             )
+        where instr("foreignShipName", #{index}) > 0
+    </select>
+
+    <select id="getPortId" resultType="java.util.Map">
+        SELECT rp.PORT_ID   "id",
+               rp.PORT_ID   "value",
+               rp.PORT_NAME "label"
+        FROM RMS_PORT rp
+    </select>
+
+
+    <select id="getOrderNumber" parameterType="string" resultType="java.util.Map">
+        select OO.ORDER_NUMBER  "orderNumber",
+               OO.ORDER_ID      "orderId"
+        from OMSTRUCK_ORDER OO
+        left join RMS_CAPACITY RC
+            ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        where OO.CAPACITY_ID = #{capacityId} and OO.ORDER_STATUS = 5
+    </select>
+
+    <select id="getCapacityNumber" parameterType="string" resultType="java.util.Map">
+        select RC.CAPACITY_NUMBER "capacityNumber",
+               RC.CAPACITY_ID   "capacityId"
+        from RMS_CAPACITY RC
+        where instr(RC.CAPACITY_NUMBER, #{num}) > 0
+    </select>
+
+    <select id="getMaterialIdByOrderId" resultType="java.util.Map">
+        select OOM.MATERIAL_ID "materialId",
+              CONCAT(CONCAT(RM.MATERIAL_NAME, RM.MATERIAL_SPECIFICATION),RM.MATERIAL_MODEL) "materialName"
+        from OMSTRUCK_ORDER_MATERIAL  OOM
+            left join RMS_MATERIAL RM
+                on RM.MATERIAL_ID = OOM.MATERIAL_ID
+        where OOM.ORDER_ID = #{orderId}
+    </select>
 </mapper>