自动化立体仓库 - WMS系统
ad306bf89cc9d774224cbeb9557efde82f6d605e..cabc5cac8a3e3867bcbbc4598c2cef6758f6e0c4
7 天以前 zhou zhou
#port
cabc5c 对比 | 目录
7 天以前 zhou zhou
#
a42856 对比 | 目录
10个文件已修改
331 ■■■■ 已修改文件
src/main/webapp/views/erpBegindata/begindata.html 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/erpBegindata/confirmedBegindata.html 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/erpIcmo/icmo.html 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/erpMaterialuse/materialuse.html 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/erpMaterialwwout/materialwwout.html 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/erpOutstock/outstock.html 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/erpPoinstock/poinstock.html 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/erpReceiving/erpReceiving.html 233 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/erpTongbu/tongbu.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/erpWwreport/wwreport.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/erpBegindata/begindata.html
@@ -43,7 +43,7 @@
        <el-form :inline="true">
            <el-form-item label="">
                <el-upload
                        action="http://127.0.0.1:9090/basicinfo/begindata/readExcel"
                        action="http://127.0.0.1:8133/basicinfo/begindata/readExcel"
                        :show-file-list="false"
                >
                    <el-button type="primary">导入</el-button>
@@ -171,7 +171,7 @@
                    background: 'rgba(0, 0, 0, 0.7)',
                })
                $.ajax({
                    url: "http://127.0.0.1:9090/basicinfo/begindata/getList",
                    url: "http://127.0.0.1:8133/basicinfo/begindata/getList",
                    headers: {
                        'token': localStorage.getItem('token')
                    },
@@ -214,7 +214,7 @@
                            background: 'rgba(0, 0, 0, 0.7)',
                        })
                        $.ajax({
                            url:"http://127.0.0.1:9090/basicinfo/begindata/softDelete",
                            url:"http://127.0.0.1:8133/basicinfo/begindata/softDelete",
                            data: JSON.stringify(selectList.value),
                            dataType: 'json',
                            contentType: 'application/json;charset=UTF-8',
@@ -254,7 +254,7 @@
                            background: 'rgba(0, 0, 0, 0.7)',
                        })
                        $.ajax({
                            url:"http://127.0.0.1:9090/basicinfo/begindata/saveorupdate",
                            url:"http://127.0.0.1:8133/basicinfo/begindata/saveorupdate",
                            data: JSON.stringify(formData.value),
                            dataType: 'json',
                            contentType: 'application/json;charset=UTF-8',
@@ -295,7 +295,7 @@
                            background: 'rgba(0, 0, 0, 0.7)',
                        })
                        $.ajax({
                            url: "http://127.0.0.1:9090/basicinfo/begindata/export",
                            url: "http://127.0.0.1:8133/basicinfo/begindata/export",
                            data: data,
                            contentType: 'application/json;charset=UTF-8',
                            method: 'GET',
@@ -350,7 +350,7 @@
            function getVendor(){
                $.ajax({
                    url: "http://127.0.0.1:9090/basicinfo/vendor/getlistfordropdown",
                    url: "http://127.0.0.1:8133/basicinfo/vendor/getlistfordropdown",
                    contentType: 'application/json;charset=UTF-8',
                    method: 'GET',
                    success: function(res) {
src/main/webapp/views/erpBegindata/confirmedBegindata.html
@@ -161,7 +161,7 @@
                    background: 'rgba(0, 0, 0, 0.7)',
                })
                $.ajax({
                    url: "http://127.0.0.1:9090/basicinfo/begindata/getList1",
                    url: "http://127.0.0.1:8133/basicinfo/begindata/getList1",
                    headers: {
                        'token': localStorage.getItem('token')
                    },
@@ -204,7 +204,7 @@
                            background: 'rgba(0, 0, 0, 0.7)',
                        })
                        $.ajax({
                            url:"http://127.0.0.1:9090/basicinfo/begindata/softDelete",
                            url:"http://127.0.0.1:8133/basicinfo/begindata/softDelete",
                            data: JSON.stringify(selectList.value),
                            dataType: 'json',
                            contentType: 'application/json;charset=UTF-8',
@@ -251,7 +251,7 @@
                            background: 'rgba(0, 0, 0, 0.7)',
                        })
                        $.ajax({
                            url:"http://127.0.0.1:9090/basicinfo/begindata/tongbu",
                            url:"http://127.0.0.1:8133/basicinfo/begindata/tongbu",
                            data: JSON.stringify(selectList.value),
                            dataType: 'json',
                            contentType: 'application/json;charset=UTF-8',
@@ -290,7 +290,7 @@
                            background: 'rgba(0, 0, 0, 0.7)',
                        })
                        $.ajax({
                            url:"http://127.0.0.1:9090/basicinfo/begindata/saveorupdate",
                            url:"http://127.0.0.1:8133/basicinfo/begindata/saveorupdate",
                            data: JSON.stringify(formData.value),
                            dataType: 'json',
                            contentType: 'application/json;charset=UTF-8',
@@ -331,7 +331,7 @@
                            background: 'rgba(0, 0, 0, 0.7)',
                        })
                        $.ajax({
                            url: "http://127.0.0.1:9090/basicinfo/begindata/export",
                            url: "http://127.0.0.1:8133/basicinfo/begindata/export",
                            data: data,
                            contentType: 'application/json;charset=UTF-8',
                            method: 'GET',
@@ -386,7 +386,7 @@
            function getVendor(){
                $.ajax({
                    url: "http://127.0.0.1:9090/basicinfo/vendor/getlistfordropdown",
                    url: "http://127.0.0.1:8133/basicinfo/vendor/getlistfordropdown",
                    contentType: 'application/json;charset=UTF-8',
                    method: 'GET',
                    success: function(res) {
src/main/webapp/views/erpIcmo/icmo.html
@@ -205,7 +205,7 @@
                    background: 'rgba(0, 0, 0, 0.7)',
                })
                $.ajax({
                    url: "http://127.0.0.1:9090/mo/icmo/getList",
                    url: "http://127.0.0.1:8133/mo/icmo/getList",
                    headers: {
                        'token': localStorage.getItem('token')
                    },
@@ -248,7 +248,7 @@
                            background: 'rgba(0, 0, 0, 0.7)',
                        })
                        $.ajax({
                            url:"http://127.0.0.1:9090/mo/icmo/softDelete",
                            url:"http://127.0.0.1:8133/mo/icmo/softDelete",
                            data: JSON.stringify(selectList.value),
                            dataType: 'json',
                            contentType: 'application/json;charset=UTF-8',
@@ -303,7 +303,7 @@
                        dataToSend.fplancommitdate = formatLocalDate(dataToSend.fplancommitdate);
                        dataToSend.fplanfinishdate = formatLocalDate(dataToSend.fplanfinishdate);
                        $.ajax({
                            url:"http://127.0.0.1:9090/mo/icmo/saveorupdate",
                            url:"http://127.0.0.1:8133/mo/icmo/saveorupdate",
                            data: JSON.stringify(dataToSend),
                            dataType: 'json',
                            contentType: 'application/json;charset=UTF-8',
@@ -344,7 +344,7 @@
                            background: 'rgba(0, 0, 0, 0.7)',
                        })
                        $.ajax({
                            url: "http://127.0.0.1:9090/basicinfo/begindata/export",
                            url: "http://127.0.0.1:8133/basicinfo/begindata/export",
                            data: data,
                            contentType: 'application/json;charset=UTF-8',
                            method: 'GET',
@@ -420,7 +420,7 @@
            function getDepOptions(){
                $.ajax({
                    url: "http://127.0.0.1:9090/basicinfo/departmentl/getlistfordropdown",
                    url: "http://127.0.0.1:8133/basicinfo/departmentl/getlistfordropdown",
                    contentType: 'application/json;charset=UTF-8',
                    method: 'GET',
                    success: function(res) {
src/main/webapp/views/erpMaterialuse/materialuse.html
@@ -180,7 +180,7 @@
                        background: 'rgba(0, 0, 0, 0.7)',
                    })
                    $.ajax({
                        url: "http://127.0.0.1:9090/mo/materialreceive/getList",
                        url: "http://127.0.0.1:8133/mo/materialreceive/getList",
                        headers: {
                            'token': localStorage.getItem('token')
                        },
@@ -222,7 +222,7 @@
                        background: 'rgba(0, 0, 0, 0.7)',
                    })
                    $.ajax({
                        url:"http://127.0.0.1:9090/mo/materialuse/canelprint",
                        url:"http://127.0.0.1:8133/mo/materialuse/canelprint",
                        headers: {
                            'token': localStorage.getItem('token')
                        },
@@ -264,7 +264,7 @@
                        background: 'rgba(0, 0, 0, 0.7)',
                    })
                    $.ajax({
                        url:"http://127.0.0.1:9090/mo/materialuse/canelprint1",
                        url:"http://127.0.0.1:8133/mo/materialuse/canelprint1",
                        headers: {
                            'token': localStorage.getItem('token')
                        },
@@ -294,7 +294,7 @@
                function getDepOptions(){
                    $.ajax({
                        url: "http://127.0.0.1:9090/basicinfo/departmentl/getlistfordropdown",
                        url: "http://127.0.0.1:8133/basicinfo/departmentl/getlistfordropdown",
                        contentType: 'application/json;charset=UTF-8',
                        method: 'GET',
                        success: function(res) {
@@ -379,7 +379,7 @@
                        background: 'rgba(0, 0, 0, 0.7)',
                    })
                    $.ajax({
                        url:"http://127.0.0.1:9090/mo/materialuse/print",
                        url:"http://127.0.0.1:8133/mo/materialuse/print",
                        headers: {
                            'token': localStorage.getItem('token')
                        },
src/main/webapp/views/erpMaterialwwout/materialwwout.html
@@ -264,7 +264,7 @@
                        background: 'rgba(0, 0, 0, 0.7)',
                    })
                    $.ajax({
                        url: "http://127.0.0.1:9090/mo/materialwwout/getList",
                        url: "http://127.0.0.1:8133/mo/materialwwout/getList",
                        headers: {
                            'token': localStorage.getItem('token')
                        },
@@ -302,7 +302,7 @@
                        background: 'rgba(0, 0, 0, 0.7)',
                    })
                    $.ajax({
                        url: "http://127.0.0.1:9090/mo/materialwwout/getListView",
                        url: "http://127.0.0.1:8133/mo/materialwwout/getListView",
                        headers: {
                            'token': localStorage.getItem('token')
                        },
@@ -355,7 +355,7 @@
                        background: 'rgba(0, 0, 0, 0.7)',
                    })
                    $.ajax({
                        url:"http://127.0.0.1:9090/mo/materialwwout/tongbu",
                        url:"http://127.0.0.1:8133/mo/materialwwout/tongbu",
                        headers: {
                            'token': localStorage.getItem('token')
                        },
@@ -397,7 +397,7 @@
                        background: 'rgba(0, 0, 0, 0.7)',
                    })
                    $.ajax({
                        url:"http://127.0.0.1:9090/mo/materialwwout/caneltongbu",
                        url:"http://127.0.0.1:8133/mo/materialwwout/caneltongbu",
                        headers: {
                            'token': localStorage.getItem('token')
                        },
@@ -439,7 +439,7 @@
                        background: 'rgba(0, 0, 0, 0.7)',
                    })
                    $.ajax({
                        url:"http://127.0.0.1:9090/mo/materialuse/canelprint",
                        url:"http://127.0.0.1:8133/mo/materialuse/canelprint",
                        headers: {
                            'token': localStorage.getItem('token')
                        },
@@ -471,7 +471,7 @@
                function getVendor(){
                    $.ajax({
                        url: "http://127.0.0.1:9090/basicinfo/vendor/getlistfordropdown",
                        url: "http://127.0.0.1:8133/basicinfo/vendor/getlistfordropdown",
                        contentType: 'application/json;charset=UTF-8',
                        method: 'GET',
                        success: function(res) {
@@ -540,7 +540,7 @@
                        data.create_time = tableSearchParam.value.datetime[0] + " - " + tableSearchParam.value.datetime[1]
                    }
                    $.ajax({
                        url: "http://127.0.0.1:9090/mo/materialwwout/updateprint",
                        url: "http://127.0.0.1:8133/mo/materialwwout/updateprint",
                        headers: {
                            'token': localStorage.getItem('token')
                        },
src/main/webapp/views/erpOutstock/outstock.html
@@ -243,7 +243,7 @@
                        background: 'rgba(0, 0, 0, 0.7)',
                    })
                    $.ajax({
                        url: "http://127.0.0.1:9090/mo/outstock/getList",
                        url: "http://127.0.0.1:8133/mo/outstock/getList",
                        headers: {
                            'token': localStorage.getItem('token')
                        },
@@ -286,7 +286,7 @@
                                background: 'rgba(0, 0, 0, 0.7)',
                            })
                            $.ajax({
                                url: "http://127.0.0.1:9090/mo/outstock/softDelete",
                                url: "http://127.0.0.1:8133/mo/outstock/softDelete",
                                data: JSON.stringify(selectList.value),
                                dataType: 'json',
                                contentType: 'application/json;charset=UTF-8',
@@ -348,7 +348,7 @@
                                item.ffetchdate = formatLocalDate(item.ffetchdate);
                            });
                            $.ajax({
                                url: "http://127.0.0.1:9090/mo/outstock/saveorupdate",
                                url: "http://127.0.0.1:8133/mo/outstock/saveorupdate",
                                data: JSON.stringify({
                                    outStockDTO: outstockDTO,
                                    outStockDTOS: outstockDTOS
@@ -420,7 +420,7 @@
                        background: 'rgba(0, 0, 0, 0.7)',
                    })
                    $.ajax({
                        url: "http://127.0.0.1:9090/mo/outstock/getbyid",
                        url: "http://127.0.0.1:8133/mo/outstock/getbyid",
                        data: JSON.stringify(row),
                        dataType: 'json',
                        contentType: 'application/json;charset=UTF-8',
@@ -462,7 +462,7 @@
                function getVendor() {
                    $.ajax({
                        url: "http://127.0.0.1:9090/basicinfo/vendor/getlistfordropdown",
                        url: "http://127.0.0.1:8133/basicinfo/vendor/getlistfordropdown",
                        contentType: 'application/json;charset=UTF-8',
                        method: 'GET',
                        success: function (res) {
@@ -484,7 +484,7 @@
                function getCustomer() {
                    $.ajax({
                        url: "http://127.0.0.1:9090/basicinfo/customer/getlistfordropdown",
                        url: "http://127.0.0.1:8133/basicinfo/customer/getlistfordropdown",
                        contentType: 'application/json;charset=UTF-8',
                        method: 'GET',
                        success: function (res) {
src/main/webapp/views/erpPoinstock/poinstock.html
@@ -304,7 +304,7 @@
                    background: 'rgba(0, 0, 0, 0.7)',
                })
                $.ajax({
                    url: "http://127.0.0.1:9090/mo/poinstock/getList",
                    url: "http://127.0.0.1:8133/mo/poinstock/getList",
                    headers: {
                        'token': localStorage.getItem('token')
                    },
@@ -347,7 +347,7 @@
                            background: 'rgba(0, 0, 0, 0.7)',
                        })
                        $.ajax({
                            url:"http://127.0.0.1:9090/mo/poinstock/softDelete",
                            url:"http://127.0.0.1:8133/mo/poinstock/softDelete",
                            data: JSON.stringify(selectList.value),
                            dataType: 'json',
                            contentType: 'application/json;charset=UTF-8',
@@ -398,7 +398,7 @@
                                                
                         poInStockDTO.fheadselfp0338 = formatLocalDate(poInStockDTO.fheadselfp0338);                       
                        $.ajax({
                            url:"http://127.0.0.1:9090/mo/poinstock/saveorupdate",
                            url:"http://127.0.0.1:8133/mo/poinstock/saveorupdate",
                            data: JSON.stringify({
                                poInStockDTO : poInStockDTO,
                                poInStockDTOS: poInStockDTOS                                
@@ -447,7 +447,7 @@
                            background: 'rgba(0, 0, 0, 0.7)',
                        })
                        $.ajax({
                            url:"http://127.0.0.1:9090/mo/poinstock/softclose",
                            url:"http://127.0.0.1:8133/mo/poinstock/softclose",
                            data: JSON.stringify(selectList.value),
                            dataType: 'json',
                            contentType: 'application/json;charset=UTF-8',
@@ -513,7 +513,7 @@
                    background: 'rgba(0, 0, 0, 0.7)',
                })
                $.ajax({
                    url:"http://127.0.0.1:9090/mo/poinstock/getbyid",
                    url:"http://127.0.0.1:8133/mo/poinstock/getbyid",
                    data: JSON.stringify(row),
                    dataType: 'json',
                    contentType: 'application/json;charset=UTF-8',
@@ -555,7 +555,7 @@
            function getVendor(){
                $.ajax({
                    url: "http://127.0.0.1:9090/basicinfo/vendor/getlistfordropdown",
                    url: "http://127.0.0.1:8133/basicinfo/vendor/getlistfordropdown",
                    contentType: 'application/json;charset=UTF-8',
                    method: 'GET',
                    success: function(res) {
src/main/webapp/views/erpReceiving/erpReceiving.html
@@ -13,88 +13,81 @@
<body>
    <div id="app">
        <el-card>
        <el-form :inline="true">
            <el-form-item label="开工日期">
                <el-date-picker
                        v-model="tableSearchParam.fplancommitdate"
                        type="date"
                        placeholder="选择日期"
                        :default-value="defaultTime"
            <el-form :inline="true">
                <el-form-item label="开工日期">
                    <el-date-picker v-model="tableSearchParam.fplancommitdate" type="date" placeholder="选择日期"
                        :default-value="defaultTime" />
                </el-form-item>
                <el-form-item label="生产单号">
                    <el-input v-model="tableSearchParam.soCode" placeholder="请输入生产单号"></el-input>
                </el-form-item>
                <el-form-item label="车间">
                    <el-select v-model="tableSearchParam.depName" placeholder="选择车间" style="width: 240px">
                        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
                    </el-select>
                </el-form-item>
                <el-form-item label="">
                    <el-button type="primary" @click="page" circle>
                        <el-icon>
                            <Search />
                        </el-icon>
                    </el-button>
                </el-form-item>
            </el-form>
            <el-form :inline="true">
                <el-form-item label="">
                    <el-button type="primary" @click="tongbu">同步</el-button>
                </el-form-item>
                <el-form-item label="">
                    <el-button type="primary" @click="caneltongbu1">撤销同步</el-button>
                </el-form-item>
                <el-form-item label="">
                    <el-button type="primary" @click="tongbureturn">退料</el-button>
                </el-form-item>
                <el-form-item label="">
                    <el-button type="primary" @click="caneltongbureturn">撤销退料</el-button>
                </el-form-item>
            </el-form>
            <el-table :data="tableData" border style="width: 100%" row-key="finterid"
                @selection-change="handleSelectionChange" max-height="650">
                <el-table-column type="selection">
                </el-table-column>
                <el-table-column type="index" width="50">
                </el-table-column>
                <el-table-column prop="soCode" label="生产单号">
                </el-table-column>
                <el-table-column prop="fbillno" label="任务单号">
                </el-table-column>
                <el-table-column prop="invCode" label="物料编码">
                </el-table-column>
                <el-table-column prop="invName" label="物料名称" width="300" :show-overflow-tooltip="true">
                </el-table-column>
                <el-table-column prop="invStd" label="规格" width="200" :show-overflow-tooltip="true">
                </el-table-column>
                <el-table-column prop="depName" label="车间">
                </el-table-column>
                <el-table-column prop="fauxqty" label="数量" width="90">
                </el-table-column>
                <el-table-column prop="fplancommitdate" label="计划开工时间">
                </el-table-column>
                <el-table-column prop="fplanfinishdate" label="计划完工时间">
                </el-table-column>
                <el-table-column prop="izSyncReceive" label="是否同步" width="90">
                </el-table-column>
                <el-table-column prop="izSyncReceiveReturn" label="是否退料" width="90">
                </el-table-column>
            </el-table>
            <!--            <div style="margin-top: 10px">-->
            <!--                <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"-->
            <!--                               :current-page="currentPage" :page-sizes="pageSizes" :page-size="pageSize"-->
            <!--                               layout="total, sizes, prev, pager, next, jumper" :total="pageTotal">-->
            <!--                </el-pagination>-->
            <!--            </div>-->
                />
            </el-form-item>
            <el-form-item label="生产单号">
                <el-input v-model="tableSearchParam.soCode" placeholder="请输入生产单号"></el-input>
            </el-form-item>
            <el-form-item label="车间">
                <el-select v-model="tableSearchParam.depName" placeholder="选择车间" style="width: 240px" >
                    <el-option
                            v-for="item in options"
                            :key="item.value"
                            :label="item.label"
                            :value="item.value"
                    />
                </el-select>
            </el-form-item>
            <el-form-item label="">
                <el-button type="primary" @click="page" circle >
                    <el-icon><Search /></el-icon>
                </el-button>
            </el-form-item>
        </el-form>
        <el-form :inline="true">
            <el-form-item label="">
               <el-button type="primary" @click="tongbu" >同步</el-button>
            </el-form-item>
            <el-form-item label="">
               <el-button type="primary" @click="caneltongbu1">撤销同步</el-button>
            </el-form-item>
            <el-form-item label="">
               <el-button type="primary" @click="tongbureturn">退料</el-button>
            </el-form-item>
            <el-form-item label="">
               <el-button type="primary" @click="caneltongbureturn">撤销退料</el-button>
            </el-form-item>
        </el-form>
        <el-table :data="tableData" border style="width: 100%" row-key="finterid" @selection-change="handleSelectionChange" max-height="650">
            <el-table-column type="selection" >
            </el-table-column>
            <el-table-column type="index" width="50" >
            </el-table-column>
            <el-table-column prop="soCode" label="生产单号" >
            </el-table-column>
            <el-table-column prop="fbillno" label="任务单号">
            </el-table-column>
            <el-table-column prop="invCode" label="物料编码">
            </el-table-column>
            <el-table-column prop="invName" label="物料名称" width="300" :show-overflow-tooltip="true">
            </el-table-column>
            <el-table-column prop="invStd" label="规格" width="200" :show-overflow-tooltip="true">
            </el-table-column>
            <el-table-column prop="depName" label="车间">
            </el-table-column>
            <el-table-column prop="fauxqty" label="数量" width="90">
            </el-table-column>
            <el-table-column prop="fplancommitdate" label="计划开工时间">
            </el-table-column>
            <el-table-column prop="fplanfinishdate" label="计划完工时间">
            </el-table-column>
            <el-table-column prop="izSyncReceive" label="是否同步" width="90">
            </el-table-column>
            <el-table-column prop="izSyncReceiveReturn" label="是否退料" width="90">
            </el-table-column>
        </el-table>
<!--            <div style="margin-top: 10px">-->
<!--                <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"-->
<!--                               :current-page="currentPage" :page-sizes="pageSizes" :page-size="pageSize"-->
<!--                               layout="total, sizes, prev, pager, next, jumper" :total="pageTotal">-->
<!--                </el-pagination>-->
<!--            </div>-->
        </el-card>
    </div>
    <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
    <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
    <script src="../../static/evn/vue.global.js"></script>
@@ -103,20 +96,20 @@
    <script type="module">
        // 导入中文语言包
        import zhCn from '../../static/js/erp/zh-cn.js';
        const { createApp, ref, onMounted } = Vue;
        const app = createApp({
            setup() {
                const currentPage = ref(1)
                const pageSizes = ref([15,20, 30, 50, 100, 200])
                const pageSizes = ref([15, 20, 30, 50, 100, 200])
                const pageSize = ref(15)
                const pageTotal = ref(0)
                const tableSearchParam = ref({
                    soCode: null,
                    fplancommitdate: new Date(),
                    depName:null
                    depName: null
                })
                const tableData = ref([])
                const defaultTime = ref(new Date())
@@ -135,8 +128,8 @@
                ]
                const selectList = ref([])
                function page(){
                function page() {
                    let data = JSON.parse(JSON.stringify(tableSearchParam.value))
                    data.curr = currentPage.value
                    data.limit = pageSize.value
@@ -150,7 +143,7 @@
                        background: 'rgba(0, 0, 0, 0.7)',
                    })
                    $.ajax({
                        url: "http://127.0.0.1:9090/mo/materialreceive/getList",
                        url: "http://127.0.0.1:8133/mo/materialreceive/getList",
                        headers: {
                            'token': localStorage.getItem('token')
                        },
@@ -158,7 +151,7 @@
                        dataType: 'json',
                        contentType: 'application/json;charset=UTF-8',
                        method: 'GET',
                        success: function(res) {
                        success: function (res) {
                            loading.close()
                            if (res.code == 200) {
                                tableData.value = res.data
@@ -178,13 +171,13 @@
                    });
                }
                function tongbu(){
                    if (selectList.value.length === 0){
                function tongbu() {
                    if (selectList.value.length === 0) {
                        ElementPlus.ElMessage({
                            message: "请先选择",
                            type: 'error'
                        });
                        return ;
                        return;
                    }
                    const loading = ElementPlus.ElLoading.service({
                        lock: true,
@@ -192,7 +185,7 @@
                        background: 'rgba(0, 0, 0, 0.7)',
                    })
                    $.ajax({
                        url:"http://127.0.0.1:9090/mo/materialreceive/tongbu",
                        url: "http://127.0.0.1:8133/mo/materialreceive/tongbu",
                        headers: {
                            'token': localStorage.getItem('token')
                        },
@@ -200,7 +193,7 @@
                        dataType: 'json',
                        contentType: 'application/json;charset=UTF-8',
                        method: 'POST',
                        success: function(res) {
                        success: function (res) {
                            loading.close();
                            if (res.code == 200) {
                                ElementPlus.ElMessage({
@@ -220,13 +213,22 @@
                    });
                }
                function caneltongbu1(){
                    if (selectList.value.length === 0){
                function caneltongbu1() {
                    if (selectList.value.length === 0) {
                        ElementPlus.ElMessage({
                            message: "请先选择",
                            type: 'error'
                        });
                        return ;
                        return;
                    }
                    // 检查是否有已退料的记录
                    const hasReturned = selectList.value.some(item => item.izSyncReceiveReturn === '是');
                    if (hasReturned) {
                        ElementPlus.ElMessage({
                            message: "选中的数据中存在已退料的记录,不允许撤销同步",
                            type: 'error'
                        });
                        return;
                    }
                    const loading = ElementPlus.ElLoading.service({
                        lock: true,
@@ -234,7 +236,7 @@
                        background: 'rgba(0, 0, 0, 0.7)',
                    })
                    $.ajax({
                        url: "http://127.0.0.1:9090/mo/materialreceive/caneltongbu1",
                        url: "http://127.0.0.1:8133/mo/materialreceive/caneltongbu1",
                        headers: {
                            'token': localStorage.getItem('token')
                        },
@@ -242,7 +244,7 @@
                        dataType: 'json',
                        contentType: 'application/json;charset=UTF-8',
                        method: 'POST',
                        success: function(res) {
                        success: function (res) {
                            loading.close();
                            if (res.code == 200) {
                                ElementPlus.ElMessage({
@@ -262,13 +264,22 @@
                    });
                }
                function tongbureturn(){
                    if (selectList.value.length === 0){
                function tongbureturn() {
                    if (selectList.value.length === 0) {
                        ElementPlus.ElMessage({
                            message: "请先选择",
                            type: 'error'
                        });
                        return ;
                        return;
                    }
                    // 检查是否有已退料的记录
                    const hasReturned = selectList.value.some(item => item.izSyncReceive !== '是');
                    if (hasReturned) {
                        ElementPlus.ElMessage({
                            message: "选中的数据中存在为同步的记录,不允许生成退料",
                            type: 'error'
                        });
                        return;
                    }
                    const loading = ElementPlus.ElLoading.service({
                        lock: true,
@@ -276,7 +287,7 @@
                        background: 'rgba(0, 0, 0, 0.7)',
                    })
                    $.ajax({
                        url: "http://127.0.0.1:9090/mo/materialreceive/tongbureturn",
                        url: "http://127.0.0.1:8133/mo/materialreceive/tongbureturn",
                        headers: {
                            'token': localStorage.getItem('token')
                        },
@@ -284,7 +295,7 @@
                        dataType: 'json',
                        contentType: 'application/json;charset=UTF-8',
                        method: 'POST',
                        success: function(res) {
                        success: function (res) {
                            loading.close();
                            if (res.code == 200) {
                                ElementPlus.ElMessage({
@@ -304,13 +315,13 @@
                    });
                }
                function caneltongbureturn(){
                    if (selectList.value.length === 0){
                function caneltongbureturn() {
                    if (selectList.value.length === 0) {
                        ElementPlus.ElMessage({
                            message: "请先选择",
                            type: 'error'
                        });
                        return ;
                        return;
                    }
                    const loading = ElementPlus.ElLoading.service({
                        lock: true,
@@ -318,7 +329,7 @@
                        background: 'rgba(0, 0, 0, 0.7)',
                    })
                    $.ajax({
                        url: "http://127.0.0.1:9090/mo/materialreceive/caneltongbureturn",
                        url: "http://127.0.0.1:8133/mo/materialreceive/caneltongbureturn",
                        headers: {
                            'token': localStorage.getItem('token')
                        },
@@ -326,7 +337,7 @@
                        dataType: 'json',
                        contentType: 'application/json;charset=UTF-8',
                        method: 'POST',
                        success: function(res) {
                        success: function (res) {
                            loading.close();
                            if (res.code == 200) {
                                ElementPlus.ElMessage({
@@ -345,18 +356,18 @@
                        }
                    });
                }
                function handleSizeChange(val) {
                    pageSize.value = val
                    currentPage.value = 1 // 重置到第一页
                    page()
                }
                function handleCurrentChange(val) {
                    currentPage.value = val
                    page()
                }
                function handleSelectionChange(val) {
                function handleSelectionChange(val) {
                    console.log(val)
                    selectList.value = val
                }
@@ -382,11 +393,11 @@
                    handleSizeChange,
                    handleCurrentChange,
                    handleSelectionChange
                }
            }
        });
        app.use(ElementPlus, {
            locale: zhCn.default || zhCn
        });
src/main/webapp/views/erpTongbu/tongbu.html
@@ -167,7 +167,7 @@
                    background: 'rgba(0, 0, 0, 0.7)',
                })
                $.ajax({
                    url: "http://127.0.0.1:9090/mo/tongbu/getList",
                    url: "http://127.0.0.1:8133/mo/tongbu/getList",
                    dataType: 'json',
                    contentType: 'application/json;charset=UTF-8',
                    method: 'GET',
@@ -220,7 +220,7 @@
                    background: 'rgba(0, 0, 0, 0.7)',
                })
                $.ajax({
                    url: "http://127.0.0.1:9090/mo/tongbu/"+method,
                    url: "http://127.0.0.1:8133/mo/tongbu/"+method,
                    data: {
                        izSrcVouch:izSrcVouch
                    },
@@ -270,7 +270,7 @@
                    background: 'rgba(0, 0, 0, 0.7)',
                })
                $.ajax({
                    url:"http://127.0.0.1:9090/mo/tongbu/tongbu",
                    url:"http://127.0.0.1:8133/mo/tongbu/tongbu",
                    data: JSON.stringify(selectList.value),
                    dataType: 'json',
                    contentType: 'application/json;charset=UTF-8',
@@ -340,7 +340,7 @@
                    background: 'rgba(0, 0, 0, 0.7)',
                })
                $.ajax({
                    url:"http://127.0.0.1:9090/mo/tongbu/"+method,
                    url:"http://127.0.0.1:8133/mo/tongbu/"+method,
                    data: JSON.stringify({
                        list : JSON.stringify(selectListDialog.value),
                        izSrcVouch : izSrcVouch
src/main/webapp/views/erpWwreport/wwreport.html
@@ -220,7 +220,7 @@
                    background: 'rgba(0, 0, 0, 0.7)',
                })
                $.ajax({
                    url: "http://127.0.0.1:9090/mo/wwreport/getList",
                    url: "http://127.0.0.1:8133/mo/wwreport/getList",
                    data: data,
                    dataType: 'json',
                    contentType: 'application/json;charset=UTF-8',
@@ -255,7 +255,7 @@
                            background: 'rgba(0, 0, 0, 0.7)',
                        })
                        $.ajax({
                            url: "http://127.0.0.1:9090/mo/wwreport/export",
                            url: "http://127.0.0.1:8133/mo/wwreport/export",
                            data: JSON.stringify({
                                data: JSON.stringify(tableData.value),
                                datas: JSON.stringify(otherData.value)
@@ -328,7 +328,7 @@
                            background: 'rgba(0, 0, 0, 0.7)',
                        })
                        $.ajax({
                            url: "http://127.0.0.1:9090/mo/wwreport/export1",
                            url: "http://127.0.0.1:8133/mo/wwreport/export1",
                            data: data,
                            contentType: 'application/json;charset=UTF-8',
                            method: 'GET',
@@ -428,7 +428,7 @@
            }
            function getVendor(){
                $.ajax({
                    url: "http://127.0.0.1:9090/basicinfo/vendor/getlistfordropdown",
                    url: "http://127.0.0.1:8133/basicinfo/vendor/getlistfordropdown",
                    contentType: 'application/json;charset=UTF-8',
                    method: 'GET',
                    success: function(res) {