Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-DAZHOU-TMSSHIP-API

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

@@ -17,6 +17,6 @@ public interface RmsCapacityMapper extends IBaseMapper<RmsCapacity, BigDecimal>
     BigDecimal selectCapacityId();
 
    //根据运力车牌查看运力id
-    Map<String,Object> getCapacityIdByCapacityNumber(String capacityNumber);
+    List<Map<String,Object>> getCapacityIdByCapacityNumber(String capacityNumber);
 
 }

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

@@ -60,4 +60,7 @@ public interface TmsshipLoadShipResultMapper extends IBaseMapper<TmsshipLoadShip
     //根据港口名称获得港存库主键id
    Map<String,Object> selectGmIdByPortId(Map<String,Object> idMap);
 
+    //为出库查询批次和实装数量
+    List<Map<String,Object>> getBatchIdForOut(Map<String,Object> map);
+
 }

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

@@ -74,10 +74,10 @@ public class OmsshipInstructionsCapacityServiceImpl implements IOmsshipInstructi
            //查询运力表中是否含有对应的运力编号
             BigDecimal capacityId=null;
             BigDecimal bookingNumber=null;
-            Map<String,Object> map = rmsCapacityMapper.getCapacityIdByCapacityNumber(capacityNumber);
-            if (map!=null) {
-              capacityId = DataChange.dataToBigDecimal(map.get("capacityId"));
-              bookingNumber =DataChange.dataToBigDecimal(map.get("bookingNumber"));
+            List<Map<String,Object>> mapList = rmsCapacityMapper.getCapacityIdByCapacityNumber(capacityNumber);
+            if (mapList!=null && mapList.size() != 0) {
+              capacityId = DataChange.dataToBigDecimal(mapList.get(0).get("capacityId"));
+              bookingNumber =DataChange.dataToBigDecimal(mapList.get(0).get("bookingNumber"));
             }
             BigDecimal capacityBookingNumber = DataChange.dataToBigDecimal(omsshipInstructionsCapacity.get("capacityBookingNumber"));
             if (capacityId != null) {

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

@@ -71,10 +71,10 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         BigDecimal orderId = new BigDecimal((Integer) rowMap.get("orderId"));
         BigDecimal batchInfactoryId= DataChange.dataToBigDecimal(rowMap.get("batchInfactoryId"));
         Map<String,Object> ppMap = tmsshipLoadShipResultMapper.getPortAndPier(batchInfactoryId);
+        BigDecimal batchId =DataChange.dataToBigDecimal(rowMap.get("batchId"));
         BigDecimal pierId = (BigDecimal) ppMap.get("pierId");
         Date noticeDeliveryTime = (Date) ppMap.get("noticeDeliveryTime");
         BigDecimal startPortId = DataChange.dataToBigDecimal(ppMap.get("startPortId"));
-
         String resultMemo = (String) mapVal.get("resultMemo");
         Date resultArrivalTime = new Date((Long)mapVal.get("resultArrivalTime"));
         tmsshipLoadShipResult.setResultArrivalPortTime(resultArrivalTime);
@@ -117,7 +117,7 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         //通过总实绩id查找船运起运港口
         //根据港口和批次Id查询实时库存id
         Map<String,Object> idMap=new HashMap<>();
-        idMap.put("batchInfactoryId",batchInfactoryId);
+        idMap.put("batchInfactoryId",batchId);
         idMap.put("downSwimPortId",startPortId);
         //查询实时库存
         Map<String,Object> gmMap = tmsshipLoadShipResultMapper.selectGmIdByPortId(idMap);
@@ -137,6 +137,13 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         tmsshipLoadShipResult.setResultIsclear(resultIsClear);
         if (resultIsClear.equals("清场")){
            wmshboundFeign.clearWmshGridMaterial(gmMap);
+        }else {
+            Map<String,Object> outBoundMap=new HashMap<>();
+            //装船入下游港口港存库库存
+            outBoundMap.put("portId",rowMap.get("downSwimPortId"));
+            outBoundMap.put("batchId",rowMap.get("batchId"));
+            outBoundMap.put("resultMaterialNumber",resultActualInstallations);
+            wmshboundFeign.addResult(outBoundMap);
         }
         String resultNumber = noUtil.setResultNo("ZC",resultEntryId);
         tmsshipLoadShipResult.setResultId(resultId);
@@ -233,7 +240,7 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         tmsshipLoadShipResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));
         long resultLoadShipDate =(long) map.get("resultLoadShipDate");
         tmsshipLoadShipResult.setResultLoadShipDate(new Date(resultLoadShipDate));
-        tmsshipLoadShipResult.setResultActualInstallations(DataChange.dataToBigDecimal(map.get("resultActualInstallations")));
+        tmsshipLoadShipResult.setResultActualInstallations(new BigDecimal((String) map.get("resultActualInstallations")));
         long resultOutPortTime =(long) map.get("resultOutPortTime");
         tmsshipLoadShipResult.setResultOutPortTime(new Date(resultOutPortTime));
         long resultArrivalPortTime = (long) map.get("resultArrivalPortTime");

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

@@ -102,15 +102,15 @@ public class TmsshipUnloadShipResultServiceImpl implements ITmsshipUnloadShipRes
         tmsshipUnloadShipResult.setInsertUpdateRemark("无");
         tmsshipUnloadShipResult.setDeleted(new BigDecimal(0));
         // 新增出库实绩
-            Map<String,Object> totalId = new HashMap<>();
-            totalId.put("totalResultId",totalResultId);
-            List<TmsshipLoadShipResult> tmsshipLoadShipResults = tmsshipLoadShipResultMapper.selectByParameters(totalId);
-            TmsshipLoadShipResult tmsshipLoadShipResult = tmsshipLoadShipResults.get(0);
-            Map<String,Object> mapValue = new HashMap<>();
-            mapValue.put("batchId",tmsshipLoadShipResult.getBatchId());
-            mapValue.put("portId",downSwimPortId);
-            mapValue.put("resultMaterialNumber",tmsshipLoadShipResult.getResultActualInstallations());
-            wmshboundFeign.addWarehousingResult(mapValue);
+        Map<String,Object> totalId = new HashMap<>();
+        totalId.put("totalResultId",totalResultId);
+        List<Map<String,Object>> tmsshipLoadShipResults = tmsshipLoadShipResultMapper.getBatchIdForOut(totalId);
+        Map<String,Object> tmsshipLoadShipResult = tmsshipLoadShipResults.get(0);
+        Map<String,Object> mapValue = new HashMap<>();
+        mapValue.put("batchId",tmsshipLoadShipResult.get("batchId"));
+        mapValue.put("portId",downSwimPortId);
+        mapValue.put("resultMaterialNumber",tmsshipLoadShipResult.get("resultMaterialNumber"));
+        wmshboundFeign.addWarehousingResult(mapValue);
 
         return tmsshipUnloadShipResultMapper.insert(tmsshipUnloadShipResult);
     }

src/main/resources/application-prod.yml

@@ -29,7 +29,7 @@ openfeign:
   WmshboundFeign:
     url: ${WMSHBOUNDFEIGN_URL:172.16.33.166:8070}
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
 
 server:
   port: 8090

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

@@ -813,7 +813,7 @@
     select  RC.CAPACITY_ID "capacityId",
             RC.CAPACITY_BOOKING_NUMBER "bookingNumber"
     from RMS_CAPACITY RC
-    WHERE  rc.CAPACITY_NUMBER = #{capacityNumber} and RC.DELETED=0
+    WHERE  rc.CAPACITY_NUMBER = #{capacityNumber}
   </select>
 
 </mapper>

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

@@ -830,6 +830,21 @@
         select WGM.GM_ID "gmId",
                WGM.GM_TONNAGE "tonnage"
         from WMSH_GRID_MATERIAL WGM
+        left join DIL_BATCH DB
+        on WGM.BATCH_ID=DB.BATCH_ID
         WHERE WGM.BATCH_ID=#{batchInfactoryId} and WGM.PORT_ID=#{downSwimPortId}
     </select>
+
+    <select id="getBatchIdForOut" resultType="java.util.Map">
+        select  DB.BATCH_ID "batchId",
+                TLSR.RESULT_ACTUAL_INSTALLATIONS "resultMaterialNumber"
+        from TMSSHIP_LOAD_SHIP_RESULT TLSR
+                 left join DIL_BATCH_INFACOTRY DBI
+                           on TLSR.BATCH_ID=DBI.BATCH_INFACOTRY_ID
+                 left join DIL_BATCH DB
+                           on DBI.BATCH_ID=DB.BATCH_ID
+        where TLSR.TOTAL_RESULT_ID=#{totalResultId}
+    </select>
+
+
 </mapper>

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

@@ -552,6 +552,7 @@
         oic.INSTRUCTIONS_CAPACITY_ID AS "orderId",
         DBI.BATCH_INFACOTRY_ID AS "batchInfactoryId",
         ada.DOWN_SWIM_PORT_ID AS "downSwimPortId",
+        db.BATCH_ID AS "batchId" ,
         rp1.PORT_NAME AS "portName1",
         ada.PORT_ID AS "portId",
         rp2.PORT_NAME AS "portName2",