修改发货通知

pom.xml

@@ -111,7 +111,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>OMSSHIP_SHIPMENT_INSTRUCTIONS</param>
+                        <param>AMSSHIP_DELIVERY_NOTICE</param>
 
                     </tables>
                 </configuration>

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

@@ -87,10 +87,12 @@ public class AmsshipDeliveryNoticeController extends BaseRESTfulController {
     @ApiOperation(value="新增", notes="根据AmsshipDeliveryNotice对象创建")
     @ApiImplicitParam(name = "amsshipDeliveryNotice", value = "详细实体amsshipDeliveryNotice", required = true, dataType = "AmsshipDeliveryNotice", paramType = "java.util.Map")
     @PostMapping(value = "/insertDeliveryNotice")
-    public RESTfulResult insertSelective(@RequestBody Map<String,Object> map){
-        int code=amsshipDeliveryNoticeService.insert(map);
-        if (code==-1){
-            return failed("进厂船名重复，请输入唯一的进厂船名");
+    public RESTfulResult insertSelective(@RequestBody Map<String,Object> map) throws Exception{
+        int code=0;
+        try {
+            code = amsshipDeliveryNoticeService.insert(map);
+        } catch (Exception e) {
+           return failed(e.getMessage());
         }
         return success(code);
     }
@@ -153,8 +155,13 @@ public class AmsshipDeliveryNoticeController extends BaseRESTfulController {
             @ApiImplicitParam(name = "amsshipDeliveryNotice", value = "详细实体amsshipDeliveryNotice", required = true, dataType = "amsshipDeliveryNotice")
     })
     @PostMapping(value = "/editDeliveryNotice", produces  = "application/json;charset=UTF-8")
-    public RESTfulResult editDeliveryNotice(@RequestBody Map<String,Object> map){
-        int  result=amsshipDeliveryNoticeService.updateAmsDeliveryNotice(map);
+    public RESTfulResult editDeliveryNotice(@RequestBody Map<String,Object> map) throws Exception{
+        int  result=0;
+        try {
+            result  =amsshipDeliveryNoticeService.updateAmsDeliveryNotice (map);
+        } catch (Exception e) {
+            return failed(e.getMessage());
+        }
         return success(result);
     }
     // 下发

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

@@ -1,9 +1,7 @@
 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;
 
@@ -15,7 +13,6 @@ public class AmsshipDeliveryNotice implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="放货通知单ID",required=true)
     private BigDecimal noticeId;
 
-
     /**
      * 贸易方式(NOTICE_COMMERCE_METHOD,VARCHAR,20)
      */
@@ -226,6 +223,12 @@ public class AmsshipDeliveryNotice implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="货权转移附件",required=false)
     private String cargoImageUrl;
 
+    /**
+     * 是否需要宁波保税(IS_NEED_BONDED,VARCHAR,20)
+     */
+    @ApiModelProperty(value="是否需要宁波保税",required=false)
+    private String isNeedBonded;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -246,7 +249,6 @@ public class AmsshipDeliveryNotice implements IBasePO<BigDecimal> {
         this.noticeId = noticeId;
     }
 
-
     public String getNoticeCommerceMethod() {
         return noticeCommerceMethod;
     }
@@ -527,6 +529,14 @@ public class AmsshipDeliveryNotice implements IBasePO<BigDecimal> {
         this.cargoImageUrl = cargoImageUrl == null ? null : cargoImageUrl.trim();
     }
 
+    public String getIsNeedBonded() {
+        return isNeedBonded;
+    }
+
+    public void setIsNeedBonded(String isNeedBonded) {
+        this.isNeedBonded = isNeedBonded == null ? null : isNeedBonded.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -569,6 +579,7 @@ public class AmsshipDeliveryNotice implements IBasePO<BigDecimal> {
         sb.append(", resultDateOfLoans=").append(resultDateOfLoans);
         sb.append(", cargoId=").append(cargoId);
         sb.append(", cargoImageUrl=").append(cargoImageUrl);
+        sb.append(", isNeedBonded=").append(isNeedBonded);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/dil/service/IAmsshipDeliveryNoticeService.java

@@ -27,7 +27,7 @@ public interface IAmsshipDeliveryNoticeService{
     List<Map<String,Object>> selectShipDeliveryNotice(Map<String,Object> mapVal);
 
     //添加收货通知单信息
-    int insert(Map<String,Object> map);
+    int insert(Map<String,Object> map) throws Exception;
 
     //下发发货通知书
     int sendDeliveryNotice(Map<String,Object> map);
@@ -54,7 +54,7 @@ public interface IAmsshipDeliveryNoticeService{
 
     List<Map<String,Object>> selectByNoticeId(Integer noticeId);
 
-    int updateAmsDeliveryNotice(Map<String, Object> map);
+    int updateAmsDeliveryNotice(Map<String, Object> map) throws Exception;
 
     String getLoadDeliveryNotice(Integer noticeId);
 }

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

@@ -58,8 +58,8 @@ public class AmsshipDeliveryNoticeServiceImpl implements IAmsshipDeliveryNoticeS
     }
     //新增发货通知
     @Override
-    @Transactional
-    public int insert(Map<String,Object> map) {
+    @Transactional(rollbackFor = {Exception.class})
+    public int insert(Map<String,Object> map) throws Exception{
         int i=0;
         AmsshipDeliveryNotice amsshipDeliveryNotice=new AmsshipDeliveryNotice();
         String userId =(String) map.get("userId");
@@ -86,6 +86,11 @@ public class AmsshipDeliveryNoticeServiceImpl implements IAmsshipDeliveryNoticeS
         if (map.get("purchaseContractUnitPrice")!=null) {
             amsshipDeliveryNotice.setPurchaseContractUnitPrice(DataChange.dataToBigDecimal(map.get("purchaseContractUnitPrice")));
         }
+        if (map.get("isNeedBonded")!=null){
+            amsshipDeliveryNotice.setIsNeedBonded((String) map.get("isNeedBonded"));
+        }else {
+              throw new Exception("请选择是否需要宁波报税");
+        }
         if (map.get("purchaseContractMoisture")!=null) {
             amsshipDeliveryNotice.setPurchaseContractMoisture((String) map.get("purchaseContractMoisture"));
         }
@@ -133,7 +138,7 @@ public class AmsshipDeliveryNoticeServiceImpl implements IAmsshipDeliveryNoticeS
         //如果存在则取批次id
         if (batchFacotryId != null && batchFacotryId.intValue() != 0){
             amsshipDeliveryNotice.setBatchId(batchFacotryId);
-            return -1;
+            throw new Exception("进厂船名重复，请输入唯一的进厂船名");
         }else {
             Map<String, Object> map1 = dilBatchService.insertBatchId(map);
             if (map1 != null) {
@@ -210,7 +215,8 @@ public class AmsshipDeliveryNoticeServiceImpl implements IAmsshipDeliveryNoticeS
 
     //更新发货通知
     @Override
-    public int updateAmsDeliveryNotice(Map<String, Object> map) {
+    @Transactional(rollbackFor = {Exception.class})
+    public int updateAmsDeliveryNotice(Map<String, Object> map) throws Exception {
         int i=0;
         BigDecimal noticeId = DataChange.dataToBigDecimal(map.get("noticeId"));
         AmsshipDeliveryNotice amsshipDeliveryNotice=new AmsshipDeliveryNotice();
@@ -243,6 +249,11 @@ public class AmsshipDeliveryNoticeServiceImpl implements IAmsshipDeliveryNoticeS
         if (map.get("noticePileFreeDays")!=null){
             amsshipDeliveryNotice.setNoticePileFreeDays(DataChange.dataToBigDecimal(map.get("noticePileFreeDays")));
         }
+        if (map.get("isNeedBonded")!=null){
+            amsshipDeliveryNotice.setIsNeedBonded((String) map.get("isNeedBonded"));
+        }else {
+            throw new Exception("请选择是否需要宁波报税");
+        }
         //单价
         if (map.get("purchaseContractUnitPrice")!=null){
             amsshipDeliveryNotice.setPurchaseContractUnitPrice(DataChange.dataToBigDecimal(map.get("purchaseContractUnitPrice")));

src/main/resources/application-dev.yml

@@ -18,5 +18,5 @@ openfeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
 
 server:
-  port: 8003
+  port: 8090
 

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

@@ -38,26 +38,27 @@
     <result column="RESULT_DATE_OF_LOANS" jdbcType="TIMESTAMP" property="resultDateOfLoans" />
     <result column="CARGO_ID" jdbcType="DECIMAL" property="cargoId" />
     <result column="CARGO_IMAGE_URL" jdbcType="VARCHAR" property="cargoImageUrl" />
+    <result column="IS_NEED_BONDED" jdbcType="VARCHAR" property="isNeedBonded" />
   </resultMap>
   <sql id="columns">
-    NOTICE_ID, NOTICE_COMMERCE_METHOD, NOTICE_HANDOVER_METHOD, PORT_ID, NOTICE_PORT_CONSTRUCTION_FEE, 
-    NOTICE_DELIVERY_TIME, NOTICE_PILE_FREE_DAYS, DELETE_NAME, DELETE_TIME, INSERT_USERNAME, 
-    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, NOTICE_DISTRIBUTION_STATUS, 
-    DELETED, BATCH_ID, PURCHASE_CONTRACT_UNIT_PRICE, PURCHASE_CONTRACT_MOISTURE, TFE_CONTENT, 
-    SILICA_CONTENT, ALUMINA_CONTENT, PHOSPHORUS_CONTENT, MANGANESE_CONTENT, IS_NEED_PORT_FEE, 
-    IS_NEED_PORT_CHARGE, MATERIAL_TYPE_ID, RESULT_CONTACT_PERSON, RESULT_TELEPHONE_FAX, 
-    GROUP_ID, RESULT_NUMBER_OF_LOANS, RESULT_FREIGHT_FORWARDING_INFO, RESULT_MEMO, RESULT_DATE_OF_LOANS, 
-    CARGO_ID, CARGO_IMAGE_URL
+    NOTICE_ID, NOTICE_COMMERCE_METHOD, NOTICE_HANDOVER_METHOD, PORT_ID, NOTICE_PORT_CONSTRUCTION_FEE,
+    NOTICE_DELIVERY_TIME, NOTICE_PILE_FREE_DAYS, DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
+    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, NOTICE_DISTRIBUTION_STATUS,
+    DELETED, BATCH_ID, PURCHASE_CONTRACT_UNIT_PRICE, PURCHASE_CONTRACT_MOISTURE, TFE_CONTENT,
+    SILICA_CONTENT, ALUMINA_CONTENT, PHOSPHORUS_CONTENT, MANGANESE_CONTENT, IS_NEED_PORT_FEE,
+    IS_NEED_PORT_CHARGE, MATERIAL_TYPE_ID, RESULT_CONTACT_PERSON, RESULT_TELEPHONE_FAX,
+    GROUP_ID, RESULT_NUMBER_OF_LOANS, RESULT_FREIGHT_FORWARDING_INFO, RESULT_MEMO, RESULT_DATE_OF_LOANS,
+    CARGO_ID, CARGO_IMAGE_URL, IS_NEED_BONDED
   </sql>
   <sql id="columns_alias">
-    t.NOTICE_ID, t.NOTICE_COMMERCE_METHOD, t.NOTICE_HANDOVER_METHOD, t.PORT_ID, t.NOTICE_PORT_CONSTRUCTION_FEE, 
-    t.NOTICE_DELIVERY_TIME, t.NOTICE_PILE_FREE_DAYS, t.DELETE_NAME, t.DELETE_TIME, t.INSERT_USERNAME, 
-    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.NOTICE_DISTRIBUTION_STATUS, 
-    t.DELETED, t.BATCH_ID, t.PURCHASE_CONTRACT_UNIT_PRICE, t.PURCHASE_CONTRACT_MOISTURE, 
-    t.TFE_CONTENT, t.SILICA_CONTENT, t.ALUMINA_CONTENT, t.PHOSPHORUS_CONTENT, t.MANGANESE_CONTENT, 
-    t.IS_NEED_PORT_FEE, t.IS_NEED_PORT_CHARGE, t.MATERIAL_TYPE_ID, t.RESULT_CONTACT_PERSON, 
-    t.RESULT_TELEPHONE_FAX, t.GROUP_ID, t.RESULT_NUMBER_OF_LOANS, t.RESULT_FREIGHT_FORWARDING_INFO, 
-    t.RESULT_MEMO, t.RESULT_DATE_OF_LOANS, t.CARGO_ID, t.CARGO_IMAGE_URL
+    t.NOTICE_ID, t.NOTICE_COMMERCE_METHOD, t.NOTICE_HANDOVER_METHOD, t.PORT_ID, t.NOTICE_PORT_CONSTRUCTION_FEE,
+    t.NOTICE_DELIVERY_TIME, t.NOTICE_PILE_FREE_DAYS, t.DELETE_NAME, t.DELETE_TIME, t.INSERT_USERNAME,
+    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.NOTICE_DISTRIBUTION_STATUS,
+    t.DELETED, t.BATCH_ID, t.PURCHASE_CONTRACT_UNIT_PRICE, t.PURCHASE_CONTRACT_MOISTURE,
+    t.TFE_CONTENT, t.SILICA_CONTENT, t.ALUMINA_CONTENT, t.PHOSPHORUS_CONTENT, t.MANGANESE_CONTENT,
+    t.IS_NEED_PORT_FEE, t.IS_NEED_PORT_CHARGE, t.MATERIAL_TYPE_ID, t.RESULT_CONTACT_PERSON,
+    t.RESULT_TELEPHONE_FAX, t.GROUP_ID, t.RESULT_NUMBER_OF_LOANS, t.RESULT_FREIGHT_FORWARDING_INFO,
+    t.RESULT_MEMO, t.RESULT_DATE_OF_LOANS, t.CARGO_ID, t.CARGO_IMAGE_URL, t.IS_NEED_BONDED
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM AMSSHIP_DELIVERY_NOTICE
@@ -66,7 +67,7 @@
     SELECT <include refid="columns_alias" /> FROM AMSSHIP_DELIVERY_NOTICE t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="noticeId != null">
         and NOTICE_ID = #{noticeId}
       </if>
@@ -175,10 +176,13 @@
       <if test="cargoImageUrl != null and cargoImageUrl != ''">
         and CARGO_IMAGE_URL = #{cargoImageUrl}
       </if>
+      <if test="isNeedBonded != null and isNeedBonded != ''">
+        and IS_NEED_BONDED = #{isNeedBonded}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="noticeId != null">
         and NOTICE_ID = #{noticeId}
       </if>
@@ -287,6 +291,9 @@
       <if test="cargoImageUrl != null and cargoImageUrl != ''">
         and CARGO_IMAGE_URL LIKE '%${cargoImageUrl}%'
       </if>
+      <if test="isNeedBonded != null and isNeedBonded != ''">
+        and IS_NEED_BONDED LIKE '%${isNeedBonded}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
@@ -295,140 +302,143 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from AMSSHIP_DELIVERY_NOTICE
-    where 1!=1 
-      <if test="noticeCommerceMethod != null and noticeCommerceMethod != ''">
-        or NOTICE_COMMERCE_METHOD = #{noticeCommerceMethod}
-      </if>
-      <if test="noticeHandoverMethod != null and noticeHandoverMethod != ''">
-        or NOTICE_HANDOVER_METHOD = #{noticeHandoverMethod}
-      </if>
-      <if test="portId != null">
-        or PORT_ID = #{portId}
-      </if>
-      <if test="noticePortConstructionFee != null">
-        or NOTICE_PORT_CONSTRUCTION_FEE = #{noticePortConstructionFee}
-      </if>
-      <if test="noticeDeliveryTime != null">
-        or TO_CHAR(NOTICE_DELIVERY_TIME,'yyyy-MM-dd') = '#{noticeDeliveryTime}'
-      </if>
-      <if test="noticePileFreeDays != null">
-        or NOTICE_PILE_FREE_DAYS = #{noticePileFreeDays}
-      </if>
-      <if test="deleteName != null and deleteName != ''">
-        or DELETE_NAME = #{deleteName}
-      </if>
-      <if test="deleteTime != null and deleteTime != ''">
-        or DELETE_TIME = #{deleteTime}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        or INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        or UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
-      <if test="noticeDistributionStatus != null">
-        or NOTICE_DISTRIBUTION_STATUS = #{noticeDistributionStatus}
-      </if>
-      <if test="deleted != null">
-        or DELETED = #{deleted}
-      </if>
-      <if test="batchId != null">
-        or BATCH_ID = #{batchId}
-      </if>
-      <if test="purchaseContractUnitPrice != null">
-        or PURCHASE_CONTRACT_UNIT_PRICE = #{purchaseContractUnitPrice}
-      </if>
-      <if test="purchaseContractMoisture != null and purchaseContractMoisture != ''">
-        or PURCHASE_CONTRACT_MOISTURE = #{purchaseContractMoisture}
-      </if>
-      <if test="tfeContent != null and tfeContent != ''">
-        or TFE_CONTENT = #{tfeContent}
-      </if>
-      <if test="silicaContent != null and silicaContent != ''">
-        or SILICA_CONTENT = #{silicaContent}
-      </if>
-      <if test="aluminaContent != null and aluminaContent != ''">
-        or ALUMINA_CONTENT = #{aluminaContent}
-      </if>
-      <if test="phosphorusContent != null and phosphorusContent != ''">
-        or PHOSPHORUS_CONTENT = #{phosphorusContent}
-      </if>
-      <if test="manganeseContent != null and manganeseContent != ''">
-        or MANGANESE_CONTENT = #{manganeseContent}
-      </if>
-      <if test="isNeedPortFee != null and isNeedPortFee != ''">
-        or IS_NEED_PORT_FEE = #{isNeedPortFee}
-      </if>
-      <if test="isNeedPortCharge != null and isNeedPortCharge != ''">
-        or IS_NEED_PORT_CHARGE = #{isNeedPortCharge}
-      </if>
-      <if test="materialTypeId != null">
-        or MATERIAL_TYPE_ID = #{materialTypeId}
-      </if>
-      <if test="resultContactPerson != null and resultContactPerson != ''">
-        or RESULT_CONTACT_PERSON = #{resultContactPerson}
-      </if>
-      <if test="resultTelephoneFax != null and resultTelephoneFax != ''">
-        or RESULT_TELEPHONE_FAX = #{resultTelephoneFax}
-      </if>
-      <if test="groupId != null">
-        or GROUP_ID = #{groupId}
-      </if>
-      <if test="resultNumberOfLoans != null">
-        or RESULT_NUMBER_OF_LOANS = #{resultNumberOfLoans}
-      </if>
-      <if test="resultFreightForwardingInfo != null and resultFreightForwardingInfo != ''">
-        or RESULT_FREIGHT_FORWARDING_INFO = #{resultFreightForwardingInfo}
-      </if>
-      <if test="resultMemo != null and resultMemo != ''">
-        or RESULT_MEMO = #{resultMemo}
-      </if>
-      <if test="resultDateOfLoans != null">
-        or TO_CHAR(RESULT_DATE_OF_LOANS,'yyyy-MM-dd') = '#{resultDateOfLoans}'
-      </if>
-      <if test="cargoId != null">
-        or CARGO_ID = #{cargoId}
-      </if>
-      <if test="cargoImageUrl != null and cargoImageUrl != ''">
-        or CARGO_IMAGE_URL = #{cargoImageUrl}
-      </if>
+    where 1!=1
+    <if test="noticeCommerceMethod != null and noticeCommerceMethod != ''">
+      or NOTICE_COMMERCE_METHOD = #{noticeCommerceMethod}
+    </if>
+    <if test="noticeHandoverMethod != null and noticeHandoverMethod != ''">
+      or NOTICE_HANDOVER_METHOD = #{noticeHandoverMethod}
+    </if>
+    <if test="portId != null">
+      or PORT_ID = #{portId}
+    </if>
+    <if test="noticePortConstructionFee != null">
+      or NOTICE_PORT_CONSTRUCTION_FEE = #{noticePortConstructionFee}
+    </if>
+    <if test="noticeDeliveryTime != null">
+      or TO_CHAR(NOTICE_DELIVERY_TIME,'yyyy-MM-dd') = '#{noticeDeliveryTime}'
+    </if>
+    <if test="noticePileFreeDays != null">
+      or NOTICE_PILE_FREE_DAYS = #{noticePileFreeDays}
+    </if>
+    <if test="deleteName != null and deleteName != ''">
+      or DELETE_NAME = #{deleteName}
+    </if>
+    <if test="deleteTime != null and deleteTime != ''">
+      or DELETE_TIME = #{deleteTime}
+    </if>
+    <if test="insertUsername != null and insertUsername != ''">
+      or INSERT_USERNAME = #{insertUsername}
+    </if>
+    <if test="insertTime != null">
+      or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+    </if>
+    <if test="updateUsername != null and updateUsername != ''">
+      or UPDATE_USERNAME = #{updateUsername}
+    </if>
+    <if test="updateTime != null">
+      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+    </if>
+    <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+      or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+    </if>
+    <if test="noticeDistributionStatus != null">
+      or NOTICE_DISTRIBUTION_STATUS = #{noticeDistributionStatus}
+    </if>
+    <if test="deleted != null">
+      or DELETED = #{deleted}
+    </if>
+    <if test="batchId != null">
+      or BATCH_ID = #{batchId}
+    </if>
+    <if test="purchaseContractUnitPrice != null">
+      or PURCHASE_CONTRACT_UNIT_PRICE = #{purchaseContractUnitPrice}
+    </if>
+    <if test="purchaseContractMoisture != null and purchaseContractMoisture != ''">
+      or PURCHASE_CONTRACT_MOISTURE = #{purchaseContractMoisture}
+    </if>
+    <if test="tfeContent != null and tfeContent != ''">
+      or TFE_CONTENT = #{tfeContent}
+    </if>
+    <if test="silicaContent != null and silicaContent != ''">
+      or SILICA_CONTENT = #{silicaContent}
+    </if>
+    <if test="aluminaContent != null and aluminaContent != ''">
+      or ALUMINA_CONTENT = #{aluminaContent}
+    </if>
+    <if test="phosphorusContent != null and phosphorusContent != ''">
+      or PHOSPHORUS_CONTENT = #{phosphorusContent}
+    </if>
+    <if test="manganeseContent != null and manganeseContent != ''">
+      or MANGANESE_CONTENT = #{manganeseContent}
+    </if>
+    <if test="isNeedPortFee != null and isNeedPortFee != ''">
+      or IS_NEED_PORT_FEE = #{isNeedPortFee}
+    </if>
+    <if test="isNeedPortCharge != null and isNeedPortCharge != ''">
+      or IS_NEED_PORT_CHARGE = #{isNeedPortCharge}
+    </if>
+    <if test="materialTypeId != null">
+      or MATERIAL_TYPE_ID = #{materialTypeId}
+    </if>
+    <if test="resultContactPerson != null and resultContactPerson != ''">
+      or RESULT_CONTACT_PERSON = #{resultContactPerson}
+    </if>
+    <if test="resultTelephoneFax != null and resultTelephoneFax != ''">
+      or RESULT_TELEPHONE_FAX = #{resultTelephoneFax}
+    </if>
+    <if test="groupId != null">
+      or GROUP_ID = #{groupId}
+    </if>
+    <if test="resultNumberOfLoans != null">
+      or RESULT_NUMBER_OF_LOANS = #{resultNumberOfLoans}
+    </if>
+    <if test="resultFreightForwardingInfo != null and resultFreightForwardingInfo != ''">
+      or RESULT_FREIGHT_FORWARDING_INFO = #{resultFreightForwardingInfo}
+    </if>
+    <if test="resultMemo != null and resultMemo != ''">
+      or RESULT_MEMO = #{resultMemo}
+    </if>
+    <if test="resultDateOfLoans != null">
+      or TO_CHAR(RESULT_DATE_OF_LOANS,'yyyy-MM-dd') = '#{resultDateOfLoans}'
+    </if>
+    <if test="cargoId != null">
+      or CARGO_ID = #{cargoId}
+    </if>
+    <if test="cargoImageUrl != null and cargoImageUrl != ''">
+      or CARGO_IMAGE_URL = #{cargoImageUrl}
+    </if>
+    <if test="isNeedBonded != null and isNeedBonded != ''">
+      or IS_NEED_BONDED = #{isNeedBonded}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.AmsshipDeliveryNotice">
-    insert into AMSSHIP_DELIVERY_NOTICE (NOTICE_ID, NOTICE_COMMERCE_METHOD, NOTICE_HANDOVER_METHOD, 
-      PORT_ID, NOTICE_PORT_CONSTRUCTION_FEE, NOTICE_DELIVERY_TIME, 
-      NOTICE_PILE_FREE_DAYS, DELETE_NAME, DELETE_TIME, 
-      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK, NOTICE_DISTRIBUTION_STATUS, 
-      DELETED, BATCH_ID, PURCHASE_CONTRACT_UNIT_PRICE, 
-      PURCHASE_CONTRACT_MOISTURE, TFE_CONTENT, SILICA_CONTENT, 
-      ALUMINA_CONTENT, PHOSPHORUS_CONTENT, MANGANESE_CONTENT, 
-      IS_NEED_PORT_FEE, IS_NEED_PORT_CHARGE, MATERIAL_TYPE_ID, 
-      RESULT_CONTACT_PERSON, RESULT_TELEPHONE_FAX, 
-      GROUP_ID, RESULT_NUMBER_OF_LOANS, RESULT_FREIGHT_FORWARDING_INFO, 
-      RESULT_MEMO, RESULT_DATE_OF_LOANS, CARGO_ID, 
-      CARGO_IMAGE_URL)
-    values (#{noticeId,jdbcType=DECIMAL}, #{noticeCommerceMethod,jdbcType=VARCHAR}, #{noticeHandoverMethod,jdbcType=VARCHAR}, 
-      #{portId,jdbcType=DECIMAL}, #{noticePortConstructionFee,jdbcType=DECIMAL}, #{noticeDeliveryTime,jdbcType=TIMESTAMP}, 
-      #{noticePileFreeDays,jdbcType=DECIMAL}, #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=VARCHAR}, 
-      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{noticeDistributionStatus,jdbcType=DECIMAL}, 
-      #{deleted,jdbcType=DECIMAL}, #{batchId,jdbcType=DECIMAL}, #{purchaseContractUnitPrice,jdbcType=DECIMAL}, 
-      #{purchaseContractMoisture,jdbcType=VARCHAR}, #{tfeContent,jdbcType=VARCHAR}, #{silicaContent,jdbcType=VARCHAR}, 
-      #{aluminaContent,jdbcType=VARCHAR}, #{phosphorusContent,jdbcType=VARCHAR}, #{manganeseContent,jdbcType=VARCHAR}, 
-      #{isNeedPortFee,jdbcType=VARCHAR}, #{isNeedPortCharge,jdbcType=VARCHAR}, #{materialTypeId,jdbcType=DECIMAL}, 
-      #{resultContactPerson,jdbcType=VARCHAR}, #{resultTelephoneFax,jdbcType=VARCHAR}, 
-      #{groupId,jdbcType=DECIMAL}, #{resultNumberOfLoans,jdbcType=DECIMAL}, #{resultFreightForwardingInfo,jdbcType=VARCHAR}, 
-      #{resultMemo,jdbcType=VARCHAR}, #{resultDateOfLoans,jdbcType=TIMESTAMP}, #{cargoId,jdbcType=DECIMAL}, 
-      #{cargoImageUrl,jdbcType=VARCHAR})
+    insert into AMSSHIP_DELIVERY_NOTICE (NOTICE_ID, NOTICE_COMMERCE_METHOD, NOTICE_HANDOVER_METHOD,
+                                         PORT_ID, NOTICE_PORT_CONSTRUCTION_FEE, NOTICE_DELIVERY_TIME,
+                                         NOTICE_PILE_FREE_DAYS, DELETE_NAME, DELETE_TIME,
+                                         INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
+                                         UPDATE_TIME, INSERT_UPDATE_REMARK, NOTICE_DISTRIBUTION_STATUS,
+                                         DELETED, BATCH_ID, PURCHASE_CONTRACT_UNIT_PRICE,
+                                         PURCHASE_CONTRACT_MOISTURE, TFE_CONTENT, SILICA_CONTENT,
+                                         ALUMINA_CONTENT, PHOSPHORUS_CONTENT, MANGANESE_CONTENT,
+                                         IS_NEED_PORT_FEE, IS_NEED_PORT_CHARGE, MATERIAL_TYPE_ID,
+                                         RESULT_CONTACT_PERSON, RESULT_TELEPHONE_FAX,
+                                         GROUP_ID, RESULT_NUMBER_OF_LOANS, RESULT_FREIGHT_FORWARDING_INFO,
+                                         RESULT_MEMO, RESULT_DATE_OF_LOANS, CARGO_ID,
+                                         CARGO_IMAGE_URL, IS_NEED_BONDED)
+    values (#{noticeId,jdbcType=DECIMAL}, #{noticeCommerceMethod,jdbcType=VARCHAR}, #{noticeHandoverMethod,jdbcType=VARCHAR},
+            #{portId,jdbcType=DECIMAL}, #{noticePortConstructionFee,jdbcType=DECIMAL}, #{noticeDeliveryTime,jdbcType=TIMESTAMP},
+            #{noticePileFreeDays,jdbcType=DECIMAL}, #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=VARCHAR},
+            #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
+            #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{noticeDistributionStatus,jdbcType=DECIMAL},
+            #{deleted,jdbcType=DECIMAL}, #{batchId,jdbcType=DECIMAL}, #{purchaseContractUnitPrice,jdbcType=DECIMAL},
+            #{purchaseContractMoisture,jdbcType=VARCHAR}, #{tfeContent,jdbcType=VARCHAR}, #{silicaContent,jdbcType=VARCHAR},
+            #{aluminaContent,jdbcType=VARCHAR}, #{phosphorusContent,jdbcType=VARCHAR}, #{manganeseContent,jdbcType=VARCHAR},
+            #{isNeedPortFee,jdbcType=VARCHAR}, #{isNeedPortCharge,jdbcType=VARCHAR}, #{materialTypeId,jdbcType=DECIMAL},
+            #{resultContactPerson,jdbcType=VARCHAR}, #{resultTelephoneFax,jdbcType=VARCHAR},
+            #{groupId,jdbcType=DECIMAL}, #{resultNumberOfLoans,jdbcType=DECIMAL}, #{resultFreightForwardingInfo,jdbcType=VARCHAR},
+            #{resultMemo,jdbcType=VARCHAR}, #{resultDateOfLoans,jdbcType=TIMESTAMP}, #{cargoId,jdbcType=DECIMAL},
+            #{cargoImageUrl,jdbcType=VARCHAR}, #{isNeedBonded,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsshipDeliveryNotice">
     insert into AMSSHIP_DELIVERY_NOTICE
@@ -541,6 +551,9 @@
       <if test="cargoImageUrl != null">
         CARGO_IMAGE_URL,
       </if>
+      <if test="isNeedBonded != null">
+        IS_NEED_BONDED,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="noticeId != null">
@@ -651,45 +664,49 @@
       <if test="cargoImageUrl != null">
         #{cargoImageUrl,jdbcType=VARCHAR},
       </if>
+      <if test="isNeedBonded != null">
+        #{isNeedBonded,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsshipDeliveryNotice">
     update AMSSHIP_DELIVERY_NOTICE
     set NOTICE_COMMERCE_METHOD = #{noticeCommerceMethod,jdbcType=VARCHAR},
-      NOTICE_HANDOVER_METHOD = #{noticeHandoverMethod,jdbcType=VARCHAR},
-      PORT_ID = #{portId,jdbcType=DECIMAL},
-      NOTICE_PORT_CONSTRUCTION_FEE = #{noticePortConstructionFee,jdbcType=DECIMAL},
-      NOTICE_DELIVERY_TIME = #{noticeDeliveryTime,jdbcType=TIMESTAMP},
-      NOTICE_PILE_FREE_DAYS = #{noticePileFreeDays,jdbcType=DECIMAL},
-      DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
-      DELETE_TIME = #{deleteTime,jdbcType=VARCHAR},
-      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-      NOTICE_DISTRIBUTION_STATUS = #{noticeDistributionStatus,jdbcType=DECIMAL},
-      DELETED = #{deleted,jdbcType=DECIMAL},
-      BATCH_ID = #{batchId,jdbcType=DECIMAL},
-      PURCHASE_CONTRACT_UNIT_PRICE = #{purchaseContractUnitPrice,jdbcType=DECIMAL},
-      PURCHASE_CONTRACT_MOISTURE = #{purchaseContractMoisture,jdbcType=VARCHAR},
-      TFE_CONTENT = #{tfeContent,jdbcType=VARCHAR},
-      SILICA_CONTENT = #{silicaContent,jdbcType=VARCHAR},
-      ALUMINA_CONTENT = #{aluminaContent,jdbcType=VARCHAR},
-      PHOSPHORUS_CONTENT = #{phosphorusContent,jdbcType=VARCHAR},
-      MANGANESE_CONTENT = #{manganeseContent,jdbcType=VARCHAR},
-      IS_NEED_PORT_FEE = #{isNeedPortFee,jdbcType=VARCHAR},
-      IS_NEED_PORT_CHARGE = #{isNeedPortCharge,jdbcType=VARCHAR},
-      MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=DECIMAL},
-      RESULT_CONTACT_PERSON = #{resultContactPerson,jdbcType=VARCHAR},
-      RESULT_TELEPHONE_FAX = #{resultTelephoneFax,jdbcType=VARCHAR},
-      GROUP_ID = #{groupId,jdbcType=DECIMAL},
-      RESULT_NUMBER_OF_LOANS = #{resultNumberOfLoans,jdbcType=DECIMAL},
-      RESULT_FREIGHT_FORWARDING_INFO = #{resultFreightForwardingInfo,jdbcType=VARCHAR},
-      RESULT_MEMO = #{resultMemo,jdbcType=VARCHAR},
-      RESULT_DATE_OF_LOANS = #{resultDateOfLoans,jdbcType=TIMESTAMP},
-      CARGO_ID = #{cargoId,jdbcType=DECIMAL},
-      CARGO_IMAGE_URL = #{cargoImageUrl,jdbcType=VARCHAR}
+        NOTICE_HANDOVER_METHOD = #{noticeHandoverMethod,jdbcType=VARCHAR},
+        PORT_ID = #{portId,jdbcType=DECIMAL},
+        NOTICE_PORT_CONSTRUCTION_FEE = #{noticePortConstructionFee,jdbcType=DECIMAL},
+        NOTICE_DELIVERY_TIME = #{noticeDeliveryTime,jdbcType=TIMESTAMP},
+        NOTICE_PILE_FREE_DAYS = #{noticePileFreeDays,jdbcType=DECIMAL},
+        DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+        DELETE_TIME = #{deleteTime,jdbcType=VARCHAR},
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+        NOTICE_DISTRIBUTION_STATUS = #{noticeDistributionStatus,jdbcType=DECIMAL},
+        DELETED = #{deleted,jdbcType=DECIMAL},
+        BATCH_ID = #{batchId,jdbcType=DECIMAL},
+        PURCHASE_CONTRACT_UNIT_PRICE = #{purchaseContractUnitPrice,jdbcType=DECIMAL},
+        PURCHASE_CONTRACT_MOISTURE = #{purchaseContractMoisture,jdbcType=VARCHAR},
+        TFE_CONTENT = #{tfeContent,jdbcType=VARCHAR},
+        SILICA_CONTENT = #{silicaContent,jdbcType=VARCHAR},
+        ALUMINA_CONTENT = #{aluminaContent,jdbcType=VARCHAR},
+        PHOSPHORUS_CONTENT = #{phosphorusContent,jdbcType=VARCHAR},
+        MANGANESE_CONTENT = #{manganeseContent,jdbcType=VARCHAR},
+        IS_NEED_PORT_FEE = #{isNeedPortFee,jdbcType=VARCHAR},
+        IS_NEED_PORT_CHARGE = #{isNeedPortCharge,jdbcType=VARCHAR},
+        MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=DECIMAL},
+        RESULT_CONTACT_PERSON = #{resultContactPerson,jdbcType=VARCHAR},
+        RESULT_TELEPHONE_FAX = #{resultTelephoneFax,jdbcType=VARCHAR},
+        GROUP_ID = #{groupId,jdbcType=DECIMAL},
+        RESULT_NUMBER_OF_LOANS = #{resultNumberOfLoans,jdbcType=DECIMAL},
+        RESULT_FREIGHT_FORWARDING_INFO = #{resultFreightForwardingInfo,jdbcType=VARCHAR},
+        RESULT_MEMO = #{resultMemo,jdbcType=VARCHAR},
+        RESULT_DATE_OF_LOANS = #{resultDateOfLoans,jdbcType=TIMESTAMP},
+        CARGO_ID = #{cargoId,jdbcType=DECIMAL},
+        CARGO_IMAGE_URL = #{cargoImageUrl,jdbcType=VARCHAR},
+        IS_NEED_BONDED = #{isNeedBonded,jdbcType=VARCHAR}
     where NOTICE_ID = #{noticeId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsshipDeliveryNotice">
@@ -800,6 +817,9 @@
       <if test="cargoImageUrl != null">
         CARGO_IMAGE_URL = #{cargoImageUrl,jdbcType=VARCHAR},
       </if>
+      <if test="isNeedBonded != null">
+        IS_NEED_BONDED = #{isNeedBonded,jdbcType=VARCHAR},
+      </if>
     </set>
     where NOTICE_ID = #{noticeId,jdbcType=DECIMAL}
   </update>
@@ -816,202 +836,208 @@
     <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into AMSSHIP_DELIVERY_NOTICE 
-      (NOTICE_ID, 
-      NOTICE_COMMERCE_METHOD, NOTICE_HANDOVER_METHOD, 
-      PORT_ID, NOTICE_PORT_CONSTRUCTION_FEE, 
-      NOTICE_DELIVERY_TIME, NOTICE_PILE_FREE_DAYS, 
-      DELETE_NAME, DELETE_TIME, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK, 
-      NOTICE_DISTRIBUTION_STATUS, DELETED, 
-      BATCH_ID, PURCHASE_CONTRACT_UNIT_PRICE, 
-      PURCHASE_CONTRACT_MOISTURE, TFE_CONTENT, 
-      SILICA_CONTENT, ALUMINA_CONTENT, 
-      PHOSPHORUS_CONTENT, MANGANESE_CONTENT, 
-      IS_NEED_PORT_FEE, IS_NEED_PORT_CHARGE, 
-      MATERIAL_TYPE_ID, RESULT_CONTACT_PERSON, 
-      RESULT_TELEPHONE_FAX, GROUP_ID, 
-      RESULT_NUMBER_OF_LOANS, RESULT_FREIGHT_FORWARDING_INFO, 
-      RESULT_MEMO, RESULT_DATE_OF_LOANS, 
-      CARGO_ID, CARGO_IMAGE_URL)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.noticeId,jdbcType=DECIMAL}, 
-      #{item.noticeCommerceMethod,jdbcType=VARCHAR}, #{item.noticeHandoverMethod,jdbcType=VARCHAR}, 
-      #{item.portId,jdbcType=DECIMAL}, #{item.noticePortConstructionFee,jdbcType=DECIMAL}, 
-      #{item.noticeDeliveryTime,jdbcType=TIMESTAMP}, #{item.noticePileFreeDays,jdbcType=DECIMAL}, 
-      #{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR}, 
-      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
-      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}, 
-      #{item.noticeDistributionStatus,jdbcType=DECIMAL}, #{item.deleted,jdbcType=DECIMAL}, 
-      #{item.batchId,jdbcType=DECIMAL}, #{item.purchaseContractUnitPrice,jdbcType=DECIMAL}, 
-      #{item.purchaseContractMoisture,jdbcType=VARCHAR}, #{item.tfeContent,jdbcType=VARCHAR}, 
-      #{item.silicaContent,jdbcType=VARCHAR}, #{item.aluminaContent,jdbcType=VARCHAR}, 
-      #{item.phosphorusContent,jdbcType=VARCHAR}, #{item.manganeseContent,jdbcType=VARCHAR}, 
-      #{item.isNeedPortFee,jdbcType=VARCHAR}, #{item.isNeedPortCharge,jdbcType=VARCHAR}, 
-      #{item.materialTypeId,jdbcType=DECIMAL}, #{item.resultContactPerson,jdbcType=VARCHAR}, 
-      #{item.resultTelephoneFax,jdbcType=VARCHAR}, #{item.groupId,jdbcType=DECIMAL}, 
-      #{item.resultNumberOfLoans,jdbcType=DECIMAL}, #{item.resultFreightForwardingInfo,jdbcType=VARCHAR}, 
-      #{item.resultMemo,jdbcType=VARCHAR}, #{item.resultDateOfLoans,jdbcType=TIMESTAMP}, 
-      #{item.cargoId,jdbcType=DECIMAL}, #{item.cargoImageUrl,jdbcType=VARCHAR} from dual  
-   </foreach> )
+    insert into AMSSHIP_DELIVERY_NOTICE
+    (NOTICE_ID,
+    NOTICE_COMMERCE_METHOD, NOTICE_HANDOVER_METHOD,
+    PORT_ID, NOTICE_PORT_CONSTRUCTION_FEE,
+    NOTICE_DELIVERY_TIME, NOTICE_PILE_FREE_DAYS,
+    DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
+    INSERT_TIME, UPDATE_USERNAME,
+    UPDATE_TIME, INSERT_UPDATE_REMARK,
+    NOTICE_DISTRIBUTION_STATUS, DELETED,
+    BATCH_ID, PURCHASE_CONTRACT_UNIT_PRICE,
+    PURCHASE_CONTRACT_MOISTURE, TFE_CONTENT,
+    SILICA_CONTENT, ALUMINA_CONTENT,
+    PHOSPHORUS_CONTENT, MANGANESE_CONTENT,
+    IS_NEED_PORT_FEE, IS_NEED_PORT_CHARGE,
+    MATERIAL_TYPE_ID, RESULT_CONTACT_PERSON,
+    RESULT_TELEPHONE_FAX, GROUP_ID,
+    RESULT_NUMBER_OF_LOANS, RESULT_FREIGHT_FORWARDING_INFO,
+    RESULT_MEMO, RESULT_DATE_OF_LOANS,
+    CARGO_ID, CARGO_IMAGE_URL, IS_NEED_BONDED
+    )
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.noticeId,jdbcType=DECIMAL},
+    #{item.noticeCommerceMethod,jdbcType=VARCHAR}, #{item.noticeHandoverMethod,jdbcType=VARCHAR},
+    #{item.portId,jdbcType=DECIMAL}, #{item.noticePortConstructionFee,jdbcType=DECIMAL},
+    #{item.noticeDeliveryTime,jdbcType=TIMESTAMP}, #{item.noticePileFreeDays,jdbcType=DECIMAL},
+    #{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR},
+    #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
+    #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
+    #{item.noticeDistributionStatus,jdbcType=DECIMAL}, #{item.deleted,jdbcType=DECIMAL},
+    #{item.batchId,jdbcType=DECIMAL}, #{item.purchaseContractUnitPrice,jdbcType=DECIMAL},
+    #{item.purchaseContractMoisture,jdbcType=VARCHAR}, #{item.tfeContent,jdbcType=VARCHAR},
+    #{item.silicaContent,jdbcType=VARCHAR}, #{item.aluminaContent,jdbcType=VARCHAR},
+    #{item.phosphorusContent,jdbcType=VARCHAR}, #{item.manganeseContent,jdbcType=VARCHAR},
+    #{item.isNeedPortFee,jdbcType=VARCHAR}, #{item.isNeedPortCharge,jdbcType=VARCHAR},
+    #{item.materialTypeId,jdbcType=DECIMAL}, #{item.resultContactPerson,jdbcType=VARCHAR},
+    #{item.resultTelephoneFax,jdbcType=VARCHAR}, #{item.groupId,jdbcType=DECIMAL},
+    #{item.resultNumberOfLoans,jdbcType=DECIMAL}, #{item.resultFreightForwardingInfo,jdbcType=VARCHAR},
+    #{item.resultMemo,jdbcType=VARCHAR}, #{item.resultDateOfLoans,jdbcType=TIMESTAMP},
+    #{item.cargoId,jdbcType=DECIMAL}, #{item.cargoImageUrl,jdbcType=VARCHAR}, #{item.isNeedBonded,jdbcType=VARCHAR}
+    from dual
+  </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
-     update AMSSHIP_DELIVERY_NOTICE
-     set
-       NOTICE_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticeId,jdbcType=DECIMAL}
-       </foreach>
-       ,NOTICE_COMMERCE_METHOD=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticeCommerceMethod,jdbcType=VARCHAR}
-       </foreach>
-       ,NOTICE_HANDOVER_METHOD=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticeHandoverMethod,jdbcType=VARCHAR}
-       </foreach>
-       ,PORT_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.portId,jdbcType=DECIMAL}
-       </foreach>
-       ,NOTICE_PORT_CONSTRUCTION_FEE=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticePortConstructionFee,jdbcType=DECIMAL}
-       </foreach>
-       ,NOTICE_DELIVERY_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticeDeliveryTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,NOTICE_PILE_FREE_DAYS=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticePileFreeDays,jdbcType=DECIMAL}
-       </foreach>
-       ,DELETE_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,NOTICE_DISTRIBUTION_STATUS=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticeDistributionStatus,jdbcType=DECIMAL}
-       </foreach>
-       ,DELETED=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-       </foreach>
-       ,BATCH_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.batchId,jdbcType=DECIMAL}
-       </foreach>
-       ,PURCHASE_CONTRACT_UNIT_PRICE=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.purchaseContractUnitPrice,jdbcType=DECIMAL}
-       </foreach>
-       ,PURCHASE_CONTRACT_MOISTURE=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.purchaseContractMoisture,jdbcType=VARCHAR}
-       </foreach>
-       ,TFE_CONTENT=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.tfeContent,jdbcType=VARCHAR}
-       </foreach>
-       ,SILICA_CONTENT=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.silicaContent,jdbcType=VARCHAR}
-       </foreach>
-       ,ALUMINA_CONTENT=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.aluminaContent,jdbcType=VARCHAR}
-       </foreach>
-       ,PHOSPHORUS_CONTENT=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.phosphorusContent,jdbcType=VARCHAR}
-       </foreach>
-       ,MANGANESE_CONTENT=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.manganeseContent,jdbcType=VARCHAR}
-       </foreach>
-       ,IS_NEED_PORT_FEE=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.isNeedPortFee,jdbcType=VARCHAR}
-       </foreach>
-       ,IS_NEED_PORT_CHARGE=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.isNeedPortCharge,jdbcType=VARCHAR}
-       </foreach>
-       ,MATERIAL_TYPE_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.materialTypeId,jdbcType=DECIMAL}
-       </foreach>
-       ,RESULT_CONTACT_PERSON=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.resultContactPerson,jdbcType=VARCHAR}
-       </foreach>
-       ,RESULT_TELEPHONE_FAX=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.resultTelephoneFax,jdbcType=VARCHAR}
-       </foreach>
-       ,GROUP_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.groupId,jdbcType=DECIMAL}
-       </foreach>
-       ,RESULT_NUMBER_OF_LOANS=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.resultNumberOfLoans,jdbcType=DECIMAL}
-       </foreach>
-       ,RESULT_FREIGHT_FORWARDING_INFO=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.resultFreightForwardingInfo,jdbcType=VARCHAR}
-       </foreach>
-       ,RESULT_MEMO=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.resultMemo,jdbcType=VARCHAR}
-       </foreach>
-       ,RESULT_DATE_OF_LOANS=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.resultDateOfLoans,jdbcType=TIMESTAMP}
-       </foreach>
-       ,CARGO_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.cargoId,jdbcType=DECIMAL}
-       </foreach>
-       ,CARGO_IMAGE_URL=
-       <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
-          when #{item.noticeId,jdbcType=DECIMAL} then #{item.cargoImageUrl,jdbcType=VARCHAR}
-       </foreach>
-     where NOTICE_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.noticeId,jdbcType=DECIMAL}
-     </foreach> 
+    update AMSSHIP_DELIVERY_NOTICE
+    set
+    NOTICE_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticeId,jdbcType=DECIMAL}
+    </foreach>
+    ,NOTICE_COMMERCE_METHOD=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticeCommerceMethod,jdbcType=VARCHAR}
+    </foreach>
+    ,NOTICE_HANDOVER_METHOD=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticeHandoverMethod,jdbcType=VARCHAR}
+    </foreach>
+    ,PORT_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.portId,jdbcType=DECIMAL}
+    </foreach>
+    ,NOTICE_PORT_CONSTRUCTION_FEE=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticePortConstructionFee,jdbcType=DECIMAL}
+    </foreach>
+    ,NOTICE_DELIVERY_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticeDeliveryTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,NOTICE_PILE_FREE_DAYS=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticePileFreeDays,jdbcType=DECIMAL}
+    </foreach>
+    ,DELETE_NAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
+    </foreach>
+    ,DELETE_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,UPDATE_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATE_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,INSERT_UPDATE_REMARK=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+    </foreach>
+    ,NOTICE_DISTRIBUTION_STATUS=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticeDistributionStatus,jdbcType=DECIMAL}
+    </foreach>
+    ,DELETED=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+    </foreach>
+    ,BATCH_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.batchId,jdbcType=DECIMAL}
+    </foreach>
+    ,PURCHASE_CONTRACT_UNIT_PRICE=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.purchaseContractUnitPrice,jdbcType=DECIMAL}
+    </foreach>
+    ,PURCHASE_CONTRACT_MOISTURE=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.purchaseContractMoisture,jdbcType=VARCHAR}
+    </foreach>
+    ,TFE_CONTENT=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.tfeContent,jdbcType=VARCHAR}
+    </foreach>
+    ,SILICA_CONTENT=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.silicaContent,jdbcType=VARCHAR}
+    </foreach>
+    ,ALUMINA_CONTENT=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.aluminaContent,jdbcType=VARCHAR}
+    </foreach>
+    ,PHOSPHORUS_CONTENT=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.phosphorusContent,jdbcType=VARCHAR}
+    </foreach>
+    ,MANGANESE_CONTENT=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.manganeseContent,jdbcType=VARCHAR}
+    </foreach>
+    ,IS_NEED_PORT_FEE=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.isNeedPortFee,jdbcType=VARCHAR}
+    </foreach>
+    ,IS_NEED_PORT_CHARGE=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.isNeedPortCharge,jdbcType=VARCHAR}
+    </foreach>
+    ,MATERIAL_TYPE_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.materialTypeId,jdbcType=DECIMAL}
+    </foreach>
+    ,RESULT_CONTACT_PERSON=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.resultContactPerson,jdbcType=VARCHAR}
+    </foreach>
+    ,RESULT_TELEPHONE_FAX=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.resultTelephoneFax,jdbcType=VARCHAR}
+    </foreach>
+    ,GROUP_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.groupId,jdbcType=DECIMAL}
+    </foreach>
+    ,RESULT_NUMBER_OF_LOANS=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.resultNumberOfLoans,jdbcType=DECIMAL}
+    </foreach>
+    ,RESULT_FREIGHT_FORWARDING_INFO=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.resultFreightForwardingInfo,jdbcType=VARCHAR}
+    </foreach>
+    ,RESULT_MEMO=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.resultMemo,jdbcType=VARCHAR}
+    </foreach>
+    ,RESULT_DATE_OF_LOANS=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.resultDateOfLoans,jdbcType=TIMESTAMP}
+    </foreach>
+    ,CARGO_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.cargoId,jdbcType=DECIMAL}
+    </foreach>
+    ,CARGO_IMAGE_URL=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.cargoImageUrl,jdbcType=VARCHAR}
+    </foreach>
+    ,IS_NEED_BONDED=
+    <foreach close="end" collection="list" index="index" item="item" open="case NOTICE_ID" separator=" ">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.isNeedBonded,jdbcType=VARCHAR}
+    </foreach>
+    where NOTICE_ID in
+    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+      #{item.noticeId,jdbcType=DECIMAL}
+    </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from AMSSHIP_DELIVERY_NOTICE
-    where NOTICE_ID in 
+    where NOTICE_ID in
     <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
@@ -1052,7 +1078,8 @@
     t1.RESULT_FREIGHT_FORWARDING_INFO "forwardingInfo",
     RMT.MATERIAL_TYPE_NAME "materialTypeName",
     t1.RESULT_MEMO "resultMemo",
-    RC.CARGO_CARRIER_NAME "cargoName"
+    RC.CARGO_CARRIER_NAME "cargoName",
+    t1.IS_NEED_BONDED "isNeedBonded"
     from  AMSSHIP_DELIVERY_NOTICE t1
     left join RMS_MATERIAL_TYPE RMT
     ON T1.MATERIAL_TYPE_ID =RMT.MATERIAL_TYPE_ID
@@ -1216,7 +1243,8 @@
       RC.CARGO_CARRIER_ID  "cargoId",
       t1.CARGO_IMAGE_URL "cargoPictureUrl",
       RP.PIER_NAME "reciveName",
-      RP.PIER_ID "pierId"
+      RP.PIER_ID "pierId",
+      t1.IS_NEED_BONDED "isNeedBonded"
     from
       AMSSHIP_DELIVERY_NOTICE t1
         left join DIL_BATCH_INFACOTRY DBI
@@ -1239,4 +1267,5 @@
     from AMSSHIP_DELIVERY_NOTICE ADN
     WHERE ADN.NOTICE_ID=#{noticeId}
   </select>
+
 </mapper>