#修改 1. 订单页面优化

skyouc

7 天以前 ef944ce8aaabb423be714f4c7febebc3d47d1b6d

#修改
1. 订单页面优化

 rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx

@@ -155,7 +155,7 @@
            <NumberField source="purQty" label="table.field.asnOrderItem.purQty" />
            <TextField source="purUnit" label="table.field.asnOrderItem.purUnit" />
            <NumberField source="qty" label="table.field.asnOrderItem.qty" />
            <TextField source="isptResult" label="table.field.asnOrderItem.isptResult" />
            <TextField source="isptResult$" label="table.field.asnOrderItem.isptResult" />
            <TextField source="splrCode" label="table.field.asnOrderItem.splrCode" />
            <TextField source="splrName" label="table.field.asnOrderItem.splrName" />
            <TextField source="qrcode" label="table.field.asnOrderItem.qrcode" />

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java

@@ -47,6 +47,7 @@

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.stream.Collectors;
@@ -267,6 +268,7 @@
            Double itemRcptQty = dto.getReceiptQty() + orderItem.getQty();
            orderItem.setQty(itemRcptQty)
                    .setSplrBatch(dto.getSplrBatch())
                    .setUpdateBy(loginUserId)
                    .setStockUnit(dto.getStockUnit())
                    .setProdTime(dto.getProdTime());

@@ -331,15 +333,24 @@
            if (!warehouseAreasItemService.saveOrUpdate(item)) {
                throw new CoolException("收货失败！！");
            }

        }

//        if (!warehouseAreasItemService.saveBatch(allOrders)) {
//            throw new CoolException("收货失败！！");
//        }
//        //获取采购数量

        AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, asnCode));
        if (order.getQty().compareTo(order.getAnfme()) >= 0.00) {
            order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val).setRleStatus(Short.valueOf("1"));

            if (!asnOrderMapper.updateById(order)) {
                throw new CoolException("订单状态修改失败！！");
            }
        }


        //获取采购数量
//        double purQty = receipts.stream().mapToDouble(ReceiptDetlsDto::getPurQty).sum();
//

//        BigDecimal subtract = BigDecimal.valueOf(receiptQty).subtract(BigDecimal.valueOf(purQty));
//        //判断已收货数量是否小于等于采购数量
//        if (subtract.compareTo(new BigDecimal("0.0")) <= 0) {

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

@@ -12,9 +12,13 @@
    //质检状态
    ASN_EXCE_STATUS_UN_EXCE("0", "未执行"),
    ASN_EXCE_STATUS_EXCE_ING("1", "执行中"),
    ASN_EXCE_STATUS_TASK_DONE("2", "已完成"),
    ASN_EXCE_STATUS_TASK_CANCEL("3", "取消"),
    ASN_EXCE_STATUS_TASK_CLOSE("4", "已关闭"),
    ASN_EXCE_STATUS_RECEIPT_DONE("2", "收货完成"),
    ASN_EXCE_STATUS_TASK_DONE("3", "已完成"),
    ASN_EXCE_STATUS_TASK_CANCEL("4", "取消"),
    ASN_EXCE_STATUS_TASK_CLOSE("5", "已关闭"),



    OUT_STOCK_STATUS_TASK_INIT("5", "初始化"),
    OUT_STOCK_STATUS_TASK_EXCE("6", "待处理"),
    OUT_STOCK_STATUS_TASK_WAVE("7", "生成波次"),

 rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml

@@ -29,7 +29,18 @@
            pack_name,
            nty_status,
            `status`,
            ispt_result,
            case ispt_result
                when 0 then
                    '未检'
                when 1 then
                    '合格'
                when 2 then
                    '不合格'
                when 3 then
                    '待定'
                when 4 then
                    '部分合格'
            end as isptResult$,
            deleted,
            tenant_id,
            create_by,