#修改 1. ASN明细标签生成

skyouc

2025-03-27 db93bbe14d4d4ed67702d2c2500c0b36c67896ec

#修改
   1. ASN明细标签生成

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java

@@ -152,16 +152,6 @@
        return R.ok(asnOrderService.getListByMatnr(params));
    }

    @PostMapping("/asnOrder/generate/barcode")
    @ApiOperation("生成ASN标签")
    @PreAuthorize("hasAuthority('manager:asnOrder:list')")
    public R generateBarcode(@RequestBody List<AsnOrder> orders) {
        if (orders.isEmpty()) {
            return R.error("单据不能为空!!");
        }
        return asnOrderService.generateBarcode(orders);
    }


    @PostMapping("/asnOrder/items/save")
    @ApiOperation("保存主单及明细")

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java

@@ -11,6 +11,7 @@
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
@@ -123,14 +124,26 @@
        ExcelUtil.build(ExcelUtil.create(list, AsnOrderTemplate.class, true), response);
    }


    @PostMapping("/asnOrderItem/generate/barcode")
    @ApiOperation("生成ASN标签")
    @PreAuthorize("hasAuthority('manager:asnOrder:list')")
    public R generateBarcode(@RequestBody List<Long> orders) {
        if (orders.isEmpty()) {
            return R.error("单据不能为空!!");
        }
        return asnOrderItemService.generateBarcode(orders);
    }


    /**
     * ASN单据明细导入
     * @param file
     * @return
     */
    @PostMapping("/asnOrder/import")
    @PostMapping("/asnOrderItem/import")
    @ApiOperation("ASN导入接口")
    @PreAuthorize("hasAuthority('manager:asnOrder:update')")
    @PreAuthorize("hasAuthority('manager:asnOrderItem:update')")
    public R importExcel(@RequestParam(value = "file") MultipartFile file, @RequestParam String asnId) throws Exception {
        if (Objects.isNull(file)) {
            throw new CoolException("文件不能为空！！");

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

@@ -1,8 +1,12 @@
package com.vincent.rsf.server.manager.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.entity.AsnOrderItemLog;

import java.util.List;

public interface AsnOrderItemLogService extends IService<AsnOrderItemLog> {


}

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

@@ -6,17 +6,22 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import org.springframework.web.multipart.MultipartFile;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

public interface AsnOrderItemService extends IService<AsnOrderItem> {


    R excelImport(MultipartFile file, HashMap<String, Object> hashMap) throws Exception;

    boolean fieldsSave(Map<String, Object> params);

    R generateBarcode(List<Long> orders);

    IPage<Map<String, Object>> listByAsnId(PageParam<AsnOrderItem, BaseParam> pageParam, QueryWrapper<AsnOrderItem> buildWrapper);
}

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

@@ -12,8 +12,6 @@

    boolean notifyInspect(List<AsnOrder> orders);

    R generateBarcode(List<AsnOrder> orders);

    List<AsnOrder> getListByMatnr(Map<String, String> params);

    R saveOrderAndItems(AsnOrderAndItemsParams params);

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

@@ -8,6 +8,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
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.ReportMsgService;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.ExcelUtil;
@@ -16,11 +18,16 @@
import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.mapper.PurchaseMapper;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.manager.service.PurchaseService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.service.FieldsItemService;
import com.vincent.rsf.server.system.service.FieldsService;
import com.vincent.rsf.server.system.utils.ExtendFieldsUtils;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -29,6 +36,7 @@

import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;

@Service("asnOrderItemService")
public class AsnOrderItemServiceImpl extends ServiceImpl<AsnOrderItemMapper, AsnOrderItem> implements AsnOrderItemService {
@@ -43,6 +51,29 @@
    private FieldsItemService fieldsItemService;

    @Override
    public R generateBarcode(List<Long> orders) {
        if (Objects.isNull(orders) || orders.isEmpty()) {
            throw new CoolException("参数不能为空！！");
        }
        List<AsnOrderItem> items = this.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, orders));
        if (items.isEmpty()) {
            throw new CoolException("单据明细不存在！！");
        }
        items.forEach(item -> {
            String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, item);
            if (Objects.isNull(ruleCode) || StringUtils.isBlank(ruleCode)) {
                throw new CoolException("系统错误，请检查「SYS_LABEL_CODE」标签规则是否存在");
            }
            item.setTrackCode(ruleCode);
        });
        if (!this.saveOrUpdateBatch(items)) {
            throw new CoolException("生成条码失败！！");
        }

        return R.ok();
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R excelImport(MultipartFile file, HashMap<String, Object> hashMap) throws Exception {
        ExcelImportResult result = ExcelImportUtil.importExcelMore(file.getInputStream(), AsnOrderTemplate.class, ExcelUtil.getDefaultImportParams());

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

@@ -66,22 +66,6 @@
        }
    }

    @Override
    public R generateBarcode(List<AsnOrder> orders) {
        orders.forEach(order -> {
            List<AsnOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
            if (!items.isEmpty()) {
                items.forEach(item -> {
                    String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, item);
                    item.setTrackCode(ruleCode);
                });
                if (!asnOrderItemService.saveOrUpdateBatch(items)) {
                    throw new CoolException("生成条码失败！！");
                }
            }
        });
        return R.ok();
    }

    @Override
    public List<AsnOrder> getListByMatnr(Map<String, String> params) {