凯和订单加返箱数、单航次配船修改、增加协议功能

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shipping/deal/TShipDealController.java

@@ -0,0 +1,127 @@
+package com.ruoyi.web.controller.shipping.deal;
+
+import java.util.List;
+
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.shipping.domain.TShipDeal;
+import com.ruoyi.shipping.service.ITShipDealService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 凯和费用协议Controller
+ * 
+ * @author ruoyi
+ * @date 2022-01-07
+ */
+@RestController
+@RequestMapping("/warehouse/deal")
+public class TShipDealController extends BaseController
+{
+    @Autowired
+    private ITShipDealService tShipDealService;
+
+    /**
+     * 查询凯和费用协议列表
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:deal:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TShipDeal tShipDeal)
+    {
+        startPage();
+        List<TShipDeal> list = tShipDealService.selectTShipDealList(tShipDeal);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出凯和费用协议列表
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:deal:export')")
+    @Log(title = "凯和费用协议", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TShipDeal tShipDeal)
+    {
+        List<TShipDeal> list = tShipDealService.selectTShipDealList(tShipDeal);
+        ExcelUtil<TShipDeal> util = new ExcelUtil<TShipDeal>(TShipDeal.class);
+        return util.exportExcel(list, "deal");
+    }
+
+    /**
+     * 获取凯和费用协议详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:deal:query')")
+    @GetMapping(value = "/{fId}")
+    public AjaxResult getInfo(@PathVariable("fId") Long fId)
+    {
+        return AjaxResult.success(tShipDealService.selectTShipDealById(fId));
+    }
+
+    /**
+     * 新增凯和费用协议
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:deal:add')")
+    @Log(title = "凯和费用协议", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TShipDeal tShipDeal)
+    {
+        if (StringUtils.isEmpty(tShipDeal.getfName())){
+            throw new RuntimeException("协议名称不能为空");
+        }
+        if (StringUtils.isEmpty(tShipDeal.getfTypes())){
+            throw new RuntimeException("协议类型不能为空");
+        }
+        if (tShipDeal.getfPeriodStart() == null){
+            throw new RuntimeException("有效期起始时间不能为空");
+        }
+        if (tShipDeal.getfPeriodEnd() == null){
+            throw new RuntimeException("有效期结束不能为空");
+        }
+        return AjaxResult.success(tShipDealService.insertTShipDeal(tShipDeal));
+    }
+
+    /**
+     * 修改凯和费用协议
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:deal:edit')")
+    @Log(title = "凯和费用协议", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TShipDeal tShipDeal)
+    {
+        return toAjax(tShipDealService.updateTShipDeal(tShipDeal));
+    }
+
+    /**
+     * 删除凯和费用协议
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:deal:remove')")
+    @Log(title = "凯和费用协议", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{fIds}")
+    public AjaxResult remove(@PathVariable Long[] fIds)
+    {
+        return toAjax(tShipDealService.deleteTShipDealByIds(fIds));
+    }
+    /**
+     * 查询凯和费用协议所有不加分页
+     */
+    //@PreAuthorize("@ss.hasPermi('warehouse:deal:list')")
+    @GetMapping("/shipList")
+    public TableDataInfo shipList(TShipDeal tShipDeal)
+    {
+        List<TShipDeal> list = tShipDealService.selectTShipDealList(tShipDeal);
+        return getDataTable(list);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shipping/deal/TShipDealItemController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.shipping.deal;
+
+import java.util.List;
+
+import com.ruoyi.shipping.domain.TShipDealItem;
+import com.ruoyi.shipping.service.ITShipDealItemService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 凯和费用协议明细Controller
+ * 
+ * @author ruoyi
+ * @date 2022-01-07
+ */
+@RestController
+@RequestMapping("/warehouse/item")
+public class TShipDealItemController extends BaseController
+{
+    @Autowired
+    private ITShipDealItemService tShipDealItemService;
+
+    /**
+     * 查询凯和费用协议明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:item:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TShipDealItem tShipDealItem)
+    {
+        startPage();
+        List<TShipDealItem> list = tShipDealItemService.selectTShipDealItemList(tShipDealItem);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出凯和费用协议明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:item:export')")
+    @Log(title = "凯和费用协议明细", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TShipDealItem tShipDealItem)
+    {
+        List<TShipDealItem> list = tShipDealItemService.selectTShipDealItemList(tShipDealItem);
+        ExcelUtil<TShipDealItem> util = new ExcelUtil<TShipDealItem>(TShipDealItem.class);
+        return util.exportExcel(list, "item");
+    }
+
+    /**
+     * 获取凯和费用协议明细详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:item:query')")
+    @GetMapping(value = "/{fId}")
+    public AjaxResult getInfo(@PathVariable("fId") Long fId)
+    {
+        return AjaxResult.success(tShipDealItemService.selectTShipDealItemById(fId));
+    }
+
+    /**
+     * 新增凯和费用协议明细
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:item:add')")
+    @Log(title = "凯和费用协议明细", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TShipDealItem tShipDealItem)
+    {
+        return toAjax(tShipDealItemService.insertTShipDealItem(tShipDealItem));
+    }
+
+    /**
+     * 修改凯和费用协议明细
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:item:edit')")
+    @Log(title = "凯和费用协议明细", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TShipDealItem tShipDealItem)
+    {
+        return toAjax(tShipDealItemService.updateTShipDealItem(tShipDealItem));
+    }
+
+    /**
+     * 删除凯和费用协议明细
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:item:remove')")
+    @Log(title = "凯和费用协议明细", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{fIds}")
+    public AjaxResult remove(@PathVariable Long[] fIds)
+    {
+        return toAjax(tShipDealItemService.deleteTShipDealItemByIds(fIds));
+    }
+}

ruoyi-shipping/src/main/java/com/ruoyi/shipping/domain/TShipDeal.java

@@ -0,0 +1,214 @@
+package com.ruoyi.shipping.domain;
+
+import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 凯和费用协议对象 t_ship_deal
+ * 
+ * @author ruoyi
+ * @date 2022-01-07
+ */
+public class TShipDeal extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long fId;
+
+    /** 协议名称 */
+    @Excel(name = "协议名称")
+    private String fName;
+
+    /** 协议类型（1 收费 2 付费） */
+    @Excel(name = "协议类型", readConverterExp = "1=,收=费,2=,付=费")
+    private String fTypes;
+
+    /** 起运港 */
+    @Excel(name = "起运港")
+    private Long fLoadportId;
+
+    /** 目的港 */
+    @Excel(name = "目的港")
+    private Long fDestportId;
+
+    /** 起运港中文名 */
+    @Excel(name = "起运港中文名")
+    private String fLoadportName;
+
+    /** 目的港中文名 */
+    @Excel(name = "目的港中文名")
+    private String fDestportName;
+
+    /** 起运港运输条款 */
+    @Excel(name = "起运港运输条款")
+    private String fLoadportMode;
+
+    /** 目的港运输条款 */
+    @Excel(name = "目的港运输条款")
+    private String fDestportMode;
+
+    /** 有效期开始 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "有效期开始", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fPeriodStart;
+
+    /** 有效期结束 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "有效期结束", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fPeriodEnd;
+    /**
+     * 协议费用明细
+     */
+    @TableField(exist = false)
+    private List<TShipDealItem> tShipDealItemList;
+    //查询制单时间区间
+    @TableField(exist = false)
+    private List<String> cLoadDate;
+
+    public List<String> getcLoadDate() {
+        return cLoadDate;
+    }
+
+    public void setcLoadDate(List<String> cLoadDate) {
+        this.cLoadDate = cLoadDate;
+    }
+
+    public List<TShipDealItem> gettShipDealItemList() {
+        return tShipDealItemList;
+    }
+
+    public void settShipDealItemList(List<TShipDealItem> tShipDealItemList) {
+        this.tShipDealItemList = tShipDealItemList;
+    }
+
+    public void setfId(Long fId)
+    {
+        this.fId = fId;
+    }
+
+    public Long getfId() 
+    {
+        return fId;
+    }
+    public void setfName(String fName) 
+    {
+        this.fName = fName;
+    }
+
+    public String getfName() 
+    {
+        return fName;
+    }
+    public void setfTypes(String fTypes) 
+    {
+        this.fTypes = fTypes;
+    }
+
+    public String getfTypes() 
+    {
+        return fTypes;
+    }
+    public void setfLoadportId(Long fLoadportId) 
+    {
+        this.fLoadportId = fLoadportId;
+    }
+
+    public Long getfLoadportId() 
+    {
+        return fLoadportId;
+    }
+    public void setfDestportId(Long fDestportId) 
+    {
+        this.fDestportId = fDestportId;
+    }
+
+    public Long getfDestportId() 
+    {
+        return fDestportId;
+    }
+    public void setfLoadportName(String fLoadportName) 
+    {
+        this.fLoadportName = fLoadportName;
+    }
+
+    public String getfLoadportName() 
+    {
+        return fLoadportName;
+    }
+    public void setfDestportName(String fDestportName) 
+    {
+        this.fDestportName = fDestportName;
+    }
+
+    public String getfDestportName() 
+    {
+        return fDestportName;
+    }
+    public void setfLoadportMode(String fLoadportMode) 
+    {
+        this.fLoadportMode = fLoadportMode;
+    }
+
+    public String getfLoadportMode() 
+    {
+        return fLoadportMode;
+    }
+    public void setfDestportMode(String fDestportMode) 
+    {
+        this.fDestportMode = fDestportMode;
+    }
+
+    public String getfDestportMode() 
+    {
+        return fDestportMode;
+    }
+    public void setfPeriodStart(Date fPeriodStart) 
+    {
+        this.fPeriodStart = fPeriodStart;
+    }
+
+    public Date getfPeriodStart() 
+    {
+        return fPeriodStart;
+    }
+    public void setfPeriodEnd(Date fPeriodEnd) 
+    {
+        this.fPeriodEnd = fPeriodEnd;
+    }
+
+    public Date getfPeriodEnd() 
+    {
+        return fPeriodEnd;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("fId", getfId())
+            .append("fName", getfName())
+            .append("fTypes", getfTypes())
+            .append("fLoadportId", getfLoadportId())
+            .append("fDestportId", getfDestportId())
+            .append("fLoadportName", getfLoadportName())
+            .append("fDestportName", getfDestportName())
+            .append("fLoadportMode", getfLoadportMode())
+            .append("fDestportMode", getfDestportMode())
+            .append("fPeriodStart", getfPeriodStart())
+            .append("fPeriodEnd", getfPeriodEnd())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .append("tShipDealItemList", gettShipDealItemList())
+            .toString();
+    }
+}

ruoyi-shipping/src/main/java/com/ruoyi/shipping/domain/TShipDealItem.java

@@ -0,0 +1,127 @@
+package com.ruoyi.shipping.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 凯和费用协议明细对象 t_ship_deal_item
+ * 
+ * @author ruoyi
+ * @date 2022-01-07
+ */
+public class TShipDealItem extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long fId;
+
+    /** 订单表主键 */
+    @Excel(name = "订单表主键")
+    private Long fPid;
+
+    /** 费用id(取费用表的id) */
+    @Excel(name = "费用id(取费用表的id)")
+    private Long fFeeId;
+
+    /** 费用名称 */
+    @Excel(name = "费用名称")
+    private String fFeeName;
+
+    /** 计量单位(数据字典)"对应t_unitfees的f_id" */
+    @Excel(name = "计量单位(数据字典)")
+    private Long fFeeunitId;
+
+    /** 计量单位中文名 */
+    @Excel(name = "计量单位中文名")
+    private String fFeeunitName;
+
+    /** 单价 */
+    @Excel(name = "单价")
+    private BigDecimal fPrice;
+
+    public void setfId(Long fId) 
+    {
+        this.fId = fId;
+    }
+
+    public Long getfId() 
+    {
+        return fId;
+    }
+    public void setfPid(Long fPid) 
+    {
+        this.fPid = fPid;
+    }
+
+    public Long getfPid() 
+    {
+        return fPid;
+    }
+    public void setfFeeId(Long fFeeId) 
+    {
+        this.fFeeId = fFeeId;
+    }
+
+    public Long getfFeeId() 
+    {
+        return fFeeId;
+    }
+    public void setfFeeName(String fFeeName) 
+    {
+        this.fFeeName = fFeeName;
+    }
+
+    public String getfFeeName() 
+    {
+        return fFeeName;
+    }
+    public void setfFeeunitId(Long fFeeunitId) 
+    {
+        this.fFeeunitId = fFeeunitId;
+    }
+
+    public Long getfFeeunitId() 
+    {
+        return fFeeunitId;
+    }
+    public void setfFeeunitName(String fFeeunitName) 
+    {
+        this.fFeeunitName = fFeeunitName;
+    }
+
+    public String getfFeeunitName() 
+    {
+        return fFeeunitName;
+    }
+    public void setfPrice(BigDecimal fPrice) 
+    {
+        this.fPrice = fPrice;
+    }
+
+    public BigDecimal getfPrice() 
+    {
+        return fPrice;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("fId", getfId())
+            .append("fPid", getfPid())
+            .append("fFeeId", getfFeeId())
+            .append("fFeeName", getfFeeName())
+            .append("fFeeunitId", getfFeeunitId())
+            .append("fFeeunitName", getfFeeunitName())
+            .append("fPrice", getfPrice())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-shipping/src/main/java/com/ruoyi/shipping/mapper/TShipDealItemMapper.java

@@ -0,0 +1,69 @@
+package com.ruoyi.shipping.mapper;
+
+import com.ruoyi.shipping.domain.TShipDealItem;
+
+import java.util.List;
+
+/**
+ * 凯和费用协议明细Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-01-07
+ */
+public interface TShipDealItemMapper 
+{
+    /**
+     * 查询凯和费用协议明细
+     * 
+     * @param fId 凯和费用协议明细ID
+     * @return 凯和费用协议明细
+     */
+    public TShipDealItem selectTShipDealItemById(Long fId);
+
+    /**
+     * 查询凯和费用协议明细列表
+     * 
+     * @param tShipDealItem 凯和费用协议明细
+     * @return 凯和费用协议明细集合
+     */
+    public List<TShipDealItem> selectTShipDealItemList(TShipDealItem tShipDealItem);
+
+    /**
+     * 新增凯和费用协议明细
+     * 
+     * @param tShipDealItem 凯和费用协议明细
+     * @return 结果
+     */
+    public int insertTShipDealItem(TShipDealItem tShipDealItem);
+
+    /**
+     * 修改凯和费用协议明细
+     * 
+     * @param tShipDealItem 凯和费用协议明细
+     * @return 结果
+     */
+    public int updateTShipDealItem(TShipDealItem tShipDealItem);
+
+    /**
+     * 删除凯和费用协议明细
+     * 
+     * @param fId 凯和费用协议明细ID
+     * @return 结果
+     */
+    public int deleteTShipDealItemById(Long fId);
+
+    /**
+     * 批量删除凯和费用协议明细
+     * 
+     * @param fIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTShipDealItemByIds(Long[] fIds);
+    /**
+     * 批量删除凯和费用协议明细
+     *
+     * @param fIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTShipDealItemByPIds(Long[] fIds);
+}

ruoyi-shipping/src/main/java/com/ruoyi/shipping/mapper/TShipDealMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.shipping.mapper;
+
+import com.ruoyi.shipping.domain.TShipDeal;
+
+import java.util.List;
+
+/**
+ * 凯和费用协议Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-01-07
+ */
+public interface TShipDealMapper 
+{
+    /**
+     * 查询凯和费用协议
+     * 
+     * @param fId 凯和费用协议ID
+     * @return 凯和费用协议
+     */
+    public TShipDeal selectTShipDealById(Long fId);
+
+    /**
+     * 查询凯和费用协议列表
+     * 
+     * @param tShipDeal 凯和费用协议
+     * @return 凯和费用协议集合
+     */
+    public List<TShipDeal> selectTShipDealList(TShipDeal tShipDeal);
+
+    /**
+     * 新增凯和费用协议
+     * 
+     * @param tShipDeal 凯和费用协议
+     * @return 结果
+     */
+    public int insertTShipDeal(TShipDeal tShipDeal);
+
+    /**
+     * 修改凯和费用协议
+     * 
+     * @param tShipDeal 凯和费用协议
+     * @return 结果
+     */
+    public int updateTShipDeal(TShipDeal tShipDeal);
+
+    /**
+     * 删除凯和费用协议
+     * 
+     * @param fId 凯和费用协议ID
+     * @return 结果
+     */
+    public int deleteTShipDealById(Long fId);
+
+    /**
+     * 批量删除凯和费用协议
+     * 
+     * @param fIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTShipDealByIds(Long[] fIds);
+}

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/ITShipDealItemService.java

@@ -0,0 +1,62 @@
+package com.ruoyi.shipping.service;
+
+import com.ruoyi.shipping.domain.TShipDealItem;
+
+import java.util.List;
+
+/**
+ * 凯和费用协议明细Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-01-07
+ */
+public interface ITShipDealItemService 
+{
+    /**
+     * 查询凯和费用协议明细
+     * 
+     * @param fId 凯和费用协议明细ID
+     * @return 凯和费用协议明细
+     */
+    public TShipDealItem selectTShipDealItemById(Long fId);
+
+    /**
+     * 查询凯和费用协议明细列表
+     * 
+     * @param tShipDealItem 凯和费用协议明细
+     * @return 凯和费用协议明细集合
+     */
+    public List<TShipDealItem> selectTShipDealItemList(TShipDealItem tShipDealItem);
+
+    /**
+     * 新增凯和费用协议明细
+     * 
+     * @param tShipDealItem 凯和费用协议明细
+     * @return 结果
+     */
+    public int insertTShipDealItem(TShipDealItem tShipDealItem);
+
+    /**
+     * 修改凯和费用协议明细
+     * 
+     * @param tShipDealItem 凯和费用协议明细
+     * @return 结果
+     */
+    public int updateTShipDealItem(TShipDealItem tShipDealItem);
+
+    /**
+     * 批量删除凯和费用协议明细
+     * 
+     * @param fIds 需要删除的凯和费用协议明细ID
+     * @return 结果
+     */
+    public int deleteTShipDealItemByIds(Long[] fIds);
+
+    /**
+     * 删除凯和费用协议明细信息
+     * 
+     * @param fId 凯和费用协议明细ID
+     * @return 结果
+     */
+    public int deleteTShipDealItemById(Long fId);
+}

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/ITShipDealService.java

@@ -0,0 +1,62 @@
+package com.ruoyi.shipping.service;
+
+import com.ruoyi.shipping.domain.TShipDeal;
+
+import java.util.List;
+
+/**
+ * 凯和费用协议Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-01-07
+ */
+public interface ITShipDealService 
+{
+    /**
+     * 查询凯和费用协议
+     * 
+     * @param fId 凯和费用协议ID
+     * @return 凯和费用协议
+     */
+    public TShipDeal selectTShipDealById(Long fId);
+
+    /**
+     * 查询凯和费用协议列表
+     * 
+     * @param tShipDeal 凯和费用协议
+     * @return 凯和费用协议集合
+     */
+    public List<TShipDeal> selectTShipDealList(TShipDeal tShipDeal);
+
+    /**
+     * 新增凯和费用协议
+     * 
+     * @param tShipDeal 凯和费用协议
+     * @return 结果
+     */
+    public TShipDeal insertTShipDeal(TShipDeal tShipDeal);
+
+    /**
+     * 修改凯和费用协议
+     * 
+     * @param tShipDeal 凯和费用协议
+     * @return 结果
+     */
+    public int updateTShipDeal(TShipDeal tShipDeal);
+
+    /**
+     * 批量删除凯和费用协议
+     * 
+     * @param fIds 需要删除的凯和费用协议ID
+     * @return 结果
+     */
+    public int deleteTShipDealByIds(Long[] fIds);
+
+    /**
+     * 删除凯和费用协议信息
+     * 
+     * @param fId 凯和费用协议ID
+     * @return 结果
+     */
+    public int deleteTShipDealById(Long fId);
+}

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/impl/TShipDealItemServiceImpl.java

@@ -0,0 +1,96 @@
+package com.ruoyi.shipping.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.shipping.domain.TShipDealItem;
+import com.ruoyi.shipping.mapper.TShipDealItemMapper;
+import com.ruoyi.shipping.service.ITShipDealItemService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 凯和费用协议明细Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2022-01-07
+ */
+@Service
+public class TShipDealItemServiceImpl implements ITShipDealItemService
+{
+    @Autowired
+    private TShipDealItemMapper tShipDealItemMapper;
+
+    /**
+     * 查询凯和费用协议明细
+     * 
+     * @param fId 凯和费用协议明细ID
+     * @return 凯和费用协议明细
+     */
+    @Override
+    public TShipDealItem selectTShipDealItemById(Long fId)
+    {
+        return tShipDealItemMapper.selectTShipDealItemById(fId);
+    }
+
+    /**
+     * 查询凯和费用协议明细列表
+     * 
+     * @param tShipDealItem 凯和费用协议明细
+     * @return 凯和费用协议明细
+     */
+    @Override
+    public List<TShipDealItem> selectTShipDealItemList(TShipDealItem tShipDealItem)
+    {
+        return tShipDealItemMapper.selectTShipDealItemList(tShipDealItem);
+    }
+
+    /**
+     * 新增凯和费用协议明细
+     * 
+     * @param tShipDealItem 凯和费用协议明细
+     * @return 结果
+     */
+    @Override
+    public int insertTShipDealItem(TShipDealItem tShipDealItem)
+    {
+        tShipDealItem.setCreateTime(DateUtils.getNowDate());
+        return tShipDealItemMapper.insertTShipDealItem(tShipDealItem);
+    }
+
+    /**
+     * 修改凯和费用协议明细
+     * 
+     * @param tShipDealItem 凯和费用协议明细
+     * @return 结果
+     */
+    @Override
+    public int updateTShipDealItem(TShipDealItem tShipDealItem)
+    {
+        tShipDealItem.setUpdateTime(DateUtils.getNowDate());
+        return tShipDealItemMapper.updateTShipDealItem(tShipDealItem);
+    }
+
+    /**
+     * 批量删除凯和费用协议明细
+     * 
+     * @param fIds 需要删除的凯和费用协议明细ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTShipDealItemByIds(Long[] fIds)
+    {
+        return tShipDealItemMapper.deleteTShipDealItemByIds(fIds);
+    }
+
+    /**
+     * 删除凯和费用协议明细信息
+     * 
+     * @param fId 凯和费用协议明细ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTShipDealItemById(Long fId)
+    {
+        return tShipDealItemMapper.deleteTShipDealItemById(fId);
+    }
+}

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/impl/TShipDealServiceImpl.java

@@ -0,0 +1,141 @@
+package com.ruoyi.shipping.service.impl;
+
+import java.util.List;
+
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.shipping.domain.TShipDeal;
+import com.ruoyi.shipping.domain.TShipDealItem;
+import com.ruoyi.shipping.mapper.TShipDealItemMapper;
+import com.ruoyi.shipping.mapper.TShipDealMapper;
+import com.ruoyi.shipping.service.ITShipDealService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+/**
+ * 凯和费用协议Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2022-01-07
+ */
+@Service
+public class TShipDealServiceImpl implements ITShipDealService
+{
+    @Resource
+    private TShipDealMapper tShipDealMapper;
+    @Resource
+    private TShipDealItemMapper tShipDealItemMapper;
+
+    /**
+     * 查询凯和费用协议
+     * 
+     * @param fId 凯和费用协议ID
+     * @return 凯和费用协议
+     */
+    @Override
+    public TShipDeal selectTShipDealById(Long fId)
+    {
+        TShipDeal shipDeal = tShipDealMapper.selectTShipDealById(fId);
+        if (shipDeal != null) {
+            TShipDealItem tShipDealItem = new TShipDealItem();
+            tShipDealItem.setfPid(shipDeal.getfId());
+            shipDeal.settShipDealItemList(tShipDealItemMapper.selectTShipDealItemList(tShipDealItem));
+        }
+        return shipDeal;
+    }
+
+    /**
+     * 查询凯和费用协议列表
+     * 
+     * @param tShipDeal 凯和费用协议
+     * @return 凯和费用协议
+     */
+    @Override
+    public List<TShipDeal> selectTShipDealList(TShipDeal tShipDeal)
+    {
+        return tShipDealMapper.selectTShipDealList(tShipDeal);
+    }
+
+    /**
+     * 新增凯和费用协议
+     * 
+     * @param tShipDeal 凯和费用协议
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public TShipDeal insertTShipDeal(TShipDeal tShipDeal)
+    {
+        if (tShipDeal.getfId() == null){
+            tShipDeal.setCreateBy(SecurityUtils.getUsername());
+            tShipDeal.setCreateTime(DateUtils.getNowDate());
+            tShipDealMapper.insertTShipDeal(tShipDeal);
+        }else {
+            tShipDeal.setUpdateBy(SecurityUtils.getUsername());
+            tShipDeal.setUpdateTime(DateUtils.getNowDate());
+            tShipDealMapper.updateTShipDeal(tShipDeal);
+        }
+       if (CollectionUtils.isNotEmpty(tShipDeal.gettShipDealItemList())){
+           tShipDeal.gettShipDealItemList().stream().forEach(item ->{
+               if (item.getfId() == null){
+                   item.setfPid(tShipDeal.getfId());
+                   item.setCreateBy(SecurityUtils.getUsername());
+                   item.setCreateTime(DateUtils.getNowDate());
+                   tShipDealItemMapper.insertTShipDealItem(item);
+               }else {
+                   item.setfPid(tShipDeal.getfId());
+                   item.setUpdateBy(SecurityUtils.getUsername());
+                   item.setUpdateTime(DateUtils.getNowDate());
+                   tShipDealItemMapper.updateTShipDealItem(item);
+               }
+           });
+       }
+        return tShipDeal;
+    }
+
+    /**
+     * 修改凯和费用协议
+     * 
+     * @param tShipDeal 凯和费用协议
+     * @return 结果
+     */
+    @Override
+    public int updateTShipDeal(TShipDeal tShipDeal)
+    {
+        tShipDeal.setUpdateTime(DateUtils.getNowDate());
+        return tShipDealMapper.updateTShipDeal(tShipDeal);
+    }
+
+    /**
+     * 批量删除凯和费用协议
+     * 
+     * @param fIds 需要删除的凯和费用协议ID
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int deleteTShipDealByIds(Long[] fIds)
+    {
+        int i = tShipDealMapper.deleteTShipDealByIds(fIds);
+        tShipDealItemMapper.deleteTShipDealItemByPIds(fIds);
+        return i;
+    }
+
+    /**
+     * 删除凯和费用协议信息
+     * 
+     * @param fId 凯和费用协议ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTShipDealById(Long fId)
+    {
+        return tShipDealMapper.deleteTShipDealById(fId);
+    }
+}

ruoyi-shipping/src/main/resources/mapper/shipping/TShipDealItemMapper.xml

@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.shipping.mapper.TShipDealItemMapper">
+    
+    <resultMap type="TShipDealItem" id="TShipDealItemResult">
+        <result property="fId"    column="f_id"    />
+        <result property="fPid"    column="f_pid"    />
+        <result property="fFeeId"    column="f_fee_id"    />
+        <result property="fFeeName"    column="f_fee_name"    />
+        <result property="fFeeunitId"    column="f_feeunit_id"    />
+        <result property="fFeeunitName"    column="f_feeunit_name"    />
+        <result property="fPrice"    column="f_price"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectTShipDealItemVo">
+        select f_id, f_pid, f_fee_id, f_fee_name, f_feeunit_id, f_feeunit_name, f_price, create_by, create_time, update_by, update_time, remark from t_ship_deal_item
+    </sql>
+
+    <select id="selectTShipDealItemList" parameterType="TShipDealItem" resultMap="TShipDealItemResult">
+        <include refid="selectTShipDealItemVo"/>
+        <where>  
+            <if test="fPid != null "> and f_pid = #{fPid}</if>
+            <if test="fFeeId != null "> and f_fee_id = #{fFeeId}</if>
+            <if test="fFeeName != null  and fFeeName != ''"> and f_fee_name like concat('%', #{fFeeName}, '%')</if>
+            <if test="fFeeunitId != null "> and f_feeunit_id = #{fFeeunitId}</if>
+            <if test="fFeeunitName != null  and fFeeunitName != ''"> and f_feeunit_name like concat('%', #{fFeeunitName}, '%')</if>
+            <if test="fPrice != null "> and f_price = #{fPrice}</if>
+        </where>
+    </select>
+    
+    <select id="selectTShipDealItemById" parameterType="Long" resultMap="TShipDealItemResult">
+        <include refid="selectTShipDealItemVo"/>
+        where f_id = #{fId}
+    </select>
+        
+    <insert id="insertTShipDealItem" parameterType="TShipDealItem" useGeneratedKeys="true" keyProperty="fId">
+        insert into t_ship_deal_item
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fPid != null">f_pid,</if>
+            <if test="fFeeId != null">f_fee_id,</if>
+            <if test="fFeeName != null">f_fee_name,</if>
+            <if test="fFeeunitId != null">f_feeunit_id,</if>
+            <if test="fFeeunitName != null">f_feeunit_name,</if>
+            <if test="fPrice != null">f_price,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fPid != null">#{fPid},</if>
+            <if test="fFeeId != null">#{fFeeId},</if>
+            <if test="fFeeName != null">#{fFeeName},</if>
+            <if test="fFeeunitId != null">#{fFeeunitId},</if>
+            <if test="fFeeunitName != null">#{fFeeunitName},</if>
+            <if test="fPrice != null">#{fPrice},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTShipDealItem" parameterType="TShipDealItem">
+        update t_ship_deal_item
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fPid != null">f_pid = #{fPid},</if>
+            <if test="fFeeId != null">f_fee_id = #{fFeeId},</if>
+            <if test="fFeeName != null">f_fee_name = #{fFeeName},</if>
+            <if test="fFeeunitId != null">f_feeunit_id = #{fFeeunitId},</if>
+            <if test="fFeeunitName != null">f_feeunit_name = #{fFeeunitName},</if>
+            <if test="fPrice != null">f_price = #{fPrice},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where f_id = #{fId}
+    </update>
+
+    <delete id="deleteTShipDealItemById" parameterType="Long">
+        delete from t_ship_deal_item where f_id = #{fId}
+    </delete>
+
+    <delete id="deleteTShipDealItemByIds" parameterType="String">
+        delete from t_ship_deal_item where f_id in 
+        <foreach item="fId" collection="array" open="(" separator="," close=")">
+            #{fId}
+        </foreach>
+    </delete>
+    <delete id="deleteTShipDealItemByPIds" parameterType="String">
+        delete from t_ship_deal_item where f_pid in
+        <foreach item="fId" collection="array" open="(" separator="," close=")">
+            #{fId}
+        </foreach>
+    </delete>
+    
+</mapper>

ruoyi-shipping/src/main/resources/mapper/shipping/TShipDealMapper.xml

@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.shipping.mapper.TShipDealMapper">
+    
+    <resultMap type="TShipDeal" id="TShipDealResult">
+        <result property="fId"    column="f_id"    />
+        <result property="fName"    column="f_name"    />
+        <result property="fTypes"    column="f_types"    />
+        <result property="fLoadportId"    column="f_loadport_id"    />
+        <result property="fDestportId"    column="f_destport_id"    />
+        <result property="fLoadportName"    column="f_loadport_name"    />
+        <result property="fDestportName"    column="f_destport_name"    />
+        <result property="fLoadportMode"    column="f_loadport_mode"    />
+        <result property="fDestportMode"    column="f_destport_mode"    />
+        <result property="fPeriodStart"    column="f_period_start"    />
+        <result property="fPeriodEnd"    column="f_period_end"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectTShipDealVo">
+        select f_id, f_name, f_types, f_loadport_id, f_destport_id, f_loadport_name, f_destport_name, f_loadport_mode, f_destport_mode, f_period_start, f_period_end, create_by, create_time, update_by, update_time, remark from t_ship_deal
+    </sql>
+
+    <select id="selectTShipDealList" parameterType="TShipDeal" resultMap="TShipDealResult">
+        <include refid="selectTShipDealVo"/>
+        <where>  
+            <if test="fName != null  and fName != ''"> and f_name like concat('%', #{fName}, '%')</if>
+            <if test="fTypes != null  and fTypes != ''"> and f_types = #{fTypes}</if>
+            <if test="fLoadportId != null "> and f_loadport_id = #{fLoadportId}</if>
+            <if test="fDestportId != null "> and f_destport_id = #{fDestportId}</if>
+            <if test="fLoadportName != null  and fLoadportName != ''"> and f_loadport_name like concat('%', #{fLoadportName}, '%')</if>
+            <if test="fDestportName != null  and fDestportName != ''"> and f_destport_name like concat('%', #{fDestportName}, '%')</if>
+            <if test="fLoadportMode != null  and fLoadportMode != ''"> and f_loadport_mode like concat('%', #{fLoadportMode}, '%')</if>
+            <if test="fDestportMode != null  and fDestportMode != ''"> and f_destport_mode like concat('%', #{fDestportMode}, '%')</if>
+            <if test="fPeriodStart != null "> and f_period_start &lt;= #{fPeriodStart}</if>
+            <if test="fPeriodEnd != null "> and f_period_end &gt;= #{fPeriodEnd}</if>
+            <if test='cLoadDate != null and cLoadDate[0] != null and cLoadDate[0]!= ""'>
+                and create_time &gt;= #{cLoadDate[0]}
+            </if>
+            <if test='cLoadDate != null and cLoadDate[1] != null and cLoadDate[1]!= ""'>
+                and create_time &lt;= #{cLoadDate[1]}
+            </if>
+        </where>
+    </select>
+    
+    <select id="selectTShipDealById" parameterType="Long" resultMap="TShipDealResult">
+        <include refid="selectTShipDealVo"/>
+        where f_id = #{fId}
+    </select>
+        
+    <insert id="insertTShipDeal" parameterType="TShipDeal" useGeneratedKeys="true" keyProperty="fId">
+        insert into t_ship_deal
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fName != null">f_name,</if>
+            <if test="fTypes != null and fTypes != ''">f_types,</if>
+            <if test="fLoadportId != null">f_loadport_id,</if>
+            <if test="fDestportId != null">f_destport_id,</if>
+            <if test="fLoadportName != null">f_loadport_name,</if>
+            <if test="fDestportName != null">f_destport_name,</if>
+            <if test="fLoadportMode != null">f_loadport_mode,</if>
+            <if test="fDestportMode != null">f_destport_mode,</if>
+            <if test="fPeriodStart != null">f_period_start,</if>
+            <if test="fPeriodEnd != null">f_period_end,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fName != null">#{fName},</if>
+            <if test="fTypes != null and fTypes != ''">#{fTypes},</if>
+            <if test="fLoadportId != null">#{fLoadportId},</if>
+            <if test="fDestportId != null">#{fDestportId},</if>
+            <if test="fLoadportName != null">#{fLoadportName},</if>
+            <if test="fDestportName != null">#{fDestportName},</if>
+            <if test="fLoadportMode != null">#{fLoadportMode},</if>
+            <if test="fDestportMode != null">#{fDestportMode},</if>
+            <if test="fPeriodStart != null">#{fPeriodStart},</if>
+            <if test="fPeriodEnd != null">#{fPeriodEnd},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTShipDeal" parameterType="TShipDeal">
+        update t_ship_deal
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fName != null">f_name = #{fName},</if>
+            <if test="fTypes != null and fTypes != ''">f_types = #{fTypes},</if>
+            <if test="fLoadportId != null">f_loadport_id = #{fLoadportId},</if>
+            <if test="fDestportId != null">f_destport_id = #{fDestportId},</if>
+            <if test="fLoadportName != null">f_loadport_name = #{fLoadportName},</if>
+            <if test="fDestportName != null">f_destport_name = #{fDestportName},</if>
+            <if test="fLoadportMode != null">f_loadport_mode = #{fLoadportMode},</if>
+            <if test="fDestportMode != null">f_destport_mode = #{fDestportMode},</if>
+            <if test="fPeriodStart != null">f_period_start = #{fPeriodStart},</if>
+            <if test="fPeriodEnd != null">f_period_end = #{fPeriodEnd},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where f_id = #{fId}
+    </update>
+
+    <delete id="deleteTShipDealById" parameterType="Long">
+        delete from t_ship_deal where f_id = #{fId}
+    </delete>
+
+    <delete id="deleteTShipDealByIds" parameterType="String">
+        delete from t_ship_deal where f_id in 
+        <foreach item="fId" collection="array" open="(" separator="," close=")">
+            #{fId}
+        </foreach>
+    </delete>
+    
+</mapper>

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehouseBills.java

@@ -608,6 +608,18 @@ public class TWarehouseBills extends BaseEntity {
     /** 拆单审批状态 */
     @Excel(name = "拆单审批状态")
     private Long fDismountStatus;
+    /**
+     * 目的港运输条款
+     */
+    private String fServiceitemsNew;
+
+    public String getfServiceitemsNew() {
+        return fServiceitemsNew;
+    }
+
+    public void setfServiceitemsNew(String fServiceitemsNew) {
+        this.fServiceitemsNew = fServiceitemsNew;
+    }
 
     public String getfCntrno() {
         return fCntrno;
@@ -2001,6 +2013,7 @@ public class TWarehouseBills extends BaseEntity {
                 ", fArrivalStatus=" + fArrivalStatus +
                 ", fDismountStatus=" + fDismountStatus +
                 ", billList=" + billList +
+                ", fServiceitemsNew=" + fServiceitemsNew +
                 '}';
     }
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -6570,14 +6570,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return AjaxResult.error("系统缺少箱动态卸船请维护");
             }
-            String address = null;
-            if (StringUtils.isNotEmpty(tCntrno.getfUpdateaddress())){
-                address = tCntrno.getfUpdateaddress();
-            }else {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return AjaxResult.error("请选择要卸船的港口");
-            }
             for (TWarehouseBills bills : tWarehouseBillsList) {
+                String address = null;
+                if (StringUtils.isNotEmpty(tCntrno.getfUpdateaddress())){
+                    address = tCntrno.getfUpdateaddress();
+                }else {
+                   address = bills.getfDestportid().toString();
+                }
                 //查询货物信息
                 TWarehousebillsCntr warehousebillsCntr = tWarehousebillsCntrMapper.selectTWarehousebillsCntrByPId(bills.getfId());
                 //查询订单箱信息

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

@@ -119,6 +119,7 @@
         <result property="fArrivalStatus"    column="f_arrival_status"    />
         <result property="fDismountStatus"    column="f_dismount_status"    />
         <result property="fFeeStatus"    column="f_fee_status"    />
+        <result property="fServiceitemsNew"    column="f_serviceitems_new"    />
     </resultMap>
 
     <resultMap type="WarehouseBillsVO" id="WarehousebillsVOResult">
@@ -143,7 +144,7 @@
         free_container_date, f_business_attribution, f_fee_status, f_supervision_unit, f_declaration_elements, f_part_number, f_ifinspection, f_value, f_weighing_date,
         f_ifsampling, send_sample_date, f_ifweight_recovery, weight_recovery_date, warehouse_status, f_times ,f_date_changed, f_chargetype,f_weigh_weight,
         f_predict_branch,f_grade,f_delivery_details,f_salesman_id,f_itemstatus,f_updete_status, f_submit_update, f_delete_status,f_remarks_fees,f_cargo_planning,
-        f_arrival_status,f_dismount_status from t_warehousebills
+        f_arrival_status,f_dismount_status,f_serviceitems_new from t_warehousebills
     </sql>
 
     <select id="selectTWarehousebillsList" parameterType="TWarehousebills" resultMap="TWarehousebillsResult">
@@ -1009,6 +1010,7 @@
             <if test="fFeeStatus != null">f_fee_status,</if>
             <if test="fArrivalStatus != null">f_arrival_status,</if>
             <if test="fDismountStatus != null">f_dismount_status,</if>
+            <if test="fServiceitemsNew != null">f_serviceitems_new,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fBillno != null">#{fBillno},</if>
@@ -1124,6 +1126,7 @@
             <if test="fFeeStatus != null">#{fFeeStatus},</if>
             <if test="fArrivalStatus != null">#{fArrivalStatus},</if>
             <if test="fDismountStatus != null">#{fDismountStatus},</if>
+            <if test="fServiceitemsNew != null">#{fServiceitemsNew},</if>
         </trim>
     </insert>
 
@@ -1243,6 +1246,7 @@
             <if test="fFeeStatus != null">f_fee_status = #{fFeeStatus},</if>
             <if test="fArrivalStatus != null">f_arrival_status = #{fArrivalStatus},</if>
             <if test="fDismountStatus != null">f_dismount_status = #{fDismountStatus},</if>
+            <if test="fServiceitemsNew != null">f_serviceitems_new = #{fServiceitemsNew},</if>
         </trim>
         where f_id = #{fId}
     </update>
@@ -1364,6 +1368,7 @@
             <if test="fFeeStatus != null">f_fee_status = #{fFeeStatus},</if>
             <if test="fArrivalStatus != null">f_arrival_status = #{fArrivalStatus},</if>
             <if test="fDismountStatus != null">f_dismount_status = #{fDismountStatus},</if>
+            <if test="fServiceitemsNew != null">f_serviceitems_new = #{fServiceitemsNew},</if>
         </trim>
         where f_id = #{fId}
     </update>
@@ -1635,7 +1640,8 @@
             tw.f_delete_status,
             tw.f_cargo_planning,
             tw.f_arrival_status,
-            tw.f_dismount_status
+            tw.f_dismount_status,
+            tw.f_serviceitems_new
         FROM t_warehousebills tw
             LEFT JOIN t_address address ON address.f_id = tw.f_loadportid
             LEFT JOIN t_address ta ON ta.f_id = tw.f_loadportid
@@ -1864,7 +1870,8 @@
         tw.f_vslid fVslid,
         tw.f_voyid fVoyid,
         tw.remark remark,
-        IFNULL(tcntr.loadCntr,0) AS loadCntr
+        IFNULL(tcntr.loadCntr,0) AS loadCntr,
+        tw.f_serviceitems_new AS fServiceitemsNew
         FROM
         t_warehousebills tw
         LEFT JOIN t_address ta ON ta.f_id = tw.f_laneid
@@ -2146,7 +2153,8 @@
         ROUND(IFNULL(tf.fAmount,0),2) fAmount,
         tw.f_cargo_planning fCargoPlanning,
         tw.f_arrival_status,
-        tw.remark remark
+        tw.remark remark,
+        tw.f_serviceitems_new AS fServiceitemsNew
         FROM
         t_warehousebills tw
         LEFT JOIN t_address ta ON ta.f_id = tw.f_laneid
@@ -2408,7 +2416,8 @@
                tw.f_delete_status,
                tw.f_cargo_planning,
                tw.f_arrival_status,
-               tw.f_dismount_status
+               tw.f_dismount_status,
+               tw.f_serviceitems_new
         FROM t_warehousebills tw
                  LEFT JOIN t_address address ON address.f_id = tw.f_loadportid
                  LEFT JOIN t_address ta ON ta.f_id = tw.f_loadportid