ytijiao

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

@@ -267,6 +267,14 @@ public class QMSController extends BaseRESTfulController {
         return qmsFeign.queueEnd(mapValue);
     }
 
+    @ApiOperation(value = "判断车辆有没有在圆心里面")
+    @PostMapping("/isInCircle")
+    public Map<String,Object> isInCircle(String longitude,
+                                         String latitude,
+                                         String capacityNo){
+        return qmsFeign.isInCircle(longitude,latitude,capacityNo);
+    }
+
 
 //    @ApiOperation(value="查询进厂排队详情")
 //    @ApiImplicitParams({

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

@@ -9,6 +9,7 @@ import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.*;
 import io.swagger.models.auth.In;
+import oracle.jdbc.proxy.annotation.Post;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -1011,4 +1012,16 @@ public class UniversalController extends BaseRESTfulController {
         return success(data);
     }
 
+    @ApiOperation(value = "内转异地库查询发站")
+    @GetMapping("/getInwardSendStation")
+    public RESTfulResult getInwardSendStation(){
+        return success(universalMapper.getInwardSendStation());
+    }
+
+    @ApiOperation(value = "获取入库实绩")
+    @PostMapping("/getInwardInboundResult")
+    public RESTfulResult getInwardInboundResult(@RequestBody Map<String,Object> map){
+        return success(universalMapper.getInwardInboundResult(map));
+    }
+
 }

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

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

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

@@ -138,6 +138,11 @@ public interface QmsFeign {
 
     @PostMapping("api/v1/queueTruck/qmsqueuelists/getSpellingListMonitorMes")
     Map<String, Object> getSpellingListMonitorMes(@RequestBody(required=false) Map<String,Object> mapValue);
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/isInCircle")
+    Map<String, Object> isInCircle(@RequestParam String longitude,
+                                   @RequestParam String latitude,
+                                   @RequestParam String capacityNo);
 //    @PostMapping("api/v1/queueTruck/qmsqueueresults/getAllQueueMes")
 //     Map<String, Object> getAllQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
 //                                              @RequestParam("apiId") Integer apiId,

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

@@ -885,4 +885,8 @@ public interface WMSFeign {
 
     @PostMapping("/api/v1/wms/wmshgridmaterials/gePortStockList")
     Map<String, Object> gePortStockList(@RequestBody(required = false) Map<String, Object> mapVal);
+
+    @PostMapping("/api/v1/wms/platformWarehouse/platformInbound")
+    Map<String, Object> platformInbound(@RequestBody Map<String, Object> map);
+
 }

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

@@ -233,4 +233,8 @@ public interface UniversalMapper {
     List<Map<String,Object>> selectPurchaseOrderForShip(Map<String,Object> map);
 
     List<Map<String,Object>> findBatchHavingLoad(Map<String,Object> map);
+
+    List<Map<String,Object>> getInwardSendStation();
+
+    List<Map<String,Object>> getInwardInboundResult(Map<String, Object> map);
 }

src/main/resources/application-prod.yml

@@ -19,17 +19,17 @@ openfeign:
   BmstruckFeign:
     url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
   QmsTruckFeign:
-    url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
+    url: ${QMSTRUCKFEIGN_URL:localhost:8047}
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.166:8070}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.166:8093}
+    url: ${WMSFEIGN_URL:localhost:8093}
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.166:8095}
   RmsFeign:

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

@@ -1228,6 +1228,46 @@
             and (INSTR(db.RESULT_FOREIGN_SHIP_NAME,#{index}) > 0 or INSTR(rm.MATERIAL_NAME,#{index}) > 0)
         </if>
     </select>
+    <select id="getInwardSendStation" resultType="java.util.Map">
+        select
+            RAS.ARRIVAL_NAME "sendStation",
+            RAS.ARRIVAL_ID		"sendStationId"
+            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",
+               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"
+        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
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 LEFT JOIN TMSTT_ORDER TTO
+                           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}
+        <if test="gmStatus != null and gmStatus != -1">
+            AND WGM.DELETED = #{gmStatus}
+        </if>
+    </select>
 
 
     <update id="closePassedOrder" >