盘点单导入功能优化

skyouc

昨天 c44cdd8db1e6691e2b2d6a915f37e956d2ed4b60

盘点单导入功能优化

 rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/CheckOrderType.java

@@ -17,15 +17,47 @@
    ;

    CheckOrderType(String type, String desc) {
        this.type = Integer.parseInt(type);
        this.type = type;
        this.desc = desc;
    }

    public Integer type;
    public String type;
    public String desc;

    public static String getOrderType() {
    public static String getTypeVal(String desc) {
        if (desc.equals(CheckOrderType.CHECK_ORDER_TYPE_TEMP.desc)) {
            return CheckOrderType.CHECK_ORDER_TYPE_TEMP.type;
        } else if (desc.equals(CheckOrderType.CHECK_ORDER_TYPE_ROUND.desc)) {
            return CheckOrderType.CHECK_ORDER_TYPE_ROUND.type;
        } else if (desc.equals(CheckOrderType.CHECK_ORDER_TYPE_AREAS.desc)) {
            return CheckOrderType.CHECK_ORDER_TYPE_AREAS.type;
        } else if (desc.equals(CheckOrderType.CHECK_ORDER_TYPE_DIFF.desc)) {
            return CheckOrderType.CHECK_ORDER_TYPE_DIFF.type;
        } else if (desc.equals(CheckOrderType.CHECK_ORDER_TYPE_CIRCLE.desc)) {
            return CheckOrderType.CHECK_ORDER_TYPE_CIRCLE.type;
        } else if (desc.equals(CheckOrderType.CHECK_ORDER_TYPE_TIMER.desc)) {
            return CheckOrderType.CHECK_ORDER_TYPE_TIMER.type;
        }
        return null;
    }


    public static String getValType(String type) {
        if (type.equals(CheckOrderType.CHECK_ORDER_TYPE_TEMP.type)) {
            return CheckOrderType.CHECK_ORDER_TYPE_TEMP.desc;
        } else if (type.equals(CheckOrderType.CHECK_ORDER_TYPE_ROUND.type)) {
            return CheckOrderType.CHECK_ORDER_TYPE_ROUND.desc;
        } else if (type.equals(CheckOrderType.CHECK_ORDER_TYPE_AREAS.type)) {
            return CheckOrderType.CHECK_ORDER_TYPE_AREAS.desc;
        } else if (type.equals(CheckOrderType.CHECK_ORDER_TYPE_DIFF.type)) {
            return CheckOrderType.CHECK_ORDER_TYPE_DIFF.desc;
        } else if (type.equals(CheckOrderType.CHECK_ORDER_TYPE_CIRCLE.type)) {
            return CheckOrderType.CHECK_ORDER_TYPE_CIRCLE.desc;
        } else if (type.equals(CheckOrderType.CHECK_ORDER_TYPE_TIMER.type)) {
            return CheckOrderType.CHECK_ORDER_TYPE_TIMER.desc;
        }
        return null;
    }


}

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

@@ -13,10 +13,7 @@
import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.entity.excel.CheckOrderTemplate;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.enums.CheckExceStatus;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.mapper.CheckOrderMapper;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.CheckOrderItemService;
@@ -29,7 +26,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;

@@ -70,12 +68,20 @@
                continue;
            }
            WkOrder order = new WkOrder();
            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
            Date arrTime = null;
            try {
                 arrTime = dateFormat.parse(template.getArrTime());
            } catch (ParseException e) {
                throw new RuntimeException(e);
            }
            order.setCode(template.getCode())
                    .setArrTime(arrTime)
                    .setMemo(template.getMemo())
                    .setUpdateBy(loginUserId)
                    .setCreateBy(loginUserId)
                    .setType(OrderType.getTypeVal(template.getType()))
                    .setWkType(OrderWorkType.getWorkType(template.getWkType()));
                    .setType(CheckOrderType.getTypeVal(template.getType()))
                    .setWkType(CheckOrderType.getValType(template.getWkType()));
            if (!this.save(order)) {
                throw new CoolException("单据保存失败！！");
            }
@@ -106,7 +112,7 @@
            if (!items.isEmpty()) {
                double purQty = items.stream().mapToDouble(WkOrderItem::getAnfme).sum();
                if (!this.update(new LambdaUpdateWrapper<WkOrder>()
                        .set(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
                        .set(WkOrder::getExceStatus, CheckExceStatus.CHECK_ORDER_STATUS_UN_EXCE.val)
                        .set(WkOrder::getAnfme, purQty).eq(WkOrder::getId, order.getId()))) {
                    throw new CoolException("单据数量修改失败！！");
                }