修改客户往来账

src/main/java/com/dk/mdm/controller/report/ReportController.java

@@ -237,7 +237,25 @@ public class ReportController  {
         return reportService.getReportBatch(params);
     }
 
+    /**
+     * @desc   : 客户往来账
+     * @author : 宋扬
+     * @date   : 2024/5/10 10:19
+     */
+    @PostMapping("get_mac_rec_current_report")
+    public ResponseResultVO<PageList<Map<String, Object>>> getMacRecCurrentReport(@RequestBody Map<String, Object> param) {
+        return reportService.getMacRecCurrentReport(param);
+    }
 
+    /**
+     * @desc   : 客户往来账明细
+     * @author : 宋扬
+     * @date   : 2024/5/10 10:20
+     */
+    @PostMapping("get_mac_rec_current_item_report")
+    public ResponseResultVO<PageList<Map<String, Object>>> getMacRecCurrentItemReport(@RequestBody Map<String, Object> param) {
+        return reportService.getMacRecCurrentItemReport(param);
+    }
 
 }
 

src/main/java/com/dk/mdm/mapper/report/ReportMapper.java

@@ -223,8 +223,6 @@ public interface ReportMapper extends BaseMapper<JSONObject> {
      */
     List<Map<String, Object>> getFundReport(Map param);
 
-
-
     /**
      * @desc   : 销售简报
      * @date   : 2024/5/6 13:32
@@ -232,5 +230,19 @@ public interface ReportMapper extends BaseMapper<JSONObject> {
      */
     Map<String, PGobject> getReportBatch(@Param("param")Map<String,Object> param);
 
+   /**
+    * @desc   : 客户往来账
+    * @author : 宋扬
+    * @date   : 2024/5/10 10:37
+    */
+    List<Map<String, Object>> getMacRecCurrentReport(Map param);
+
+   /**
+    * @desc   : 客户往来账明细
+    * @author : 宋扬
+    * @date   : 2024/5/10 10:37
+    */
+    List<Map<String, Object>> getMacRecCurrentItemReport(Map param);
+
 
 }

src/main/java/com/dk/mdm/mapper/report/ReportMapper.xml

@@ -2045,7 +2045,6 @@
         </where>
     </sql>
 
-
     <!--   日结对账表-查销售出库-->
     <select id="getDailyReconciliationReportByOut" resultType="java.util.Map">
         SELECT 
@@ -2637,4 +2636,15 @@
         </if>
     </select>
 
+    <!-- 客户往来账 -->
+    <select id="getMacRecCurrentReport" resultType="java.util.Map">
+        select dkic_b.f_query_mac_rec_current(#{cpId},#{currentPage},#{pageSize}, #{querys, typeHandler=JsonTypeHandler})
+    </select>
+
+    <!-- 客户往来账明细 -->
+    <select id="getMacRecCurrentItemReport" resultType="java.util.Map">
+        select dkic_b.f_query_mac_rec_current_item(#{cpId},#{objectId} ::uuid,#{orgId} ::uuid,#{macType},#{accDateStart} ::date
+                   ,#{accDateEnd} ::date,#{i18n} ,#{currentPage},#{pageSize})
+    </select>
+
 </mapper>

src/main/java/com/dk/mdm/service/ivt/FreezeService.java

@@ -142,7 +142,7 @@ public class FreezeService extends BaseService<Freeze> {
 				// 赋值库存可售量、冻结量和库存ID值
 				inventoryUpdate.setInvId(freezeItemVO.getInvId()).setFreezeQty(freezeqty).setUsableQty(usableQt);
 				// 修改库存冻结量、可售量
-				ResponseResultVO<Boolean> booleanResponseResultVO = inventoryService.updateByUuid(inventoryUpdate);
+				inventoryService.updateByUuid(inventoryUpdate);
 			}
 		}
 		return ResponseResultUtil.success();

src/main/java/com/dk/mdm/service/report/ReportService.java

@@ -507,5 +507,63 @@ public class ReportService {
         return ResponseResultUtil.success(result);
     }
 
+    /**
+     * @desc   : 客户往来账
+     * @author : 宋扬
+     * @date   : 2024/5/10 10:32
+     */
+    public ResponseResultVO<PageList<Map<String, Object>>> getMacRecCurrentReport(Map<String, Object> param) {
+        if (param.get("querys") != null) {
+            JSONObject querys = JSONObject.parseObject(param.get("querys").toString());
+            param.put("querys",querys);
+        }
+
+        List<Map<String, Object>> list = reportMapper.getMacRecCurrentReport(param);
+        JSONObject jObject = JSONObject.parseObject(list.get(0).get("f_query_mac_rec_current").toString());
+        List dataList = jObject.get("data") != null ? JSONObject.parseArray(jObject.get("data").toString())
+                .toJavaList(Map.class) : new ArrayList();
+
+        // 定义返回值
+        PageList data = new PageList<>();
+        data.setPageSize((int) param.get("pageSize")).setCurrentPage((int) param.get("currentPage"))
+                .setTotal(Long.parseLong(jObject.get("pageTotal").toString()))
+                .setList(dataList);
+
+        if ("查询成功".equals(jObject.get("message").toString())) {
+            return ResponseResultUtil.success(data);
+        } else {
+            return ResponseResultUtil.error(666, jObject.get("message").toString());
+        }
+    }
+
+    /**
+     * @desc   : 客户往来账明细
+     * @author : 宋扬
+     * @date   : 2024/5/10 10:32
+     */
+    public ResponseResultVO<PageList<Map<String, Object>>> getMacRecCurrentItemReport(Map<String, Object> param) {
+        // 校验分页参数
+        if (param.get("pageSize") == null || param.get("currentPage") == null) {
+            return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL, "请检查分页参数!");
+        }
+
+        List<Map<String, Object>> list = reportMapper.getMacRecCurrentItemReport(param);
+        JSONObject jObject = JSONObject.parseObject(list.get(0).get("f_query_mac_rec_current_item").toString());
+        List dataList = jObject.get("data") != null ? JSONObject.parseArray(jObject.get("data").toString())
+                .toJavaList(Map.class) : new ArrayList();
+
+        // 定义返回值
+        PageList data = new PageList<>();
+        data.setPageSize((int) param.get("pageSize")).setCurrentPage((int) param.get("currentPage"))
+                .setTotal(Long.parseLong(jObject.get("pageTotal").toString()))
+                .setList(dataList);
+
+        if ("查询成功".equals(jObject.get("message").toString())) {
+            return ResponseResultUtil.success(data);
+        } else {
+            return ResponseResultUtil.error(666, jObject.get("message").toString());
+        }
+    }
+
 
 }