skyouc
2025-04-18 f4f9cd966b0353323636c7aa19b38a6bb3f9936e
no message
4个文件已修改
25 ■■■■ 已修改文件
rsf-admin/src/page/basicInfo/loc/BindModal.jsx 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/basicInfo/loc/BindModal.jsx
@@ -76,16 +76,17 @@
    const refresh = useRefresh();
    const translate = useTranslate();
    const notify = useNotify();
    const [options, setOptions] = useState[{
    const [options, setOptions] = useState({
        condition: null
    }];
    });
    const [formData, setFormData] = useState({
        areaMatId: null,
        groupId: null,
        matnrId: null,
    });
    const { selectedIds, onUnselectItems } = useListContext();
    const { selectedIds, onUnselectItems, onSelectAll } = useListContext();
    const handleClose = (event, reason) => {
        if (reason !== "backdropClick") {
            setOpen(false);
@@ -177,15 +178,14 @@
                                    onChange={(e) => handleChange(e.target.value, 'groupId')}
                                />
                            </Grid>
                            <Grid item xs={4}>
                                <TextInput></TextInput>
                            </Grid>
                        </Grid>
                        <Grid item xs={4}>
                            <List
                                resource="matnr"
                                filter={{ groupId: formData.groupId }}
                                empty={false}
                                queryOptions={{options}}
                                actions={<></>}
                            >
                                <StyledDatagrid
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
@@ -157,10 +157,14 @@
                        .setWkType(OrderWorkType.getWorkDesc(order.getWkType()))
                        .setExceStatus(AsnExceStatus.getExceStatus(order.getExceStatus()))
                        .setAnfme(item.getAnfme() + "")
                        .setMaktx(item.getMaktx()).setMemo(item.getMemo())
                        .setMaktx(item.getMaktx())
                        .setMemo(item.getMemo())
                        .setMatnrCode(item.getMatnrCode())
                        .setPoCode(item.getPoCode())
                        .setSplrName(item.getSplrName())
                        .setPoId(order.getPoId() + "")
                        .setTrackCode(item.getTrackCode())
                        .setBarcode(item.getBarcode())
                        .setPackName(item.getPackName())
                        .setPlatItemId(item.getPlatItemId())
                        .setSplrBatch(item.getSplrBatch())
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java
@@ -134,6 +134,11 @@
    @ExcelComment(value = "barcode",example = "2354788")
    private String barcode;
    @Excel(name = "跟踪码")
    @ApiModelProperty("跟踪码")
    @ExcelComment(value = "trackCode",example = "2354788")
    private String trackCode;
    @Excel(name = "包装名称")
    @ApiModelProperty("包装名称")
    @ExcelComment(value = "packName",example = "箱")
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
@@ -123,6 +123,8 @@
                        .setAnfme(Double.parseDouble(orderTemplate.getAnfme()))
                        .setQty(Double.parseDouble(orderTemplate.getQty()))
                        .setSplrName(orderTemplate.getSplrName())
                        .setBarcode(orderTemplate.getBarcode())
                        .setTrackCode(orderTemplate.getTrackCode())
                        .setSplrCode(orderTemplate.getSplrCode())
                        .setPoCode(orderTemplate.getPoCode())
                        .setMaktx(orderTemplate.getMaktx())