product-inventory-management-after.git

			@@ -22,10 +22,11 @@
			import com.ruoyi.basic.pojo.ProductModel;
			import com.ruoyi.basic.pojo.SupplierManage;
			import com.ruoyi.basic.utils.FileUtil;
			import com.ruoyi.common.exception.base.BaseException;
			import com.ruoyi.common.enums.ApprovalStatusEnum;
			import com.ruoyi.common.enums.ReviewStatusEnum;
			import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
			import com.ruoyi.common.enums.TypeEnums;
			import com.ruoyi.common.exception.base.BaseException;
			import com.ruoyi.common.utils.DateUtils;
			import com.ruoyi.common.utils.SecurityUtils;
			import com.ruoyi.common.utils.StringUtils;
			@@ -173,23 +174,10 @@
			// 实际合同金额始终等于合同金额
			purchaseLedger.setNetContractAmount(purchaseLedger.getContractAmount());
			// 3. 新增或更新主表
			if (purchaseLedger.getId() == null) {
			if (!StringUtils.hasText(purchaseLedger.getPurchaseContractNumber())) {
			if (purchaseLedger.getId() == null && !StringUtils.hasText(purchaseLedger.getPurchaseContractNumber())) {
			purchaseLedger.setPurchaseContractNumber(generatePurchaseContractNo(purchaseLedger.getEntryDate()));
			}
			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);
			}
			this.saveOrUpdate(purchaseLedger);

			// 4. 处理子表数据
			List<SalesLedgerProduct> productList = purchaseLedgerDto.getProductData();
			@@ -197,7 +185,17 @@
			handleSalesLedgerProducts(purchaseLedger.getId(), productList, purchaseLedgerDto.getType());
			}
			// 6.采购审核新增；审批管理未配置采购审批人时，审批服务会自动置为审批通过。
			//查询当前采购合同号是否已添加审批，如果有且不是驳回状态，则不重复添加
			ApprovalInstance oldApprovalInstance = approvalInstanceService.getOne(Wrappers.<ApprovalInstance>lambdaQuery()
			.eq(ApprovalInstance::getDeleted, 0)
			.eq(ApprovalInstance::getBusinessType, TypeEnums.PURCHASE_APPROVAL.getCode())
			.eq(ApprovalInstance::getBusinessId, purchaseLedger.getId())
			.ne(ApprovalInstance::getStatus,"REJECTED")
			.last("limit 1")
			);
			if(Objects.isNull(oldApprovalInstance)){
			addApproveByPurchase(loginUser, purchaseLedger);
			}
			// 5. 迁移临时文件到正式目录
			fileUtil.saveStorageAttachment(ApplicationTypeEnum.FILE, RecordTypeEnum.PURCHASE_LEDGER, purchaseLedger.getId(), purchaseLedgerDto.getStorageBlobDTOS());
			return 1;
			@@ -1054,7 +1052,7 @@
			return resultDto;
			}

			public void addApproveByPurchase(LoginUser loginUser,PurchaseLedger purchaseLedger) throws Exception {
			public void addApproveByPurchase(LoginUser loginUser,PurchaseLedger purchaseLedger) {
			if (loginUser == null) {
			return;
			}

			@@ -25,6 +25,7 @@
			import com.ruoyi.technology.mapper.TechnologyBomStructureMapper;
			import com.ruoyi.technology.mapper.TechnologyRoutingMapper;
			import com.ruoyi.technology.pojo.TechnologyRouting;
			import org.apache.commons.lang3.BooleanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			@@ -33,9 +34,7 @@
			import java.lang.reflect.Field;
			import java.math.BigDecimal;
			import java.math.RoundingMode;
			import java.time.LocalDate;
			import java.time.LocalDateTime;
			import java.time.ZoneId;
			import java.time.format.DateTimeFormatter;
			import java.util.Arrays;
			import java.util.List;
			@@ -229,7 +228,7 @@
			*/
			public void addProductionData(SalesLedgerProduct salesLedgerProduct) {
			//先判断该产品是否需要生产
			if (!salesLedgerProduct.getIsProduction()) {
			if (!BooleanUtils.isTrue(salesLedgerProduct.getIsProduction())) {
			return;
			}
			SalesLedger salesLedger = salesLedgerMapper.selectById(salesLedgerProduct.getSalesLedgerId());

	src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java	32 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史