修改港存库

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

@@ -71,7 +71,6 @@ public class OmsshipInstructionsCapacityServiceImpl implements IOmsshipInstructi
         }else{
            //判断用户输入的船名在数据库中是否存在
             String capacityNumber=(String)omsshipInstructionsCapacity.get("capacityName");
-
            //查询运力表中是否含有对应的运力编号
             BigDecimal capacityId=null;
             BigDecimal bookingNumber=null;

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

@@ -74,6 +74,7 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         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);
@@ -121,7 +122,7 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         //查询实时库存
         Map<String,Object> gmMap = tmsshipLoadShipResultMapper.selectGmIdByPortId(idMap);
         if (gmMap==null) {
-           return -2;
+            return -2;
         }else {
             BigDecimal gmId = DataChange.dataToBigDecimal(gmMap.get("gmId"));
             tmsshipLoadShipResult.setRwarehouseMaterialId(gmId);

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

@@ -820,8 +820,8 @@
             ADN.GROUP_ID            AS "pierId",
             ADN.NOTICE_DELIVERY_TIME AS "noticeDeliveryTime"
         FROM AMSSHIP_DELIVERY_NOTICE ADN
-                 LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ADA
-                           ON ADA.BATCH_ID = ADN.BATCH_ID
+        LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ADA
+        ON ADA.BATCH_ID = ADN.BATCH_ID
         WHERE ADA.BATCH_ID = #{batchInfactoryId} AND ADA.DELETED=0 AND ADN.DELETED=0 FETCH NEXT  1 row only
     </select>
 

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

@@ -545,31 +545,34 @@
 
     <select id="getCapacity" resultType="java.util.Map">
         SELECT DISTINCT
-            DBI.INFACTORY_SHIP_NAME "infactoryShipName",
-            db.RESULT_FOREIGN_SHIP_NAME AS "resultForeignShipName",
-            rm.MATERIAL_NAME AS "materialName",
-            rc.CAPACITY_NUMBER AS "capacityNumber",
-            oic.INSTRUCTIONS_CAPACITY_ID AS "orderId",
-            DBI.BATCH_INFACOTRY_ID AS "batchInfactoryId",
-            ada.DOWN_SWIM_PORT_ID AS "downSwimPortId",
-            rp1.PORT_NAME AS "portName1",
-            ada.PORT_ID AS "portId",
-            rp2.PORT_NAME AS "portName2",
-            oic.INSTRUCTIONS_SHIP_POSITION "instructionsShipPosition"
+        DBI.INFACTORY_SHIP_NAME "infactoryShipName",
+        db.RESULT_FOREIGN_SHIP_NAME AS "resultForeignShipName",
+        rm.MATERIAL_NAME AS "materialName",
+        rc.CAPACITY_NUMBER AS "capacityNumber",
+        oic.INSTRUCTIONS_CAPACITY_ID AS "orderId",
+        DBI.BATCH_INFACOTRY_ID AS "batchInfactoryId",
+        ada.DOWN_SWIM_PORT_ID AS "downSwimPortId",
+        rp1.PORT_NAME AS "portName1",
+        ada.PORT_ID AS "portId",
+        rp2.PORT_NAME AS "portName2",
+        oic.INSTRUCTIONS_SHIP_POSITION "instructionsShipPosition",
+        RP3.PORT_NAME "startPortName"
         FROM
-            OMSSHIP_INSTRUCTIONS_CAPACITY oic
-                LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
-                LEFT JOIN DIL_BATCH_INFACOTRY DBI ON DBI.BATCH_INFACOTRY_ID = osi.BATCH_ID
-                LEFT JOIN DIL_BATCH db ON db.BATCH_ID = DBI.BATCH_ID
-                LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ada ON ada.BATCH_ID = DBI.BATCH_INFACOTRY_ID
-                LEFT JOIN RMS_PORT rp1 ON ada.DOWN_SWIM_PORT_ID = rp1.PORT_ID
-                LEFT JOIN RMS_PORT rp2 ON ada.PORT_ID = rp2.PORT_ID
-                LEFT JOIN RMS_MATERIAL rm ON rm.MATERIAL_ID = db.MATERIAL_ID
-                LEFT JOIN RMS_CAPACITY rc ON rc.CAPACITY_ID = oic.CAPACITY_ID
+        OMSSHIP_INSTRUCTIONS_CAPACITY oic
+        LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
+        LEFT JOIN DIL_BATCH_INFACOTRY DBI ON DBI.BATCH_INFACOTRY_ID = osi.BATCH_ID
+        LEFT JOIN DIL_BATCH db ON db.BATCH_ID = DBI.BATCH_ID
+        LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ada ON ada.BATCH_ID = DBI.BATCH_INFACOTRY_ID
+        LEFT JOIN AMSSHIP_DELIVERY_NOTICE ADN ON ADN.BATCH_ID = ADA.BATCH_ID
+        LEFT JOIN RMS_PORT RP3 ON RP3.PORT_ID = ADN.PORT_ID
+        LEFT JOIN RMS_PORT rp1 ON ada.DOWN_SWIM_PORT_ID = rp1.PORT_ID
+        LEFT JOIN RMS_PORT rp2 ON ada.PORT_ID = rp2.PORT_ID
+        LEFT JOIN RMS_MATERIAL rm ON rm.MATERIAL_ID = db.MATERIAL_ID
+        LEFT JOIN RMS_CAPACITY rc ON rc.CAPACITY_ID = oic.CAPACITY_ID
         WHERE OSI.DELETED = 0
-          AND OIC.DELETED = 0
-          AND ADA.DELETED = 0
-          AND OSI.INSTRUCTION_ISSUE_STATUS='已下发'
+        AND OIC.DELETED = 0
+        AND ADA.DELETED = 0
+        AND OSI.INSTRUCTION_ISSUE_STATUS='已下发'
         <if test="con!=null">
             AND (DB.RESULT_FOREIGN_SHIP_NAME like concat('%', concat(#{con},'%'))
             or RM.MATERIAL_NAME like concat('%', concat(#{con}, '%'))