Merge remote-tracking branch 'origin/dev' into dev

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseInStockController.java

@@ -22,6 +22,7 @@ import com.ruoyi.warehouseBusiness.domain.enums.WarehouseTypeEnum;
 import com.ruoyi.warehouseBusiness.excel.CorpAnalysis;
 import com.ruoyi.warehouseBusiness.excel.InStock;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
+import com.ruoyi.warehouseBusiness.service.ITWarehousebillsitemsElabelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -46,6 +47,8 @@ import java.util.Map;
 public class TWarehouseInStockController extends BaseController {
     @Autowired
     private ITWarehouseBillsService itWarehouseBillsService;
+    @Autowired
+    private ITWarehousebillsitemsElabelService elabelService;
 
     /**
      * 查询单据是否允许修改
@@ -81,6 +84,14 @@ public class TWarehouseInStockController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 根据仓库主表 id 获取电子标签数据
+     */
+    @GetMapping("/selectElabelList/{fGPid}")
+    public AjaxResult selectElabelListByfGPid (@PathVariable("fGPid") Long fGPid) {
+        return AjaxResult.success(elabelService.selectByfGPid(fGPid));
+    }
+
     @GetMapping("/longRageDownloadTemplate")
     public AjaxResult longRageDownloadTemplate(){
         String filePath = "";

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/domain/AuditItemsDo.java

@@ -1,12 +1,9 @@
 package com.ruoyi.approvalFlow.domain;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
 /**
  * 审批流任务明细从表对象 audit_items_do
  *
- * @author nzf
+ * @author ni
  * @date 2022-03-23
  */
 public class AuditItemsDo {

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/service/impl/AuditPathsServiceImpl.java

@@ -287,8 +287,8 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
      */
     @Override
     public List<Map<String, Object>> selectAllAuditItems(AuditItems auditItems) {
-        List<Map<String,Object>> list = new ArrayList<>();
-        for (Map<String,Object> map : auditItemsMapper.selectAuditItems(auditItems)) {
+        List<Map<String,Object>> list = auditItemsMapper.selectAuditItems(auditItems);
+        for (Map<String,Object> map : list) {
             // 根据审批明细详情主表 id 获取审批明细从表数据
             List<Map<String,Object>> auditItemsDoList = auditItemsDoMapper.selectByFPid(Long.valueOf(map.get("id").toString()));
             StringBuilder stringBuilder = new StringBuilder();
@@ -298,8 +298,6 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
                 }
             }
             map.put("fBsno",StringUtils.removeTheLastComma(stringBuilder));
-            // 将 map 数据重新放入 list 中
-            list.add(map);
         }
         return list;
     }

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/impl/TFeeServiceImpl.java

@@ -1331,9 +1331,9 @@ public class TFeeServiceImpl implements ITFeeService {
             this.updateMessage(tFee.getfId());
         }
         // 撤销对账时更改费用明细数据
-        if (fBilltype.equals("DZRevoke")) {
+        /*if (fBilltype.equals("DZRevoke")) {
             this.updateDSFMoney(tFee.getfId(),fBilltype);
-        }
+        }*/
         // 根据业务财务数据 id 删除对应的审批流数据
         AuditItemsAbout.deleteAuditItemsData(tFee.getfId());
         return AjaxResult.success();
@@ -1498,8 +1498,7 @@ public class TFeeServiceImpl implements ITFeeService {
                 map.put("fSrcBillno",StringUtils.removeTheLastComma(stringBuilder));
             }
         }
-        List<Contrast> list1 = ListMapToBeanUtils.castMapToBean(list, Contrast.class);
-        return list1;
+        return ListMapToBeanUtils.castMapToBean(list, Contrast.class);
     }
 
     @Override

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

@@ -145,6 +145,11 @@ public class TWarehousebillsitems extends BaseEntity {
     private String fPackagespecs;
 
     /**
+     * 电子标签
+     */
+    private String fElabel;
+
+    /**
      * 计划毛重
      */
     @Excel(name = "计划毛重")
@@ -367,6 +372,14 @@ public class TWarehousebillsitems extends BaseEntity {
     @TableField(exist = false)
     private Long fTocorpid;
 
+    public String getfElabel() {
+        return fElabel;
+    }
+
+    public void setfElabel(String fElabel) {
+        this.fElabel = fElabel;
+    }
+
     public void setfSrcBsdate(Date fSrcBsdate)
     {
         this.fSrcBsdate = fSrcBsdate;

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

@@ -0,0 +1,74 @@
+package com.ruoyi.warehouseBusiness.domain;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
+
+/**
+ * 仓储明细电子标签从表
+ * @author ni
+ * @date 2022-04-26
+ */
+public class TWarehousebillsitemsElabel extends BaseEntity {
+
+    /** 表 id */
+    private Long fId;
+    /** fGPID，对应明细从表的主表id */
+    private Long fGPid;
+    /** fPID对应明细从表id */
+    private Long fPid;
+    /** 电子标签内容 */
+    private String fContent;
+    /** 件数 */
+    private Long fQty;
+    /** 重量 */
+    private BigDecimal fWeight;
+
+    public Long getfId() {
+        return fId;
+    }
+
+    public void setfId(Long fId) {
+        this.fId = fId;
+    }
+
+    public Long getfGPid() {
+        return fGPid;
+    }
+
+    public void setfGPid(Long fGPid) {
+        this.fGPid = fGPid;
+    }
+
+    public Long getfPid() {
+        return fPid;
+    }
+
+    public void setfPid(Long fPid) {
+        this.fPid = fPid;
+    }
+
+    public String getfContent() {
+        return fContent;
+    }
+
+    public void setfContent(String fContent) {
+        this.fContent = fContent;
+    }
+
+    public Long getfQty() {
+        return fQty;
+    }
+
+    public void setfQty(Long fQty) {
+        this.fQty = fQty;
+    }
+
+    public BigDecimal getfWeight() {
+        return fWeight;
+    }
+
+    public void setfWeight(BigDecimal fWeight) {
+        this.fWeight = fWeight;
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.ruoyi.warehouseBusiness.mapper;
+
+import com.ruoyi.warehouseBusiness.domain.TWarehousebillsitemsElabel;
+import org.apache.ibatis.annotations.MapKey;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+@Repository
+public interface TWarehousebillsitemsElabelMapper {
+    /**
+     * 增一条
+     */
+    void insert(TWarehousebillsitemsElabel elabel);
+    /**
+     * 修改一条
+     */
+    void updateById(TWarehousebillsitemsElabel elabel);
+    /**
+     * 删一条
+     */
+    int deleteById(Long id);
+
+    /**
+     * 根据父级 id 删除数据
+     */
+    int deleteByFPid(Long fPid);
+    /**
+     * 查一条
+     */
+    Map<String,Object> selectById(Long id);
+
+    /**
+     * 根据标签内容获取数据
+     */
+    TWarehousebillsitemsElabel selectByfContent(String fContent);
+    /**
+     * 根据父级 id 获取数据
+     */
+    TWarehousebillsitemsElabel selectByfPid(Long fContent);
+    /**
+     * 根据父级的父级 id 获取数据
+     */
+    List<TWarehousebillsitemsElabel> selectByfGPid(Long fGPid);
+}

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

@@ -0,0 +1,27 @@
+package com.ruoyi.warehouseBusiness.service;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.warehouseBusiness.domain.TWarehousebillsitemsElabel;
+
+import java.util.Map;
+
+
+public interface ITWarehousebillsitemsElabelService {
+    /**
+     * 增一条
+     */
+    void insert(TWarehousebillsitemsElabel elabel);
+    /**
+     * 修改一条
+     */
+    void update(TWarehousebillsitemsElabel elabel);
+    /**
+     * 删一条
+     */
+    int deleteById(Long id);
+    /**
+     * 根据父级的父级 id 获取数据
+     */
+    Map<String,Object> selectByfGPid(Long fGPid);
+}

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

@@ -223,6 +223,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     private TCtnpriceItemsMapper tCtnpriceItemsMapper;
     @Autowired
     private AuditItemsUsersMapper auditItemsUsersMapper;
+    @Autowired
+    private TWarehousebillsitemsElabelMapper warehousebillsitemsElabelMapper;
 
     private static final Logger log = LoggerFactory.getLogger(AddressUtils.class);
 
@@ -906,6 +908,27 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                         insertTWarehousebillsLog(wbItem, 10L);
                     }
                 }
+                // 获取前端是否传递电子标签数据
+                if (StringUtils.isNotNull(wbItem.getfElabel())) { // 如果电子标签有数据
+                    Date now = new Date();
+                    TWarehousebillsitemsElabel result = warehousebillsitemsElabelMapper.selectByfPid(wbItem.getfId());
+                    if (StringUtils.isNotNull(result)) {
+                        result.setfQty(wbItem.getfQty());
+                        result.setfContent(wbItem.getfElabel());
+                        result.setUpdateBy(loginUser.getUser().getUserName());
+                        result.setUpdateTime(now);
+                        warehousebillsitemsElabelMapper.updateById(result);
+                    } else {
+                        TWarehousebillsitemsElabel elabel = new TWarehousebillsitemsElabel();
+                        elabel.setfGPid(wbItem.getfPid());
+                        elabel.setfPid(wbItem.getfId());
+                        elabel.setfContent(wbItem.getfElabel());
+                        elabel.setfQty(wbItem.getfQty());
+                        elabel.setCreateBy(loginUser.getUser().getUserName());
+                        elabel.setCreateTime(now);
+                        warehousebillsitemsElabelMapper.insert(elabel);
+                    }
+                }
             }
         }
         //  附件添加
@@ -5893,6 +5916,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                                 warehousebillsitems.setfPlannetweight(new BigDecimal(cell.getStringCellValue()).setScale(2, BigDecimal.ROUND_HALF_UP));
                             }
                             break;
+                        case "电子标签":
+                            // 设置单元格类型
+                            cell.setCellType(CellType.STRING);
+                            if (StringUtils.isNotEmpty(cell.getStringCellValue())) {
+                                warehousebillsitems.setfElabel(cell.getStringCellValue());
+                            }
+                            break;
                     }
                 }
                 if (StringUtils.isNotEmpty(warehousebillsitems.getfCntrno())) {
@@ -6854,7 +6884,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             }
         }
         int bStatus = status.size(); // 还有多少不在计划中，为 0 则全部都在计划中
-        System.err.println("bStatus:" + bStatus);
         if (bStatus != 0) { // 有数据不在计划中
             tWarehousebills.setfItemsStatus(3L); //处理中状态
         } else { // 数据都在计划中
@@ -6922,6 +6951,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         reduce1.forEach(id ->
                 tWarehousebillsitemsMapper.deleteTWarehousebillsitemsById(id)
         );
+        reduce1.forEach(id ->
+                warehousebillsitemsElabelMapper.deleteByFPid(id)
+        );
     }
 
     /**

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

@@ -0,0 +1,40 @@
+package com.ruoyi.warehouseBusiness.service.impl;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.warehouseBusiness.domain.TWarehousebillsitemsElabel;
+import com.ruoyi.warehouseBusiness.mapper.TWarehousebillsitemsElabelMapper;
+import com.ruoyi.warehouseBusiness.service.ITWarehousebillsitemsElabelService;
+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
+public class TWarehousebillsitemsElabelServiceImpl implements ITWarehousebillsitemsElabelService {
+    @Autowired
+    private TWarehousebillsitemsElabelMapper elabelMapper;
+
+    @Override
+    public void insert(TWarehousebillsitemsElabel elabel) {
+        elabelMapper.insert(elabel);
+    }
+
+    @Override
+    public void update(TWarehousebillsitemsElabel elabel) {
+        elabelMapper.updateById(elabel);
+    }
+
+    @Override
+    public int deleteById(Long id) {
+        return elabelMapper.deleteById(id);
+    }
+
+    @Override
+    public Map<String, Object> selectByfGPid(Long fGPid) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("elabelList",elabelMapper.selectByfGPid(fGPid));
+        return map;
+    }
+}

ruoyi-warehouse/src/main/resources/mapper/approvalFlow/AuditItemsDoMapper.xml

@@ -16,14 +16,14 @@
         insert into audit_items_do
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="fPid != null and fPid != ''">f_pid,</if>
-            <if test="actId != null and fPid != ''">act_id,</if>
-            <if test="billId != null and fPid != ''">bill_id,</if>
+            <if test="actId != null and actId != ''">act_id,</if>
+            <if test="billId != null and billId != ''">bill_id,</if>
             <if test="fBsno != null">f_bsno,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fPid != null and fPid != ''">#{fPid},</if>
-            <if test="actId != null and fPid != ''">#{actId},</if>
-            <if test="billId != null and fPid != ''">#{billId},</if>
+            <if test="actId != null and actId != ''">#{actId},</if>
+            <if test="billId != null and billId != ''">#{billId},</if>
             <if test="fBsno != null">#{fBsno},</if>
         </trim>
     </insert>
@@ -33,8 +33,8 @@
             audit_items_do
         <trim prefix="SET" suffixOverrides=",">
             <if test="fPid != null and fPid != ''">f_pid = #{fPid},</if>
-            <if test="actId != null and fPid != ''">act_id = #{actId},</if>
-            <if test="billId != null and fPid != ''">bill_id = #{billId},</if>
+            <if test="actId != null and actId != ''">act_id = #{actId},</if>
+            <if test="billId != null and billId != ''">bill_id = #{billId},</if>
             <if test="fBsno != null">f_bsno = #{fBsno},</if>
         </trim>
         WHERE

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeMapper.xml

@@ -254,8 +254,8 @@
             c.f_name AS fCorpidName,
             f.f_accbilldate AS fAccbilldate,
             f.t_mblno AS tMblno,
-            f.f_amtdr AS fAmtdr,
-            f.f_amtcr AS fAmtcr,
+            SUM(fd.f_amtdr) AS fAmtdr,
+            SUM(fd.f_amt) AS fAmtcr,
             f.f_billtype AS fBilltype,
             f.f_system_type AS fSystemType,
             CASE

ruoyi-warehouse/src/main/resources/mapper/reportManagement/TWhgenlegMapper.xml

@@ -662,6 +662,7 @@
             DISTINCT
             leg.f_id AS fId,
             leg.f_corpid AS fCorpIds,
+            elabel.f_content as fElabel,
             leg.f_bsdate AS fBsdate,
             corp.f_name AS fCorpid,
             leg.f_shipper AS fShipper,
@@ -698,6 +699,8 @@
             leg.f_cntrno AS fCntrno
         FROM
             t_whgenleg leg
+            LEFT JOIN t_warehousebillsitems wt on wt.f_marks = leg.f_marks
+            LEFT JOIN t_warehousebillsitems_elabel elabel on elabel.f_pid = wt.f_id
             left join sys_user u on leg.create_by = u.user_name
             left join sys_dept d on u.dept_id = d.dept_id
             LEFT JOIN t_corps corp ON corp.f_id = leg.f_corpid
@@ -715,6 +718,7 @@
             AND leg.f_qtyblc > 0
             AND leg.f_grossweightblc > 0
             AND leg.f_netweightblc > 0
+            AND leg.f_mblno = wt.f_mblno
             <if test="fOriginalbillno != null  and fOriginalbillno != ''">and leg.f_originalbillno = #{fOriginalbillno}</if>
             <if test="fPreqty != null ">and leg.f_preqty = #{fPreqty}</if>
             <if test="fCorpid != null ">and leg.f_corpid = #{fCorpid}</if>

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

@@ -0,0 +1,139 @@
+<?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.warehouseBusiness.mapper.TWarehousebillsitemsElabelMapper">
+
+    <resultMap type="TWarehousebillsitemsElabel" id="ElabelResult">
+        <result property="fId"    column="f_id"    />
+        <result property="fGPid"    column="f_g_pid"    />
+        <result property="fPid"    column="f_pid"    />
+        <result property="fContent"    column="f_content"    />
+        <result property="fQty"    column="f_qty"    />
+        <result property="fWeight"    column="f_weight"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <insert id="insert" parameterType="TWarehousebillsitemsElabel" useGeneratedKeys="true" keyProperty="fId">
+        insert into t_warehousebillsitems_elabel
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fGPid != null">f_g_pid,</if>
+            <if test="fPid != null">f_pid,</if>
+            <if test="fContent != null">f_content,</if>
+            <if test="fQty != null">f_qty,</if>
+            <if test="fWeight != null">f_weight,</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>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fGPid != null">#{fGPid},</if>
+            <if test="fPid != null">#{fPid},</if>
+            <if test="fContent != null">#{fContent},</if>
+            <if test="fQty != null">#{fQty},</if>
+            <if test="fWeight != null">#{fWeight},</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>
+        </trim>
+    </insert>
+
+    <update id="updateById" parameterType="com.ruoyi.warehouseBusiness.domain.TWarehousebillsitemsElabel">
+        UPDATE
+        t_warehousebillsitems_elabel
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fGPid != null">f_g_pid = #{fGPid},</if>
+            <if test="fPid != null">f_pid = #{fPid},</if>
+            <if test="fContent != null">f_content = #{fContent},</if>
+            <if test="fQty != null">f_qty = #{fQty},</if>
+            <if test="fWeight != null">f_weight = #{fWeight},</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>
+        </trim>
+        WHERE
+            f_id = #{fId}
+    </update>
+
+    <delete id="deleteById" parameterType="com.ruoyi.warehouseBusiness.domain.TWarehousebillsitemsElabel">
+        delete from t_warehousebillsitems_elabel where f_id = #{id}
+    </delete>
+
+    <delete id="deleteByFPid" parameterType="com.ruoyi.warehouseBusiness.domain.TWarehousebillsitemsElabel">
+        delete from t_warehousebillsitems_elabel where f_pid = #{fPid}
+    </delete>
+
+    <select id="selectById" parameterType="com.ruoyi.warehouseBusiness.domain.TWarehousebillsitemsElabel" resultMap="ElabelResult">
+        SELECT
+            f_id,
+            f_g_pid,
+            f_pid,
+            f_content,
+            f_qty,
+            f_weight,
+            create_by,
+            create_time,
+            update_by,
+            update_time
+        FROM
+            t_warehousebillsitems_elabel
+        WHERE f_id = #{fId}
+    </select>
+
+    <select id="selectByfContent" parameterType="com.ruoyi.warehouseBusiness.domain.TWarehousebillsitemsElabel" resultMap="ElabelResult">
+        SELECT
+            f_id,
+            f_g_pid,
+            f_pid,
+            f_content,
+            f_qty,
+            f_weight,
+            create_by,
+            create_time,
+            update_by,
+            update_time
+        FROM
+            t_warehousebillsitems_elabel
+        WHERE f_content = #{fContent}
+    </select>
+
+    <select id="selectByfPid" parameterType="com.ruoyi.warehouseBusiness.domain.TWarehousebillsitemsElabel" resultMap="ElabelResult">
+        SELECT
+            f_id,
+            f_g_pid,
+            f_pid,
+            f_content,
+            f_qty,
+            f_weight,
+            create_by,
+            create_time,
+            update_by,
+            update_time
+        FROM
+            t_warehousebillsitems_elabel
+        WHERE f_pid = #{fPid}
+    </select>
+
+    <select id="selectByfGPid" parameterType="com.ruoyi.warehouseBusiness.domain.TWarehousebillsitemsElabel" resultMap="ElabelResult">
+        SELECT
+            f_id,
+            f_g_pid,
+            f_pid,
+            f_content,
+            f_qty,
+            f_weight,
+            create_by,
+            create_time,
+            update_by,
+            update_time
+        FROM
+            t_warehousebillsitems_elabel
+        WHERE f_g_pid = #{fGPid}
+    </select>
+</mapper>

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

@@ -189,6 +189,7 @@
             item.f_srcid AS fSrcid,
             item.f_lineno AS fLineno,
             item.f_billno AS fBillno,
+            elb.f_content AS fElabel,
             item.f_shipper AS fShipper,
             item.f_goodsid AS fGoodsid,
             goods.f_name AS fGoodsids,
@@ -251,6 +252,7 @@
         FROM
             t_warehousebills w
             LEFT JOIN t_warehousebillsitems item ON item.f_pid = w.f_id
+            LEFT JOIN t_warehousebillsitems_elabel elb ON elb.f_pid = item.f_id
             LEFT JOIN t_goods goods ON goods.f_id = item.f_goodsid
             LEFT JOIN t_warehouse_area area ON area.f_id = item.f_warehouselocid
             LEFT JOIN t_warehouse ware ON ware.f_id = area.f_warehouseid