product-inventory-management-after.git

			@@ -172,6 +172,17 @@
			@Override
			public boolean addReq(ShippingInfoDto req) {

			// 校验该产品是否已有待审核/审核中的发货记录，防止重复提交
			Long salesLedgerProductId = req.getSalesLedgerProductId();
			if (salesLedgerProductId != null) {
			long pendingCount = this.count(new LambdaQueryWrapper<ShippingInfo>()
			.eq(ShippingInfo::getSalesLedgerProductId, salesLedgerProductId)
			.in(ShippingInfo::getStatus, "待审核", "审核中"));
			if (pendingCount > 0) {
			throw new RuntimeException("该产品已有待审核的发货记录，请勿重复提交");
			}
			}

			LoginUser loginUser = SecurityUtils.getLoginUser();
			String sh = OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SH","shipping_no",req.getCreateTime());
			// 先保存发货单，再发起审批；无审核人自动通过时需要按发货编号回写发货状态。
			@@ -200,6 +211,9 @@
			approvalInstance.setApplicantName(loginUser.getNickName());
			approvalInstance.setApplyTime(LocalDateTime.now());
			approvalInstanceService.add(approvalInstance);
			// 创建审批实例后，更新发货状态为"审核中"，使前端正确显示审批状态
			req.setStatus("审核中");
			this.updateById(req);
			return true;
			}
			}

			@@ -33,7 +33,7 @@
			WHEN (IFNULL(t2.qualitity, 0) - IFNULL(t2.locked_quantity, 0)) >0 THEN 1
			ELSE 0
			END as has_sufficient_stock,
			(IFNULL(T1.quantity, 0) - IFNULL(t3.shipped_quantity, 0)) as no_quantity,
			(IFNULL(T1.quantity, 0) - IFNULL(t3.shipped_quantity, 0) - IFNULL(t5.pending_approval_quantity, 0)) as no_quantity,
			IFNULL(t5.pending_approval_quantity, 0) as pending_approval_quantity,
			CASE
			WHEN IFNULL(t3.shipped_quantity, 0) = 0 AND IFNULL(t5.pending_approval_quantity, 0) = 0 THEN '待发货'

	src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/mapper/sales/SalesLedgerProductMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史