下游港口入库和船舶动态表精度“

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

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 @RestController
@@ -86,7 +87,7 @@ public class ShipDynamicsController extends BaseRESTfulController {
                 map2.put("tonnage",list.get(i-1).get("tonnage"));
                 map2.put("materialType",list.get(i-1).get("materialTypeName"));
                 map2.put("portName", list.get(i-1).get("portName"));
-                map2.put("capacity1",capacityNumberSum1+capacityNumberSum2+capacityNumberSum3+capacityNumberSum4);
+                map2.put("capacity1", new BigDecimal(capacityNumberSum1+capacityNumberSum2+capacityNumberSum3+capacityNumberSum4).setScale(2,BigDecimal.ROUND_HALF_UP));
                 map2.put("type",1);
                 map2.put("aaaaa", 2);
                 mapList.add(map2);
@@ -139,6 +140,8 @@ public class ShipDynamicsController extends BaseRESTfulController {
                 locationValue1 = list.get(i).get("locationValue").toString();
                 capacityNumberSum1 += Double.valueOf(capacityNumber1);
                 capacityNumberAllSum1+=Double.valueOf(capacityNumber1);
+                capacityNumberSum1 = new BigDecimal(capacityNumberSum1).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
+                capacityNumberAllSum1 = new BigDecimal(capacityNumberAllSum1).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
             } else if ("等闸船舶".equals(locationStatus)) {
                 capacity2 = list.get(i).get("capacity").toString();
                 capacityNumber2 = list.get(i).get("capacityNumber").toString();
@@ -146,6 +149,8 @@ public class ShipDynamicsController extends BaseRESTfulController {
                 locationValue2 = list.get(i).get("locationValue").toString();
                 capacityNumberSum2 += Double.valueOf(capacityNumber2);
                 capacityNumberAllSum2+=Double.valueOf(capacityNumber2);
+                capacityNumberSum2 = new BigDecimal(capacityNumberSum2).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
+                capacityNumberAllSum2 = new BigDecimal(capacityNumberAllSum2).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
             } else if ("已过闸船舶".equals(locationStatus)) {
                 capacity3 = list.get(i).get("capacity").toString();
                 capacityNumber3 = list.get(i).get("capacityNumber").toString();
@@ -153,6 +158,8 @@ public class ShipDynamicsController extends BaseRESTfulController {
                 locationValue3 = list.get(i).get("locationValue").toString();
                 capacityNumberSum3 += Double.valueOf(capacityNumber3);
                 capacityNumberAllSum3+=Double.valueOf(capacityNumber3);
+                capacityNumberSum3 = new BigDecimal(capacityNumberSum3).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
+                capacityNumberAllSum3 = new BigDecimal(capacityNumberAllSum3).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
             } else if ("到港待卸船舶".equals(locationStatus)) {
                 capacity4 = list.get(i).get("capacity").toString();
                 capacityNumber4 = list.get(i).get("capacityNumber").toString();
@@ -161,6 +168,8 @@ public class ShipDynamicsController extends BaseRESTfulController {
                 dgsj=list.get(i).get("dgsj").toString();
                 capacityNumberSum4 += Double.valueOf(capacityNumber4);
                 capacityNumberAllSum4+=Double.valueOf(capacityNumber4);
+                capacityNumberSum4 = new BigDecimal(capacityNumberSum4).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
+                capacityNumberAllSum4 = new BigDecimal(capacityNumberAllSum4).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
             }
             map.put("capacity1",capacity1);
             map.put("capacityNumber1",capacityNumber1);
@@ -220,7 +229,7 @@ public class ShipDynamicsController extends BaseRESTfulController {
             map2.put("tonnage",list.get(list.size()-1).get("tonnage"));
         }
         map2.put("portName", list.get(list.size()-1).get("portName"));
-        map2.put("capacity1",capacityNumberSum1+capacityNumberSum2+capacityNumberSum3+capacityNumberSum4);
+        map2.put("capacity1",new BigDecimal(capacityNumberSum1+capacityNumberSum2+capacityNumberSum3+capacityNumberSum4).setScale(2,BigDecimal.ROUND_HALF_UP));
         map2.put("type",1);
         map2.put("eeeeee", 12);
         mapList.add(map2);
@@ -251,7 +260,7 @@ public class ShipDynamicsController extends BaseRESTfulController {
             map4.put("tonnage",tonnageSum);
         }
         map4.put("pm","合计");
-        map4.put("capacity1",capacityNumberAllSum1+capacityNumberAllSum2+capacityNumberAllSum3+capacityNumberAllSum4);
+        map4.put("capacity1",new BigDecimal(capacityNumberAllSum1+capacityNumberAllSum2+capacityNumberAllSum3+capacityNumberAllSum4).setScale(2,BigDecimal.ROUND_HALF_UP));
         map4.put("type",1);
         map4.put("ttttt", 2);
         mapList.add(map4);

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

@@ -62,4 +62,7 @@ public interface AmsshipDeliveryAttorneyMapper extends IBaseMapper<AmsshipDelive
    //新增主键
     @Select("select seq_AMSSHIP_ATTORNEY.nextval from dual")
     BigDecimal selectAttorneyId();
+
+    //为港口入库查询信息
+    Map<String, Object> getDetailsForInbound(Map<String, Object> map);
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.feign.WmshboundFeign;
 import com.steerinfo.dil.mapper.AmsshipCargoTransferResultMapper;
 import com.steerinfo.dil.mapper.AmsshipDeliveryAttorneyMapper;
 import com.steerinfo.dil.model.AmsshipDeliveryAttorney;
@@ -37,7 +38,8 @@ public class AmsshipDeliveryAttorneyServiceImpl implements IAmsshipDeliveryAttor
     private AmsshipDeliveryAttorneyMapper amsshipDeliveryAttorneyMapper;
     @Autowired
     private AmsshipCargoTransferResultMapper amsshipCargoTransferResultMapper;
-
+    @Autowired
+    private WmshboundFeign wmshboundFeign;
 
     @Override
     public List<Map<String, Object>> selectdeliveryAttorney(Map<String, Object> mapVal) {
@@ -76,6 +78,10 @@ public class AmsshipDeliveryAttorneyServiceImpl implements IAmsshipDeliveryAttor
         amsshipDeliveryAttorney.setUpdateTime(new Date());
         amsshipDeliveryAttorney.setDeleted((short) 0);
         amsshipDeliveryAttorney.setRealForeignShipName(map.get("realForeignShipName")+"");
+        //下游港口入库
+        Map<String,Object> inbound=amsshipDeliveryAttorneyMapper.getDetailsForInbound(map);
+        inbound.put("portId",amsshipDeliveryAttorney.getDownSwimPortId());
+        wmshboundFeign.addWarehousingResult(inbound);
         return amsshipDeliveryAttorneyMapper.insertSelective(amsshipDeliveryAttorney);
     }
 

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

@@ -157,15 +157,15 @@ public class AmsshipDeliveryNoticeServiceImpl implements IAmsshipDeliveryNoticeS
         BigDecimal batchIdInfacotryId =DataChange.dataToBigDecimal(map1.get("batchIdInfacotryId"));
         amsshipDeliveryNotice.setBatchId(batchIdInfacotryId);
         //调用港口入库
-        Map<String,Object> mapValue = new HashMap<>();
-        mapValue.put("batchId",map1.get("batchIds"));
-        mapValue.put("portId",portId);
-        mapValue.put("resultMaterialNumber",DataChange.dataToBigDecimal(map.get("resultNumberOfLoans")));
-        if(mapValue.get("batchId") ==null || DataChange.dataToBigDecimal(mapValue.get("batchId")).compareTo(new BigDecimal(0))==0){
-            //如果是录入批次，则传新增批次的批次id
-            mapValue.put("batchId",map1.get("batchId"));
-        }
-        wmshboundFeign.addWarehousingResult(mapValue);
+//        Map<String,Object> mapValue = new HashMap<>();
+//        mapValue.put("batchId",map1.get("batchIds"));
+//        mapValue.put("portId",portId);
+//        mapValue.put("resultMaterialNumber",DataChange.dataToBigDecimal(map.get("resultNumberOfLoans")));
+//        if(mapValue.get("batchId") ==null || DataChange.dataToBigDecimal(mapValue.get("batchId")).compareTo(new BigDecimal(0))==0){
+//            //如果是录入批次，则传新增批次的批次id
+//            mapValue.put("batchId",map1.get("batchId"));
+//        }
+//        wmshboundFeign.addWarehousingResult(mapValue);
         i += amsshipDeliveryNoticeMapper.insertSelective(amsshipDeliveryNotice);
         return i ;
     }

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

@@ -782,4 +782,13 @@
            rrmr.GM_TONNAGE "label"
     FROM WMSH_GRID_MATERIAL rrmr
   </select>
+    <select id="getDetailsForInbound" resultType="java.util.Map">
+      SELECT DB.BATCH_ID "batchId",
+             ADN.RESULT_NUMBER_OF_LOANS "resultMaterialNumber"
+      FROM DIL_BATCH_INFACOTRY DBI
+             LEFT JOIN DIL_BATCH DB ON DBI.BATCH_ID = DB.BATCH_ID
+             LEFT JOIN AMSSHIP_DELIVERY_NOTICE ADN ON ADN.BATCH_ID = DBI.BATCH_INFACOTRY_ID
+      WHERE DBI.BATCH_INFACOTRY_ID=#{batchId} AND ADN.DELETED=0
+        FETCH NEXT 1 ROWS ONLY
+    </select>
 </mapper>

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

@@ -23,10 +23,11 @@
                OSI.INSTRUCTIONS_STATUS "instructionStatus"
                  from AMSSHIP_DELIVERY_NOTICE adn
                  LEFT JOIN DIL_BATCH_INFACOTRY DBI2 on adn.batch_id=DBI2.BATCH_INFACOTRY_ID
+                 LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ADA ON ADA.BATCH_ID = adn.batch_id
                  JOIN DIL_BATCH DB ON DBI2.BATCH_ID=DB.BATCH_ID
                  join rms_material rm on db.material_id=rm.material_id
-                 left join rms_port rp on rp.port_id=adn.port_id
-                 left join WMSH_GRID_MATERIAL wgm on wgm.batch_id = DB.BATCH_ID AND ADN.PORT_ID=WGM.PORT_ID
+                 left join rms_port rp on rp.port_id=ADA.DOWN_SWIM_PORT_ID
+                 left join WMSH_GRID_MATERIAL wgm on wgm.batch_id = DB.BATCH_ID AND ADA.DOWN_SWIM_PORT_ID=WGM.PORT_ID
                  left join TMSSHIP_LOAD_SHIP_RESULT tlsr on DBI2.BATCH_INFACOTRY_ID=tlsr.batch_id
                  left join tmsship_total_result ttr on ttr.result_id=tlsr.TOTAL_RESULT_ID
                  left join omsship_instructions_capacity oic on ttr.order_id=oic.instructions_capacity_id