修改货权转让查看详情方法

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsitems;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 仓库明细从表Mapper接口
@@ -62,4 +63,6 @@ public interface TWarehousebillsitemsMapper extends BaseMapper<TWarehousebillsit
     public int deleteTWarehousebillsitemsByIds(Long[] fIds);
 
     int deleteByFPid(Long fId);
+
+    List<Map<String, Object>> selectGoodsTransferitemsList(TWarehousebillsitems tWarehousebillsitems);
 }

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

@@ -105,6 +105,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         // 库区
         List<Long> warehouseAreaId = new ArrayList<>();
         if (!StringUtils.isNull(tWarehousebills)) {
+            if (StringUtils.isNotNull(tWarehousebills.getfTocorpid())) {
+                corpsId.add(tWarehousebills.getfTocorpid());
+            }
             corpsId.add(tWarehousebills.getfCorpid());
             // 查询联系人
             SysUser sysUser = sysUserMapper.selectUserByUserName(tWarehousebills.getfStorekeeper());
@@ -123,13 +126,19 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         // 查询仓库明细从表数据
         TWarehousebillsitems tWarehousebillsitems = new TWarehousebillsitems();
         tWarehousebillsitems.setfPid(fId);
-        List<TWarehousebillsitems> warehousebillsitems = tWarehousebillsitemsMapper.selectTWarehousebillsitemsList(tWarehousebillsitems);
-        if (StringUtils.isNotEmpty(warehousebillsitems)) {
-            for (TWarehousebillsitems wb : warehousebillsitems) {
-                goodsId.add(wb.getfGoodsid());
-                warehouseAreaId.add(wb.getfWarehouselocid());
+        List<Map<String, Object>> mapList = tWarehousebillsitemsMapper.selectGoodsTransferitemsList(tWarehousebillsitems);
+        if (StringUtils.isNotEmpty(mapList)) {
+            for (Map<String, Object> wb : mapList) {
+                if (StringUtils.isNotNull(wb.get("fGoodsid"))) {
+                    Integer fGoodsid = (Integer) wb.get("fGoodsid");
+                    goodsId.add(fGoodsid.longValue());
+                }
+                if (StringUtils.isNotNull(wb.get("fWarehouselocid"))) {
+                    Integer fWarehouselocid = (Integer) wb.get("fWarehouselocid");
+                    warehouseAreaId.add(fWarehouselocid.longValue());
+                }
             }
-            map.put("warehouseBillsItem", warehousebillsitems);
+            map.put("warehouseBillsItem", mapList);
         }
         // 查询仓库费用明细表数据
         TWarehousebillsfees tWarehousebillsfees = new TWarehousebillsfees();

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

@@ -38,7 +38,9 @@
     </resultMap>
 
     <sql id="selectTWarehousebillsitemsVo">
-        select f_id, f_pid, f_lineno, f_goodsid, f_warehouselocid, f_originalbillno, f_mblno, f_bsdate, f_boxno, f_cntqty, f_goodsval, f_cntrtype, f_planqty, f_planvolumn, f_packagespecs, f_plangrossweight, f_plannetweight, f_qty, f_volumn, f_grossweight, f_netweight, f_cntrno, f_truckno, f_billstatus, del_flag, create_by, create_time, update_by, update_time, remark from t_warehousebillsitems
+        select f_id, f_pid, f_lineno, f_goodsid, f_warehouselocid, f_originalbillno, f_mblno, f_bsdate, f_boxno, f_cntqty,
+         f_goodsval, f_cntrtype, f_planqty, f_planvolumn, f_packagespecs, f_plangrossweight, f_plannetweight, f_qty, f_volumn, f_grossweight, f_netweight,
+          f_cntrno, f_truckno, f_billstatus, del_flag, create_by, create_time, update_by, update_time, remark from t_warehousebillsitems
     </sql>
 
     <select id="selectTWarehousebillsitemsList" parameterType="TWarehousebillsitems"
@@ -71,6 +73,44 @@
         </where>
     </select>
 
+    <select id="selectGoodsTransferitemsList" parameterType="TWarehousebillsitems" resultType="Map">
+        select
+            item.f_id AS fId,
+            item.f_pid AS fPid,
+            item.f_lineno AS fLineno,
+            item.f_goodsid AS fGoodsid,
+            goods.f_name AS fGoodsids,
+            item.f_warehouselocid AS fWarehouselocid,
+            area.f_name AS fWarehouselocids,
+            item.f_originalbillno AS fOriginalbillno,
+            item.f_mblno AS fMblno,
+            item.f_bsdate AS fBsdate,
+            item.f_boxno AS fBoxno,
+            item.f_cntqty AS fCntqty,
+            item.f_goodsval AS fGoodsval,
+            item.f_cntrtype AS fCntrtype,
+            item.f_planqty AS fPlanqty,
+            item.f_planvolumn AS fPlanvolumn,
+            item.f_packagespecs AS fPackagespecs,
+            item.f_plangrossweight AS fPlangrossweight,
+            item.f_plannetweight AS fPlannetweight,
+            item.f_qty AS fQty,
+            item.f_volumn AS fVolumn,
+            item.f_grossweight AS fGrossweight,
+            item.f_netweight AS fNetweight,
+            item.f_cntrno AS fCntrno,
+            item.f_truckno AS fTruckno,
+            item.f_billstatus AS fBillstatus,
+            item.remark
+        from
+            t_warehousebillsitems item
+            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
+        <where>
+            <if test="fPid != null ">and item.f_pid = #{fPid}</if>
+        </where>
+    </select>
+
     <select id="selectTWarehousebillsitemsById" parameterType="Long" resultMap="TWarehousebillsitemsResult">
         <include refid="selectTWarehousebillsitemsVo"/>
         where f_id = #{fId}