“修改船运进口”

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

@@ -19,8 +19,8 @@ public class ShipDynamicsController extends BaseRESTfulController {
     ShipDynamicsServiceImpl iShipDynamicsService;
 
     @ApiOperation(value="查询所有的船舶动态信息")
-    @PostMapping("/selectAllShipDyna")
-    public RESTfulResult selectAll() {
+    @PostMapping("/selectAllShipDynamaics")
+    public RESTfulResult selectAllShipDynamaics() {
         //返回值mapList
         //获取视图里的所有外轮船名，物资名称
         List<Map<String, Object>> list = iShipDynamicsService.selectAll();

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

@@ -8,6 +8,7 @@ import java.util.Map;
 
 @Mapper
 public interface ShipDynamicsMapper {
+    //查询船舶动态表
     List<Map<String, Object>> selectAll();
     List<Map<String, Object>> selectByshipName(String shipName, String materialName);
 }

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

@@ -94,12 +94,18 @@ public class OmsshipShipmentInstructionsServiceImpl implements IOmsshipShipmentI
         }
         BigDecimal shipmentInstructionsId = omsshipShipmentInstructionsMapper.selectInstructionId();
         omsshipShipmentInstructions.setShipmentInstructionsId(shipmentInstructionsId);
-        BigDecimal batchId = omsshipShipmentInstructions.getBatchId();
+        BigDecimal batchId = DataChange.dataToBigDecimal(map.get("batchId"));
         Map<String,Object> map1 = omsshipShipmentInstructionsMapper.getPortAndPier(batchId);
         BigDecimal pierId = (BigDecimal) map1.get("pierId");
         BigDecimal portId = (BigDecimal) map1.get("portId");
         omsshipShipmentInstructions.setRecipientCarrierId(pierId);
         omsshipShipmentInstructions.setPortCarrierId(portId);
+        omsshipShipmentInstructions.setBatchId(batchId);
+        //新增合计吨位
+        omsshipShipmentInstructions.setInstructionsTotalTonnage(DataChange.dataToBigDecimal(map.get("instructionsTotalTonnage")));
+        //新增装船日期
+        long instructionTime =(long) map.get("instructionTime");
+        omsshipShipmentInstructions.setInstructionTime(new Date(instructionTime));
         //  设置常规字段
         omsshipShipmentInstructions.setInsertTime(new Date());
         omsshipShipmentInstructions.setInsertUpdateRemark("无");

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

@@ -163,6 +163,7 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         tmsshipShipLocation.setTotalResultId(totalResultId);
         tmsshipShipLocation.setLocationStatus("未到闸船舶");
         tmsshipShipLocation.setInsertTime(new Date());
+        tmsshipShipLocation.setLocationRouteTime(new Date());
         i += tmsshipShipLocationMapper.insertSelective(tmsshipShipLocation);
         i += tmsshipLoadShipResultMapper.insertSelective(tmsshipLoadShipResult);
         return i;

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

@@ -3,63 +3,65 @@
 <mapper namespace="com.steerinfo.dil.mapper.ShipDynamicsMapper">
 <!--   获取数据  -->
     <select id="selectAll" resultType="java.util.Map" parameterType="java.util.Map">
-        select *
-        from (
-                 select db.BATCH_ID                      "batchId",
-                        db.result_foreign_ship_name      "shipName",
-                        rm.material_name                 "materialName",
-                        actr.result_date_of_loans        "tonnage",
-                        actr.RESULT_NUMBER_OF_LOANS      "dateOfLoans",
-                        rp.port_name                     "numberOfLoans",
-                        wgm.gm_tonnage                   "portName",
-                        rc.capacity_number               "capacity",
-                        tlsr.RESULT_ACTUAL_INSTALLATIONS "capacityNumber",
-                        tlsr.RESULT_OUT_PORT_TIME        "outPortTime",
-                        tsl.LOCATION_STATUS              "locationStatus",
-                        tsl.LOCATION_VALUE               "locationValue",
-                        tsl.LOCATION_ROUTE_TIME          "localtionRouteTime"
-                 from DIL_BATCH db
-                          join rms_material rm on db.material_id = rm.material_id
-                          left join AMSSHIP_CARGO_TRANSFER_RESULT actr on db.batch_id = actr.batch_id
-                          left join AMSSHIP_DELIVERY_NOTICE adn on adn.batch_id = db.batch_id
-                          left join rms_port rp on rp.port_id = adn.port_id
-                          left join (select *
-                                     from WMSH_GRID_MATERIAL wgm
-                                     where wgm.GM_ID in
-                                           (SELECT wgm.GM_ID
-                                            FROM (
-                                                     SELECT wgm.GM_ID,
-                                                            wgm.BATCH_ID,
-                                                            wgm.INSERT_TIME,
-                                                            ROW_NUMBER() OVER (
-                                                                PARTITION BY wgm.BATCH_ID
-                                                                ORDER BY wgm.INSERT_TIME DESC
-                                                                ) AS rn
-                                                     FROM WMSH_GRID_MATERIAL wgm
-                                                 ) wgm
-                                            WHERE rn = 1)) wgm on wgm.batch_id = db.batch_id
-                          left join TMSSHIP_LOAD_SHIP_RESULT tlsr on db.batch_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
-                          left join rms_capacity rc on oic.capacity_id = rc.capacity_id
-                          left join (select *
-                                     from tmsship_ship_location t
-                                     where t.location_id in
-                                           (SELECT t.location_id
-                                            FROM (
-                                                     SELECT t.location_id,
-                                                            t.total_result_id,
-                                                            t.location_route_time,
-                                                            ROW_NUMBER() OVER (
-                                                                PARTITION BY t.total_result_id
-                                                                ORDER BY t.location_route_time DESC
-                                                                ) AS rn
-                                                     FROM tmsship_ship_location t
-                                                 ) t
-                                            WHERE rn = 1)) tsl on tsl.total_result_id = ttr.result_id
-                 where ttr.ship_status = 0
-             )
-        where "locationValue" is not null
+        select db.BATCH_ID "batchId",
+               db.result_foreign_ship_name "shipName",
+               rm.material_name "materialName",
+               actr.result_date_of_loans "dateOfLoans",
+               actr.RESULT_NUMBER_OF_LOANS "numberOfLoans",
+               rp.port_name "portName",
+               wgm.gm_tonnage "tonnage",
+               rc.capacity_number "capacity",
+               tlsr.RESULT_ACTUAL_INSTALLATIONS "capacityNumber",
+               tlsr.RESULT_OUT_PORT_TIME "outPortTime",
+               tsl.LOCATION_STATUS "locationStatus",
+               tsl.LOCATION_VALUE "locationValue",
+               tsl.LOCATION_ROUTE_TIME
+        from DIL_BATCH db
+                 join rms_material rm on db.material_id=rm.material_id
+                 left join AMSSHIP_CARGO_TRANSFER_RESULT actr on db.batch_id=actr.batch_id
+                 left join AMSSHIP_DELIVERY_NOTICE adn on adn.batch_id=db.batch_id
+                 left join rms_port rp on rp.port_id=adn.port_id
+                 left join (select * from WMSH_GRID_MATERIAL wgm where wgm.GM_ID in
+                                                                       (SELECT
+                                                                            wgm.GM_ID
+                                                                        FROM
+                                                                            (
+                                                                                SELECT
+                                                                                    wgm.GM_ID,
+                                                                                    wgm.BATCH_ID,
+                                                                                    wgm.INSERT_TIME,
+                                                                                    ROW_NUMBER () OVER (
+                                                                                        PARTITION BY wgm.BATCH_ID
+                                                                                        ORDER BY wgm.INSERT_TIME DESC
+                                                                                        ) AS rn
+                                                                                FROM
+                                                                                    WMSH_GRID_MATERIAL wgm
+                                                                            ) wgm
+                                                                        WHERE
+                                                                            rn = 1)) wgm on wgm.batch_id=db.batch_id
+                 left join TMSSHIP_LOAD_SHIP_RESULT tlsr on db.batch_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
+                 left join rms_capacity rc on oic.capacity_id=rc.capacity_id
+                 left join (select * from tmsship_ship_location t where t.location_id in
+                                                                        (SELECT
+                                                                             t.location_id
+                                                                         FROM
+                                                                             (
+                                                                                 SELECT
+                                                                                     t.location_id,
+                                                                                     t.total_result_id,
+                                                                                     t.location_route_time,
+                                                                                     ROW_NUMBER () OVER (
+                                                                                         PARTITION BY t.total_result_id
+                                                                                         ORDER BY t.location_route_time DESC
+                                                                                         ) AS rn
+                                                                                 FROM
+                                                                                     tmsship_ship_location t
+                                                                             ) t
+                                                                         WHERE
+                                                                             rn = 1)) tsl on tsl.total_result_id=ttr.result_id
+        where ttr.ship_status = 0 and tsl.LOCATION_STATUS is not null
     </select>
     <select id="selectByshipName" resultType="java.util.Map" parameterType="java.util.Map">
         select sd.GM_TONNAGE as "tonnage",