sadd

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

@@ -2,10 +2,7 @@ package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.feign.OmsFeign;
 import com.steerinfo.framework.controller.RESTfulResult;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -920,4 +917,22 @@ public class OMSController {
     public  Map<String, Object> closeInwardOrderByPlan(@RequestParam Integer planId) {
         return omsFeign.closeInwardOrderByPlan(planId);
     }
+
+
+    @ApiOperation(value = "查询内转钢材异地库物资详情")
+    @GetMapping("/getOrderTrainMes")
+    public Map<String,Object> getOrderTrainMes(@RequestParam Integer orderId){
+        return omsFeign.getOrderTrainMes(orderId);
+    }
+
+    @ApiOperation(value = "查询内转钢材火车发运明细")
+    @PostMapping("getWagonShippingDetails")
+    public Map<String,Object> getWagonShippingDetails(@RequestBody(required = false) Map<String,Object> map,
+                                                      @RequestParam(required = false) String startTime,
+                                                      @RequestParam(required = false) String endTime){
+        if (map == null) {
+            map = new HashMap<>();
+        }
+        return omsFeign.getWagonShippingDetails(map,startTime,endTime);
+    }
 }

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

@@ -4,6 +4,7 @@ import com.steerinfo.dil.mapper.UniversalMapper;
 import com.steerinfo.dil.service.impl.UniversalServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
@@ -1021,7 +1022,30 @@ public class UniversalController extends BaseRESTfulController {
     @ApiOperation(value = "获取入库实绩")
     @PostMapping("/getInwardInboundResult")
     public RESTfulResult getInwardInboundResult(@RequestBody Map<String,Object> map){
-        return success(universalMapper.getInwardInboundResult(map));
+        List<Map<String,Object>> mapList = universalMapper.getInwardInboundResult(map);
+        //遍历数组去查物资数据
+        for(Map<String,Object>map1:mapList){
+            BigDecimal orderId = DataChange.dataToBigDecimal(map1.get("orderId"));
+            List<Map<String,Object>> materialList = universalMapper.getMaterialList(map1);
+            for (Map<String,Object>materialMap:materialList){
+                BigDecimal materialId = DataChange.dataToBigDecimal(materialMap.get("materialId"));
+                //根据运输订单ID和物资ID去查询炉号
+                List<Map<String, Object>> luHaoNumberList = universalMapper.getLuhaoNum(orderId,materialId);
+                StringBuilder sb = new StringBuilder();
+                for (Map<String, Object> luHaoMap : luHaoNumberList) {
+                    sb.append(luHaoMap.get("materialFurnaceNumber"));
+                    sb.append("-");
+                    sb.append(luHaoMap.get("materialNum"));
+                    sb.append("/");
+                }
+                if(luHaoNumberList.size() > 0){
+                    sb.deleteCharAt(sb.length() - 1);
+                    materialMap.put("luhao",sb.toString());
+                }
+            }
+            map1.put("materialList",materialList);
+        }
+        return success(mapList);
     }
 
 }

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

@@ -1047,5 +1047,11 @@ public class WMSController extends BaseRESTfulController {
     public Map<String,Object> platformInbound(@RequestBody Map<String,Object> map){
         return wmsFeign.platformInbound(map);
     }
+
+    @ApiOperation(value = "站台出库作业")
+    @PostMapping("afterInwardOutbound")
+    public Map<String,Object> afterInwardOutbound(@RequestBody Map<String,Object> map){
+        return wmsFeign.afterInwardOutbound(map);
+    }
 }
 

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

@@ -531,5 +531,13 @@ public interface OmsFeign {
 
     @PostMapping("api/v1/oms/omstruckorders/closeInwardOrderByPlan")
     Map<String, Object> closeInwardOrderByPlan(@RequestParam Integer planId);
+
+    @GetMapping("api/v1/oms/omstrainorders/getOrderTrainMes")
+    Map<String, Object> getOrderTrainMes(@RequestParam Integer orderId);
+
+    @PostMapping("/api/v1/oms/omstrainorders/getWagonShippingDetails")
+    Map<String, Object> getWagonShippingDetails(@RequestBody(required = false) Map<String, Object> map,
+                                                @RequestParam(required = false) String startTime,
+                                                @RequestParam(required = false) String endTime);
 }
 

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

@@ -889,4 +889,7 @@ public interface WMSFeign {
     @PostMapping("/api/v1/wms/platformWarehouse/platformInbound")
     Map<String, Object> platformInbound(@RequestBody Map<String, Object> map);
 
+    @PostMapping("/api/v1/wms/platformWarehouse/afterInwardOutbound")
+    Map<String, Object> afterInwardOutbound(@RequestBody(required = false) Map<String, Object> map);
+
 }

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.mapper;
 
 import io.swagger.models.auth.In;
+import org.apache.ibatis.annotations.Param;
 import org.mapstruct.Mapper;
 
 import java.math.BigDecimal;
@@ -237,4 +238,9 @@ public interface UniversalMapper {
     List<Map<String,Object>> getInwardSendStation();
 
     List<Map<String,Object>> getInwardInboundResult(Map<String, Object> map);
+
+    List<Map<String, Object>> getMaterialList(Map<String, Object> map1);
+
+    List<Map<String, Object>> getLuhaoNum(@Param("orderId") BigDecimal orderId, @Param("materialId") BigDecimal materialId);
+
 }

src/main/resources/application-dev.yml

@@ -28,7 +28,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+    url: ${AMSFEIGN_URL:localhost:8015}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:
@@ -36,19 +36,19 @@ openfeign:
   BmstruckFeign:
     url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
   QmsTruckFeign:
-    url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8017}
+    url: ${QMSTRUCKFEIGN_URL:localhost:8017}
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162: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}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.162:8012}
+    url: ${WMSFEIGN_URL:localhost:8012}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+    url: ${OMSFEIGN_URL:localhost:8016}
   RmsFeign:
     url: ${RMSFEIGN_HRL:172.16.33.162:8060}
   JoinFeign:
@@ -62,4 +62,4 @@ piction:
   path: /shared
 
 server:
-  port: 8019
+  port: 8080

src/main/resources/application-prod.yml

@@ -9,9 +9,9 @@ spring:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+    url: ${AMSFEIGN_URL:localhost:8079}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmstrainFeign:
@@ -31,7 +31,7 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:localhost:8093}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.166:8095}
+    url: ${OMSFEIGN_URL:localhost:8095}
   RmsFeign:
     url: ${RMSFEIGN_URL:172.16.33.166:8060}
   JoinFeign:

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -1231,22 +1231,19 @@
             from RMSTRAIN_ARRIVAL_SEND RAS
             WHERE RAS.ARRIVAL_TYPE_ID = 1
     </select>
-    <select id="getInwardInboundResult" resultType="java.util.Map" parameterType="java.util.Map">
-        SELECT RC.CAPACITY_NUMBER "capacityNumber",
+    <select id="getInwardInboundResult" resultType="java.util.Map" parameterType="java.util.LinkedHashMap">
+        SELECT DISTINCT
+               RC.CAPACITY_NUMBER "capacityNumber",
                OO.ORDER_NUMBER "orderNumber",
                OO.ORDER_ID "orderId",
-               RM.MATERIAL_ID "materialId",
-               RM.MATERIAL_NAME || '-' || RM.MATERIAL_SPECIFICATION || '(' ||
-               RM.MATERIAL_MODEL || ')' || '-' || OOM.ORDER_MATERIAL_NUMBER || '件' "materialName",
                RPG.INSERT_TIME "insertTime",
                DECODE(WGM.DELETED, 1, '已出库', '未出库') "gmStatus",
-               WGM.GM_NUMBER    "gmNumber",
-               OTO.ORDER_WAGON_NO "wagonNo"
+               OTO.ORDER_WAGON_NO "wagonNo",
+               OTO.ORDER_ID     "trainOrderId",
+               RPG.INSERT_UPDATE_REMARK "remark"
         FROM WMSP_GRID_MATERIAL WGM
                  LEFT JOIN RMS_PWAREHOUSE_GRID RPG
                            ON RPG.GRID_ID = WGM.GRID_ID
-                 LEFT JOIN RMS_MATERIAL RM
-                           ON RM.MATERIAL_ID = WGM.MATERIAL_ID
                  LEFT JOIN OMSTRUCK_ORDER OO
                            ON OO.ORDER_ID = RPG.STACKING_ID
                  LEFT JOIN RMS_CAPACITY RC
@@ -1255,14 +1252,35 @@
                            ON TTO.TRUCK_ORDER_ID = OO.ORDER_ID
                  LEFT JOIN OMSTRAIN_ORDER OTO
                            ON OTO.ORDER_ID = TTO.TRAIN_ORDER_ID
-                 LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
-                            ON OOM.ORDER_ID = OO.ORDER_ID
-                            AND OOM.MATERIAL_ID = RM.MATERIAL_ID
         WHERE RPG.GRID_TYPE = 1
-          AND RPG.INSERT_UPDATE_REMARK = #{userId}
+          AND RPG.INSERT_USERNAME = #{userId}
         <if test="gmStatus != null and gmStatus != -1">
             AND WGM.DELETED = #{gmStatus}
         </if>
+        order by RPG.INSERT_TIME desc
+    </select>
+    <select id="getMaterialList" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT RM.MATERIAL_ID "materialId",
+               RM.MATERIAL_NAME||'-'||RM.MATERIAL_SPECIFICATION||'('||RM.MATERIAL_SPECIFICATION||')'||'-'||OOM.ORDER_MATERIAL_NUMBER||'件' "materialName"
+        FROM OMSTRUCK_ORDER_MATERIAL OOM
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        WHERE OOM.ORDER_ID = #{orderId}
+    </select>
+    <select id="getLuhaoNum" resultType="java.util.Map" parameterType="decimal">
+        SELECT
+            RMS.MATERIAL_FURNACE_NUMBER "materialFurnaceNumber",
+            COUNT( WOSR.RESULT_ID ) "materialNum"
+        FROM
+            WMSP_OUTBOUND_RESULT WOR
+                LEFT JOIN WMSP_OUTBOUND_RESULT_MATERIAL WORM ON WORM.OUTBOUND_RESULT_ID = WOR.RESULT_ID
+                LEFT JOIN WMSP_OUTBOUND_SCAN_RESULT WOSR ON WORM.RESULT_MATERIAL_ID = WOSR.RESULT_MATERIAL_ID
+                LEFT JOIN WMSP_INBOUND_RESULT WIR ON WOSR.INBOUND_RESULT_ID = WIR.INBOUND_ID
+                LEFT JOIN RMS_MATERIAL_STEEL RMS ON WIR.MATERIAL_ID = RMS.MATERIAL_STEEL_ID
+        WHERE WOR.BILL_LADING_ID = #{orderId}
+          AND WORM.MATERIAL_ID = #{materialId}
+        GROUP BY
+            RMS.MATERIAL_FURNACE_NUMBER
     </select>