添加 仓库主表补充字段，修改主表名称，添加mybatis-plus依赖

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseDetailsController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseBillsController.java

@@ -3,11 +3,15 @@ package com.ruoyi.web.controller.warehouse.warehouseBusiness;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseDetails;
-import com.ruoyi.warehouseBusiness.service.ITWarehouseDetailsService;
+import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -22,9 +26,9 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/warehouseBusiness/details")
-public class TWarehouseDetailsController extends BaseController {
+public class TWarehouseBillsController extends BaseController {
     @Autowired
-    private ITWarehouseDetailsService tWarehouseDetailsService;
+    private ITWarehouseBillsService tWarehouseDetailsService;
 
     /**
      * 查询详情主表列表
@@ -65,7 +69,9 @@ public class TWarehouseDetailsController extends BaseController {
     @Log(title = "详情主表", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TWarehouseDetails tWarehouseDetails) {
-        return toAjax(tWarehouseDetailsService.insertTWarehouseDetails(tWarehouseDetails));
+        // 获取当前的用户
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        return toAjax(tWarehouseDetailsService.insertTWarehouseDetails(tWarehouseDetails, loginUser));
     }
 
     /**

ruoyi-warehouse/pom.xml

@@ -34,6 +34,11 @@
             <artifactId>hutool-all</artifactId>
             <version>5.5.2</version>
         </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-support</artifactId>
+            <version>2.3</version>
+        </dependency>
     </dependencies>
 
 </project>

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

@@ -1,6 +1,5 @@
 package com.ruoyi.warehouseBusiness.domain;
 
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -59,7 +58,6 @@ public class TEnclosure extends BaseEntity {
     /**
      * 删除状态
      */
-    @TableLogic
     private String delFlag;
 
     public void setfId(Long fId) {

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

@@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -16,6 +15,7 @@ import java.util.Date;
  * @author ruoyi
  * @date 2020-12-11
  */
+@Data
 public class TWarehouseDetails extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -32,6 +32,12 @@ public class TWarehouseDetails extends BaseEntity {
     private String fBillno;
 
     /**
+     * 报关号 取入库的f_customsdeclartion
+     */
+    @Excel(name = "报关号")
+    private String fCustomsdeclartion;
+
+    /**
      * 原始业务编号,入库时和f_billno 相同，出库 取入库的f_originalbillno
      */
     @Excel(name = "原始业务编号,入库时和f_billno 相同，出库 取入库的f_originalbillno")
@@ -50,6 +56,18 @@ public class TWarehouseDetails extends BaseEntity {
     private Long fBsdeptid;
 
     /**
+     * 联系人
+     */
+    @Excel(name = "业务所属部门")
+    private String fContacts;
+
+    /**
+     * 电话
+     */
+    @Excel(name = "业务所属部门")
+    private String fTel;
+
+    /**
      * 客户名称，t_corps 中的no或 name，模糊查找选择后，存储id，显示name
      */
     @Excel(name = "客户名称，t_corps 中的no或 name，模糊查找选择后，存储id，显示name")
@@ -81,6 +99,12 @@ public class TWarehouseDetails extends BaseEntity {
     private Long fWarehouseid;
 
     /**
+     * 仓管人
+     */
+    @Excel(name = "仓库人")
+    private String fStorekeeper;
+
+    /**
      * 入（出）库日期
      */
     @Excel(name = "入", readConverterExp = "出=")
@@ -129,6 +153,12 @@ public class TWarehouseDetails extends BaseEntity {
     private BigDecimal fNetweight;
 
     /**
+     * 贸易方式(数据字典),对应t_sbu
+     */
+    @Excel(name = "经营单位(客户表)")
+    private Long fSbu;
+
+    /**
      * 贸易方式(数据字典),对应t_trademodels
      */
     @Excel(name = "贸易方式(数据字典),对应t_trademodels ")
@@ -212,303 +242,4 @@ public class TWarehouseDetails extends BaseEntity {
      */
     @TableLogic
     private String delFlag;
-
-    public void setfId(Long fId) {
-        this.fId = fId;
-    }
-
-    public Long getfId() {
-        return fId;
-    }
-
-    public void setfBillno(String fBillno) {
-        this.fBillno = fBillno;
-    }
-
-    public String getfBillno() {
-        return fBillno;
-    }
-
-    public void setfOriginalbillno(String fOriginalbillno) {
-        this.fOriginalbillno = fOriginalbillno;
-    }
-
-    public String getfOriginalbillno() {
-        return fOriginalbillno;
-    }
-
-    public void setfDeptid(Long fDeptid) {
-        this.fDeptid = fDeptid;
-    }
-
-    public Long getfDeptid() {
-        return fDeptid;
-    }
-
-    public void setfBsdeptid(Long fBsdeptid) {
-        this.fBsdeptid = fBsdeptid;
-    }
-
-    public Long getfBsdeptid() {
-        return fBsdeptid;
-    }
-
-    public void setfCorpid(Long fCorpid) {
-        this.fCorpid = fCorpid;
-    }
-
-    public Long getfCorpid() {
-        return fCorpid;
-    }
-
-    public void setfTocorpid(Long fTocorpid) {
-        this.fTocorpid = fTocorpid;
-    }
-
-    public Long getfTocorpid() {
-        return fTocorpid;
-    }
-
-    public void setfStltypeid(Long fStltypeid) {
-        this.fStltypeid = fStltypeid;
-    }
-
-    public Long getfStltypeid() {
-        return fStltypeid;
-    }
-
-    public void setfBscorpno(String fBscorpno) {
-        this.fBscorpno = fBscorpno;
-    }
-
-    public String getfBscorpno() {
-        return fBscorpno;
-    }
-
-    public void setfWarehouseid(Long fWarehouseid) {
-        this.fWarehouseid = fWarehouseid;
-    }
-
-    public Long getfWarehouseid() {
-        return fWarehouseid;
-    }
-
-    public void setfBsdate(Date fBsdate) {
-        this.fBsdate = fBsdate;
-    }
-
-    public Date getfBsdate() {
-        return fBsdate;
-    }
-
-    public void setfPlanqty(Long fPlanqty) {
-        this.fPlanqty = fPlanqty;
-    }
-
-    public Long getfPlanqty() {
-        return fPlanqty;
-    }
-
-    public void setfPlangrossweight(BigDecimal fPlangrossweight) {
-        this.fPlangrossweight = fPlangrossweight;
-    }
-
-    public BigDecimal getfPlangrossweight() {
-        return fPlangrossweight;
-    }
-
-    public void setfPlanvolumn(BigDecimal fPlanvolumn) {
-        this.fPlanvolumn = fPlanvolumn;
-    }
-
-    public BigDecimal getfPlanvolumn() {
-        return fPlanvolumn;
-    }
-
-    public void setfPlannetweight(BigDecimal fPlannetweight) {
-        this.fPlannetweight = fPlannetweight;
-    }
-
-    public BigDecimal getfPlannetweight() {
-        return fPlannetweight;
-    }
-
-    public void setfQty(Long fQty) {
-        this.fQty = fQty;
-    }
-
-    public Long getfQty() {
-        return fQty;
-    }
-
-    public void setfGrossweight(BigDecimal fGrossweight) {
-        this.fGrossweight = fGrossweight;
-    }
-
-    public BigDecimal getfGrossweight() {
-        return fGrossweight;
-    }
-
-    public void setfNetweight(BigDecimal fNetweight) {
-        this.fNetweight = fNetweight;
-    }
-
-    public BigDecimal getfNetweight() {
-        return fNetweight;
-    }
-
-    public void setfTrademodeid(Long fTrademodeid) {
-        this.fTrademodeid = fTrademodeid;
-    }
-
-    public Long getfTrademodeid() {
-        return fTrademodeid;
-    }
-
-    public void setfVolumn(BigDecimal fVolumn) {
-        this.fVolumn = fVolumn;
-    }
-
-    public BigDecimal getfVolumn() {
-        return fVolumn;
-    }
-
-    public void setfFeetunit(String fFeetunit) {
-        this.fFeetunit = fFeetunit;
-    }
-
-    public String getfFeetunit() {
-        return fFeetunit;
-    }
-
-    public void setfMblno(String fMblno) {
-        this.fMblno = fMblno;
-    }
-
-    public String getfMblno() {
-        return fMblno;
-    }
-
-    public void setfVslvoy(String fVslvoy) {
-        this.fVslvoy = fVslvoy;
-    }
-
-    public String getfVslvoy() {
-        return fVslvoy;
-    }
-
-    public void setfEta(Date fEta) {
-        this.fEta = fEta;
-    }
-
-    public Date getfEta() {
-        return fEta;
-    }
-
-    public void setfCustomno(String fCustomno) {
-        this.fCustomno = fCustomno;
-    }
-
-    public String getfCustomno() {
-        return fCustomno;
-    }
-
-    public void setfIfweigh(String fIfweigh) {
-        this.fIfweigh = fIfweigh;
-    }
-
-    public String getfIfweigh() {
-        return fIfweigh;
-    }
-
-    public void setfIfpledge(String fIfpledge) {
-        this.fIfpledge = fIfpledge;
-    }
-
-    public String getfIfpledge() {
-        return fIfpledge;
-    }
-
-    public void setfIfdamage(String fIfdamage) {
-        this.fIfdamage = fIfdamage;
-    }
-
-    public String getfIfdamage() {
-        return fIfdamage;
-    }
-
-    public void setfBankcorpid(Long fBankcorpid) {
-        this.fBankcorpid = fBankcorpid;
-    }
-
-    public Long getfBankcorpid() {
-        return fBankcorpid;
-    }
-
-    public void setfBilltype(String fBilltype) {
-        this.fBilltype = fBilltype;
-    }
-
-    public String getfBilltype() {
-        return fBilltype;
-    }
-
-    public void setfBillstatus(String fBillstatus) {
-        this.fBillstatus = fBillstatus;
-    }
-
-    public String getfBillstatus() {
-        return fBillstatus;
-    }
-
-    public void setDelFlag(String delFlag) {
-        this.delFlag = delFlag;
-    }
-
-    public String getDelFlag() {
-        return delFlag;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("fId", getfId())
-                .append("fBillno", getfBillno())
-                .append("fOriginalbillno", getfOriginalbillno())
-                .append("fDeptid", getfDeptid())
-                .append("fBsdeptid", getfBsdeptid())
-                .append("fCorpid", getfCorpid())
-                .append("fTocorpid", getfTocorpid())
-                .append("fStltypeid", getfStltypeid())
-                .append("fBscorpno", getfBscorpno())
-                .append("fWarehouseid", getfWarehouseid())
-                .append("fBsdate", getfBsdate())
-                .append("fPlanqty", getfPlanqty())
-                .append("fPlangrossweight", getfPlangrossweight())
-                .append("fPlanvolumn", getfPlanvolumn())
-                .append("fPlannetweight", getfPlannetweight())
-                .append("fQty", getfQty())
-                .append("fGrossweight", getfGrossweight())
-                .append("fNetweight", getfNetweight())
-                .append("fTrademodeid", getfTrademodeid())
-                .append("fVolumn", getfVolumn())
-                .append("fFeetunit", getfFeetunit())
-                .append("fMblno", getfMblno())
-                .append("fVslvoy", getfVslvoy())
-                .append("fEta", getfEta())
-                .append("fCustomno", getfCustomno())
-                .append("fIfweigh", getfIfweigh())
-                .append("fIfpledge", getfIfpledge())
-                .append("fIfdamage", getfIfdamage())
-                .append("fBankcorpid", getfBankcorpid())
-                .append("fBilltype", getfBilltype())
-                .append("fBillstatus", getfBillstatus())
-                .append("delFlag", getDelFlag())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("remark", getRemark())
-                .toString();
-    }
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TEnclosureMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.warehouseBusiness.mapper;
 
 
+import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.ruoyi.warehouseBusiness.domain.TEnclosure;
 
 import java.util.List;
@@ -11,7 +12,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2020-12-11
  */
-public interface TEnclosureMapper {
+public interface TEnclosureMapper extends BaseMapper<TEnclosure> {
     /**
      * 查询附件
      *

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehouseDetailsMapper.java → ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehouseBillsMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.warehouseBusiness.mapper;
 
 
+import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseDetails;
 
 import java.util.List;
@@ -11,7 +12,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2020-12-11
  */
-public interface TWarehouseDetailsMapper {
+public interface TWarehouseBillsMapper extends BaseMapper<TWarehouseDetails> {
     /**
      * 查询详情主表
      *

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehousebillsfeesMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.warehouseBusiness.mapper;
 
 
+import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsfees;
 
 import java.util.List;
@@ -11,7 +12,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2020-12-11
  */
-public interface TWarehousebillsfeesMapper {
+public interface TWarehousebillsfeesMapper extends BaseMapper<TWarehousebillsfees> {
     /**
      * 查询仓库费用明细
      *

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehousebillsitemsMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.warehouseBusiness.mapper;
 
 
+import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsitems;
 
 import java.util.List;
@@ -11,7 +12,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2020-12-11
  */
-public interface TWarehousebillsitemsMapper {
+public interface TWarehousebillsitemsMapper extends BaseMapper<TWarehousebillsitems> {
     /**
      * 查询仓库明细从表
      *

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseDetailsService.java → ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseBillsService.java

@@ -1,9 +1,10 @@
 package com.ruoyi.warehouseBusiness.service;
 
-
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseDetails;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 详情主表Service接口
@@ -11,14 +12,14 @@ import java.util.List;
  * @author ruoyi
  * @date 2020-12-11
  */
-public interface ITWarehouseDetailsService {
+public interface ITWarehouseBillsService {
     /**
      * 查询详情主表
      *
      * @param fId 详情主表ID
      * @return 详情主表
      */
-    public TWarehouseDetails selectTWarehouseDetailsById(Long fId);
+    public Map<String, Object> selectTWarehouseDetailsById(Long fId);
 
     /**
      * 查询详情主表列表
@@ -32,9 +33,10 @@ public interface ITWarehouseDetailsService {
      * 新增详情主表
      *
      * @param tWarehouseDetails 详情主表
+     * @param loginUser
      * @return 结果
      */
-    public int insertTWarehouseDetails(TWarehouseDetails tWarehouseDetails);
+    public int insertTWarehouseDetails(TWarehouseDetails tWarehouseDetails, LoginUser loginUser);
 
     /**
      * 修改详情主表

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

@@ -0,0 +1,136 @@
+package com.ruoyi.warehouseBusiness.service.impl;
+
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.warehouseBusiness.domain.TEnclosure;
+import com.ruoyi.warehouseBusiness.domain.TWarehouseDetails;
+import com.ruoyi.warehouseBusiness.domain.TWarehousebillsfees;
+import com.ruoyi.warehouseBusiness.domain.TWarehousebillsitems;
+import com.ruoyi.warehouseBusiness.mapper.TEnclosureMapper;
+import com.ruoyi.warehouseBusiness.mapper.TWarehouseBillsMapper;
+import com.ruoyi.warehouseBusiness.mapper.TWarehousebillsfeesMapper;
+import com.ruoyi.warehouseBusiness.mapper.TWarehousebillsitemsMapper;
+import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 详情主表Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2020-12-11
+ */
+@Service
+public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
+    @Autowired
+    private TEnclosureMapper tEnclosureMapper;
+
+    @Autowired
+    private TWarehouseBillsMapper tWarehouseDetailsMapper;
+
+    @Autowired
+    private TWarehousebillsfeesMapper tWarehousebillsfeesMapper;
+
+    @Autowired
+    private TWarehousebillsitemsMapper tWarehousebillsitemsMapper;
+
+
+    /**
+     * 查询详情主表
+     *
+     * @param fId 详情主表ID
+     * @return 详情主表
+     */
+    @Override
+    public Map<String, Object> selectTWarehouseDetailsById(Long fId) {
+        Map<String, Object> map = new HashMap<>();
+        // 查询仓库主表数据
+        TWarehouseDetails tWarehouseDetails = tWarehouseDetailsMapper.selectTWarehouseDetailsById(fId);
+        if (StringUtils.isNull(tWarehouseDetails)) {
+            map.put("warehouseDetails", tWarehouseDetails);
+        }
+        // 查询仓库明细从表数据
+        List<TWarehousebillsitems> warehousebillsitems = tWarehousebillsitemsMapper.selectList(new EntityWrapper<TWarehousebillsitems>().eq("f_pid", fId));
+        if (StringUtils.isEmpty(warehousebillsitems)) {
+            map.put("warehouseBillsItem", warehousebillsitems);
+        }
+        // 查询仓库费用明细表数据
+        List<TWarehousebillsfees> warehousebillsfees = tWarehousebillsfeesMapper.selectList(new EntityWrapper<TWarehousebillsfees>().eq("f_pid", fId));
+        if (StringUtils.isEmpty(warehousebillsfees)) {
+            map.put("warehousebillsfees", warehousebillsfees);
+        }
+        // 查询附件表数据
+        List<TEnclosure> enclosures = tEnclosureMapper.selectList(new EntityWrapper<TEnclosure>().eq("f_pid", fId));
+        if (StringUtils.isEmpty(enclosures)) {
+            map.put("enclosures", enclosures);
+        }
+        return map;
+    }
+
+    /**
+     * 查询详情主表列表
+     *
+     * @param tWarehouseDetails 详情主表
+     * @return 详情主表
+     */
+    @Override
+    public List<TWarehouseDetails> selectTWarehouseDetailsList(TWarehouseDetails tWarehouseDetails) {
+        return tWarehouseDetailsMapper.selectTWarehouseDetailsList(tWarehouseDetails);
+    }
+
+    /**
+     * 新增详情主表
+     *
+     * @param tWarehouseDetails 详情主表
+     * @param loginUser
+     * @return 结果
+     */
+    @Override
+    public int insertTWarehouseDetails(TWarehouseDetails tWarehouseDetails, LoginUser loginUser) {
+
+
+        tWarehouseDetails.setCreateTime(DateUtils.getNowDate());
+        return tWarehouseDetailsMapper.insertTWarehouseDetails(tWarehouseDetails);
+    }
+
+    /**
+     * 修改详情主表
+     *
+     * @param tWarehouseDetails 详情主表
+     * @return 结果
+     */
+    @Override
+    public int updateTWarehouseDetails(TWarehouseDetails tWarehouseDetails) {
+        tWarehouseDetails.setUpdateTime(DateUtils.getNowDate());
+        return tWarehouseDetailsMapper.updateTWarehouseDetails(tWarehouseDetails);
+    }
+
+    /**
+     * 批量删除详情主表
+     *
+     * @param fIds 需要删除的详情主表ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTWarehouseDetailsByIds(Long[] fIds) {
+        return tWarehouseDetailsMapper.deleteTWarehouseDetailsByIds(fIds);
+    }
+
+    /**
+     * 删除详情主表信息
+     *
+     * @param fId 详情主表ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTWarehouseDetailsById(Long fId) {
+        return tWarehouseDetailsMapper.deleteTWarehouseDetailsById(fId);
+    }
+}

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

@@ -1,91 +0,0 @@
-package com.ruoyi.warehouseBusiness.service.impl;
-
-
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.warehouseBusiness.domain.TWarehouseDetails;
-import com.ruoyi.warehouseBusiness.mapper.TWarehouseDetailsMapper;
-import com.ruoyi.warehouseBusiness.service.ITWarehouseDetailsService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 详情主表Service业务层处理
- *
- * @author ruoyi
- * @date 2020-12-11
- */
-@Service
-public class TWarehouseDetailsServiceImpl implements ITWarehouseDetailsService {
-    @Autowired
-    private TWarehouseDetailsMapper tWarehouseDetailsMapper;
-
-    /**
-     * 查询详情主表
-     *
-     * @param fId 详情主表ID
-     * @return 详情主表
-     */
-    @Override
-    public TWarehouseDetails selectTWarehouseDetailsById(Long fId) {
-        return tWarehouseDetailsMapper.selectTWarehouseDetailsById(fId);
-    }
-
-    /**
-     * 查询详情主表列表
-     *
-     * @param tWarehouseDetails 详情主表
-     * @return 详情主表
-     */
-    @Override
-    public List<TWarehouseDetails> selectTWarehouseDetailsList(TWarehouseDetails tWarehouseDetails) {
-        return tWarehouseDetailsMapper.selectTWarehouseDetailsList(tWarehouseDetails);
-    }
-
-    /**
-     * 新增详情主表
-     *
-     * @param tWarehouseDetails 详情主表
-     * @return 结果
-     */
-    @Override
-    public int insertTWarehouseDetails(TWarehouseDetails tWarehouseDetails) {
-        tWarehouseDetails.setCreateTime(DateUtils.getNowDate());
-        return tWarehouseDetailsMapper.insertTWarehouseDetails(tWarehouseDetails);
-    }
-
-    /**
-     * 修改详情主表
-     *
-     * @param tWarehouseDetails 详情主表
-     * @return 结果
-     */
-    @Override
-    public int updateTWarehouseDetails(TWarehouseDetails tWarehouseDetails) {
-        tWarehouseDetails.setUpdateTime(DateUtils.getNowDate());
-        return tWarehouseDetailsMapper.updateTWarehouseDetails(tWarehouseDetails);
-    }
-
-    /**
-     * 批量删除详情主表
-     *
-     * @param fIds 需要删除的详情主表ID
-     * @return 结果
-     */
-    @Override
-    public int deleteTWarehouseDetailsByIds(Long[] fIds) {
-        return tWarehouseDetailsMapper.deleteTWarehouseDetailsByIds(fIds);
-    }
-
-    /**
-     * 删除详情主表信息
-     *
-     * @param fId 详情主表ID
-     * @return 结果
-     */
-    @Override
-    public int deleteTWarehouseDetailsById(Long fId) {
-        return tWarehouseDetailsMapper.deleteTWarehouseDetailsById(fId);
-    }
-}

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehouseDetailsMapper.xml → ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehouseBillsMapper.xml

@@ -2,21 +2,26 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.warehouseBusiness.mapper.TWarehouseDetailsMapper">
+<mapper namespace="com.ruoyi.warehouseBusiness.mapper.TWarehouseBillsMapper">
 
     <resultMap type="TWarehouseDetails" id="TWarehouseDetailsResult">
         <result property="fId" column="f_id"/>
         <result property="fBillno" column="f_billno"/>
         <result property="fOriginalbillno" column="f_originalbillno"/>
+        <result property="fCustomsdeclartion" column="f_customsdeclartion"/>
         <result property="fDeptid" column="f_deptid"/>
         <result property="fBsdeptid" column="f_bsdeptid"/>
         <result property="fCorpid" column="f_corpid"/>
+        <result property="fTel" column="f_tel"/>
+        <result property="fContacts" column="f_contacts"/>
         <result property="fTocorpid" column="f_tocorpid"/>
         <result property="fStltypeid" column="f_stltypeid"/>
         <result property="fBscorpno" column="f_bscorpno"/>
         <result property="fWarehouseid" column="f_warehouseid"/>
         <result property="fBsdate" column="f_bsdate"/>
         <result property="fPlanqty" column="f_planqty"/>
+        <result property="fStorekeeper" column="f_storekeeper"/>
+        <result property="fSbu" column="f_sbu"/>
         <result property="fPlangrossweight" column="f_plangrossweight"/>
         <result property="fPlanvolumn" column="f_planvolumn"/>
         <result property="fPlannetweight" column="f_plannetweight"/>