zjj
2025-04-30 a1dd07f6884d2bf2fc1431927a557c8f3cdff870
#报检
3个文件已修改
18 ■■■■ 已修改文件
rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/orders/asnOrder/AsnOrderList.jsx
@@ -169,6 +169,7 @@
          <TextField source="logisNo" label="table.field.asnOrder.logisNo" />
          <DateField source="arrTime" label="table.field.asnOrder.arrTime" showTime />
          <TextField source="rleStatus$" label="table.field.asnOrder.rleStatus" sortable={false} />
          <TextField source="ntyStatus$" label="table.field.asnOrder.ntyStatus" />
          <TextField source="updateBy$" label="common.field.updateBy" />
          <DateField source="updateTime" label="common.field.updateTime" showTime />
          <TextField source="createBy$" label="common.field.createBy" />
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
@@ -130,7 +130,7 @@
                longSet.add(Long.parseLong(set));
            });
            List<AsnOrderItem> asnOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getNtyStatus, longSet));
            List<AsnOrderItem> asnOrderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getPoDetlId, longSet));
            if (asnOrderItems.isEmpty()) {
                throw new CoolException("ASN单据不存在!!");
            }
@@ -139,7 +139,7 @@
            /**************************     修改ASN明细单状态         ******************************/
            if (!asnOrderItemService.update(new LambdaUpdateWrapper<AsnOrderItem>().in(AsnOrderItem::getId, list).set(AsnOrderItem::getStatus, 1))) {
            if (!asnOrderItemService.update(new LambdaUpdateWrapper<AsnOrderItem>().in(AsnOrderItem::getId, list).set(AsnOrderItem::getNtyStatus, 1))) {
                throw new CoolException("ASN明细单据状态修改失败!!");
            }
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
@@ -309,5 +309,18 @@
                return null;
        }
    }
    public String getNtyStatus$(){
        if (null == this.ntyStatus){ return "error"; }
        switch (this.ntyStatus){
            case 0:
                return "未上报";
            case 1:
                return "已上报";
            case 2:
                return "部分上报";
            default:
                return "error";
        }
    }
}