报检提示优化

skyouc

2025-04-02 ca23f2be97249ab82494983ee34636dcc28c8a19

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java

@@ -2,14 +2,15 @@

import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.entity.dto.PoItemsDto;
import com.vincent.rsf.server.api.service.ReceiveMsgService;
import com.vincent.rsf.server.api.service.ReportMsgService;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.mapper.PurchaseMapper;
@@ -17,7 +18,6 @@
import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.entity.SerialRule;
import com.vincent.rsf.server.system.mapper.SerialRuleMapper;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,10 +44,8 @@
    private ReportMsgService reportMsgService;
    @Resource
    private PurchaseMapper purchaseMapper;

    @Autowired
    private AsnOrderItemService asnOrderItemService;

    @Resource
    private SerialRuleMapper serialRuleMapper;

@@ -61,13 +59,15 @@
            throw new CoolException("ASN单据不能为空！！");
        }
        List<PoItemsDto> items = purchaseMapper.poList(asnIds);
        if (items.isEmpty()) {
            throw new CoolException("物料所属采购单据不存在！！");
        }
        if (reportMsgService.reportInspectNotify(items)) {
            return true;
        } else {
            return false;
        }
    }


    @Override
    public List<AsnOrder> getListByMatnr(Map<String, String> params) {
@@ -77,7 +77,6 @@
        List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
                .like(!Objects.isNull(params.get("maktx")), AsnOrderItem::getMaktx, params.get("maktx"))
                .eq(!Objects.isNull(params.get("matnrCode")), AsnOrderItem::getMatnrCode, params.get("matnrCode")));

        if (orderItems.isEmpty()) {
            return new ArrayList<>();
        }
@@ -87,17 +86,21 @@
    }

    @Override
    public R saveOrderAndItems(AsnOrderAndItemsParams params) {
    public R saveOrderAndItems(AsnOrderAndItemsParams params, Long loginUserId) {
        if (Objects.isNull(params.getOrders())) {
            throw new CoolException("主单信息不能为空");
        }
        AsnOrder orders = params.getOrders();

        if (Objects.isNull(orders)) {
            throw new CoolException("单据不能为空！！");
        }
        String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, orders);
        if (Objects.isNull(ruleCode)) {
            throw new CoolException("收货通知单编码生成失败！！");
        }
        orders.setCode(ruleCode);
        orders.setCode(ruleCode)
                .setUpdateBy(loginUserId)
                .setCreateBy(loginUserId);
        if (!this.save(orders)) {
            throw new CoolException("主单保存失败！！");
        }
@@ -108,22 +111,25 @@
            item.put("asnId", orders.getId());
            item.put("asnCode", orders.getCode());
            item.put("poCode", orders.getPoCode());
            item.put("createBy", loginUserId);
            item.put("updateBy", loginUserId);
            if (!asnOrderItemService.fieldsSave(item)) {
                throw new CoolException("明细保存失败！！");
            }

        });
        return R.ok("保存成功!!");
    }

    /**
     * 表单明细修改
     *
     * @param params
     * @param loginUserId
     * @return
     */
    @Override
    @Transactional
    public R updateOrderItem(AsnOrderAndItemsParams params) {
    public R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) {
        if (Objects.isNull(params.getOrders())) {
            throw new CoolException("主单信息不能为空！！");
        }
@@ -143,4 +149,28 @@
        }
        return R.ok("修改完成！！");
    }

    /**
     * @author Ryan
     * @description 批量修改
     * @param
     * @return
     * @time 2025/4/1 07:58
     */
    @Override
    public boolean batchUpdate(BatchUpdateParam params, Long userId) {
        AsnOrder order = params.getOrder();
        if (Objects.isNull(order)) {
            throw new CoolException("修改参数不能为空！！");
        }
        return this.update(new LambdaUpdateWrapper<AsnOrder>()
                .in(AsnOrder::getId, params.getIds())
                       .set(!Objects.isNull(order.getRleStatus()), AsnOrder::getRleStatus, order.getRleStatus())
                        .set(!Objects.isNull(order.getNtyStatus()), AsnOrder::getNtyStatus, order.getNtyStatus())
                        .set(!Objects.isNull(order.getStatus()),  AsnOrder::getStatus, order.getStatus())
                        .set(!Objects.isNull(order.getWkType()), AsnOrder::getWkType, order.getWkType())
                        .set(!Objects.isNull(order.getExceStatus()), AsnOrder::getExceStatus, order.getExceStatus())
                .set(AsnOrder::getUpdateBy, userId));

    }
}