Merge remote-tracking branch 'gitee/0.8.X' into 0.8.X

2026-01-27 16:55:12 +08:00
parent a1f8b0c60b 6bf42cc2ec
commit be790edf04
20 changed files with 479 additions and 148 deletions
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillDetailServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillDetailServiceImpl.java
@@ -7,11 +7,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.klp.common.utils.StringUtils;
+import com.klp.common.exception.ServiceException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.klp.domain.bo.WmsDeliveryWaybillDetailBo;
 import com.klp.domain.vo.WmsDeliveryWaybillDetailVo;
 import com.klp.domain.WmsDeliveryWaybillDetail;
+import com.klp.domain.vo.WmsCoilBindInfoVo;
 import com.klp.mapper.WmsDeliveryWaybillDetailMapper;
 import com.klp.service.IWmsDeliveryWaybillDetailService;

@@ -105,7 +107,32 @@ public class WmsDeliveryWaybillDetailServiceImpl implements IWmsDeliveryWaybillD
     * 保存前的数据校验
     */
    private void validEntityBeforeSave(WmsDeliveryWaybillDetail entity){
-        //TODO 做一些数据校验,如唯一约束
+        if (entity == null || entity.getCoilId() == null) {
+            return;
+        }
+
+        // 同一个钢卷只能被一个发货单明细绑定（排除当前记录）
+        LambdaQueryWrapper<WmsDeliveryWaybillDetail> lqw = Wrappers.lambdaQuery();
+        lqw.eq(WmsDeliveryWaybillDetail::getCoilId, entity.getCoilId());
+        lqw.eq(WmsDeliveryWaybillDetail::getDelFlag, 0);
+        lqw.ne(entity.getDetailId() != null, WmsDeliveryWaybillDetail::getDetailId, entity.getDetailId());
+        lqw.last("LIMIT 1");
+        WmsDeliveryWaybillDetail exists = baseMapper.selectOne(lqw);
+        if (exists == null) {
+            return;
+        }
+
+        // 拼接提示：在哪个计划/发货单下已被绑定
+        WmsCoilBindInfoVo bindInfo = baseMapper.selectBindInfoByCoilId(entity.getCoilId());
+        if (bindInfo != null) {
+            throw new ServiceException(
+                "该钢卷已被绑定，不能重复选择；" +
+                    "发货计划：" + bindInfo.getPlanName() +
+                    "，发货单：" + bindInfo.getWaybillNo() +
+                    "（" + bindInfo.getWaybillName() + "）"
+            );
+        }
+        throw new ServiceException("该钢卷已被绑定，不能重复选择");
    }

    /**
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java
@@ -95,6 +95,12 @@ public class WmsDeliveryWaybillServiceImpl implements IWmsDeliveryWaybillService
     */
    @Override
    public Boolean updateByBo(WmsDeliveryWaybillBo bo) {
+        // 现根据bo.getWaybillId()查询出数据库中的数据
+        // 如果这条数据的status是1 则抛异常为不允许修改
+        WmsDeliveryWaybill db = baseMapper.selectById(bo.getWaybillId());
+        if (db.getStatus() == 1) {
+            throw new RuntimeException("已发货的发货单不能修改");
+        }
        WmsDeliveryWaybill update = BeanUtil.toBean(bo, WmsDeliveryWaybill.class);
        validEntityBeforeSave(update);
        return baseMapper.updateById(update) > 0;
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
@@ -70,6 +70,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
    private final WmsDeliveryPlanMapper deliveryPlanMapper;
    private final WmsProductMapper productMapper;
    private final WmsRawMaterialMapper rawMaterialMapper;
+    private final WmsDeliveryWaybillDetailMapper deliveryWaybillDetailMapper;

    /**
     * 查询钢卷物料表
@@ -305,6 +306,47 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
            return TableDataInfo.build(result);
        }

+        // 批量查询当前页钢卷的“发货单明细绑定”信息（用于禁选/置灰/提示来源）
+        // 仅当前端明确需要时才查询，避免不必要的性能开销
+        if (Boolean.TRUE.equals(bo.getIncludeBindInfo())) {
+            try {
+                List<Long> coilIds = records.stream()
+                    .map(WmsMaterialCoilVo::getCoilId)
+                    .filter(Objects::nonNull)
+                    .distinct()
+                    .collect(Collectors.toList());
+
+                if (!coilIds.isEmpty()) {
+                    Map<Long, WmsCoilBindInfoVo> bindMap = deliveryWaybillDetailMapper
+                        .selectBindInfoByCoilIds(coilIds)
+                        .stream()
+                        .collect(Collectors.toMap(
+                            WmsCoilBindInfoVo::getCoilId,
+                            v -> v,
+                            (a, b) -> a
+                        ));
+
+                    for (WmsMaterialCoilVo vo : records) {
+                        WmsCoilBindInfoVo bind = bindMap.get(vo.getCoilId());
+                        if (bind != null) {
+                            vo.setBound(Boolean.TRUE);
+                            vo.setBindDetailId(bind.getDetailId());
+                            vo.setBindWaybillId(bind.getWaybillId());
+                            vo.setBindWaybillNo(bind.getWaybillNo());
+                            vo.setBindWaybillName(bind.getWaybillName());
+                            vo.setBindPlanId(bind.getPlanId());
+                            vo.setBindPlanName(bind.getPlanName());
+                            vo.setBindPlanDate(bind.getPlanDate());
+                        } else {
+                            vo.setBound(Boolean.FALSE);
+                        }
+                    }
+                }
+            } catch (Exception ignore) {
+                // 绑定信息属于增强字段，查询失败时不影响钢卷列表主流程
+            }
+        }
+
        Set<String> userNames = records.stream()
            .flatMap(v -> java.util.stream.Stream.of(v.getCreateBy(), v.getUpdateBy(), v.getExportBy()))
            .filter(StringUtils::isNotBlank)
@@ -408,6 +450,11 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
            qw.in("mc.quality_status", java.util.Arrays.asList("C+", "C", "C-", "D+", "D", "D-"));
        }

+        // 排除已被发货单明细绑定的钢卷（SQL级过滤，分页总数准确）
+        if (Boolean.TRUE.equals(bo.getExcludeBound())) {
+            qw.apply("NOT EXISTS (SELECT 1 FROM wms_delivery_waybill_detail d WHERE d.del_flag = 0 AND d.coil_id = mc.coil_id)");
+        }
+
        // 组合 item_id 条件：改为使用 EXISTS 子查询，替代预查询 + IN
        boolean hasSelectType = StringUtils.isNotBlank(bo.getSelectType());
        boolean hasAnyItemFilter = StringUtils.isNotBlank(bo.getItemMaterial())
@@ -505,16 +552,16 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
                qw.in("mc.coil_id", coilIdList);
            }
        }
-        // 仅查询未发货且未绑定在发货计划里的钢卷
-        if (Boolean.TRUE.equals(bo.getOnlyUnshippedAndUnplanned())) {
-            // 未发货：排除状态=1（已出库/已发货）
-            qw.ne("mc.status", 1);
-            // 未绑定在任一有效发货计划：计划未删除，coil 字段包含当前 coil_id
-            // 这里使用 NOT EXISTS + FIND_IN_SET，避免将所有计划加载到内存
-            qw.apply("NOT EXISTS (SELECT 1 FROM wms_delivery_plan dp " +
-                "WHERE dp.del_flag = 0 AND dp.coil IS NOT NULL AND dp.coil <> '' " +
-                "AND FIND_IN_SET(CAST(mc.coil_id AS CHAR), dp.coil))");
-        }
+//        // 仅查询未发货且未绑定在发货计划里的钢卷
+//        if (Boolean.TRUE.equals(bo.getOnlyUnshippedAndUnplanned())) {
+//            // 未发货：排除状态=1（已出库/已发货）
+//            qw.ne("mc.status", 1);
+//            // 未绑定在任一有效发货计划：计划未删除，coil 字段包含当前 coil_id
+//            // 这里使用 NOT EXISTS + FIND_IN_SET，避免将所有计划加载到内存
+//            qw.apply("NOT EXISTS (SELECT 1 FROM wms_delivery_plan dp " +
+//                "WHERE dp.del_flag = 0 AND dp.coil IS NOT NULL AND dp.coil <> '' " +
+//                "AND FIND_IN_SET(CAST(mc.coil_id AS CHAR), dp.coil))");
+//        }
        //逻辑删除
        qw.eq("mc.del_flag", 0);
        //把team字段作为筛选条件