skyouc
2025-08-04 c13370c9e13771b7c987b11a4f8b24ff8c41a9ae
no message
2个文件已修改
9 ■■■■ 已修改文件
zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewInOutController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue
@@ -174,6 +174,12 @@
        list: tableData.value
    };
    let locs = tableData.value.filter(item => item.locId == null && item.locs.length < 1);
    if (locs != null && locs.length > 0) {
        message.error("物料库存不足,无法生成出库任务 !!");
        return
    }
    post('/api/out/orderOut/merge/wave', requestParam).then((resp) => {
        let result = resp.data;
        if (result.code == 200) {
@@ -353,7 +359,7 @@
                <template #bodyCell="{ column, text, record, index }">
                    <template v-if="column.dataIndex === 'locNo'">
                        <div v-if="record.locId != null && record.anfme > 0">
<!--                             <a-tag color="green">{{ record.locNo }}</a-tag>-->
                            <!--                             <a-tag color="green">{{ record.locNo }}</a-tag>-->
                            <a-select v-model:value="record.locNo" :options="record.otherLocs"
                                :fieldNames="{ label: 'locNo', value: 'locId' }"
                                @change="handleOtherLocChange(index, record)">
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewInOutController.java
@@ -33,6 +33,7 @@
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<ViewInOut, BaseParam> pageParam = new PageParam<>(baseParam, ViewInOut.class);
        QueryWrapper<ViewInOut> queryWrapper = pageParam.buildWrapper(true);
        queryWrapper.orderByDesc("ymd");
        PageParam<ViewInOut, BaseParam> page = viewInOutMapper.selectPage(pageParam, queryWrapper);
        return R.ok().add(page);
    }