修改出库 查询总账信息

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

@@ -726,7 +726,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     }
                     // 更新库存总账
                     updateTWhgenlegData(wbItem, tWhgenle.getfId(), billsType);
-                    long dateDay = DateUtils.getDateDay(tWarehouseBills.getfBsdate(), wbItem.getfBsdate());
+                    long dateDay = DateUtils.getDateDay(tWarehouseBills.getfBsdate(), wbItem.getfChargedate());
                     long fCorpid = tWarehouseBills.getfCorpid();
                     TGoods tGoods = tGoodsMapper.selectTGoodsById(wbItem.getfGoodsid());
                     long fGoodsid = tGoods.getfTypeid();
@@ -743,6 +743,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     BigDecimal amt = (BigDecimal) objectMap.get("amt");
                     fees.setfPid(fPid);
                     fees.setfFeeid(feeId);
+                    fees.setfCorpid(tWarehouseBills.getfCorpid());
                     fees.setfFeeUnitid(fBillingway);
                     fees.setfQty(new BigDecimal(1));
                     fees.setfUnitprice(amt);

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

@@ -83,7 +83,7 @@
 
     <!-- 联查计费规则信息 -->
     <select id="getItemsBytWarehouseAgreementMsg"
-            resultType="com.ruoyi.warehouseBusiness.domain.TWarehouseAgreementitems"
+            resultMap="TWarehouseAgreementitemsResult"
             parameterType="object">
         SELECT
             items.f_id,