修改进口矿

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

@@ -224,7 +224,11 @@ public class ShipDynamicsController extends BaseRESTfulController {
         //第一行
         Map<String,Object> map3=new HashMap<>();
         map3.put("batchId",Integer.parseInt(list.get(list.size()-1).get("batchId").toString())+1);
-        map3.put("tonnage",tonnageSum);
+        if (list.get(list.size()-1).get("instructionStatus")!=null) {
+            map3.put("tonnage1",tonnageSum);
+        }else {
+            map3.put("tonnage",tonnageSum);
+        }
         map3.put("pm","合计");
         map3.put("capacityNumber1",capacityNumberAllSum1);
         map3.put("capacityNumber2",capacityNumberAllSum2);
@@ -235,7 +239,11 @@ public class ShipDynamicsController extends BaseRESTfulController {
         //第二行
         Map<String,Object> map4=new HashMap<>();
         map4.put("batchId",Integer.parseInt(list.get(list.size()-1).get("batchId").toString())+1);
-        map4.put("tonnage",tonnageSum);
+        if (list.get(list.size()-1).get("instructionStatus")!=null) {
+            map4.put("tonnage1",tonnageSum);
+        }else {
+            map4.put("tonnage",tonnageSum);
+        }
         map4.put("pm","合计");
         map4.put("capacity1",capacityNumberAllSum1+capacityNumberAllSum2+capacityNumberAllSum3+capacityNumberAllSum4);
         map4.put("type",1);

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

@@ -3,7 +3,6 @@ package com.steerinfo.dil.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -106,10 +105,16 @@ public class OmsshipShipmentInstructions implements IBasePO<BigDecimal> {
     private String instructionsStatus;
 
     /**
-     * 中转港(TRANSIT_PORT,VARCHAR,20)
+     * 中转港(TRANSIT_PORT,DECIMAL,20)
      */
     @ApiModelProperty(value="中转港",required=false)
-    private String transitPort;
+    private BigDecimal transitPort;
+
+    /**
+     * 二程: 交接方式(HANDOVER_MODE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="二程: 交接方式",required=false)
+    private String handoverMode;
 
     private static final long serialVersionUID = 1L;
 
@@ -251,12 +256,20 @@ public class OmsshipShipmentInstructions implements IBasePO<BigDecimal> {
         this.instructionsStatus = instructionsStatus == null ? null : instructionsStatus.trim();
     }
 
-    public String getTransitPort() {
+    public BigDecimal getTransitPort() {
         return transitPort;
     }
 
-    public void setTransitPort(String transitPort) {
-        this.transitPort = transitPort == null ? null : transitPort.trim();
+    public void setTransitPort(BigDecimal transitPort) {
+        this.transitPort = transitPort;
+    }
+
+    public String getHandoverMode() {
+        return handoverMode;
+    }
+
+    public void setHandoverMode(String handoverMode) {
+        this.handoverMode = handoverMode == null ? null : handoverMode.trim();
     }
 
     @Override
@@ -282,6 +295,7 @@ public class OmsshipShipmentInstructions implements IBasePO<BigDecimal> {
         sb.append(", instructionIssueStatus=").append(instructionIssueStatus);
         sb.append(", instructionsStatus=").append(instructionsStatus);
         sb.append(", transitPort=").append(transitPort);
+        sb.append(", handoverMode=").append(handoverMode);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -73,18 +73,22 @@ public class OmsshipInstructionsCapacityServiceImpl implements IOmsshipInstructi
             String capacityNumber=(String)omsshipInstructionsCapacity.get("capacityName");
 
            //查询运力表中是否含有对应的运力编号
+            BigDecimal capacityId=null;
+            BigDecimal bookingNumber=null;
             Map<String,Object> map = rmsCapacityMapper.getCapacityIdByCapacityNumber(capacityNumber);
-            BigDecimal capacityId = DataChange.dataToBigDecimal(map.get("capacityId"));
-            BigDecimal bookingNumber =DataChange.dataToBigDecimal( map.get("bookingNumber"));
-            if (capacityId != null||!capacityId.equals(null) ) {
+            if (map!=null) {
+              capacityId = DataChange.dataToBigDecimal(map.get("capacityId"));
+              bookingNumber =DataChange.dataToBigDecimal(map.get("bookingNumber"));
+            }
+            BigDecimal capacityBookingNumber = DataChange.dataToBigDecimal(omsshipInstructionsCapacity.get("capacityBookingNumber"));
+            if (capacityId != null) {
                //当运力编号存在的时候，将获取到的运力编号的id插入进去
-                BigDecimal capacityBookingNumber =(BigDecimal) omsshipInstructionsCapacity.get("capacityBookingNumber");
                 realOmsshipInstructionsCapacity.setCapacityId(capacityId);
                 //根据对应的航次和传输的航次做对比
                 if (!bookingNumber.equals(capacityBookingNumber)) {
                    RmsCapacity rmsCapacity=new RmsCapacity();
                    rmsCapacity.setCapacityId(capacityId);
-                   rmsCapacity.setCapacityBookingNumber(bookingNumber);
+                   rmsCapacity.setCapacityBookingNumber(capacityBookingNumber);
                    rmsCapacityMapper.updateByPrimaryKeySelective(rmsCapacity);
                 }
             }
@@ -95,7 +99,9 @@ public class OmsshipInstructionsCapacityServiceImpl implements IOmsshipInstructi
                 rmsCapacity.setCapacityNumber(capacityNumber);
                 rmsCapacity.setCapacityTypeId(new BigDecimal(3));
                 rmsCapacity.setCapacityTel((String)omsshipInstructionsCapacity.get("instructionContactInf"));
-                rmsCapacity.setCapacityBookingNumber(bookingNumber);
+                if (capacityBookingNumber!=null) {
+                    rmsCapacity.setCapacityBookingNumber(capacityBookingNumber);
+                }
                 rmsCapacityMapper.insertSelective(rmsCapacity);
                 realOmsshipInstructionsCapacity.setCapacityId(rmsCapacity.getCapacityId());
             }

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

@@ -111,7 +111,10 @@ public class OmsshipShipmentInstructionsServiceImpl implements IOmsshipShipmentI
         }
         if (map.get("transportPortName")!=null){
             //新增中转港
-            omsshipShipmentInstructions.setTransitPort((String) map.get("transportPortName"));
+            omsshipShipmentInstructions.setTransitPort( DataChange.dataToBigDecimal(map.get("transportPortName")));
+        }
+        if (map.get("handoverMethod")!=null){
+          omsshipShipmentInstructions.setHandoverMode((String)map.get("handoverMethod"));
         }
         //  设置常规字段
         omsshipShipmentInstructions.setInsertTime(new Date());

src/main/resources/application-prod.yml

@@ -26,7 +26,7 @@ openfeign:
   WmshboundFeign:
     url: ${WMSHBOUNDFEIGN_URL:172.16.33.166:8070}
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
 
 server:
   port: 8090

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

@@ -484,7 +484,8 @@
     oic.INSTRUCTIONS_SHIP_POSITION as "nowLocation",
     oic.INSTRUCTION_PLANNED_LOADING as "planWeight",
     oic.INSTRUCTION_CONTACT_INF as "phoneNumber",
-    oic.INSTRUCTION_ESARRIVAL_TIME as "esArrivalTime"
+    oic.INSTRUCTION_ESARRIVAL_TIME as "esArrivalTime",
+    RC.CAPACITY_BOOKING_NUMBER "bookingNumber"
     FROM OMSSHIP_INSTRUCTIONS_CAPACITY oic
     LEFT JOIN RMS_CAPACITY rc
     ON oic.CAPACITY_ID = rc.CAPACITY_ID

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

@@ -18,19 +18,20 @@
         <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
         <result column="INSTRUCTION_ISSUE_STATUS" jdbcType="VARCHAR" property="instructionIssueStatus" />
         <result column="INSTRUCTIONS_STATUS" jdbcType="VARCHAR" property="instructionsStatus" />
-        <result column="TRANSIT_PORT" jdbcType="VARCHAR" property="transitPort" />
+        <result column="TRANSIT_PORT" jdbcType="DECIMAL" property="transitPort" />
+        <result column="HANDOVER_MODE" jdbcType="VARCHAR" property="handoverMode" />
     </resultMap>
     <sql id="columns">
         SHIPMENT_INSTRUCTIONS_ID, BATCH_ID, RECIPIENT_CARRIER_ID, PORT_CARRIER_ID, INSTRUCTIONS_TOTAL_TONNAGE,
     INSTRUCTION_TIME, DELETE_NAME, DELETE_TIME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
     UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, INSTRUCTION_ISSUE_STATUS, INSTRUCTIONS_STATUS,
-    TRANSIT_PORT
+    TRANSIT_PORT, HANDOVER_MODE
     </sql>
     <sql id="columns_alias">
         t.SHIPMENT_INSTRUCTIONS_ID, t.BATCH_ID, t.RECIPIENT_CARRIER_ID, t.PORT_CARRIER_ID,
     t.INSTRUCTIONS_TOTAL_TONNAGE, t.INSTRUCTION_TIME, t.DELETE_NAME, t.DELETE_TIME, t.INSERT_USERNAME,
     t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED,
-    t.INSTRUCTION_ISSUE_STATUS, t.INSTRUCTIONS_STATUS, t.TRANSIT_PORT
+    t.INSTRUCTION_ISSUE_STATUS, t.INSTRUCTIONS_STATUS, t.TRANSIT_PORT, t.HANDOVER_MODE
     </sql>
     <sql id="select">
         SELECT <include refid="columns" /> FROM OMSSHIP_SHIPMENT_INSTRUCTIONS
@@ -88,9 +89,12 @@
             <if test="instructionsStatus != null and instructionsStatus != ''">
                 and INSTRUCTIONS_STATUS = #{instructionsStatus}
             </if>
-            <if test="transitPort != null and transitPort != ''">
+            <if test="transitPort != null">
                 and TRANSIT_PORT = #{transitPort}
             </if>
+            <if test="handoverMode != null and handoverMode != ''">
+                and HANDOVER_MODE = #{handoverMode}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -143,8 +147,11 @@
             <if test="instructionsStatus != null and instructionsStatus != ''">
                 and INSTRUCTIONS_STATUS LIKE '%${instructionsStatus}%'
             </if>
-            <if test="transitPort != null and transitPort != ''">
-                and TRANSIT_PORT LIKE '%${transitPort}%'
+            <if test="transitPort != null">
+                and TRANSIT_PORT = #{transitPort}
+            </if>
+            <if test="handoverMode != null and handoverMode != ''">
+                and HANDOVER_MODE LIKE '%${handoverMode}%'
             </if>
         </where>
     </sql>
@@ -200,9 +207,12 @@
         <if test="instructionsStatus != null and instructionsStatus != ''">
             or INSTRUCTIONS_STATUS = #{instructionsStatus}
         </if>
-        <if test="transitPort != null and transitPort != ''">
+        <if test="transitPort != null">
             or TRANSIT_PORT = #{transitPort}
         </if>
+        <if test="handoverMode != null and handoverMode != ''">
+            or HANDOVER_MODE = #{handoverMode}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.OmsshipShipmentInstructions">
         insert into OMSSHIP_SHIPMENT_INSTRUCTIONS (SHIPMENT_INSTRUCTIONS_ID, BATCH_ID,
@@ -211,14 +221,14 @@
                                                    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
                                                    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED,
                                                    INSTRUCTION_ISSUE_STATUS, INSTRUCTIONS_STATUS,
-                                                   TRANSIT_PORT)
+                                                   TRANSIT_PORT, HANDOVER_MODE)
         values (#{shipmentInstructionsId,jdbcType=DECIMAL}, #{batchId,jdbcType=DECIMAL},
                 #{recipientCarrierId,jdbcType=DECIMAL}, #{portCarrierId,jdbcType=DECIMAL}, #{instructionsTotalTonnage,jdbcType=DECIMAL},
                 #{instructionTime,jdbcType=TIMESTAMP}, #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=VARCHAR},
                 #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
                 #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL},
                 #{instructionIssueStatus,jdbcType=VARCHAR}, #{instructionsStatus,jdbcType=VARCHAR},
-                #{transitPort,jdbcType=VARCHAR})
+                #{transitPort,jdbcType=DECIMAL}, #{handoverMode,jdbcType=VARCHAR})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.OmsshipShipmentInstructions">
         insert into OMSSHIP_SHIPMENT_INSTRUCTIONS
@@ -274,6 +284,9 @@
             <if test="transitPort != null">
                 TRANSIT_PORT,
             </if>
+            <if test="handoverMode != null">
+                HANDOVER_MODE,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="shipmentInstructionsId != null">
@@ -325,7 +338,10 @@
                 #{instructionsStatus,jdbcType=VARCHAR},
             </if>
             <if test="transitPort != null">
-                #{transitPort,jdbcType=VARCHAR},
+                #{transitPort,jdbcType=DECIMAL},
+            </if>
+            <if test="handoverMode != null">
+                #{handoverMode,jdbcType=VARCHAR},
             </if>
         </trim>
     </insert>
@@ -346,7 +362,8 @@
             DELETED = #{deleted,jdbcType=DECIMAL},
             INSTRUCTION_ISSUE_STATUS = #{instructionIssueStatus,jdbcType=VARCHAR},
             INSTRUCTIONS_STATUS = #{instructionsStatus,jdbcType=VARCHAR},
-            TRANSIT_PORT = #{transitPort,jdbcType=VARCHAR}
+            TRANSIT_PORT = #{transitPort,jdbcType=DECIMAL},
+            HANDOVER_MODE = #{handoverMode,jdbcType=VARCHAR}
         where SHIPMENT_INSTRUCTIONS_ID = #{shipmentInstructionsId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.OmsshipShipmentInstructions">
@@ -398,7 +415,10 @@
                 INSTRUCTIONS_STATUS = #{instructionsStatus,jdbcType=VARCHAR},
             </if>
             <if test="transitPort != null">
-                TRANSIT_PORT = #{transitPort,jdbcType=VARCHAR},
+                TRANSIT_PORT = #{transitPort,jdbcType=DECIMAL},
+            </if>
+            <if test="handoverMode != null">
+                HANDOVER_MODE = #{handoverMode,jdbcType=VARCHAR},
             </if>
         </set>
         where SHIPMENT_INSTRUCTIONS_ID = #{shipmentInstructionsId,jdbcType=DECIMAL}
@@ -425,7 +445,7 @@
         UPDATE_USERNAME, UPDATE_TIME,
         INSERT_UPDATE_REMARK, DELETED,
         INSTRUCTION_ISSUE_STATUS, INSTRUCTIONS_STATUS,
-        TRANSIT_PORT)
+        TRANSIT_PORT, HANDOVER_MODE)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.shipmentInstructionsId,jdbcType=DECIMAL},
@@ -436,7 +456,7 @@
         #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
         #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
         #{item.instructionIssueStatus,jdbcType=VARCHAR}, #{item.instructionsStatus,jdbcType=VARCHAR},
-        #{item.transitPort,jdbcType=VARCHAR} from dual
+        #{item.transitPort,jdbcType=DECIMAL}, #{item.handoverMode,jdbcType=VARCHAR} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -508,7 +528,11 @@
         </foreach>
         ,TRANSIT_PORT=
         <foreach close="end" collection="list" index="index" item="item" open="case SHIPMENT_INSTRUCTIONS_ID" separator=" ">
-            when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.transitPort,jdbcType=VARCHAR}
+            when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.transitPort,jdbcType=DECIMAL}
+        </foreach>
+        ,HANDOVER_MODE=
+        <foreach close="end" collection="list" index="index" item="item" open="case SHIPMENT_INSTRUCTIONS_ID" separator=" ">
+            when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.handoverMode,jdbcType=VARCHAR}
         </foreach>
         where SHIPMENT_INSTRUCTIONS_ID in
         <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
@@ -524,6 +548,7 @@
     </delete>
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+
     <sql id="orderByInsertTime">
         <if test="orderField != null and orderField != ''">
             order by "${orderField}"
@@ -556,7 +581,9 @@
         osi.INSTRUCTIONS_STATUS  "instructions",
         RC.CAPACITY_NUMBER "capacityNumber",
         RC.CAPACITY_BOOKING_NUMBER "capacityBookingNumber",
-        RC.CAPACITY_TEL "capacityTel"
+        RP3.PORT_NAME "transitPort",
+        RC.CAPACITY_TEL "capacityTel",
+        osi.HANDOVER_MODE "havdoverMode"
         from OMSSHIP_SHIPMENT_INSTRUCTIONS osi
         left join AMSSHIP_DELIVERY_ATTORNEY ada
         on osi.BATCH_ID = ada.BATCH_ID

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

@@ -29,22 +29,23 @@
     <result column="DRIVER_LICENCE_URL" jdbcType="VARCHAR" property="driverLicenceUrl" />
     <result column="CAPACITY_USER_DEP" jdbcType="VARCHAR" property="capacityUserDep" />
     <result column="CAPACITY_TEL" jdbcType="VARCHAR" property="capacityTel" />
+    <result column="CAPACITY_BOOKING_NUMBER" jdbcType="DECIMAL" property="capacityBookingNumber" />
   </resultMap>
   <sql id="columns">
-    CAPACITY_ID, CAPACITY_NUMBER, CAPACITY_MAX_LOAD, CAPACITY_TYPE_ID, CAPACITY_STATUS, 
-    CARRIER_ID, CAPACITY_ENERGY_ID, CAPACITY_LEN_VAL, CAPACITY_WID_VAL, CAPACITY_HIG_VAL, 
-    CAPACITY_OIL_ID, CAPACITY_FUEL_CONSUMPTION, CAPACITY_OWNERIS, CAPACITY_BLACKLIST, 
-    MEMO, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
-    CAPACITY_CORLOR, CAPACITY_VIP, DELETED, CAPACITY_SSO_ID, DRIVER_LICENCE_URL, CAPACITY_USER_DEP, 
-    CAPACITY_TEL
+    CAPACITY_ID, CAPACITY_NUMBER, CAPACITY_MAX_LOAD, CAPACITY_TYPE_ID, CAPACITY_STATUS,
+    CARRIER_ID, CAPACITY_ENERGY_ID, CAPACITY_LEN_VAL, CAPACITY_WID_VAL, CAPACITY_HIG_VAL,
+    CAPACITY_OIL_ID, CAPACITY_FUEL_CONSUMPTION, CAPACITY_OWNERIS, CAPACITY_BLACKLIST,
+    MEMO, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+    CAPACITY_CORLOR, CAPACITY_VIP, DELETED, CAPACITY_SSO_ID, DRIVER_LICENCE_URL, CAPACITY_USER_DEP,
+    CAPACITY_TEL, CAPACITY_BOOKING_NUMBER
   </sql>
   <sql id="columns_alias">
-    t.CAPACITY_ID, t.CAPACITY_NUMBER, t.CAPACITY_MAX_LOAD, t.CAPACITY_TYPE_ID, t.CAPACITY_STATUS, 
-    t.CARRIER_ID, t.CAPACITY_ENERGY_ID, t.CAPACITY_LEN_VAL, t.CAPACITY_WID_VAL, t.CAPACITY_HIG_VAL, 
-    t.CAPACITY_OIL_ID, t.CAPACITY_FUEL_CONSUMPTION, t.CAPACITY_OWNERIS, t.CAPACITY_BLACKLIST, 
-    t.MEMO, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, 
-    t.CAPACITY_CORLOR, t.CAPACITY_VIP, t.DELETED, t.CAPACITY_SSO_ID, t.DRIVER_LICENCE_URL, 
-    t.CAPACITY_USER_DEP, t.CAPACITY_TEL
+    t.CAPACITY_ID, t.CAPACITY_NUMBER, t.CAPACITY_MAX_LOAD, t.CAPACITY_TYPE_ID, t.CAPACITY_STATUS,
+    t.CARRIER_ID, t.CAPACITY_ENERGY_ID, t.CAPACITY_LEN_VAL, t.CAPACITY_WID_VAL, t.CAPACITY_HIG_VAL,
+    t.CAPACITY_OIL_ID, t.CAPACITY_FUEL_CONSUMPTION, t.CAPACITY_OWNERIS, t.CAPACITY_BLACKLIST,
+    t.MEMO, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK,
+    t.CAPACITY_CORLOR, t.CAPACITY_VIP, t.DELETED, t.CAPACITY_SSO_ID, t.DRIVER_LICENCE_URL,
+    t.CAPACITY_USER_DEP, t.CAPACITY_TEL, t.CAPACITY_BOOKING_NUMBER
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM RMS_CAPACITY
@@ -135,6 +136,9 @@
       <if test="capacityTel != null and capacityTel != ''">
         and CAPACITY_TEL = #{capacityTel}
       </if>
+      <if test="capacityBookingNumber != null">
+        and CAPACITY_BOOKING_NUMBER = #{capacityBookingNumber}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -220,9 +224,12 @@
       <if test="capacityTel != null and capacityTel != ''">
         and CAPACITY_TEL LIKE '%${capacityTel}%'
       </if>
+      <if test="capacityBookingNumber != null">
+        and CAPACITY_BOOKING_NUMBER = #{capacityBookingNumber}
+      </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
     delete from RMS_CAPACITY
     where CAPACITY_ID = #{capacityId,jdbcType=DECIMAL}
   </delete>
@@ -307,6 +314,9 @@
     <if test="capacityTel != null and capacityTel != ''">
       or CAPACITY_TEL = #{capacityTel}
     </if>
+    <if test="capacityBookingNumber != null">
+      or CAPACITY_BOOKING_NUMBER = #{capacityBookingNumber}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.RmsCapacity">
     insert into RMS_CAPACITY (CAPACITY_ID, CAPACITY_NUMBER, CAPACITY_MAX_LOAD,
@@ -317,8 +327,8 @@
                               INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
                               UPDATE_TIME, INSERT_UPDATE_REMARK, CAPACITY_CORLOR,
                               CAPACITY_VIP, DELETED, CAPACITY_SSO_ID,
-                              DRIVER_LICENCE_URL, CAPACITY_USER_DEP, CAPACITY_TEL
-    )
+                              DRIVER_LICENCE_URL, CAPACITY_USER_DEP, CAPACITY_TEL,
+                              CAPACITY_BOOKING_NUMBER)
     values (#{capacityId,jdbcType=DECIMAL}, #{capacityNumber,jdbcType=VARCHAR}, #{capacityMaxLoad,jdbcType=DECIMAL},
             #{capacityTypeId,jdbcType=DECIMAL}, #{capacityStatus,jdbcType=DECIMAL}, #{carrierId,jdbcType=DECIMAL},
             #{capacityEnergyId,jdbcType=VARCHAR}, #{capacityLenVal,jdbcType=DECIMAL}, #{capacityWidVal,jdbcType=DECIMAL},
@@ -327,8 +337,8 @@
             #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
             #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{capacityCorlor,jdbcType=VARCHAR},
             #{capacityVip,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{capacitySsoId,jdbcType=VARCHAR},
-            #{driverLicenceUrl,jdbcType=VARCHAR}, #{capacityUserDep,jdbcType=VARCHAR}, #{capacityTel,jdbcType=VARCHAR}
-           )
+            #{driverLicenceUrl,jdbcType=VARCHAR}, #{capacityUserDep,jdbcType=VARCHAR}, #{capacityTel,jdbcType=VARCHAR},
+            #{capacityBookingNumber,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsCapacity">
     insert into RMS_CAPACITY
@@ -414,6 +424,9 @@
       <if test="capacityTel != null">
         CAPACITY_TEL,
       </if>
+      <if test="capacityBookingNumber != null">
+        CAPACITY_BOOKING_NUMBER,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="capacityId != null">
@@ -497,6 +510,9 @@
       <if test="capacityTel != null">
         #{capacityTel,jdbcType=VARCHAR},
       </if>
+      <if test="capacityBookingNumber != null">
+        #{capacityBookingNumber,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsCapacity">
@@ -526,7 +542,8 @@
         CAPACITY_SSO_ID = #{capacitySsoId,jdbcType=VARCHAR},
         DRIVER_LICENCE_URL = #{driverLicenceUrl,jdbcType=VARCHAR},
         CAPACITY_USER_DEP = #{capacityUserDep,jdbcType=VARCHAR},
-        CAPACITY_TEL = #{capacityTel,jdbcType=VARCHAR}
+        CAPACITY_TEL = #{capacityTel,jdbcType=VARCHAR},
+        CAPACITY_BOOKING_NUMBER = #{capacityBookingNumber,jdbcType=DECIMAL}
     where CAPACITY_ID = #{capacityId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsCapacity">
@@ -610,10 +627,13 @@
       <if test="capacityTel != null">
         CAPACITY_TEL = #{capacityTel,jdbcType=VARCHAR},
       </if>
+      <if test="capacityBookingNumber != null">
+        CAPACITY_BOOKING_NUMBER = #{capacityBookingNumber,jdbcType=DECIMAL},
+      </if>
     </set>
     where CAPACITY_ID = #{capacityId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
     <include refid="select" />
     where CAPACITY_ID = #{capacityId,jdbcType=DECIMAL}
   </select>
@@ -625,8 +645,7 @@
     <include refid="select" />
     <include refid="whereLike" />
   </select>
-
-    <insert id="batchInsert" parameterType="java.util.List">
+  <insert id="batchInsert" parameterType="java.util.List">
     insert into RMS_CAPACITY
     (CAPACITY_ID,
     CAPACITY_NUMBER, CAPACITY_MAX_LOAD,
@@ -640,7 +659,8 @@
     UPDATE_TIME, INSERT_UPDATE_REMARK,
     CAPACITY_CORLOR, CAPACITY_VIP,
     DELETED, CAPACITY_SSO_ID, DRIVER_LICENCE_URL,
-    CAPACITY_USER_DEP, CAPACITY_TEL)
+    CAPACITY_USER_DEP, CAPACITY_TEL,
+    CAPACITY_BOOKING_NUMBER)
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.capacityId,jdbcType=DECIMAL},
@@ -655,7 +675,8 @@
     #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
     #{item.capacityCorlor,jdbcType=VARCHAR}, #{item.capacityVip,jdbcType=VARCHAR},
     #{item.deleted,jdbcType=DECIMAL}, #{item.capacitySsoId,jdbcType=VARCHAR}, #{item.driverLicenceUrl,jdbcType=VARCHAR},
-    #{item.capacityUserDep,jdbcType=VARCHAR}, #{item.capacityTel,jdbcType=VARCHAR} from dual
+    #{item.capacityUserDep,jdbcType=VARCHAR}, #{item.capacityTel,jdbcType=VARCHAR},
+    #{item.capacityBookingNumber,jdbcType=DECIMAL} from dual
   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -769,6 +790,10 @@
     <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
       when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityTel,jdbcType=VARCHAR}
     </foreach>
+    ,CAPACITY_BOOKING_NUMBER=
+    <foreach close="end" collection="list" index="index" item="item" open="case CAPACITY_ID" separator=" ">
+      when #{item.capacityId,jdbcType=DECIMAL} then #{item.capacityBookingNumber,jdbcType=DECIMAL}
+    </foreach>
     where CAPACITY_ID in
     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
       #{item.capacityId,jdbcType=DECIMAL}
@@ -783,12 +808,12 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  <!-- 友情提示！！！-->
-  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+
   <select id="getCapacityIdByCapacityNumber" resultType="java.util.Map" parameterType="java.lang.String">
-  select  RC.CAPACITY_ID "capacityId",
-          RC.CAPACITY_BOOKING_NUMBER "bookingNumber"
-  from RMS_CAPACITY RC
-  WHERE  rc.CAPACITY_NUMBER = #{capacityNumber}
+    select  RC.CAPACITY_ID "capacityId",
+            RC.CAPACITY_BOOKING_NUMBER "bookingNumber"
+    from RMS_CAPACITY RC
+    WHERE  rc.CAPACITY_NUMBER = #{capacityNumber} and RC.DELETED=0
   </select>
+
 </mapper>