12.14合并

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

@@ -106,6 +106,9 @@ public class DilBatchController extends BaseRESTfulController {
                                       Integer pageSize,
                                       Integer apiId,
                                       String con) {
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
         //框计算
         if (con != null) {
             if (!"undefined".equals(con)) {

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

@@ -121,7 +121,7 @@ public class OmsshipShipmentInstructionsController extends BaseRESTfulController
                                                      Integer pageSize,
                                                      Integer apiId,
                                                      String con,
-                                                     Integer status){
+                                                     String status){
         //判断状态值是否为空
         if (status!=null){
             mapVal.put("status",status);
@@ -164,24 +164,7 @@ public class OmsshipShipmentInstructionsController extends BaseRESTfulController
 
     }
 
-/*    *//**
-     * 修改下发状态
-     * @param
-     * @return
-     *//*
-    @ApiOperation(value="修改下发状态")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "shipmentInstructionsId", value = "主键id", required = true, dataType = "BigDecimal")
-    })
-    @PostMapping(value = "/updateIssueStatus/{shipmentInstructionsId}")
-    public RESTfulResult updateIssueStatus(@PathVariable("shipmentInstructionsId") BigDecimal shipmentInstructionsId){
-        int code = omsshipShipmentInstructionsService.updateIssueStatus(shipmentInstructionsId);
-        return success(code);
-    }*/
 
-    /*
-    * 下发
-    * */
     //下发
     @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
     @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
@@ -193,12 +176,6 @@ public class OmsshipShipmentInstructionsController extends BaseRESTfulController
         omsshipShipmentInstructions.setInstructionIssueStatus(status);
         omsshipShipmentInstructionsService.updateByPrimaryKeySelective(omsshipShipmentInstructions);
         return success(omsshipShipmentInstructions);
-  /*      AmsshipDeliveryAttorney amsshipDeliveryAttorney=new AmsshipDeliveryAttorney();
-        amsshipDeliveryAttorney.setAttorneyId(new BigDecimal(attorneyId));
-        short status=1;
-        amsshipDeliveryAttorney.setAttorneyDistributionStatus(status);
-        amsshipDeliveryAttorneyService.updateByPrimaryKeySelective(amsshipDeliveryAttorney);
-        return success(amsshipDeliveryAttorney);*/
     }
     /**
      * 获取批次id

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

@@ -58,5 +58,5 @@ public interface TmsshipLoadShipResultMapper extends IBaseMapper<TmsshipLoadShip
     Map<String, Object> getPortAndPier(BigDecimal batchId);
 
     //根据港口名称获得港存库主键id
-    BigDecimal selectGmIdByPortId(Integer portId);
+   Map<String,Object> selectGmIdByPortId(Map<String,Object> idMap);
 }

src/main/java/com/steerinfo/dil/model/TmsshipLoadShipResult.java

@@ -20,17 +20,6 @@ public class TmsshipLoadShipResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="总实绩ID",required=false)
     private BigDecimal totalResultId;
 
-    /**
-     * 起运港(LOCATION_START_PORT_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="起运港",required=false)
-    private BigDecimal locationStartPortId;
-
-    /**
-     * 到达港ID(ARRIVAL_PORT_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="到达港ID",required=false)
-    private BigDecimal arrivalPortId;
 
     /**
      * 批次id(BATCH_ID,DECIMAL,38)
@@ -162,22 +151,6 @@ public class TmsshipLoadShipResult implements IBasePO<BigDecimal> {
         this.totalResultId = totalResultId;
     }
 
-    public BigDecimal getLocationStartPortId() {
-        return locationStartPortId;
-    }
-
-    public void setLocationStartPortId(BigDecimal locationStartPortId) {
-        this.locationStartPortId = locationStartPortId;
-    }
-
-    public BigDecimal getArrivalPortId() {
-        return arrivalPortId;
-    }
-
-    public void setArrivalPortId(BigDecimal arrivalPortId) {
-        this.arrivalPortId = arrivalPortId;
-    }
-
     public BigDecimal getBatchId() {
         return batchId;
     }
@@ -322,8 +295,6 @@ public class TmsshipLoadShipResult implements IBasePO<BigDecimal> {
         sb.append("Hash = ").append(hashCode());
         sb.append(", resultId=").append(resultId);
         sb.append(", totalResultId=").append(totalResultId);
-        sb.append(", locationStartPortId=").append(locationStartPortId);
-        sb.append(", arrivalPortId=").append(arrivalPortId);
         sb.append(", batchId=").append(batchId);
         sb.append(", resultDeliveryDate=").append(resultDeliveryDate);
         sb.append(", resultActualInstallations=").append(resultActualInstallations);

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

@@ -61,9 +61,35 @@ public class OmsshipInstructionsCapacityServiceImpl implements IOmsshipInstructi
     @Override
     public int insert(Map<String,Object> omsshipInstructionsCapacity) {
         //        插入装船指令
-        Integer capacityNumber = (Integer) omsshipInstructionsCapacity.get("capacityIds");
         OmsshipInstructionsCapacity realOmsshipInstructionsCapacity = new OmsshipInstructionsCapacity();
-        realOmsshipInstructionsCapacity.setCapacityId(new BigDecimal(capacityNumber));
+        String omsship= (String) omsshipInstructionsCapacity.get("capacityIds");
+//        判断是否有id值传入，有则代表表中含有这个船名
+        if (omsship!=""){
+            Integer capacityNumber = (Integer) omsshipInstructionsCapacity.get("capacityIds");
+            realOmsshipInstructionsCapacity.setCapacityId(new BigDecimal(capacityNumber));
+        }else{
+//            判断用户输入的船名在数据库中是否存在
+            String capacityNumber=(String)omsshipInstructionsCapacity.get("capacityName");
+            Map<String,Object> map = new HashMap<>();
+            map.put("capacityNumber",capacityNumber);
+//            查询运力表中是否含有对应的运力编号
+            List<RmsCapacity> rmsCapacities = rmsCapacityMapper.selectByParameters(map);
+            if (rmsCapacities.size() != 0 ) {
+//                当运力编号存在的时候，将获取到的运力编号的id插入进去
+                RmsCapacity rmsCapacity = rmsCapacities.get(0);
+                rmsCapacityMapper.updateByPrimaryKeySelective(rmsCapacity);
+                realOmsshipInstructionsCapacity.setCapacityId(rmsCapacity.getCapacityId());
+            }
+            else {
+//                当运力编号不存在的时候，在运力表中新增一条运力信息，并将运力类型设置为3，也就是船类型
+                RmsCapacity rmsCapacity = new RmsCapacity();
+                rmsCapacity.setCapacityId(rmsCapacityMapper.selectCapacityId());
+                rmsCapacity.setCapacityNumber(capacityNumber);
+                rmsCapacity.setCapacityTypeId(new BigDecimal(3));
+                rmsCapacityMapper.insertSelective(rmsCapacity);
+                realOmsshipInstructionsCapacity.setCapacityId(rmsCapacity.getCapacityId());
+            }
+        }
         String instructionPlannedLoading = (String) omsshipInstructionsCapacity.get("instructionPlannedLoading");
         String instructionsShipPosition = (String) omsshipInstructionsCapacity.get("instructionsShipPosition");
         String instructionContactInf = (String) omsshipInstructionsCapacity.get("instructionContactInf");

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

@@ -152,7 +152,7 @@ public class OmsshipShipmentInstructionsServiceImpl implements IOmsshipShipmentI
     public List<Map<String, Object>> getPortList(Map<String, Object> map) {
         return omsshipShipmentInstructionsMapper.getPortList(map);
     }
-
+  //修改状态
     @Override
     public int updateByPrimaryKeySelective(OmsshipShipmentInstructions omsshipShipmentInstructions) {
         return omsshipShipmentInstructionsMapper.updateByPrimaryKeySelective(omsshipShipmentInstructions);

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

@@ -5,6 +5,7 @@ import com.steerinfo.dil.mapper.TmsshipEntryWharyResultMapper;
 import com.steerinfo.dil.mapper.TmsshipOutWharyResultMapper;
 import com.steerinfo.dil.model.TmsshipEntryWharyResult;
 import com.steerinfo.dil.model.TmsshipOutWharyResult;
+import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.NoUtil;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
@@ -64,10 +65,9 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         TmsshipLoadShipResult tmsshipLoadShipResult = new TmsshipLoadShipResult();
         TmsshipEntryWharyResult tmsshipEntryWharyResult = new TmsshipEntryWharyResult();
         BigDecimal orderId = new BigDecimal((Integer) rowMap.get("orderId"));
-        BigDecimal batchId = getBatchId(rowMap);
+        //BigDecimal batchId = getBatchId(rowMap);
+        BigDecimal batchId= DataChange.dataToBigDecimal(rowMap.get("batchId"));
         Map<String,Object> ppMap = tmsshipLoadShipResultMapper.getPortAndPier(batchId);
-        BigDecimal startPortId = (BigDecimal) ppMap.get("startPortId");
-        BigDecimal arrivePortId = (BigDecimal) ppMap.get("arrivePortId");
         BigDecimal pierId = (BigDecimal) ppMap.get("pierId");
         Date noticeDeliveryTime = (Date) ppMap.get("noticeDeliveryTime");
         String resultMemo = (String) mapVal.get("resultMemo");
@@ -117,9 +117,15 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         tmsshipOutWharyResult.setDeleteTime(null);
         // 装船
         BigDecimal resultId = tmsshipLoadShipResultMapper.selectLoadId();
-        BigDecimal portId = new BigDecimal((Integer) mapVal.get("portId"));
-        //根据港口查询实时库存id
-        BigDecimal gmId = tmsshipLoadShipResultMapper.selectGmIdByPortId(portId.intValue());
+        //获得起运港
+        BigDecimal downSwimPortId= DataChange.dataToBigDecimal(rowMap.get("downSwimPortId")) ;
+
+        //根据港口和批次Id查询实时库存id
+        Map<String,Object> idMap=new HashMap<>();
+        idMap.put("batchId",batchId);
+        idMap.put("downSwimPortId",downSwimPortId);
+        Map<String,Object> gmMap = tmsshipLoadShipResultMapper.selectGmIdByPortId(idMap);
+        BigDecimal gmId=DataChange.dataToBigDecimal(gmMap.get("gmId"));
         //获得实装数量
         BigDecimal resultActualInstallations = new BigDecimal((String) mapVal.get("resultActualInstallations"));
         Date resultLoadShipDate = new Date((Long) mapVal.get("resultLoadShipDate"));
@@ -127,8 +133,7 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         String resultNumber = noUtil.setResultNo("ZC",resultEntryId);
         tmsshipLoadShipResult.setResultId(resultId);
         tmsshipLoadShipResult.setTotalResultId(totalResultId);
-        tmsshipLoadShipResult.setLocationStartPortId(startPortId);
-        tmsshipLoadShipResult.setArrivalPortId(arrivePortId);
+
         tmsshipLoadShipResult.setBatchId(batchId);
         tmsshipLoadShipResult.setResultDeliveryDate(noticeDeliveryTime);
         tmsshipLoadShipResult.setResultActualInstallations(resultActualInstallations);
@@ -153,7 +158,7 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         // 新增出库实绩
         Map<String,Object> mapValue = new HashMap<>();
         mapValue.put("batchId",batchId);
-        mapValue.put("portId",startPortId);
+        mapValue.put("downSwimPortId",downSwimPortId);
         mapValue.put("resultTonnage",resultActualInstallations);
         mapValue.put("isClean",resultIsClear);
         wmshboundFeign.addResult(mapValue);

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

@@ -8,6 +8,7 @@ import com.steerinfo.dil.model.TmsshipTotalResult;
 import com.steerinfo.dil.model.TmsshipUnloadShipResult;
 import com.steerinfo.dil.mapper.TmsshipUnloadShipResultMapper;
 import com.steerinfo.dil.service.ITmsshipUnloadShipResultService;
+import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -66,6 +67,7 @@ public class TmsshipUnloadShipResultServiceImpl implements ITmsshipUnloadShipRes
     public int insertUnloadShip(Map<String, Object> map) {
         Map<String,Object> mapVal = (Map<String, Object>) map.get("mapVal");
         Map<String,Object> unloadMap = (Map<String, Object>) map.get("unloadMap");
+        BigDecimal downSwimPortId= DataChange.dataToBigDecimal(unloadMap.get("downSwimPortId"));
         TmsshipUnloadShipResult tmsshipUnloadShipResult = new TmsshipUnloadShipResult();
         BigDecimal resultId = selectMaxId();
         BigDecimal orderId = new BigDecimal((Integer) unloadMap.get("orderId"));
@@ -102,7 +104,7 @@ public class TmsshipUnloadShipResultServiceImpl implements ITmsshipUnloadShipRes
         TmsshipLoadShipResult tmsshipLoadShipResult = tmsshipLoadShipResults.get(0);
         Map<String,Object> mapValue = new HashMap<>();
         mapValue.put("batchId",tmsshipLoadShipResult.getBatchId());
-        mapValue.put("portId",tmsshipLoadShipResult.getArrivalPortId());
+        mapValue.put("downSwimPortId",downSwimPortId);
         mapValue.put("resultMaterialNumber",tmsshipLoadShipResult.getResultActualInstallations());
         wmshboundFeign.addWarehousingResult(mapValue);
         return tmsshipUnloadShipResultMapper.insert(tmsshipUnloadShipResult);

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

@@ -90,10 +90,10 @@ public class TmsshipWaterQualityResultServiceImpl implements ITmsshipWaterQualit
         String purchaseContractMoisture=(String)mapVal.get("contractMoistureValue");
         amsshipDeliveryNotice.setPurchaseContractMoisture(purchaseContractMoisture);
         //实装吨位
-        BigDecimal resultActualInstallations=new BigDecimal((Integer) mapVal.get("actualTonnage"));
+        BigDecimal resultActualInstallations=(BigDecimal)mapVal.get("realWeight");
         tmsshipLoadShipResult.setResultActualInstallations( resultActualInstallations);
         //水分吨位
-        BigDecimal resultWaterTonnage = (BigDecimal) mapVal.get("resultWaterTonnage");
+        BigDecimal resultWaterTonnage = new BigDecimal((Integer)mapVal.get("resultWaterTonnage")) ;
         tmsshipWaterQualityResult.setResultWaterTonnage(resultWaterTonnage);
         //装船比例
         BigDecimal instructionsId = selectInstructionsId(orderId);

src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: Dil123789
-    username: dil
+    password: root123
+    username: dagang
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-shiptms-api-dev

src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: Dil123789
-    username: dil
+    password: root123
+    username: dagang
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-shiptms-api-dev

src/main/resources/bootstrap.yml

@@ -14,9 +14,9 @@ spring:
 
 openfeign:
   WmshboundFeign:
-    url: ${WMSHBOUNDFEIGN_URL:localhost:8093}
+    url: ${WMSHBOUNDFEIGN_URL:172.16.33.166:8070}
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:localhost:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
 
 #eureka设置
 eureka:

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

@@ -535,7 +535,7 @@
         on db.MATERIAL_ID = rm.MATERIAL_ID
         left join RMS_SHIPPER rs
         on adn.REQUESTER_GROUP_ID=rs.SHIPPER_ID
-        where osi.DELETED = 0
+        where osi.DELETED = 0 and osi.INSTRUCTION_ISSUE_STATUS=#{status}
         )
         <where>
             <if test="piername!= null">

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

@@ -4,8 +4,6 @@
     <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmsshipLoadShipResult">
         <id column="RESULT_ID" jdbcType="DECIMAL" property="resultId"/>
         <result column="TOTAL_RESULT_ID" jdbcType="DECIMAL" property="totalResultId"/>
-        <result column="LOCATION_START_PORT_ID" jdbcType="DECIMAL" property="locationStartPortId"/>
-        <result column="ARRIVAL_PORT_ID" jdbcType="DECIMAL" property="arrivalPortId"/>
         <result column="BATCH_ID" jdbcType="DECIMAL" property="batchId"/>
         <result column="RESULT_DELIVERY_DATE" jdbcType="TIMESTAMP" property="resultDeliveryDate"/>
         <result column="RESULT_ACTUAL_INSTALLATIONS" jdbcType="DECIMAL" property="resultActualInstallations"/>
@@ -25,14 +23,14 @@
         <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
     </resultMap>
     <sql id="columns">
-        RESULT_ID, TOTAL_RESULT_ID, LOCATION_START_PORT_ID, ARRIVAL_PORT_ID, BATCH_ID, RESULT_DELIVERY_DATE,
+        RESULT_ID, TOTAL_RESULT_ID, BATCH_ID, RESULT_DELIVERY_DATE,
     RESULT_ACTUAL_INSTALLATIONS, RESULT_NUMBER, RWAREHOUSE_MATERIAL_ID, RESULT_ARRIVAL_PORT_TIME,
     RESULT_OUT_PORT_TIME, RESULT_LOAD_SHIP_DATE, RESULT_ISCLEAR, DELETE_NAME, DELETE_TIME,
     INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
     DELETED
     </sql>
     <sql id="columns_alias">
-        t.RESULT_ID, t.TOTAL_RESULT_ID, t.LOCATION_START_PORT_ID, t.ARRIVAL_PORT_ID, t.BATCH_ID,
+        t.RESULT_ID, t.TOTAL_RESULT_ID, t.BATCH_ID,
     t.RESULT_DELIVERY_DATE, t.RESULT_ACTUAL_INSTALLATIONS, t.RESULT_NUMBER, t.RWAREHOUSE_MATERIAL_ID,
     t.RESULT_ARRIVAL_PORT_TIME, t.RESULT_OUT_PORT_TIME, t.RESULT_LOAD_SHIP_DATE, t.RESULT_ISCLEAR,
     t.DELETE_NAME, t.DELETE_TIME, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME,
@@ -56,12 +54,6 @@
             <if test="totalResultId != null">
                 and TOTAL_RESULT_ID = #{totalResultId}
             </if>
-            <if test="locationStartPortId != null">
-                and LOCATION_START_PORT_ID = #{locationStartPortId}
-            </if>
-            <if test="arrivalPortId != null">
-                and ARRIVAL_PORT_ID = #{arrivalPortId}
-            </if>
             <if test="batchId != null">
                 and BATCH_ID = #{batchId}
             </if>
@@ -123,12 +115,6 @@
             <if test="totalResultId != null">
                 and TOTAL_RESULT_ID = #{totalResultId}
             </if>
-            <if test="locationStartPortId != null">
-                and LOCATION_START_PORT_ID = #{locationStartPortId}
-            </if>
-            <if test="arrivalPortId != null">
-                and ARRIVAL_PORT_ID = #{arrivalPortId}
-            </if>
             <if test="batchId != null">
                 and BATCH_ID = #{batchId}
             </if>
@@ -193,12 +179,6 @@
         <if test="totalResultId != null">
             or TOTAL_RESULT_ID = #{totalResultId}
         </if>
-        <if test="locationStartPortId != null">
-            or LOCATION_START_PORT_ID = #{locationStartPortId}
-        </if>
-        <if test="arrivalPortId != null">
-            or ARRIVAL_PORT_ID = #{arrivalPortId}
-        </if>
         <if test="batchId != null">
             or BATCH_ID = #{batchId}
         </if>
@@ -252,8 +232,8 @@
         </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.TmsshipLoadShipResult">
-        insert into TMSSHIP_LOAD_SHIP_RESULT (RESULT_ID, TOTAL_RESULT_ID, LOCATION_START_PORT_ID,
-                                              ARRIVAL_PORT_ID, BATCH_ID, RESULT_DELIVERY_DATE,
+        insert into TMSSHIP_LOAD_SHIP_RESULT (RESULT_ID, TOTAL_RESULT_ID,
+                                              BATCH_ID, RESULT_DELIVERY_DATE,
                                               RESULT_ACTUAL_INSTALLATIONS, RESULT_NUMBER,
                                               RWAREHOUSE_MATERIAL_ID, RESULT_ARRIVAL_PORT_TIME,
                                               RESULT_OUT_PORT_TIME, RESULT_LOAD_SHIP_DATE,
@@ -261,8 +241,7 @@
                                               INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
                                               UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED)
         values (#{resultId,jdbcType=DECIMAL}, #{totalResultId,jdbcType=DECIMAL},
-                #{locationStartPortId,jdbcType=DECIMAL},
-                #{arrivalPortId,jdbcType=DECIMAL}, #{batchId,jdbcType=DECIMAL},
+                #{batchId,jdbcType=DECIMAL},
                 #{resultDeliveryDate,jdbcType=TIMESTAMP},
                 #{resultActualInstallations,jdbcType=DECIMAL}, #{resultNumber,jdbcType=VARCHAR},
                 #{rwarehouseMaterialId,jdbcType=DECIMAL}, #{resultArrivalPortTime,jdbcType=TIMESTAMP},
@@ -281,12 +260,6 @@
             <if test="totalResultId != null">
                 TOTAL_RESULT_ID,
             </if>
-            <if test="locationStartPortId != null">
-                LOCATION_START_PORT_ID,
-            </if>
-            <if test="arrivalPortId != null">
-                ARRIVAL_PORT_ID,
-            </if>
             <if test="batchId != null">
                 BATCH_ID,
             </if>
@@ -346,12 +319,6 @@
             <if test="totalResultId != null">
                 #{totalResultId,jdbcType=DECIMAL},
             </if>
-            <if test="locationStartPortId != null">
-                #{locationStartPortId,jdbcType=DECIMAL},
-            </if>
-            <if test="arrivalPortId != null">
-                #{arrivalPortId,jdbcType=DECIMAL},
-            </if>
             <if test="batchId != null">
                 #{batchId,jdbcType=DECIMAL},
             </if>
@@ -408,8 +375,6 @@
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmsshipLoadShipResult">
         update TMSSHIP_LOAD_SHIP_RESULT
         set TOTAL_RESULT_ID             = #{totalResultId,jdbcType=DECIMAL},
-            LOCATION_START_PORT_ID      = #{locationStartPortId,jdbcType=DECIMAL},
-            ARRIVAL_PORT_ID             = #{arrivalPortId,jdbcType=DECIMAL},
             BATCH_ID                    = #{batchId,jdbcType=DECIMAL},
             RESULT_DELIVERY_DATE        = #{resultDeliveryDate,jdbcType=TIMESTAMP},
             RESULT_ACTUAL_INSTALLATIONS = #{resultActualInstallations,jdbcType=DECIMAL},
@@ -435,12 +400,6 @@
             <if test="totalResultId != null">
                 TOTAL_RESULT_ID = #{totalResultId,jdbcType=DECIMAL},
             </if>
-            <if test="locationStartPortId != null">
-                LOCATION_START_PORT_ID = #{locationStartPortId,jdbcType=DECIMAL},
-            </if>
-            <if test="arrivalPortId != null">
-                ARRIVAL_PORT_ID = #{arrivalPortId,jdbcType=DECIMAL},
-            </if>
             <if test="batchId != null">
                 BATCH_ID = #{batchId,jdbcType=DECIMAL},
             </if>
@@ -510,8 +469,8 @@
     <insert id="batchInsert" parameterType="java.util.List">
         insert into TMSSHIP_LOAD_SHIP_RESULT
         (RESULT_ID,
-        TOTAL_RESULT_ID, LOCATION_START_PORT_ID,
-        ARRIVAL_PORT_ID, BATCH_ID, RESULT_DELIVERY_DATE,
+        TOTAL_RESULT_ID,
+        BATCH_ID, RESULT_DELIVERY_DATE,
         RESULT_ACTUAL_INSTALLATIONS, RESULT_NUMBER,
         RWAREHOUSE_MATERIAL_ID, RESULT_ARRIVAL_PORT_TIME,
         RESULT_OUT_PORT_TIME, RESULT_LOAD_SHIP_DATE,
@@ -522,8 +481,7 @@
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.resultId,jdbcType=DECIMAL},
-        #{item.totalResultId,jdbcType=DECIMAL}, #{item.locationStartPortId,jdbcType=DECIMAL},
-        #{item.arrivalPortId,jdbcType=DECIMAL}, #{item.batchId,jdbcType=DECIMAL},
+        #{item.totalResultId,jdbcType=DECIMAL},
         #{item.resultDeliveryDate,jdbcType=TIMESTAMP},
         #{item.resultActualInstallations,jdbcType=DECIMAL}, #{item.resultNumber,jdbcType=VARCHAR},
         #{item.rwarehouseMaterialId,jdbcType=DECIMAL}, #{item.resultArrivalPortTime,jdbcType=TIMESTAMP},
@@ -546,14 +504,6 @@
         <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.totalResultId,jdbcType=DECIMAL}
         </foreach>
-        ,LOCATION_START_PORT_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.locationStartPortId,jdbcType=DECIMAL}
-        </foreach>
-        ,ARRIVAL_PORT_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.arrivalPortId,jdbcType=DECIMAL}
-        </foreach>
         ,BATCH_ID=
         <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.batchId,jdbcType=DECIMAL}
@@ -700,9 +650,9 @@
         LEFT JOIN TMSSHIP_SHIP_LOCATION tsl
         ON ttr.RESULT_ID = tsl.TOTAL_RESULT_ID
         LEFT JOIN RMS_PORT rps
-        ON tlsr.LOCATION_START_PORT_ID = rps.PORT_ID
+        ON ada.DOWN_SWIM_PORT_ID = rps.PORT_ID
         LEFT JOIN RMS_PORT rpe
-        ON tlsr.ARRIVAL_PORT_ID = rpe.PORT_ID
+        ON ada.PORT_ID = rpe.PORT_ID
         WHERE tlsr.DELETED = 0)
         <where>
             <if test="noticePort != null">
@@ -861,9 +811,11 @@
     </select>
 
 <!-- 通过港口查询港存库实时库存id  -->
-    <select id="selectGmIdByPortId" parameterType="java.lang.Integer" resultType="java.math.BigDecimal">
+    <select id="selectGmIdByPortId" parameterType="java.util.Map" resultType="java.util.Map">
         select WGM.GM_ID "gmId"
         from WMSH_GRID_MATERIAL WGM
-        WHERE WGM.PORT_ID=#{portId}
+        left join AMSSHIP_DELIVERY_ATTORNEY ADA
+        on ADA.BATCH_ID=WGM.BATCH_ID
+        WHERE WGM.BATCH_ID=#{batchId} and ADA.DOWN_SWIM_PORT_ID=#{downSwimPortId}
     </select>
 </mapper>

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

@@ -484,14 +484,16 @@
                      ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
            LEFT JOIN DIL_BATCH db
                      ON osi.BATCH_ID = db.BATCH_ID
+           LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ada
+                     ON ada.BATCH_ID=db.BATCH_ID
            LEFT JOIN RMS_MATERIAL rm
                      ON db.MATERIAL_ID = rm.MATERIAL_ID
            LEFT JOIN TMSSHIP_LOAD_SHIP_RESULT tlsr
                      ON ttr.RESULT_ID = tlsr.TOTAL_RESULT_ID
            LEFT JOIN RMS_PORT rps
-                     ON tlsr.LOCATION_START_PORT_ID = rps.PORT_ID
+                     ON ada.DOWN_SWIM_PORT_ID = rps.PORT_ID
            LEFT JOIN RMS_PORT rpe
-                     ON tlsr.ARRIVAL_PORT_ID = rpe.PORT_ID
+                     ON ada.PORT_ID = rpe.PORT_ID
            LEFT JOIN RMS_CAPACITY rc
                      ON rc.CAPACITY_ID = oic.CAPACITY_ID
     WHERE tsl.DELETED = 0 and to_char(tsl.LOCATION_ROUTE_TIME, 'yyyy-mm-dd') = #{dayTime}

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

@@ -429,9 +429,9 @@
         LEFT JOIN TMSSHIP_LOAD_SHIP_RESULT tlsr
         ON ttr.RESULT_ID = tlsr.TOTAL_RESULT_ID
         LEFT JOIN RMS_PORT rps
-        ON tlsr.LOCATION_START_PORT_ID = rps.PORT_ID
+        ON ada.DOWN_SWIM_PORT_ID = rps.PORT_ID
         LEFT JOIN RMS_PORT rpe
-        ON tlsr.ARRIVAL_PORT_ID = rpe.PORT_ID
+        ON ada.PORT_ID = rpe.PORT_ID
         LEFT JOIN RMS_CAPACITY rc
         ON rc.CAPACITY_ID = oic.CAPACITY_ID
         )
@@ -533,9 +533,9 @@
         oic.INSTRUCTIONS_CAPACITY_ID as "orderId",
         db.BATCH_ID as "batchId",
         ada.DOWN_SWIM_PORT_ID as "downSwimPortId",
+        rp1.PORT_NAME as "portName1",
         ada.PORT_ID as "portId",
-        rp.PORT_NAME as "portName1",
-        rp.PORT_NAME as "portName2"
+        rp2.PORT_NAME as "portName2"
         FROM OMSSHIP_INSTRUCTIONS_CAPACITY oic
         LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi
         ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
@@ -543,15 +543,14 @@
         ON db.BATCH_ID = osi.BATCH_ID
         LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ada
         ON ada.BATCH_ID=db.BATCH_ID
-        LEFT JOIN RMS_PORT rp
-        ON ada.PORT_ID=rp.PORT_ID
-        LEFT JOIN RMS_PORT rp
-        ON ada.DOWN_SWIM_PORT_ID=rp.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
-        )
+        ON rc.CAPACITY_ID = oic.CAPACITY_ID）
         <where>
             <if test="resultForeignShipName != null">
                 and

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

@@ -470,7 +470,7 @@
         select * from (
         SELECT DISTINCT
         db.BATCH_ID as "batchId",
-        tlsr.ARRIVAL_PORT_ID as "portId",
+        ada.PORT_ID as "portId",
         ttr.ORDER_ID as "orderId",
         tusr.RESULT_ID as "resultId",
         tusr.INSERT_TIME as "insertTime",
@@ -491,6 +491,8 @@
         ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
         LEFT JOIN DIL_BATCH db
         ON osi.BATCH_ID = db.BATCH_ID
+        LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ada
+        ON ada.BATCH_ID=db.BATCH_ID
         LEFT JOIN RMS_MATERIAL rm
         ON db.MATERIAL_ID = rm.MATERIAL_ID
         LEFT JOIN RMS_CAPACITY rc

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

@@ -613,8 +613,10 @@
         ON rc.CAPACITY_ID = oic.CAPACITY_ID
         LEFT JOIN TMSSHIP_LOAD_SHIP_RESULT tlsr
         ON ttr.RESULT_ID = tlsr.TOTAL_RESULT_ID
+        LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ada
+        ON ada.BATCH_ID=db.BATCH_ID
         LEFT JOIN RMS_PORT rpo
-        ON tlsr.ARRIVAL_PORT_ID = rpo.PORT_ID
+        ON ada.PORT_ID = rpo.PORT_ID
         LEFT JOIN AMSSHIP_DELIVERY_NOTICE adn
         ON adn.BATCH_ID = db.BATCH_ID
         WHERE twqr.DELETED = 0)