From 555fdbae1f338a404da8d5f4c52c0afb8003bce6 Mon Sep 17 00:00:00 2001
From: lixiangyu <lixiangyu@xalxzn.com>
Date: 星期二, 09 九月 2025 17:54:38 +0800
Subject: [PATCH] feat(cms): 添加库存刀具列表接口并优化相关功能
---
src/main/java/org/jeecg/modules/cms/controller/CuttingReceiveController.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/cms/controller/CuttingReceiveController.java b/src/main/java/org/jeecg/modules/cms/controller/CuttingReceiveController.java
index 17ad902..a1be185 100644
--- a/src/main/java/org/jeecg/modules/cms/controller/CuttingReceiveController.java
+++ b/src/main/java/org/jeecg/modules/cms/controller/CuttingReceiveController.java
@@ -12,13 +12,12 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import liquibase.pro.packaged.G;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.cms.entity.CuttingInbound;
-import org.jeecg.modules.cms.entity.CuttingInboundDetail;
-import org.jeecg.modules.cms.entity.CuttingReceive;
-import org.jeecg.modules.cms.entity.CuttingReceiveDetail;
+import org.jeecg.modules.cms.entity.*;
+import org.jeecg.modules.cms.service.ICuttingInventoryService;
import org.jeecg.modules.cms.service.ICuttingReceiveDetailService;
import org.jeecg.modules.cms.service.ICuttingReceiveService;
@@ -59,7 +58,6 @@
@Autowired
private ICuttingReceiveDetailService cuttingReceiveDetailService;
-
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -93,13 +91,16 @@
//@RequiresPermissions("org.jeecg.modules:cms_cutting_receive:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody JSONObject jSONObject) {
+ // 淇濆瓨涓昏〃鏁版嵁
CuttingReceive cuttingReceive = jSONObject.toJavaObject(CuttingReceive.class);
cuttingReceive.setOrderStatus("1");
cuttingReceiveService.saveOrUpdate(cuttingReceive);
- //鍒犻櫎鍘熷叧鑱旀暟鎹�
+
+ // 鍒犻櫎鍘熸湁鍏宠仈鐨勬槑缁嗘暟鎹�
List<CuttingReceiveDetail> cuttingReceiveDetailList = cuttingReceiveDetailService.lambdaQuery().eq(CuttingReceiveDetail::getOrderId, cuttingReceive.getId()).list();
cuttingReceiveDetailService.removeBatchByIds(cuttingReceiveDetailList);
- //娣诲姞鏂板叧鑱旀暟鎹�
+
+ // 閲嶆柊娣诲姞鏂扮殑鏄庣粏鏁版嵁
JSONArray jsonArray = jSONObject.getJSONArray("detailData");
List<CuttingReceiveDetail> list = jsonArray.toJavaList(CuttingReceiveDetail.class);
for (int i = 0; i < list.size(); i++) {
@@ -209,4 +210,16 @@
return Result.ok(list);
}
+ /**
+ * 閫夋嫨搴撳瓨鍒�鍏风殑鍒楄〃
+ *
+ * @return
+ */
+ @GetMapping("/getInventoryToolList")
+ public Result<?> getInventoryToolList(@RequestParam("pageNo") Integer pageNo,
+ @RequestParam("pageSize") Integer pageSize,
+ @RequestParam Map<String, Object> params) {
+ IPage<Map<String, Object>> inventoryTooList = cuttingReceiveService.getInventoryToolList(pageNo, pageSize, params);
+ return Result.ok(inventoryTooList);
+ }
}
--
Gitblit v1.9.3