2021年12月17日12:32:14

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

@@ -629,4 +629,23 @@ public class OMSController {
     public List<Map<String, Object>> getOrderResult(@RequestBody Map<String,Object> map){
         return omsFeign.getOrderResult(map);
     }
+
+    @ApiOperation(value = "查询未下发的零星物资订单")
+    @PostMapping("/getOthersOrderMesToSend")
+    public Map<String, Object> getOthersOrderMesToSend(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer type,
+                                                 Integer orderStatus,
+                                                 Integer carrierId,
+                                                 String  con) {
+        return omsFeign.getOthersOrderMesToSend(mapValue==null?new HashMap<>(): mapValue, apiId, pageNum, pageSize, orderStatus, carrierId, type, con);
+    }
+
+    @ApiOperation(value = "修改运输订单方法：根据运输订单id修改运力id")
+    @PostMapping("/updateOmstruckOrder")
+    public Map<String, Object> updateOmstruckOrder(@RequestBody(required = false) Map<String,Object> map){
+        return omsFeign.updateOmstruckOrder(map);
+    }
 }

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

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
 
 
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -168,6 +169,13 @@ public class UniversalController extends BaseRESTfulController {
         return success(pageList);
     }
 
+    @ApiModelProperty(value = "通过订单ID查询订单下物资信息")
+    @PostMapping("/getOrderMaterialMesByOrderId/{orderId}")
+    public RESTfulResult getMaterialMesByOrderId(@PathVariable("orderId") Integer orderId){
+        List<Map<String, Object>> mes = universalMapper.getOrderMaterialMesByOrderId(new BigDecimal(orderId));
+        return success(mes);
+    }
+
     @ApiModelProperty(value = "模糊查询物资")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),

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

@@ -352,5 +352,20 @@ public interface OmsFeign {
     @ApiOperation(value = "根据运单id查询实绩位置")
     @PostMapping("api/v1/oms/omstruckorders/addInputOrder")
     Map<String, Object> addInputOrder(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping("api/v1/oms/omstruckorderseparates/getOthersOrderMesToSend")
+    Map<String, Object> getOthersOrderMesToSend(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                       @RequestParam("apiId") Integer apiId,
+                                                       @RequestParam("pageNum") Integer pageNum,
+                                                       @RequestParam("pageSize") Integer pageSize,
+                                                       @RequestParam("orderStatus") Integer orderStatus,
+                                                       @RequestParam("carrierId") Integer carrierId,
+                                                       @RequestParam("type") Integer type,
+                                                       @RequestParam("con") String con
+                                                       );
+
+    @ApiOperation(value = "根据运输订单id修改运力id")
+    @PostMapping("api/v1/oms/omstruckorderseparates/updateOmstruckOrder")
+    Map<String, Object> updateOmstruckOrder(@RequestBody(required = false) Map<String,Object> map);
 }
 

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

@@ -2,6 +2,7 @@ package com.steerinfo.dil.mapper;
 
 import org.mapstruct.Mapper;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -28,9 +29,12 @@ public interface UniversalMapper {
     //模糊查询承运商的运力信息
     List<Map<String, Object>> getAllCapacityByCarrierLike(Map<String, Object> map);
 
-    //通过运输订单ID查询物资子表（针对钢材）
+    //通过运输订单ID查询物资子表（针对多拼）
     List<Map<String, Object>> getMaterialMesByOrderId(Map<String, Object> map);
 
+    //通过订单ID查询订单下所有物资
+    List<Map<String, Object>> getOrderMaterialMesByOrderId(BigDecimal orderId);
+
     //通过物资ID查询该物资的发货单位信息
     List<Map<String, Object>> getSupplierMesByMaterialId(Map<String, Object> map);
 

src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: root123
-    username: dagang
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-api

src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: root123
-    username: dagang
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-api

src/main/resources/bootstrap.yml

@@ -25,60 +25,60 @@ eureka:
 
 openfeign:
   #正式环境
-#  ColumnDataFeign:
-#    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8083}
-#  AmsFeign:
-#    url: ${AMSFEIGN_URL:172.16.33.162:8079}
-#  BmsshipFeign:
-#    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8078}
-#  BmstrainFeign:
-#    url: ${BMSTRAINFEIGN_URL:172.16.33.162:8077}
-#  BmstruckFeign:
-#    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8076}
-#  QmsTruckFeign:
-#    url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8047}
-#  TmsTrainFeign:
-#    url: ${TMSTRAINFEIGN_URL:172.16.33.162:8086}
-#  TmsTruckFeign:
-#    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8088}
-#  TmsshipFeign:
-#    url: ${TMSSHIPFEIGN_URL:172.16.33.162:8090}
-#  WMSHFeign:
-#    url: ${WMSHFEIGN_URL:172.16.33.162:8070}
-#  WMSFeign:
-#    url: ${WMSFEIGN_URL:172.16.33.162:8093}
-#  OMSFeign:
-#    url: ${OMSFEIGN_URL:172.16.33.162:8095}
-#  RmsFeign:
-#    url: ${RMSFEIGN_HRL:172.16.33.162:8060}
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8083}
+  AmsFeign:
+    url: ${AMSFEIGN_URL:172.16.33.162:8079}
+  BmsshipFeign:
+    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8078}
+  BmstrainFeign:
+    url: ${BMSTRAINFEIGN_URL:172.16.33.162:8077}
+  BmstruckFeign:
+    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8076}
+  QmsTruckFeign:
+    url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8047}
+  TmsTrainFeign:
+    url: ${TMSTRAINFEIGN_URL:172.16.33.162:8086}
+  TmsTruckFeign:
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8088}
+  TmsshipFeign:
+    url: ${TMSSHIPFEIGN_URL:172.16.33.162:8090}
+  WMSHFeign:
+    url: ${WMSHFEIGN_URL:172.16.33.162:8070}
+  WMSFeign:
+    url: ${WMSFEIGN_URL:172.16.33.162:8093}
+  OMSFeign:
+    url: ${OMSFEIGN_URL:172.16.33.162:8095}
+  RmsFeign:
+    url: ${RMSFEIGN_HRL:172.16.33.162:8060}
 
 #测试环境
-    ColumnDataFeign:
-      url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
-    AmsFeign:
-      url: ${AMSFEIGN_URL:172.16.33.162:8015}
-    BmsshipFeign:
-      url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
-    BmstrainFeign:
-      url: ${BMSTRAINFEIGN_URL:172.16.33.162:8005}
-    BmstruckFeign:
-      url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
-    QmsTruckFeign:
-      url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8017}
-    TmsTrainFeign:
-      url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
-    TmsTruckFeign:
-      url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
-    TmsshipFeign:
-      url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
-    WMSHFeign:
-      url: ${WMSHFEIGN_URL:172.16.33.162:8013}
-    WMSFeign:
-      url: ${WMSFEIGN_URL:172.16.33.162:8012}
-    OMSFeign:
-      url: ${OMSFEIGN_URL:172.16.33.162:8016}
-    RmsFeign:
-      url: ${RMSFEIGN_HRL:172.16.33.162:8014}
+#    ColumnDataFeign:
+#      url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+#    AmsFeign:
+#      url: ${AMSFEIGN_URL:172.16.33.162:8015}
+#    BmsshipFeign:
+#      url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
+#    BmstrainFeign:
+#      url: ${BMSTRAINFEIGN_URL:172.16.33.162:8005}
+#    BmstruckFeign:
+#      url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
+#    QmsTruckFeign:
+#      url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8017}
+#    TmsTrainFeign:
+#      url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
+#    TmsTruckFeign:
+#      url: ${TMSTRUCKFEIGN_URL:localhost:8008}
+#    TmsshipFeign:
+#      url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
+#    WMSHFeign:
+#      url: ${WMSHFEIGN_URL:172.16.33.162:8013}
+#    WMSFeign:
+#      url: ${WMSFEIGN_URL:172.16.33.162:8012}
+#    OMSFeign:
+#      url: ${OMSFEIGN_URL:localhost:8016}
+#    RmsFeign:
+#      url: ${RMSFEIGN_HRL:172.16.33.162:8014}
 
 genxml:
   pth: com/a
@@ -109,5 +109,5 @@ mybatis:
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
 server:
-  port: 8019
+  port: 8080
 

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

@@ -66,9 +66,9 @@
                     RM.MATERIAL_SPECIFICATION "materialSpecification",
                     RM.MATERIAL_MODEL "materialModel"
                 FROM AMS_PURCHASE_ORDER APO
-                    LEFT JOIN DIL_BATCH DB
+                    JOIN DIL_BATCH DB
                         ON DB.BATCH_ID = APO.BATCH_ID
-                    LEFT JOIN RMS_MATERIAL RM
+                    JOIN RMS_MATERIAL RM
                         ON RM.MATERIAL_ID = DB.MATERIAL_ID
                 <where>
                     <if test="index != null">
@@ -150,15 +150,12 @@
                         RC.CAPACITY_NUMBER     "capacityNumber",
                         RCA.CARRIER_NAME       "carrierName"
                  FROM RMS_CAPACITY RC
-                          LEFT JOIN RMS_CARRIER RCA
-                                    ON RCA.CARRIER_ID = RC.CARRIER_ID
+                          JOIN RMS_CARRIER RCA
+                                ON RCA.CARRIER_ID = RC.CARRIER_ID
                  WHERE RC.CAPACITY_STATUS = 0 AND RC.CAPACITY_TYPE_ID = 1
                    <if test="index != null">
                        and RCA.CARRIER_NAME LIKE #{index}
                    </if>
-                   <if test="index == null">
-                       and rownum &lt; 21
-                   </if>
              )
     </select>
 
@@ -378,4 +375,19 @@
             </if>
         </where>
     </select>
+
+<!--  通过订单ID查询订单下所有物资  -->
+    <select id="getOrderMaterialMesByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+        select RM.MATERIAL_NAME     "materialName",
+               CONCAT(RM.MATERIAL_SPECIFICATION,RM.MATERIAL_MODEL)     "materialModel",
+               (case
+                   when OOM.ORDER_MATERIAL_WEIGHT is not null
+                        then OOM.ORDER_MATERIAL_WEIGHT
+                   else OOM.ORDER_MATERIAL_NUMBER
+               end) "weightNum"
+        from OMSTRUCK_ORDER_MATERIAL OOM
+            left join RMS_MATERIAL  RM
+            on RM.MATERIAL_ID = OOM.MATERIAL_ID
+        where OOM.ORDER_ID = #{orderId}
+    </select>
 </mapper>