Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2025-04-30 17f9f7d74b7f2f3344b335441f9bf1653cff03f0

Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

 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-admin/src/page/orders/purchase/PurchaseItemCreate.jsx

@@ -55,6 +55,7 @@
    return (
        <>
            <CreateBase
                resource="purchaseItem"
                record={{}}
                transform={(data) => {
                    return data;

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

@@ -99,7 +99,8 @@
            inspectParams.add(params);

        });

        CommonReponse reponse = new CommonReponse();
        if (!remotesInfoProperties.getHost().equals("http://127.0.0.1")){
        MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
        //获取上报质检接口
        String url = remotesInfoProperties.getBaseUrl() + apiInfo.getNotifyInspect();
@@ -114,8 +115,13 @@
        log.info("下发任务 返回结果：{}", exchange);
        if (Objects.isNull(exchange.getBody()) || exchange.getBody() == null) {
            throw new CoolException("下发任务失败！！");
            }
            reponse = (CommonReponse) JSON.parse(exchange.getBody());
        } else {
            CommonReponse reponse = (CommonReponse) JSON.parse(exchange.getBody());
            reponse.setCode(0);
        }


            if (reponse.getCode() == 0) {
                //修改asn上报状态
                Set<String> itemSets = items.stream().map(PoItemsDto::getId).collect(Collectors.toSet());
@@ -133,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明细单据状态修改失败！！");
                }

@@ -145,11 +151,11 @@
                ids.forEach(id -> {
                    int count = asnOrderService.count(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, id));
                    if (count == asnIds.get(id).size()) {
                        if (!asnOrderService.update(new LambdaUpdateWrapper<AsnOrder>().eq(AsnOrder::getId, id).set(AsnOrder::getStatus, 1))) {
                    if (!asnOrderService.update(new LambdaUpdateWrapper<AsnOrder>().eq(AsnOrder::getId, id).set(AsnOrder::getNtyStatus, 1))) {
                            throw new CoolException("ASN主单状态修改失败！！");
                        }
                    } else {
                        if (!asnOrderService.update(new LambdaUpdateWrapper<AsnOrder>().eq(AsnOrder::getId, id).set(AsnOrder::getStatus, 2))) {
                    if (!asnOrderService.update(new LambdaUpdateWrapper<AsnOrder>().eq(AsnOrder::getId, id).set(AsnOrder::getNtyStatus, 2))) {
                            throw new CoolException("ASN主单状态修改失败！！");
                        }
                    }
@@ -157,7 +163,6 @@
                return true;
            } else {
                throw new CoolException(reponse.getMsg());
            }
        }
    }
}

 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";
        }
    }

}