From da78c6cd6cfa63c09fc8b41c18af6f06393847aa Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 26 一月 2026 15:53:53 +0800
Subject: [PATCH] yys 修改采购审核模块
---
src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java | 111 ++++++++
src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java | 3
src/main/java/com/ruoyi/approve/service/IApproveProcessService.java | 2
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 101 +++----
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerTemplateServiceImpl.java | 29 ++
src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml | 3
src/main/resources/mapper/purchase/SalesLedgerProductTemplateMapper.xml | 28 ++
src/main/java/com/ruoyi/framework/security/service/TokenService.java | 1
src/main/java/com/ruoyi/purchase/mapper/PurchaseLedgerTemplateMapper.java | 18 +
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 2
src/main/java/com/ruoyi/purchase/pojo/SalesLedgerProductTemplate.java | 84 ++++++
src/main/resources/mapper/purchase/PurchaseLedgerTemplateMapper.xml | 29 ++
src/main/java/com/ruoyi/purchase/service/impl/SalesLedgerProductTemplateServiceImpl.java | 20 +
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 7
src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java | 60 +---
src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java | 2
src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java | 4
src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java | 3
src/main/resources/static/销售台账导入模板.xlsx | 0
src/main/java/com/ruoyi/purchase/controller/SalesLedgerProductTemplateController.java | 18 +
src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java | 4
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | 51 +++
src/main/java/com/ruoyi/purchase/pojo/PurchaseLedgerTemplate.java | 96 +++++++
src/main/java/com/ruoyi/CodeGenerator.java | 6
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java | 6
src/main/java/com/ruoyi/purchase/service/SalesLedgerProductTemplateService.java | 16 +
src/main/java/com/ruoyi/purchase/service/PurchaseLedgerTemplateService.java | 16 +
src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java | 2
src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java | 36 ++
src/main/java/com/ruoyi/purchase/mapper/SalesLedgerProductTemplateMapper.java | 18 +
src/main/java/com/ruoyi/approve/service/IApproveNodeService.java | 2
31 files changed, 659 insertions(+), 119 deletions(-)
diff --git a/src/main/java/com/ruoyi/CodeGenerator.java b/src/main/java/com/ruoyi/CodeGenerator.java
index f4efe04..e670dbb 100644
--- a/src/main/java/com/ruoyi/CodeGenerator.java
+++ b/src/main/java/com/ruoyi/CodeGenerator.java
@@ -19,11 +19,11 @@
// 婕旂ず渚嬪瓙锛屾墽琛� main 鏂规硶鎺у埗鍙拌緭鍏ユā鍧楄〃鍚嶅洖杞﹁嚜鍔ㄧ敓鎴愬搴旈」鐩洰褰曚腑
public class CodeGenerator {
- public static String database_url = "jdbc:mysql://1.15.17.182:9999/product-inventory-management-new";
+ public static String database_url = "jdbc:mysql://localhost:3306/product-inventory-management-new";
public static String database_username = "root";
- public static String database_password= "xd@123456..";
+ public static String database_password= "123456";
public static String author = "鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃";
- public static String model = "stock"; // 妯″潡
+ public static String model = "purchase"; // 妯″潡
public static String setParent = "com.ruoyi."+ model; // 鍖呰矾寰�
public static String tablePrefix = ""; // 璁剧疆杩囨护琛ㄥ墠缂�
public static void main(String[] args) {
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
index 6fb9986..f44a3cd 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
@@ -115,8 +115,8 @@
@DeleteMapping("/deleteIds")
@ApiOperation(value = "鍒犻櫎瀹℃壒")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult deleteIds(@RequestBody Long[] ids) {
- if (ids == null || ids.length == 0) {
+ public AjaxResult deleteIds(@RequestBody List<Long> ids) {
+ if (ids == null || ids.size() == 0) {
return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
}
approveProcessService.delApprove(ids);
diff --git a/src/main/java/com/ruoyi/approve/service/IApproveNodeService.java b/src/main/java/com/ruoyi/approve/service/IApproveNodeService.java
index 41c84ec..eac4cce 100644
--- a/src/main/java/com/ruoyi/approve/service/IApproveNodeService.java
+++ b/src/main/java/com/ruoyi/approve/service/IApproveNodeService.java
@@ -17,5 +17,5 @@
void updateApproveNode(ApproveNode approveNode) throws IOException;
- void delApproveNodeByApproveId(Long id);
+ void delApproveNodeByApproveId(String id);
}
diff --git a/src/main/java/com/ruoyi/approve/service/IApproveProcessService.java b/src/main/java/com/ruoyi/approve/service/IApproveProcessService.java
index 675c474..a951ff6 100644
--- a/src/main/java/com/ruoyi/approve/service/IApproveProcessService.java
+++ b/src/main/java/com/ruoyi/approve/service/IApproveProcessService.java
@@ -27,7 +27,7 @@
IPage<ApproveProcess> listAll(Page page, ApproveProcess approveProcess);
- void delApprove(Long[] ids);
+ void delApprove(List<Long> ids);
void updateByApproveId(ApproveGetAndUpdateVo approveGetAndUpdateVo) throws IOException;
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
index ddc3718..5ff767c 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
@@ -19,6 +19,8 @@
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.project.system.service.ISysNoticeService;
+import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
+import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.sales.mapper.CommonFileMapper;
import com.ruoyi.sales.mapper.SalesQuotationMapper;
import com.ruoyi.sales.mapper.SalesQuotationProductMapper;
@@ -61,10 +63,16 @@
private DeviceRepairMapper deviceRepairMapper;
@Autowired
+ private PurchaseLedgerMapper purchaseLedgerMapper;
+
+ @Autowired
private SalesQuotationMapper salesQuotationMapper;
@Autowired
private ShippingInfoMapper shippingInfoMapper;
+
+ @Autowired
+ private CommonFileServiceImpl commonFileService;
@@ -168,6 +176,26 @@
}
deviceRepairMapper.updateById(deviceRepair);
}
+
+ //閲囪喘瀹℃牳
+ if(approveProcess.getApproveType().equals(5)){
+ PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectOne(new LambdaQueryWrapper<PurchaseLedger>()
+ .eq(PurchaseLedger::getPurchaseContractNumber, approveProcess.getApproveReason())
+ .last("limit 1"));
+ if(purchaseLedger != null) {
+ if (status.equals(2)) {
+ // 鍚屾剰
+ purchaseLedger.setApprovalStatus(3);
+ } else if (status.equals(3)) {
+ // 鎷掔粷
+ purchaseLedger.setApprovalStatus(4);
+ } else if (status.equals(1)) {
+ // 瀹℃牳涓�
+ purchaseLedger.setApprovalStatus(2);
+ }
+ purchaseLedgerMapper.updateById(purchaseLedger);
+ }
+ }
// 閿�鍞姤浠风姸鎬佷慨鏀�
if(approveProcess.getApproveType().equals(6)){
SalesQuotation salesQuote = salesQuotationMapper.selectOne(new LambdaQueryWrapper<SalesQuotation>()
@@ -237,11 +265,17 @@
}
@Override
- public void delApproveNodeByApproveId(Long id) {
+ public void delApproveNodeByApproveId(String id) {
+ List<ApproveNode> approveNodes = approveNodeMapper.selectList(new LambdaQueryWrapper<ApproveNode>()
+ .eq(ApproveNode::getApproveProcessId, id));
UpdateWrapper<ApproveNode> queryWrapper = new UpdateWrapper<>();
queryWrapper.lambda().set(ApproveNode::getDeleteFlag, 1)
.eq(ApproveNode::getApproveProcessId, id);
update(queryWrapper);
+ // 鍒犻櫎闄勪欢
+ for (ApproveNode approveNode : approveNodes) {
+ commonFileService.deleteByBusinessId(approveNode.getId(), FileNameType.ApproveNode.getValue());
+ }
}
//瀹℃壒绫诲瀷鑾峰彇(涓庡墠绔〉闈㈠搴�)
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
index 13c493a..4e41219 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -27,6 +27,7 @@
import com.ruoyi.project.system.service.ISysNoticeService;
import com.ruoyi.sales.mapper.CommonFileMapper;
import com.ruoyi.sales.pojo.CommonFile;
+import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
@@ -64,6 +65,7 @@
private final ApproveProcessMapper approveProcessMapper;
private final TempFileServiceImpl tempFileService;
private final CommonFileMapper commonFileMapper;
+ private final CommonFileServiceImpl commonFileService;
private final ISysNoticeService sysNoticeService;
@Override
@@ -153,19 +155,58 @@
return approveProcessIPage;
}
- @Override
- public void delApprove(Long[] ids) {
- ApproveProcess approveProcess;
+ public void delByIds(List<Long> ids) {
for (Long approveId : ids) {
// 閫昏緫鍒犻櫎瀹℃壒娴佺▼
update(new UpdateWrapper<ApproveProcess>()
.lambda()
.set(ApproveProcess::getApproveDelete, 1)
- .eq(ApproveProcess::getApproveId, approveId));
+ .eq(ApproveProcess::getId, approveId));
+ // 鍒犻櫎瀵瑰簲鐨勯檮浠�
+ commonFileService.deleteByBusinessId(approveId, FileNameType.ApproveProcess.getValue());
+ ApproveProcess approveProcess = approveProcessMapper.selectById(approveId);
// 鍒犻櫎瀹℃壒鑺傜偣
- approveNodeService.delApproveNodeByApproveId(approveId);
+ approveNodeService.delApproveNodeByApproveId(approveProcess.getApproveId());
+
+ // 鍙煡鏈�鏂颁竴鏉″鎵规祦绋�
+ ApproveProcess latestProcess = approveProcessMapper.selectOne(
+ new LambdaQueryWrapper<ApproveProcess>()
+ .eq(ApproveProcess::getApproveId, approveId)
+ .orderByDesc(ApproveProcess::getCreateTime)
+ .last("LIMIT 1"));
+
+ if (latestProcess == null) {
+ continue;
+ }
+
+
+ // 鍒犻櫎瀵瑰簲鐨勬秷鎭�氱煡
+ sysNoticeService.remove(new LambdaQueryWrapper<SysNotice>()
+ .eq(SysNotice::getNoticeTitle, approveProcessType(latestProcess.getApproveType()))
+ .eq(SysNotice::getSenderId, latestProcess.getApproveUser())
+ .apply("CAST(notice_content AS CHAR) LIKE CONCAT('%', {0}, '%')", latestProcess.getApproveId()));
+ }
+
+ }
+
+ @Override
+ public void delApprove(List<Long> ids) {
+ for (Long approveId : ids) {
+ ApproveProcess approveProcess = approveProcessMapper.selectOne(new LambdaQueryWrapper<ApproveProcess>()
+ .eq(ApproveProcess::getApproveId, approveId)
+ .eq(ApproveProcess::getApproveDelete, 0)
+ .last("LIMIT 1"));
+ // 閫昏緫鍒犻櫎瀹℃壒娴佺▼
+ update(new UpdateWrapper<ApproveProcess>()
+ .lambda()
+ .set(ApproveProcess::getApproveDelete, 1)
+ .eq(ApproveProcess::getApproveId, approveId));
+ // 鍒犻櫎瀵瑰簲鐨勯檮浠�
+ commonFileService.deleteByBusinessId(approveProcess.getId(), FileNameType.ApproveProcess.getValue());
+ // 鍒犻櫎瀹℃壒鑺傜偣
+ approveNodeService.delApproveNodeByApproveId(approveId.toString());
// 鍙煡鏈�鏂颁竴鏉″鎵规祦绋�
ApproveProcess latestProcess = approveProcessMapper.selectOne(
diff --git a/src/main/java/com/ruoyi/framework/security/service/TokenService.java b/src/main/java/com/ruoyi/framework/security/service/TokenService.java
index 3ac2035..7d09431 100644
--- a/src/main/java/com/ruoyi/framework/security/service/TokenService.java
+++ b/src/main/java/com/ruoyi/framework/security/service/TokenService.java
@@ -160,6 +160,7 @@
loginUser.setLoginTime(System.currentTimeMillis());
loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
loginUser.setDeptIds(getDeptIdsByUserId(loginUser.getUserId()));
+ loginUser.setCurrentDeptId(loginUser.getDeptIds()[0]);
// 鏍规嵁uuid灏唋oginUser缂撳瓨
String userKey = getTokenKey(loginUser.getToken());
redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
index 378a9c3..4dc2f7a 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
@@ -11,7 +11,11 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
+import com.ruoyi.purchase.mapper.PurchaseLedgerTemplateMapper;
+import com.ruoyi.purchase.mapper.SalesLedgerProductTemplateMapper;
import com.ruoyi.purchase.pojo.PurchaseLedger;
+import com.ruoyi.purchase.pojo.PurchaseLedgerTemplate;
+import com.ruoyi.purchase.pojo.SalesLedgerProductTemplate;
import com.ruoyi.purchase.service.IPurchaseLedgerService;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerProductService;
@@ -37,12 +41,16 @@
@RestController
@RequestMapping("/purchase/ledger")
@AllArgsConstructor
-@Api(tags = "111")
+@Api(tags = "閲囪喘鍙拌处")
public class PurchaseLedgerController extends BaseController {
private IPurchaseLedgerService purchaseLedgerService;
private ISalesLedgerService salesLedgerService;
private ISalesLedgerProductService salesLedgerProductService;
+
+ private PurchaseLedgerTemplateMapper purchaseLedgerTemplateMapper;
+
+ private SalesLedgerProductTemplateMapper salesLedgerProductTemplateMapper;
/**
* 鏌ヨ閲囪喘鍙拌处鍒楄〃
@@ -84,34 +92,24 @@
*/
@Log(title = "閲囪喘鍙拌处", businessType = BusinessType.INSERT)
@PostMapping("/addOrEditPurchase")
- public AjaxResult addOrEditPurchase(@RequestBody PurchaseLedgerDto purchaseLedgerDto) throws IOException {
+ public AjaxResult addOrEditPurchase(@RequestBody PurchaseLedgerDto purchaseLedgerDto) throws Exception {
return toAjax(purchaseLedgerService.addOrEditPurchase(purchaseLedgerDto));
}
- /**
- * 鏂板閲囪喘妯℃澘
- */
- @PostMapping("/addPurchaseTemplate")
- public AjaxResult addPurchaseTemplate(@RequestBody PurchaseLedgerDto purchaseLedgerDto) throws IOException {
- return toAjax(purchaseLedgerService.addPurchaseTemplate(purchaseLedgerDto));
- }
+
/**
* 鏌ヨ閲囪喘妯℃澘
*/
- @ApiOperation("/2222")
+ @ApiOperation("/鏌ヨ閲囪喘妯℃澘")
@GetMapping("/getPurchaseTemplateList")
public AjaxResult getPurchaseTemplateList() {
- PurchaseLedgerDto purchaseLedgerDto = new PurchaseLedgerDto();
- purchaseLedgerDto.setApprovalStatus(3);
- IPage<PurchaseLedgerDto> purchaseLedgerDtoIPage = purchaseLedgerService.selectPurchaseLedgerListPage(new Page(1, -1), purchaseLedgerDto);
- List<PurchaseLedgerDto> purchaseLedgers = purchaseLedgerDtoIPage.getRecords();
-
+ List<PurchaseLedgerTemplate> purchaseLedgers = purchaseLedgerTemplateMapper.selectList(null);
purchaseLedgers.forEach(purchaseLedgerDto1 -> {
- LambdaQueryWrapper<SalesLedgerProduct> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(SalesLedgerProduct::getSalesLedgerId, purchaseLedgerDto1.getId())
- .eq(SalesLedgerProduct::getType, 2);
- List<SalesLedgerProduct> list = salesLedgerProductService.list(queryWrapper);
+ LambdaQueryWrapper<SalesLedgerProductTemplate> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(SalesLedgerProductTemplate::getSalesLedgerId, purchaseLedgerDto1.getId())
+ .eq(SalesLedgerProductTemplate::getType, 2);
+ List<SalesLedgerProductTemplate> list = salesLedgerProductTemplateMapper.selectList(queryWrapper);
if (!list.isEmpty()) {
- purchaseLedgerDto1.setProductData(list);
+ purchaseLedgerDto1.setProductList(list);
}
});
return AjaxResult.success(purchaseLedgers);
@@ -194,27 +192,7 @@
*/
@GetMapping("/listPage")
public AjaxResult listPage(Page page, PurchaseLedgerDto purchaseLedger) {
- IPage<PurchaseLedgerDto> purchaseLedgerDtoIPage = Optional.ofNullable(
- purchaseLedgerService.selectPurchaseLedgerListPage(page, purchaseLedger)
- ).orElse(new Page<>());
-
- // 澶勭悊null
- Optional.ofNullable(purchaseLedgerDtoIPage.getRecords())
- .filter(CollectionUtils::isNotEmpty)
- .ifPresent(records -> {
- // 杩囨护approvalStatus=3鐨勮褰�
- records.removeIf(dto -> dto != null && dto.getApprovalStatus() == 3);
- // 淇鏈敹浠樻閲戦
- records.forEach(dto -> {
- if (dto == null) return;
- BigDecimal unReceiptAmt = Optional.ofNullable(dto.getUnReceiptPaymentAmount()).orElse(BigDecimal.ZERO);
- if (unReceiptAmt.compareTo(BigDecimal.ZERO) == 0) {
- dto.setUnReceiptPaymentAmount(Optional.ofNullable(dto.getContractAmount()).orElse(BigDecimal.ZERO));
- }
- });
- });
-
- return AjaxResult.success(purchaseLedgerDtoIPage);
+ return AjaxResult.success(purchaseLedgerService.selectPurchaseLedgerListPage(page, purchaseLedger));
}
@ApiOperation("鐢熸垚閲囪喘搴忓垪鍙�")
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java
new file mode 100644
index 0000000..3f5aca6
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java
@@ -0,0 +1,111 @@
+package com.ruoyi.purchase.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.purchase.dto.PurchaseLedgerDto;
+import com.ruoyi.purchase.mapper.PurchaseLedgerTemplateMapper;
+import com.ruoyi.purchase.mapper.SalesLedgerProductTemplateMapper;
+import com.ruoyi.purchase.pojo.PurchaseLedgerTemplate;
+import com.ruoyi.purchase.pojo.SalesLedgerProductTemplate;
+import com.ruoyi.purchase.service.PurchaseLedgerTemplateService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ * 閲囪喘鍙拌处妯℃澘 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-26 11:21:44
+ */
+@RestController
+@RequestMapping("/purchaseLedgerTemplate")
+@Api(tags = "閲囪喘鍙拌处妯℃澘")
+public class PurchaseLedgerTemplateController {
+
+ @Autowired
+ private PurchaseLedgerTemplateMapper purchaseLedgerTemplateMapper;
+
+ @Autowired
+ private SalesLedgerProductTemplateMapper salesLedgerProductTemplateMapper;
+
+ @PostMapping("/add")
+ @Log(title = "娣诲姞閲囪喘鍙拌处妯℃澘", businessType = BusinessType.INSERT)
+ @ApiOperation(value = "娣诲姞閲囪喘鍙拌处妯℃澘")
+ public AjaxResult add(@RequestBody PurchaseLedgerDto purchaseLedgerDto) {
+ // 閲囪喘妯℃澘
+ if(StringUtils.isNotEmpty(purchaseLedgerDto.getTemplateName())){
+ // 妯℃澘鍚嶇О涓嶈兘閲嶅锛屾湁閲嶅灏变笉闇�瑕佹柊澧炰簡
+ PurchaseLedgerTemplate purchaseLedgerTemplate = purchaseLedgerTemplateMapper
+ .selectOne(new LambdaQueryWrapper<PurchaseLedgerTemplate>()
+ .eq(PurchaseLedgerTemplate::getTemplateName, purchaseLedgerDto.getTemplateName())
+ .last("limit 1"));
+ if(purchaseLedgerTemplate == null){
+ purchaseLedgerTemplate = new PurchaseLedgerTemplate();
+ BeanUtils.copyProperties(purchaseLedgerDto, purchaseLedgerTemplate);
+ purchaseLedgerTemplate.setTemplateName(purchaseLedgerDto.getTemplateName());
+ purchaseLedgerTemplateMapper.insert(purchaseLedgerTemplate);
+ // 浜у搧妯℃澘鏂板
+ PurchaseLedgerTemplate finalPurchaseLedgerTemplate = purchaseLedgerTemplate;
+ purchaseLedgerDto.getProductData().forEach(product -> {
+ SalesLedgerProductTemplate salesLedgerProductTemplate = new SalesLedgerProductTemplate();
+ BeanUtils.copyProperties(product, salesLedgerProductTemplate);
+ salesLedgerProductTemplate.setSalesLedgerId(finalPurchaseLedgerTemplate.getId());
+ salesLedgerProductTemplate.setType(2);
+ salesLedgerProductTemplateMapper.insert(salesLedgerProductTemplate);
+ });
+ }
+ }
+ return AjaxResult.success();
+ }
+
+ @DeleteMapping("/delete")
+ @Log(title = "閲囪喘鍙拌处妯℃澘", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "鍒犻櫎閲囪喘鍙拌处妯℃澘")
+ public AjaxResult delete(@RequestBody List<Long> id) {
+ if(CollectionUtils.isEmpty(id)) return AjaxResult.error("璇烽�夋嫨瑕佸垹闄ょ殑閲囪喘鍙拌处妯℃澘");
+ int result = purchaseLedgerTemplateMapper.deleteBatchIds(id);
+ salesLedgerProductTemplateMapper.delete(new LambdaQueryWrapper<SalesLedgerProductTemplate>()
+ .in(SalesLedgerProductTemplate::getSalesLedgerId, id));
+ return AjaxResult.success(result);
+ }
+
+ @PostMapping("/update")
+ @Log(title = "淇敼閲囪喘鍙拌处妯℃澘", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "淇敼閲囪喘鍙拌处妯℃澘")
+ public AjaxResult update(@RequestBody PurchaseLedgerDto purchaseLedgerDto) {
+ // 妯℃澘鍚嶇О涓嶈兘閲嶅锛屾湁閲嶅灏变笉闇�瑕佹柊澧炰簡
+ PurchaseLedgerTemplate purchaseLedgerTemplate = purchaseLedgerTemplateMapper
+ .selectOne(new LambdaQueryWrapper<PurchaseLedgerTemplate>()
+ .eq(PurchaseLedgerTemplate::getTemplateName, purchaseLedgerDto.getTemplateName())
+ .last("limit 1"));
+ if(purchaseLedgerTemplate != null){
+ BeanUtils.copyProperties(purchaseLedgerDto, purchaseLedgerTemplate);
+ purchaseLedgerTemplate.setTemplateName(purchaseLedgerDto.getTemplateName());
+ purchaseLedgerTemplateMapper.updateById(purchaseLedgerTemplate);
+ // 浜у搧妯℃澘鍒犻櫎
+ salesLedgerProductTemplateMapper.delete(new LambdaQueryWrapper<SalesLedgerProductTemplate>()
+ .in(SalesLedgerProductTemplate::getSalesLedgerId, purchaseLedgerTemplate.getId()));
+ // 浜у搧妯℃澘鏂板
+ purchaseLedgerDto.getProductData().forEach(product -> {
+ SalesLedgerProductTemplate salesLedgerProductTemplate = new SalesLedgerProductTemplate();
+ BeanUtils.copyProperties(product, salesLedgerProductTemplate);
+ salesLedgerProductTemplate.setSalesLedgerId(purchaseLedgerTemplate.getId());
+ salesLedgerProductTemplateMapper.insert(salesLedgerProductTemplate);
+ });
+ }
+ return AjaxResult.success();
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/purchase/controller/SalesLedgerProductTemplateController.java b/src/main/java/com/ruoyi/purchase/controller/SalesLedgerProductTemplateController.java
new file mode 100644
index 0000000..910ac91
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/controller/SalesLedgerProductTemplateController.java
@@ -0,0 +1,18 @@
+package com.ruoyi.purchase.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 浜у搧淇℃伅妯℃澘 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-26 11:22:23
+ */
+@RestController
+@RequestMapping("/salesLedgerProductTemplate")
+public class SalesLedgerProductTemplateController {
+
+}
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
index 4808080..c8ea3f5 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
@@ -15,6 +15,12 @@
@Data
public class PurchaseLedgerDto {
+ /**
+ * 瀹℃壒浜篿d鍒楄〃
+ */
+ @ApiModelProperty(value = "瀹℃壒浜篿d鍒楄〃")
+ private String approveUserIds;
+
private String entryDateStart;
diff --git a/src/main/java/com/ruoyi/purchase/mapper/PurchaseLedgerTemplateMapper.java b/src/main/java/com/ruoyi/purchase/mapper/PurchaseLedgerTemplateMapper.java
new file mode 100644
index 0000000..8f7c813
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/mapper/PurchaseLedgerTemplateMapper.java
@@ -0,0 +1,18 @@
+package com.ruoyi.purchase.mapper;
+
+import com.ruoyi.purchase.pojo.PurchaseLedgerTemplate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 閲囪喘鍙拌处妯℃澘 Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-26 11:21:44
+ */
+@Mapper
+public interface PurchaseLedgerTemplateMapper extends BaseMapper<PurchaseLedgerTemplate> {
+
+}
diff --git a/src/main/java/com/ruoyi/purchase/mapper/SalesLedgerProductTemplateMapper.java b/src/main/java/com/ruoyi/purchase/mapper/SalesLedgerProductTemplateMapper.java
new file mode 100644
index 0000000..cc87e19
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/mapper/SalesLedgerProductTemplateMapper.java
@@ -0,0 +1,18 @@
+package com.ruoyi.purchase.mapper;
+
+import com.ruoyi.purchase.pojo.SalesLedgerProductTemplate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 浜у搧淇℃伅妯℃澘 Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-26 11:22:23
+ */
+@Mapper
+public interface SalesLedgerProductTemplateMapper extends BaseMapper<SalesLedgerProductTemplate> {
+
+}
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
index 838976d..fef46ea 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
@@ -150,12 +150,12 @@
@ApiModelProperty(value = "浠樻鏂瑰紡")
private String paymentMethod;
- @ApiModelProperty("瀹℃壒鐘舵��")
+ @ApiModelProperty("瀹℃壒鐘舵�� 1-寰呭鏍革紝2-瀹℃壒涓紝3-瀹℃壒閫氳繃锛�4-瀹℃壒澶辫触,5琛ㄧず鏄ā鏉�")
private Integer approvalStatus;
@ApiModelProperty(value = "妯℃澘鍚嶇О")
private String templateName;
@ApiModelProperty(value = "瀹℃壒浜篿d")
- private Integer approverId;
+ private String approveUserIds;
}
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedgerTemplate.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedgerTemplate.java
new file mode 100644
index 0000000..2bb53a4
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedgerTemplate.java
@@ -0,0 +1,96 @@
+package com.ruoyi.purchase.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 閲囪喘鍙拌处妯℃澘
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-26 11:21:44
+ */
+@Getter
+@Setter
+@TableName("purchase_ledger_template")
+@ApiModel(value = "PurchaseLedgerTemplate瀵硅薄", description = "閲囪喘鍙拌处妯℃澘")
+public class PurchaseLedgerTemplate implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("鑷涓婚敭ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("閲囪喘鍚堝悓鍙�")
+ private String purchaseContractNumber;
+
+ @ApiModelProperty("渚涘簲鍟嗗悕绉癷d")
+ private Long supplierId;
+
+ @ApiModelProperty("渚涘簲鍟嗗悕绉�")
+ private String supplierName;
+
+ @ApiModelProperty("褰曞叆浜篿d")
+ private Integer recorderId;
+
+ @ApiModelProperty("褰曞叆浜哄鍚�")
+ private String recorderName;
+
+ @ApiModelProperty("閿�鍞悎鍚屽彿")
+ private String salesContractNo;
+
+ @ApiModelProperty("椤圭洰鍚嶇О")
+ private String projectName;
+
+ @ApiModelProperty("褰曞叆鏃ユ湡")
+ private Date entryDate;
+
+ @ApiModelProperty("澶囨敞")
+ private String remarks;
+
+ @ApiModelProperty("璁板綍鍒涘缓鏃堕棿")
+ private Date createdAt;
+
+ @ApiModelProperty("璁板綍鏈�鍚庢洿鏂版椂闂�")
+ private Date updatedAt;
+
+ @ApiModelProperty("鍏宠仈閿�鍞彴璐︿富琛ㄤ富閿�")
+ private Integer salesLedgerId;
+
+ @ApiModelProperty("鍚堝悓閲戦")
+ private BigDecimal contractAmount;
+
+ @ApiModelProperty("涓氬姟鍛�")
+ private String businessPerson;
+
+ @ApiModelProperty("涓氬姟鍛榠d")
+ private Integer businessPersonId;
+
+ @ApiModelProperty("褰曞叆浜虹數璇�")
+ private String phoneNumber;
+
+ private String paymentMethod;
+
+ private Date executionDate;
+
+ @ApiModelProperty("妯℃澘鍚嶇О")
+ private String templateName;
+
+ @TableField(exist = false)
+ private List<SalesLedgerProductTemplate> productList;
+}
diff --git a/src/main/java/com/ruoyi/purchase/pojo/SalesLedgerProductTemplate.java b/src/main/java/com/ruoyi/purchase/pojo/SalesLedgerProductTemplate.java
new file mode 100644
index 0000000..1c47d7b
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/pojo/SalesLedgerProductTemplate.java
@@ -0,0 +1,84 @@
+package com.ruoyi.purchase.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 浜у搧淇℃伅妯℃澘
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-26 11:22:23
+ */
+@Getter
+@Setter
+@TableName("sales_ledger_product_template")
+@ApiModel(value = "SalesLedgerProductTemplate瀵硅薄", description = "浜у搧淇℃伅妯℃澘")
+public class SalesLedgerProductTemplate implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("浜у搧淇℃伅涓婚敭")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("鍏宠仈鍙拌处涓昏〃涓婚敭")
+ private Integer salesLedgerId;
+
+ @ApiModelProperty("浜у搧澶х被")
+ private String productCategory;
+
+ @ApiModelProperty("瑙勬牸鍨嬪彿")
+ private String specificationModel;
+
+ @ApiModelProperty("鍗曚綅")
+ private String unit;
+
+ @ApiModelProperty("鏁伴噺")
+ private BigDecimal quantity;
+
+ @ApiModelProperty("鏈�浣庡簱瀛�")
+ private BigDecimal minStock;
+
+ @ApiModelProperty("绋庣巼")
+ private BigDecimal taxRate;
+
+ @ApiModelProperty("鍚◣鍗曚环")
+ private BigDecimal taxInclusiveUnitPrice;
+
+ @ApiModelProperty("鍚◣鎬讳环")
+ private BigDecimal taxInclusiveTotalPrice;
+
+ @ApiModelProperty("涓嶅惈绋庢�讳环")
+ private BigDecimal taxExclusiveTotalPrice;
+
+ @ApiModelProperty("鍙戠エ绫诲瀷")
+ private String invoiceType;
+
+ @ApiModelProperty("1.閿�鍞彴璐︼紝2.閲囪喘鍙拌处")
+ private Integer type;
+
+ @ApiModelProperty("浜у搧id")
+ private Integer productId;
+
+ @ApiModelProperty("鍨嬪彿id")
+ private Integer productModelId;
+
+ private String register;
+
+ private LocalDateTime registerDate;
+
+ private BigDecimal warnNum;
+
+ @ApiModelProperty("鏄惁鎺ㄩ�佽川妫�")
+ private Boolean isChecked;
+}
diff --git a/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java b/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java
index c0eb379..a998d0e 100644
--- a/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java
+++ b/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java
@@ -20,7 +20,7 @@
List<PurchaseLedger> selectPurchaseLedgerList(PurchaseLedger purchaseLedger);
- int addOrEditPurchase(PurchaseLedgerDto purchaseLedgerDto) throws IOException;
+ int addOrEditPurchase(PurchaseLedgerDto purchaseLedgerDto) throws Exception;
int deletePurchaseLedgerByIds(Long[] ids);
@@ -40,5 +40,4 @@
String getPurchaseNo();
- int addPurchaseTemplate(PurchaseLedgerDto purchaseLedgerDto) throws IOException;
}
diff --git a/src/main/java/com/ruoyi/purchase/service/PurchaseLedgerTemplateService.java b/src/main/java/com/ruoyi/purchase/service/PurchaseLedgerTemplateService.java
new file mode 100644
index 0000000..c2c1f87
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/service/PurchaseLedgerTemplateService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.purchase.service;
+
+import com.ruoyi.purchase.pojo.PurchaseLedgerTemplate;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 閲囪喘鍙拌处妯℃澘 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-26 11:21:44
+ */
+public interface PurchaseLedgerTemplateService extends IService<PurchaseLedgerTemplate> {
+
+}
diff --git a/src/main/java/com/ruoyi/purchase/service/SalesLedgerProductTemplateService.java b/src/main/java/com/ruoyi/purchase/service/SalesLedgerProductTemplateService.java
new file mode 100644
index 0000000..56003a0
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/service/SalesLedgerProductTemplateService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.purchase.service;
+
+import com.ruoyi.purchase.pojo.SalesLedgerProductTemplate;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 浜у搧淇℃伅妯℃澘 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-26 11:22:23
+ */
+public interface SalesLedgerProductTemplateService extends IService<SalesLedgerProductTemplate> {
+
+}
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
index 257313f..c4fef55 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.purchase.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -10,6 +11,9 @@
import com.ruoyi.account.pojo.AccountIncome;
import com.ruoyi.account.service.AccountExpenseService;
import com.ruoyi.account.service.AccountIncomeService;
+import com.ruoyi.approve.pojo.ApproveProcess;
+import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
+import com.ruoyi.approve.vo.ApproveProcessVO;
import com.ruoyi.basic.mapper.ProductMapper;
import com.ruoyi.basic.mapper.ProductModelMapper;
import com.ruoyi.basic.mapper.SupplierManageMapper;
@@ -29,14 +33,8 @@
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
-import com.ruoyi.purchase.mapper.PaymentRegistrationMapper;
-import com.ruoyi.purchase.mapper.ProductRecordMapper;
-import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
-import com.ruoyi.purchase.mapper.TicketRegistrationMapper;
-import com.ruoyi.purchase.pojo.PaymentRegistration;
-import com.ruoyi.purchase.pojo.ProductRecord;
-import com.ruoyi.purchase.pojo.PurchaseLedger;
-import com.ruoyi.purchase.pojo.TicketRegistration;
+import com.ruoyi.purchase.mapper.*;
+import com.ruoyi.purchase.pojo.*;
import com.ruoyi.purchase.service.IPurchaseLedgerService;
import com.ruoyi.quality.mapper.*;
import com.ruoyi.quality.pojo.*;
@@ -111,7 +109,13 @@
private final QualityTestStandardMapper qualityTestStandardMapper;
private final QualityInspectParamMapper qualityInspectParamMapper;
+ private final ApproveProcessServiceImpl approveProcessService;
+
private final ProcurementRecordMapper procurementRecordStorageMapper;
+
+ private final PurchaseLedgerTemplateMapper purchaseLedgerTemplateMapper;
+
+ private final SalesLedgerProductTemplateMapper salesLedgerProductTemplateMapper;
@Value("${file.upload-dir}")
private String uploadDir;
@@ -123,52 +127,10 @@
}
return purchaseLedgerMapper.selectList(queryWrapper);
}
+
@Override
@Transactional(rollbackFor = Exception.class)
- public int addPurchaseTemplate(PurchaseLedgerDto purchaseLedgerDto)throws IOException {
- //褰曞叆浜�
- SysUser sysUser = userMapper.selectUserById(purchaseLedgerDto.getRecorderId());
-
- SupplierManage supplierManage = supplierManageMapper.selectById(purchaseLedgerDto.getSupplierId());
- PurchaseLedger purchaseLedger = new PurchaseLedger();
-// BeanUtils.copyProperties(purchaseLedger,purchaseLedgerDto);
- LoginUser loginUser = SecurityUtils.getLoginUser();
- if(ObjectUtils.isNotEmpty(loginUser) && null != loginUser.getTenantId()) {
- purchaseLedger.setTenantId(loginUser.getTenantId());
- }
- purchaseLedger.setPaymentMethod(purchaseLedgerDto.getPaymentMethod());
- purchaseLedger.setRecorderId(purchaseLedgerDto.getRecorderId());
- purchaseLedger.setSupplierId(purchaseLedgerDto.getSupplierId());
- purchaseLedger.setTemplateName(purchaseLedgerDto.getTemplateName());
-// purchaseLedger.setSalesLedgerPId(purchaseLedgerDto.getSalesLedgerId());
- purchaseLedger.setApprovalStatus(3);
- purchaseLedger.setSupplierName(supplierManage.getSupplierName());
- purchaseLedger.setRecorderName(sysUser.getNickName());
- purchaseLedger.setPhoneNumber(sysUser.getPhonenumber());
- purchaseLedger.setPurchaseContractNumber(UUID.randomUUID().toString().replaceAll("-", ""));
- purchaseLedger.setEntryDate(Date.from(LocalDate.now().atStartOfDay(ZoneId.systemDefault()).toInstant()));
- int insert = purchaseLedgerMapper.insert(purchaseLedger);
-
- LambdaQueryWrapper<PurchaseLedger> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(PurchaseLedger::getSupplierName, purchaseLedger.getSupplierName())
- .eq(PurchaseLedger::getPurchaseContractNumber, purchaseLedger.getPurchaseContractNumber())
- .eq(PurchaseLedger::getApprovalStatus,3);
- PurchaseLedger purchaseLedger1 = purchaseLedgerMapper.selectOne(queryWrapper);
-
- if(ObjectUtils.isNotEmpty(purchaseLedgerDto.getProductData())) {
- // 4. 澶勭悊瀛愯〃鏁版嵁
- List<SalesLedgerProduct> salesLedgerProductList = purchaseLedgerDto.getProductData();
- salesLedgerProductList.forEach(salesLedgerProduct -> {
- salesLedgerProduct.setSalesLedgerId(purchaseLedger1.getId());
- salesLedgerProduct.setType(2);
- });
- salesLedgerProductList.forEach(salesLedgerProductMapper::insert);
- }
- return insert;
- }
- @Override
- @Transactional(rollbackFor = Exception.class)
- public int addOrEditPurchase(PurchaseLedgerDto purchaseLedgerDto) throws IOException {
+ public int addOrEditPurchase(PurchaseLedgerDto purchaseLedgerDto) throws Exception {
SalesLedger salesLedger = salesLedgerMapper.selectById(purchaseLedgerDto.getSalesLedgerId());
//褰曞叆浜�
@@ -193,9 +155,26 @@
if (purchaseLedger.getId() == null) {
purchaseLedgerMapper.insert(purchaseLedger);
} else {
+ // 鍒犻櫎閲囪喘瀹℃壒锛岄噸鏂版彁浜�
+ ApproveProcess one = approveProcessService.getOne(new LambdaQueryWrapper<ApproveProcess>()
+ .eq(ApproveProcess::getApproveType, 5)
+ .eq(ApproveProcess::getApproveReason, purchaseLedger.getPurchaseContractNumber())
+ .eq(ApproveProcess::getApproveDelete, 0)
+ .last("limit 1"));
+ if (one != null) {
+ approveProcessService.delByIds(Collections.singletonList(one.getId()));
+ }
purchaseLedgerMapper.updateById(purchaseLedger);
}
-
+ // 6.閲囪喘瀹℃壒鏂板
+ ApproveProcessVO approveProcessVO = new ApproveProcessVO();
+ approveProcessVO.setApproveType(5);
+ approveProcessVO.setApproveDeptId(loginUser.getCurrentDeptId());
+ approveProcessVO.setApproveReason(purchaseLedger.getPurchaseContractNumber());
+ approveProcessVO.setApproveUserIds(purchaseLedgerDto.getApproveUserIds());
+ approveProcessVO.setApproveUser(loginUser.getUserId());
+ approveProcessVO.setApproveTime(LocalDate.now().toString());
+ approveProcessService.addApprove(approveProcessVO);
// 4. 澶勭悊瀛愯〃鏁版嵁
List<SalesLedgerProduct> productList = purchaseLedgerDto.getProductData();
if (productList != null && !productList.isEmpty()) {
@@ -214,7 +193,6 @@
if (purchaseLedgerDto.getTempFileIds() != null && !purchaseLedgerDto.getTempFileIds().isEmpty()) {
migrateTempFilesToFormal(purchaseLedger.getId(), purchaseLedgerDto.getTempFileIds());
}
-
return 1;
}
@@ -461,7 +439,20 @@
qualityStandardLambdaQueryWrapper.in(QualityInspectParam::getInspectId, inspectIds);
qualityInspectParamMapper.delete(qualityStandardLambdaQueryWrapper);
}
-
+ // 鍒犻櫎閲囪喘瀹℃壒璁板綍
+ for (Long id : ids) {
+ PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(id);
+ if(purchaseLedger != null){
+ ApproveProcess one = approveProcessService.getOne(new LambdaQueryWrapper<ApproveProcess>()
+ .eq(ApproveProcess::getApproveType, 5)
+ .eq(ApproveProcess::getApproveDelete, 0)
+ .eq(ApproveProcess::getApproveReason, purchaseLedger.getPurchaseContractNumber())
+ .last("limit 1"));
+ if (one != null) {
+ approveProcessService.delByIds(Collections.singletonList(one.getId()));
+ }
+ }
+ }
//鎵归噺鍒犻櫎鍘熸潗鏂欐楠屾暟鎹�
qualityInspectMapper.delete(materialInspectLambdaQueryWrapper);
// 鎵归噺鍒犻櫎閲囪喘鍙拌处
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerTemplateServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerTemplateServiceImpl.java
new file mode 100644
index 0000000..d64bd4d
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerTemplateServiceImpl.java
@@ -0,0 +1,29 @@
+package com.ruoyi.purchase.service.impl;
+
+import com.ruoyi.purchase.mapper.SalesLedgerProductTemplateMapper;
+import com.ruoyi.purchase.pojo.PurchaseLedgerTemplate;
+import com.ruoyi.purchase.mapper.PurchaseLedgerTemplateMapper;
+import com.ruoyi.purchase.service.PurchaseLedgerTemplateService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 閲囪喘鍙拌处妯℃澘 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-26 11:21:44
+ */
+@Service
+public class PurchaseLedgerTemplateServiceImpl extends ServiceImpl<PurchaseLedgerTemplateMapper, PurchaseLedgerTemplate> implements PurchaseLedgerTemplateService {
+
+ @Autowired
+ private PurchaseLedgerTemplateMapper purchaseLedgerTemplateMapper;
+
+ @Autowired
+ private SalesLedgerProductTemplateMapper salesLedgerProductTemplateMapper;
+
+
+}
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/SalesLedgerProductTemplateServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/SalesLedgerProductTemplateServiceImpl.java
new file mode 100644
index 0000000..edc7c8a
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/service/impl/SalesLedgerProductTemplateServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.purchase.service.impl;
+
+import com.ruoyi.purchase.pojo.SalesLedgerProductTemplate;
+import com.ruoyi.purchase.mapper.SalesLedgerProductTemplateMapper;
+import com.ruoyi.purchase.service.SalesLedgerProductTemplateService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 浜у搧淇℃伅妯℃澘 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-26 11:22:23
+ */
+@Service
+public class SalesLedgerProductTemplateServiceImpl extends ServiceImpl<SalesLedgerProductTemplateMapper, SalesLedgerProductTemplate> implements SalesLedgerProductTemplateService {
+
+}
diff --git a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
index 1c657e9..b07730d 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
@@ -82,7 +82,7 @@
// 鍙戣揣瀹℃壒
ApproveProcessVO approveProcessVO = new ApproveProcessVO();
approveProcessVO.setApproveType(7);
- approveProcessVO.setApproveDeptId(loginUser.getTenantId());
+ approveProcessVO.setApproveDeptId(loginUser.getCurrentDeptId());
approveProcessVO.setApproveReason(req.getType() + ":" +sh);
approveProcessVO.setApproveUserIds(req.getApproveUserIds());
approveProcessVO.setApproveUser(loginUser.getUserId());
@@ -106,6 +106,7 @@
}
byId.setExpressNumber(req.getExpressNumber());
byId.setExpressCompany(req.getExpressCompany());
+ byId.setStatus("宸插彂璐�");
byId.setShippingCarNumber(req.getShippingCarNumber());
boolean update = shippingInfoService.updateById(req);
// 杩佺Щ鏂囦欢
diff --git a/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java b/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
index 3385739..2a552d9 100644
--- a/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
+++ b/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
@@ -37,7 +37,7 @@
@ApiModelProperty(value = "閿�鍞姤浠蜂骇鍝佽〃id")
private Long salesLedgerProductId;
- @ApiModelProperty(value = "鐘舵��")
+ @ApiModelProperty(value = "鐘舵�� 寰呭鏍� 瀹℃牳涓� 锛屽鏍告嫆缁� 瀹℃牳閫氳繃")
@Excel(name = "鐘舵��")
private String status;
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index 0ebfb5b..f8a61e9 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -391,13 +391,18 @@
if (aLong == null)
throw new RuntimeException("褰曞叆浜�:" + salesLedger.getEntryPerson() + ",鏃犲搴旂敤鎴凤紒");
salesLedger.setEntryPerson(aLong.toString());
- salesLedgerMapper.insert(salesLedger);
// 閿�鍞骇鍝佹暟鎹粦瀹氾紝閫氳繃閿�鍞崟鍙疯幏鍙栧搴旈攢鍞骇鍝佹暟鎹�
List<SalesLedgerProductImportDto> salesLedgerProductImportDtos = salesLedgerProductImportDtoList.stream()
.filter(salesLedgerProductImportDto -> salesLedgerProductImportDto.getSalesContractNo().equals(salesLedger.getSalesContractNo()))
.collect(Collectors.toList());
if (CollectionUtils.isEmpty(salesLedgerProductImportDtos))
throw new RuntimeException("閿�鍞崟鍙�:" + salesLedgerImportDto.getSalesContractNo() + ",鏃犲搴斾骇鍝佹暟鎹紒");
+ salesLedger.setContractAmount(salesLedgerProductImportDtos.stream()
+ .map(SalesLedgerProductImportDto::getTaxInclusiveTotalPrice)
+ .reduce(BigDecimal.ZERO,BigDecimal::add));
+ salesLedgerMapper.insert(salesLedger);
+
+
for (SalesLedgerProductImportDto salesLedgerProductImportDto : salesLedgerProductImportDtos) {
SalesLedgerProduct salesLedgerProduct = new SalesLedgerProduct();
BeanUtils.copyProperties(salesLedgerProductImportDto, salesLedgerProduct);
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java
index db9e181..f181ea0 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java
@@ -79,7 +79,7 @@
// 鎶ヤ环瀹℃壒
ApproveProcessVO approveProcessVO = new ApproveProcessVO();
approveProcessVO.setApproveType(6);
- approveProcessVO.setApproveDeptId(loginUser.getTenantId());
+ approveProcessVO.setApproveDeptId(loginUser.getCurrentDeptId());
approveProcessVO.setApproveReason(quotationNo);
approveProcessVO.setApproveUserIds(salesQuotationDto.getApproveUserIds());
approveProcessVO.setApproveUser(loginUser.getUserId());
diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index 51c46b4..efeda16 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -21,10 +21,11 @@
sum(tr.invoice_amount)as receipt_payment_amount,
pl.contract_amount-sum(tr.invoice_amount) AS unReceipt_payment_amount,
pl.entry_date,
+ pl.execution_date,
pl.recorder_id,
pl.recorder_name,
pl.template_name,
- pl.approver_id,
+ pl.approve_user_ids,
sm.is_white,
pl.approval_status,
pl.payment_method
diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerTemplateMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerTemplateMapper.xml
new file mode 100644
index 0000000..de0ddcf
--- /dev/null
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerTemplateMapper.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.purchase.mapper.PurchaseLedgerTemplateMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.purchase.pojo.PurchaseLedgerTemplate">
+ <id column="id" property="id" />
+ <result column="purchase_contract_number" property="purchaseContractNumber" />
+ <result column="supplier_id" property="supplierId" />
+ <result column="supplier_name" property="supplierName" />
+ <result column="recorder_id" property="recorderId" />
+ <result column="recorder_name" property="recorderName" />
+ <result column="sales_contract_no" property="salesContractNo" />
+ <result column="project_name" property="projectName" />
+ <result column="entry_date" property="entryDate" />
+ <result column="remarks" property="remarks" />
+ <result column="created_at" property="createdAt" />
+ <result column="updated_at" property="updatedAt" />
+ <result column="sales_ledger_id" property="salesLedgerId" />
+ <result column="contract_amount" property="contractAmount" />
+ <result column="business_person" property="businessPerson" />
+ <result column="business_person_id" property="businessPersonId" />
+ <result column="phone_number" property="phoneNumber" />
+ <result column="payment_method" property="paymentMethod" />
+ <result column="execution_date" property="executionDate" />
+ <result column="template_name" property="templateName" />
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/purchase/SalesLedgerProductTemplateMapper.xml b/src/main/resources/mapper/purchase/SalesLedgerProductTemplateMapper.xml
new file mode 100644
index 0000000..9e71148
--- /dev/null
+++ b/src/main/resources/mapper/purchase/SalesLedgerProductTemplateMapper.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.purchase.mapper.SalesLedgerProductTemplateMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.purchase.pojo.SalesLedgerProductTemplate">
+ <id column="id" property="id" />
+ <result column="sales_ledger_id" property="salesLedgerId" />
+ <result column="product_category" property="productCategory" />
+ <result column="specification_model" property="specificationModel" />
+ <result column="unit" property="unit" />
+ <result column="quantity" property="quantity" />
+ <result column="min_stock" property="minStock" />
+ <result column="tax_rate" property="taxRate" />
+ <result column="tax_inclusive_unit_price" property="taxInclusiveUnitPrice" />
+ <result column="tax_inclusive_total_price" property="taxInclusiveTotalPrice" />
+ <result column="tax_exclusive_total_price" property="taxExclusiveTotalPrice" />
+ <result column="invoice_type" property="invoiceType" />
+ <result column="type" property="type" />
+ <result column="product_id" property="productId" />
+ <result column="product_model_id" property="productModelId" />
+ <result column="register" property="register" />
+ <result column="register_date" property="registerDate" />
+ <result column="warn_num" property="warnNum" />
+ <result column="is_checked" property="isChecked" />
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index e27d27e..71b776c 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -9,7 +9,7 @@
T1.*,
t3.shipping_car_number,
t3.shipping_date,
- t3.status as shippingStatus
+ t3.status as shippingStatus,
t3.shipping_date,
CASE
WHEN t2.qualitity > T1.quantity THEN 1
diff --git "a/src/main/resources/static/\351\224\200\345\224\256\345\217\260\350\264\246\345\257\274\345\205\245\346\250\241\346\235\277.xlsx" "b/src/main/resources/static/\351\224\200\345\224\256\345\217\260\350\264\246\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
index bbb5525..8630fb2 100644
--- "a/src/main/resources/static/\351\224\200\345\224\256\345\217\260\350\264\246\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
+++ "b/src/main/resources/static/\351\224\200\345\224\256\345\217\260\350\264\246\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
Binary files differ
--
Gitblit v1.9.3