From 4788f8d86807296a3dce75b5dd428c0a8d5828db Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期五, 25 七月 2025 17:12:39 +0800
Subject: [PATCH] 分类字典设置上级是否存在子节点修改
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsStocktakingBoundController.java | 81 ++++++++++++++++++++++++++++++++--------
1 files changed, 64 insertions(+), 17 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsStocktakingBoundController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsStocktakingBoundController.java
index a8da7df..f671f4d 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsStocktakingBoundController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsStocktakingBoundController.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.tms.controller;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -15,9 +16,9 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
-import org.jeecg.modules.tms.entity.BaseTools;
-import org.jeecg.modules.tms.entity.ToolsStocktakingBound;
-import org.jeecg.modules.tms.entity.ToolsStocktakingBoundDetail;
+import org.jeecg.modules.tms.entity.*;
+import org.jeecg.modules.tms.entity.dto.LossBoundFlowDto;
+import org.jeecg.modules.tms.entity.dto.StocktakingBoundFlowDto;
import org.jeecg.modules.tms.entity.vo.ToolsStocktakingVo;
import org.jeecg.modules.tms.enums.OutBillStatus;
import org.jeecg.modules.tms.mapper.ToolsStocktakingBoundMapper;
@@ -35,6 +36,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.math.BigDecimal;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -146,7 +148,18 @@
return Result.OK("鎻愪氦鎴愬姛");
}
-
+ /**
+ * 瀹℃壒娴佺▼
+ * @param stocktakingBoundFlowDto
+ * @return
+ */
+ @AutoLog(value = "瀹℃壒娴佺▼")
+ @ApiOperation(value = "鎶ユ崯鍗�-瀹℃壒娴佺▼", notes = "鎶ユ崯鍗�-瀹℃壒娴佺▼")
+ @PostMapping("/approval")
+ public Result<?> approval(@RequestBody StocktakingBoundFlowDto stocktakingBoundFlowDto) {
+ toolsStocktakingBoundService.approvalProcess(stocktakingBoundFlowDto);
+ return Result.OK("鎿嶄綔鎴愬姛");
+ }
/**
* 缂栬緫
*
@@ -158,27 +171,42 @@
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
@Transactional(rollbackFor = {Exception.class})
public Result<String> edit(@RequestBody ToolsStocktakingBound toolsStocktakingBound) {
- if (toolsStocktakingBound == null || StringUtils.isBlank(toolsStocktakingBound.getId())) {
- return Result.error("鍙傛暟閿欒");
- }
- toolsStocktakingBoundDetailService.remove(new LambdaQueryWrapper<ToolsStocktakingBoundDetail>()
+ toolsStocktakingBoundService.updateById(toolsStocktakingBound);
+ // 鍒犻櫎鐢宠鍗曟槑缁嗘暟鎹�
+ toolsStocktakingBoundDetailService.remove(new LambdaQueryWrapper<ToolsStocktakingBoundDetail>()
.eq(ToolsStocktakingBoundDetail::getStocktakingBoundId, toolsStocktakingBound.getId()));
-
- ToolsStocktakingBound stocktakingBound = new ToolsStocktakingBound();
- BeanUtils.copyProperties(stocktakingBound, toolsStocktakingBound);
- toolsStocktakingBoundMapper.updateById(stocktakingBound);
-
List<ToolsStocktakingBoundDetail> detailList = toolsStocktakingBound.getToolsStocktakingBoundDetailList();
if (CollectionUtils.isEmpty(detailList)) {
return Result.error("鏄庣粏涓嶈兘涓虹┖");
}
+ for (ToolsStocktakingBoundDetail item : detailList) {
+ item.setStocktakingBoundId(toolsStocktakingBound.getId());
+ item.setToolId(item.getToolId());
+ item.setToolCode(item.getToolCode());
+ item.setRemark(item.getRemark());
+ item.setStocktakingDate(item.getStocktakingDate());
+ item.setBookQuantity(item.getBookQuantity());
+ item.setAvailableQuantity(item.getAvailableQuantity());
+ item.setPracticalQuantity(item.getPracticalQuantity());
+ item.setSurplusDeficit(item.getSurplusDeficit());
+ item.setDifferenceValue(item.getDifferenceValue());
+ item.setParamaTableName(item.getParamaTableName());
+ item.setForeignLanguageName(item.getForeignLanguageName());
+ item.setChineseName(item.getChineseName());
+ item.setSupplierId(item.getSupplierId());
+ item.setStorageLocation(item.getStorageLocation());
+ item.setToolMaterial(item.getToolMaterial());
+ item.setToolModel(item.getToolModel());
+ item.setPositionCode(item.getPositionCode());
+ item.setClassifyId(item.getClassifyId());
+ item.setApplicationType(item.getApplicationType());
+ toolsStocktakingBoundDetailService.saveOrUpdate(item);
+ }
+ toolsStocktakingBoundDetailService.saveOrUpdateBatch(detailList);
+ return Result.OK("鎿嶄綔鎴愬姛!");
- detailList.forEach(item -> item.setStocktakingBoundId(stocktakingBound.getId()));
- toolsStocktakingBoundDetailService.saveBatch(detailList);
-
- return Result.OK("缂栬緫鎴愬姛");
}
@@ -270,4 +298,23 @@
return Result.OK("鏂囦欢瀵煎叆澶辫触锛�");
}
+ /**
+ * 宸ュ叿鍙拌处-鐩樼偣瀛愰〉闈㈠垪琛ㄦ煡璇�
+ *
+ * @param toolsStocktakingBound
+ * @param pageNo
+ * @param pageSize
+ * @param query
+ * @return
+ */
+ @ApiOperation(value="宸ュ叿鍙拌处-鐩樼偣瀛愰〉闈㈠垪琛ㄦ煡璇�", notes="宸ュ叿鍙拌处-鐩樼偣瀛愰〉闈㈠垪琛ㄦ煡璇�")
+ @GetMapping(value = "/toolsStocktakingList")
+ public Result<?> toolsStocktakingList(ToolsStocktakingBound toolsStocktakingBound,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ @RequestParam Map<String, String> query) {
+ IPage<Map<String, Object>> pageList = toolsStocktakingBoundDetailService.toolsStocktakingList(pageNo,pageSize, query);
+ return Result.OK(pageList);
+ }
+
}
--
Gitblit v1.9.3