安品添加仓库入库 销售出库导出功能

ruoyi-admin/src/main/java/com/ruoyi/web/controller/anpin/StockControl.java

@@ -406,5 +406,27 @@ public class StockControl extends BaseController {
         ExcelUtil<AnPinExcePort> util = new ExcelUtil<AnPinExcePort>(AnPinExcePort.class);
         return util.exportExcel(list, "入库统计表");
     }
+    /**
+     * 导出仓库入库表
+     */
+    @Log(title = "导出仓库入库表", businessType = BusinessType.EXPORT)
+    @GetMapping("/warehouseIn")
+    public AjaxResult warehouseIn(TWarehouseBills tWarehouseBills)
+    {
+        List<WarehouseIn> list = tWarehousebillsService.warehouseIn(tWarehouseBills);
+        ExcelUtil<WarehouseIn> util = new ExcelUtil<WarehouseIn>(WarehouseIn.class);
+        return util.exportExcel(list, "仓库入库");
+    }
+    /**
+     * 导出销售出库
+     */
+    @Log(title = "导出销售出库", businessType = BusinessType.EXPORT)
+    @GetMapping("/marketOut")
+    public AjaxResult marketOut(TWarehouseBills tWarehouseBills)
+    {
+        List<MarketOut> list = tWarehousebillsService.marketOut(tWarehouseBills);
+        ExcelUtil<MarketOut> util = new ExcelUtil<MarketOut>(MarketOut.class);
+        return util.exportExcel(list, "销售出库");
+    }
 
 }

ruoyi-warehouse/src/main/java/com/ruoyi/anpin/MarketOut.java

@@ -0,0 +1,163 @@
+package com.ruoyi.anpin;
+
+import com.ruoyi.common.annotation.Excel;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 销售出库导出对象
+ */
+public class MarketOut {
+    private static final long serialVersionUID = 1L;
+
+    @Excel(name = "业务编号")
+    private String fBillno;
+    @Excel(name = "项目名称")
+    private String projectName;
+    @Excel(name = "客户名称")
+    private String corpName;
+    @Excel(name = "金额")
+    private BigDecimal fMoney;
+    @Excel(name = "规格型号")
+    private String fCurrencyName;
+    @Excel(name = "制单日期",dateFormat = "yyyy-MM-dd")
+    private Date createTime;
+    @Excel(name = "申请人")
+    private String createBy;
+    @Excel(name = "状态")
+    private String fBillstatusName;
+    @Excel(name = "审核日期",dateFormat = "yyyy-MM-dd")
+    private Date fReviewDate;
+    @Excel(name = "出库日期",dateFormat = "yyyy-MM-dd")
+    private Date fBsdate;
+    @Excel(name = "备注")
+    private String remark;
+    @Excel(name = "打印日志")
+    private String fPrintLog;
+    @Excel(name = "开票公司")
+    private String fsbuName;
+
+    public String getfBillno() {
+        return fBillno;
+    }
+
+    public void setfBillno(String fBillno) {
+        this.fBillno = fBillno;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getCorpName() {
+        return corpName;
+    }
+
+    public void setCorpName(String corpName) {
+        this.corpName = corpName;
+    }
+
+    public BigDecimal getfMoney() {
+        return fMoney;
+    }
+
+    public void setfMoney(BigDecimal fMoney) {
+        this.fMoney = fMoney;
+    }
+
+    public String getfCurrencyName() {
+        return fCurrencyName;
+    }
+
+    public void setfCurrencyName(String fCurrencyName) {
+        this.fCurrencyName = fCurrencyName;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public String getfBillstatusName() {
+        return fBillstatusName;
+    }
+
+    public void setfBillstatusName(String fBillstatusName) {
+        this.fBillstatusName = fBillstatusName;
+    }
+
+    public Date getfReviewDate() {
+        return fReviewDate;
+    }
+
+    public void setfReviewDate(Date fReviewDate) {
+        this.fReviewDate = fReviewDate;
+    }
+
+    public Date getfBsdate() {
+        return fBsdate;
+    }
+
+    public void setfBsdate(Date fBsdate) {
+        this.fBsdate = fBsdate;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getfPrintLog() {
+        return fPrintLog;
+    }
+
+    public void setfPrintLog(String fPrintLog) {
+        this.fPrintLog = fPrintLog;
+    }
+
+    public String getFsbuName() {
+        return fsbuName;
+    }
+
+    public void setFsbuName(String fsbuName) {
+        this.fsbuName = fsbuName;
+    }
+
+    @Override
+    public String toString() {
+        return "MarketOut{" +
+                "fBillno='" + fBillno + '\'' +
+                ", projectName='" + projectName + '\'' +
+                ", corpName='" + corpName + '\'' +
+                ", fMoney=" + fMoney +
+                ", fCurrencyName='" + fCurrencyName + '\'' +
+                ", createTime=" + createTime +
+                ", createBy='" + createBy + '\'' +
+                ", fBillstatusName='" + fBillstatusName + '\'' +
+                ", fReviewDate=" + fReviewDate +
+                ", fBsdate=" + fBsdate +
+                ", remark='" + remark + '\'' +
+                ", fPrintLog='" + fPrintLog + '\'' +
+                ", fsbuName='" + fsbuName + '\'' +
+                '}';
+    }
+}

ruoyi-warehouse/src/main/java/com/ruoyi/anpin/WarehouseIn.java

@@ -0,0 +1,156 @@
+package com.ruoyi.anpin;
+
+import com.ruoyi.common.annotation.Excel;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 仓库入库导出对象
+ */
+public class WarehouseIn {
+    private static final long serialVersionUID = 1L;
+
+    @Excel(name = "业务编号")
+    private String fBillno;
+    @Excel(name = "仓库")
+    private String fWarehouseName;
+    @Excel(name = "供应商")
+    private String corpName;
+    @Excel(name = "金额")
+    private BigDecimal fMoney;
+    @Excel(name = "制单日期",dateFormat = "yyyy-MM-dd")
+    private Date createTime;
+    @Excel(name = "入库日期",dateFormat = "yyyy-MM-dd")
+    private Date fBsdate;
+    @Excel(name = "制单人")
+    private String createBy;
+    @Excel(name = "状态")
+    private String fBillstatusName;
+
+    @Excel(name = "审核日期",dateFormat = "yyyy-MM-dd")
+    private Date fReviewDate;
+
+    @Excel(name = "项目名称")
+    private String projectName;
+
+    @Excel(name = "备注")
+    private String remark;
+
+    @Excel(name = "生成日志")
+    private String fCreateLog;
+
+    public String getfBillno() {
+        return fBillno;
+    }
+
+    public void setfBillno(String fBillno) {
+        this.fBillno = fBillno;
+    }
+
+    public String getfWarehouseName() {
+        return fWarehouseName;
+    }
+
+    public void setfWarehouseName(String fWarehouseName) {
+        this.fWarehouseName = fWarehouseName;
+    }
+
+    public String getCorpName() {
+        return corpName;
+    }
+
+    public void setCorpName(String corpName) {
+        this.corpName = corpName;
+    }
+
+    public BigDecimal getfMoney() {
+        return fMoney;
+    }
+
+    public void setfMoney(BigDecimal fMoney) {
+        this.fMoney = fMoney;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getfBsdate() {
+        return fBsdate;
+    }
+
+    public void setfBsdate(Date fBsdate) {
+        this.fBsdate = fBsdate;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public String getfBillstatusName() {
+        return fBillstatusName;
+    }
+
+    public void setfBillstatusName(String fBillstatusName) {
+        this.fBillstatusName = fBillstatusName;
+    }
+
+    public Date getfReviewDate() {
+        return fReviewDate;
+    }
+
+    public void setfReviewDate(Date fReviewDate) {
+        this.fReviewDate = fReviewDate;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getfCreateLog() {
+        return fCreateLog;
+    }
+
+    public void setfCreateLog(String fCreateLog) {
+        this.fCreateLog = fCreateLog;
+    }
+
+    @Override
+    public String toString() {
+        return "WarehouseIn{" +
+                "fBillno='" + fBillno + '\'' +
+                ", fWarehouseName='" + fWarehouseName + '\'' +
+                ", corpName='" + corpName + '\'' +
+                ", fMoney=" + fMoney +
+                ", createTime=" + createTime +
+                ", fBsdate=" + fBsdate +
+                ", createBy='" + createBy + '\'' +
+                ", fBillstatusName='" + fBillstatusName + '\'' +
+                ", fReviewDate=" + fReviewDate +
+                ", projectName='" + projectName + '\'' +
+                ", remark='" + remark + '\'' +
+                ", fCreateLog='" + fCreateLog + '\'' +
+                '}';
+    }
+}

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

@@ -2,6 +2,8 @@ package com.ruoyi.warehouseBusiness.mapper;
 
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.ruoyi.anpin.MarketOut;
+import com.ruoyi.anpin.WarehouseIn;
 import com.ruoyi.anpin.WarhousrExcel;
 import com.ruoyi.common.core.domain.entity.TWarehouse;
 import com.ruoyi.reportManagement.domain.SingleAnalysisExcel;
@@ -231,4 +233,15 @@ public interface TWarehouseBillsMapper extends BaseMapper<TWarehouseBills> {
      * @return 详情主表集合
      */
     public List<TWarehouseBills> cannibalizeList(TWarehouseBills tWarehousebills);
+
+    /**
+     * 安品导出仓库入库
+     * @return
+     */
+    List<WarehouseIn> warehouseIn(TWarehouseBills tWarehousebills);
+    /**
+     * 安品导出销售出库
+     * @return
+     */
+    List<MarketOut> marketOut(TWarehouseBills tWarehousebills);
 }

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

@@ -542,4 +542,14 @@ public interface ITWarehouseBillsService {
      * @return
      */
     public List<AnPinExcePort> anPinExcePort(TWarehousebillsfees tWarehousebillsfees);
+    /**
+     * 安品导出仓库入库
+     * @return
+     */
+    public List<WarehouseIn> warehouseIn(TWarehouseBills tWarehousebills);
+    /**
+     * 安品导出销售出库
+     * @return
+     */
+    public List<MarketOut> marketOut(TWarehouseBills tWarehousebills);
 }

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

@@ -2293,6 +2293,16 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         return tWarehousebillsfeesMapper.anPinExcePort(tWarehousebillsfees);
     }
 
+    @Override
+    public List<WarehouseIn> warehouseIn(TWarehouseBills tWarehousebills) {
+        return tWarehouseBillsMapper.warehouseIn(tWarehousebills);
+    }
+
+    @Override
+    public List<MarketOut> marketOut(TWarehouseBills tWarehousebills) {
+        return tWarehouseBillsMapper.marketOut(tWarehousebills);
+    }
+
     /**
      * app仓储新行提交业务
      *

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

@@ -2912,5 +2912,94 @@
         </where>
         ORDER BY tw.f_bsdate DESC,tw.f_id DESC
     </select>
+    <select id="warehouseIn" parameterType="TWarehousebills" resultType="com.ruoyi.anpin.WarehouseIn">
+        SELECT
+            DISTINCT
+            tw.f_billno AS fBillno,
+            th.f_name AS fWarehouseName,
+            tc.f_name AS corpName,
+            tw.f_money AS fMoney,
+            tw.create_time AS createTime,
+            tw.f_bsdate AS fBsdate,
+            tw.create_by AS createBy,
+            CASE
+
+                WHEN tw.f_billstatus = '1' THEN
+                    '保存'
+                WHEN tw.f_billstatus = '2' THEN
+                    '暂存'
+                WHEN tw.f_billstatus = '3' THEN
+                    '审批驳回'
+                WHEN tw.f_billstatus = '4' THEN
+                    '提交审核'
+                WHEN tw.f_billstatus = '5' THEN
+                    '审核中'
+                WHEN tw.f_billstatus = '6' THEN
+                    '审核完成'
+                END AS fBillstatusName,
+            tw.f_review_date AS fReviewDate,
+            tp.f_name AS projectName,
+            tw.remark AS remark,
+            tw.f_create_log AS fCreateLog
+        FROM
+            t_warehousebills tw
+                LEFT JOIN t_project tp
+                          ON tw.f_goodsid = tp.f_id
+                LEFT JOIN t_corps tc
+                          ON tw.f_corpid = tc.f_id
+                LEFT JOIN t_corps tr
+                          ON tr.f_id = tw.f_sbu
+                LEFT JOIN t_warehouse th ON tw.f_warehouseid = th.f_id
+                LEFT JOIN t_warehousebillsfees tb ON tb.f_pid = tw.f_id
+        where
+            tw.del_flag = '0'
+          and tb.del_flag = '0'
+          and tw.f_billtype = 'RK'
+        ORDER BY tw.f_bsdate DESC,tw.f_id DESC
+    </select>
+    <select id="marketOut" parameterType="TWarehousebills" resultType="com.ruoyi.anpin.MarketOut">
+        SELECT
+        DISTINCT
+        tw.f_billno AS fBillno,
+        tp.f_name AS projectName,
+        tc.f_name AS corpName,
+        tw.f_money AS fMoney,
+        tw.create_by AS createBy,
+        tw.create_time AS createTime,
+        CASE
 
+            WHEN tw.f_billstatus = '1' THEN
+                '保存'
+            WHEN tw.f_billstatus = '2' THEN
+                '暂存'
+            WHEN tw.f_billstatus = '3' THEN
+                '审批驳回'
+            WHEN tw.f_billstatus = '4' THEN
+                '提交审核'
+            WHEN tw.f_billstatus = '5' THEN
+                '审核中'
+            WHEN tw.f_billstatus = '6' THEN
+                '审核完成'
+            END AS fBillstatusName,
+        tw.f_review_date AS fReviewDate,
+        tw.f_bsdate AS  fBsdate,
+        tw.remark AS remark,
+        tr.f_name  AS fsbuName,
+        tw.f_print_log AS fPrintLog
+        FROM
+        t_warehousebills tw
+        LEFT JOIN t_project tp
+        ON tw.f_goodsid = tp.f_id
+        LEFT JOIN t_corps tc
+        ON tw.f_corpid = tc.f_id
+        LEFT JOIN t_corps tr
+        ON tr.f_id = tw.f_sbu
+        LEFT JOIN t_warehouse th ON tw.f_warehouseid = th.f_id
+        LEFT JOIN t_warehousebillsfees tb ON tb.f_pid = tw.f_id
+        where
+            tw.del_flag = '0'
+            and tb.del_flag = '0'
+            and tw.f_billtype = 'XS'
+        ORDER BY tw.f_bsdate DESC,tw.f_id DESC
+    </select>
 </mapper>