zx 2 years ago
parent
commit
88e8093bf0

+ 0 - 1
src/main/java/com/steerinfo/dil/controller/ShipDynamicsController.java

@@ -92,7 +92,6 @@ public class ShipDynamicsController extends BaseRESTfulController {
                capacityNumberSum2 = 0.0;
                capacityNumberSum3 = 0.0;
                capacityNumberSum4 = 0.0;
-
             }
             Map<String, Object> map = new HashMap<>();
             map.put("batchId",list.get(i).get("batchId"));

+ 1 - 0
src/main/resources/com/steerinfo/dil/mapper/AmsshipDeliveryAttorneyMapper.xml

@@ -610,6 +610,7 @@
     t6.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
     t8.MATERIAL_NAME "materialName",
     RP2.PORT_NAME "portName",
+    RP2.PORT_ALL_NAME "pickupAllName",
     t5.PORT_NAME "portName1",
     t1.ATTORNEY_PICKUP_CONTACT_PERSON "attorneyPickupContactPerson",
     t1.ATTORENY_PICKUP_IDCARD "attorneyPickupIdcard",

+ 1 - 0
src/main/resources/com/steerinfo/dil/mapper/TmsshipTotalResultMapper.xml

@@ -549,6 +549,7 @@
         db.RESULT_FOREIGN_SHIP_NAME AS "resultForeignShipName",
         rm.MATERIAL_NAME AS "materialName",
         rc.CAPACITY_NUMBER AS "capacityNumber",
+        db.BATCH_ID "batchId",
         oic.INSTRUCTIONS_CAPACITY_ID AS "orderId",
         DBI.BATCH_INFACOTRY_ID AS "batchInfactoryId",
         ada.DOWN_SWIM_PORT_ID AS "downSwimPortId",