仓库出库修改仓储费计算，增加查询库存总账表的仓库接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/reportManagement/TWhgenlegController.java

@@ -223,6 +223,21 @@ public class TWhgenlegController extends BaseController {
         List<Map<String, Object>> list = tWhgenlegService.selectdetailedList(tWarehousebill);
         return getDataTable(list);
     }
+    /**
+     *  根据客户id或者提单号查询库存不为0的仓库
+     */
+    //@PreAuthorize("@ss.hasPermi('warehouseBusiness:whgenleg:list')")
+    @GetMapping("/getWarehouse")
+    public AjaxResult getWarehouse(TWhgenleg tWhgenleg) {
+        if (tWhgenleg.getfCorpid() == null){
+            return AjaxResult.error("请选择客户后再选择仓库");
+        }
+        if (StringUtils.isNull(tWhgenleg.getfMblno())){
+            return AjaxResult.error("请输入提单号后再选择仓库");
+        }
+        List<Map<String, Object>> list = tWhgenlegService.getWarehouse(tWhgenleg);
+        return AjaxResult.success(list);
+    }
 
 
 

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

@@ -347,7 +347,7 @@ public class TWarehouseOutStockController extends BaseController {
         return itWarehouseBillsService.serialNumber(billsType);
     }
     /**
-     * 入库明细提交审批确认
+     * 出库明细提交审批确认
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:inStock:add')")
     @Log(title = "详情主表", businessType = BusinessType.INSERT)

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/mapper/TWhgenlegMapper.java

@@ -107,4 +107,11 @@ public interface TWhgenlegMapper {
      * @return 库存总账集合
      */
     public List<Map<String, Object>> selectInventoryMapList(TWhgenleg tWhgenleg);
+
+    /**
+     * 根据客户id或者提单号查询库存不为0的仓库
+     * @param tWhgenleg
+     * @return
+     */
+    public List<Map<String, Object>> getWarehouse(TWhgenleg tWhgenleg);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/service/ITWhgenlegService.java

@@ -126,4 +126,10 @@ public interface ITWhgenlegService {
      * @return
      */
     public List<SingleAnalysisFeesExcel> selectSingleAnalysisFees(SingleAnalysisExcel singleAnalysisExcel);
+    /**
+     * 根据客户id或者提单号查询库存不为0的仓库
+     * @param tWhgenleg
+     * @return
+     */
+    public List<Map<String, Object>> getWarehouse(TWhgenleg tWhgenleg);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/service/impl/TWhgenlegServiceImpl.java

@@ -412,6 +412,11 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
         return tWarehouseBillsMapper.selectSingleAnalysisFees(singleAnalysisExcel);
     }
 
+    @Override
+    public List<Map<String, Object>> getWarehouse(TWhgenleg tWhgenleg) {
+        return tWhgenlegMapper.getWarehouse(tWhgenleg);
+    }
+
     /**
      *
      * @param fOriginalbilldate 根据该字段进行合并

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

@@ -473,7 +473,7 @@ public interface ITWarehouseBillsService {
     public AjaxResult queryClerkRoleList();
 
     /**
-     * 入库明细提交审批确认
+     * 出入库明细提交审批确认
      */
     public AjaxResult addDetails(Long fId, String billsType,LoginUser loginUser);
 }

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

@@ -2909,17 +2909,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             return AjaxResult.error("未找到入账信息");
         }
         TWarehouseBills tWarehouseBills = JSONArray.parseObject(warehouseBills, TWarehouseBills.class);
-        tWarehouseBills.setfItemsStatus(4L);
-        tWarehouseBills.setfBilltype(billsType);
-        tWarehouseBills.setUpdateBy(loginUser.getUser().getUserName());
-        tWarehouseBills.setUpdateTime(new Date());
-        Long timestamp = DateUtils.getTimestamp(new Date());
-        tWarehouseBills.setfDateChanged(timestamp.toString() + (int) (Math.random() * 900) + 100);
-        TWarehousebillsitems itemInFo = tWarehousebillsitemsMapper.selectItemQtyByFPid(tWarehouseBills.getfId());
-        tWarehouseBills.setfQty(itemInFo.getfQty());
-        tWarehouseBills.setfNetweight(itemInFo.getfNetweight());
-        tWarehouseBills.setfGrossweight(itemInFo.getfGrossweight());
-        tWarehouseBillsMapper.updateTWarehousebills(tWarehouseBills);
         tEnclosureMapper.deleteByFPid(tWarehouseBills.getfId());
         tWarehousebillsfeesMapper.deleteByFPid(tWarehouseBills.getfId());
         tWarehousebillsCntrMapper.deleteTWarehousebillsCntrfPid(tWarehouseBills.getfId());
@@ -3066,6 +3055,18 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
             }
         }
+        //最后更新仓库主表
+        tWarehouseBills.setfItemsStatus(4L);
+        tWarehouseBills.setfBilltype(billsType);
+        tWarehouseBills.setUpdateBy(loginUser.getUser().getUserName());
+        tWarehouseBills.setUpdateTime(new Date());
+        Long timestamp = DateUtils.getTimestamp(new Date());
+        tWarehouseBills.setfDateChanged(timestamp.toString() + (int) (Math.random() * 900) + 100);
+        TWarehousebillsitems itemInFo = tWarehousebillsitemsMapper.selectItemQtyByFPid(tWarehouseBills.getfId());
+        tWarehouseBills.setfQty(itemInFo.getfQty());
+        tWarehouseBills.setfNetweight(itemInFo.getfNetweight());
+        tWarehouseBills.setfGrossweight(itemInFo.getfGrossweight());
+        tWarehouseBillsMapper.updateTWarehousebills(tWarehouseBills);
         map.put("warehousebills", tWarehouseBills);
         map.put("warehousebillsitems", warehousebillsitemsList);
         return AjaxResult.success("成功", map);
@@ -3184,10 +3185,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         tWarehouseBills.setfItemsStatus(4L);
         Long timestamp = DateUtils.getTimestamp(new Date());
         tWarehouseBills.setfDateChanged(timestamp.toString() + (int) (Math.random() * 900) + 100);
-        TWarehousebillsitems itemInFo = tWarehousebillsitemsMapper.selectItemQtyByFPid(tWarehouseBills.getfId());
-        tWarehouseBills.setfQty(itemInFo.getfQty());
-        tWarehouseBills.setfNetweight(itemInFo.getfNetweight());
-        tWarehouseBills.setfGrossweight(itemInFo.getfGrossweight());
         tWarehouseBills.setUpdateBy(loginUser.getUser().getUserName());
         tWarehouseBills.setUpdateTime(new Date());
         fPid = tWarehouseBills.getfId();
@@ -3405,6 +3402,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
             }
         }
+        //从表更新完再查从表信息更新主表
+        TWarehousebillsitems itemInFo = tWarehousebillsitemsMapper.selectItemQtyByFPid(tWarehouseBills.getfId());
+        tWarehouseBills.setfQty(itemInFo.getfQty());
+        tWarehouseBills.setfNetweight(itemInFo.getfNetweight());
+        tWarehouseBills.setfGrossweight(itemInFo.getfGrossweight());
         tWarehouseBillsMapper.updateTWarehousebills(tWarehouseBills);
         map.put("fPid", fPid);
         map.put("warehouse", tWarehouseBills);
@@ -3714,7 +3716,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             // 要计费天数
             long fBillingDays = DateUtils.getDateDay(warehouseBills.getfBillingDeadline(), (Date) item.get("fOriginalbilldate"));
             if ("SJCK".equals(fBilltype)) {
-                fInventoryDays = DateUtils.getDateDay(fBsdate, (Date) item.get("fOriginalbilldate"));
+                fInventoryDays = DateUtils.getDateDay(fBsdate, (Date) item.get("fChargedate"));
                 fBillingDays = fInventoryDays;
             } else if ("HQZY".equals(fBilltype)) {
                 fInventoryDays = DateUtils.getDateDay(warehouseBills.getfBillingDeadline(), fBsdate);
@@ -4685,10 +4687,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         tWarehousebills.setUpdateBy(loginUser.getUsername());
         Long timestamp = DateUtils.getTimestamp(new Date());
         tWarehousebills.setfDateChanged(timestamp.toString() + (int) (Math.random() * 900) + 100);
-        TWarehousebillsitems itemInFo = tWarehousebillsitemsMapper.selectItemQtyByFPid(tWarehousebills.getfId());
-        tWarehousebills.setfQty(itemInFo.getfQty());
-        tWarehousebills.setfNetweight(itemInFo.getfNetweight());
-        tWarehousebills.setfGrossweight(itemInFo.getfGrossweight());
         tEnclosureMapper.deleteByFPid(tWarehousebills.getfId());
         tWarehousebillsfeesMapper.deleteByFPid(tWarehousebills.getfId());
         tWarehousebillsCntrMapper.deleteTWarehousebillsCntrfPid(tWarehousebills.getfId());
@@ -4878,6 +4876,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
             }
         }
+        //从表更新完再查询主表信息修改入库件数
+        TWarehousebillsitems itemInFo = tWarehousebillsitemsMapper.selectItemQtyByFPid(tWarehousebills.getfId());
+        tWarehousebills.setfQty(itemInFo.getfQty());
+        tWarehousebills.setfNetweight(itemInFo.getfNetweight());
+        tWarehousebills.setfGrossweight(itemInFo.getfGrossweight());
         tWarehouseBillsMapper.updateTWarehousebills(tWarehousebills);
         return AjaxResult.success(tWarehousebills.getfDateChanged());
     }

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

@@ -734,5 +734,18 @@
             </if>
         </where>
     </select>
+    <!--根据客户id或加上提单号查询库存不为0的仓库名-->
+    <select id="getWarehouse" parameterType="TWhgenleg" resultType="Map">
+        SELECT
+            DISTINCT
+            th.f_id AS fId,
+            th.f_name AS fName
+        FROM
+            t_whgenleg tw
+                LEFT JOIN t_warehouse th ON th.f_id = tw.f_warehouseid
+        WHERE tw.f_qtyblc > 0
+          AND f_corpid = #{fCorpid}
+          AND f_mblno = #{fMblno}
+    </select>
 
 </mapper>