#

luxiaotao1123

2020-06-17 5d176257d7a7dfe1330dd02c1e869c1d45ff887f

#

 src/main/java/com/zy/asrs/controller/MatCodeController.java

@@ -65,7 +65,7 @@
            } else if (entry.getKey().endsWith("<")) {
                wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
            } else {
                wrapper.eq(entry.getKey(), String.valueOf(entry.getValue()));
                wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
            }
        }
    }

 src/main/java/com/zy/asrs/service/WorkService.java

@@ -18,7 +18,6 @@

    /**
     * 全板出库
     * @return 库位号
     */
    void startupFullTakeStore(StockOutParam param, Long userId);


 src/main/webapp/static/js/api/api.js

@@ -132,7 +132,7 @@
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/basCrnError/basCrnError.js

@@ -138,7 +138,7 @@
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/basCrnStatus/basCrnStatus.js

@@ -137,7 +137,7 @@
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/basCrnp/basCrnp.js

@@ -163,7 +163,7 @@
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/basDevp/basDevp.js

@@ -206,7 +206,7 @@
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/basLocType/basLocType.js

@@ -129,7 +129,7 @@
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/basWhs/basWhs.js

@@ -137,7 +137,7 @@
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/basWrkIotype/basWrkIotype.js

@@ -131,7 +131,7 @@
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/basWrkStatus/basWrkStatus.js

@@ -130,7 +130,7 @@
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/config/config.js

@@ -130,7 +130,7 @@
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/host/host.js

@@ -130,7 +130,7 @@
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/locDetl/locDetl.js

@@ -145,7 +145,7 @@
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/locMast/locMast.js

@@ -164,7 +164,7 @@
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/operateLog/operateLog.js

@@ -142,7 +142,7 @@
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/permission/permission.js

@@ -129,7 +129,7 @@
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/report/inOut.js

@@ -76,7 +76,7 @@
        var checkStatus = table.checkStatus(obj.config.id);
        switch(obj.event) {
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/report/reportStockUse.js

@@ -79,7 +79,7 @@
        var checkStatus = table.checkStatus(obj.config.id);
        switch(obj.event) {
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/report/stayTime.js

@@ -84,7 +84,7 @@
        var checkStatus = table.checkStatus(obj.config.id);
        switch(obj.event) {
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/report/workIn.js

@@ -85,7 +85,7 @@
        var checkStatus = table.checkStatus(obj.config.id);
        switch(obj.event) {
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/report/workOut.js

@@ -85,7 +85,7 @@
        var checkStatus = table.checkStatus(obj.config.id);
        switch(obj.event) {
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/resource/resource.js

@@ -131,7 +131,7 @@
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/role/role.js

@@ -148,7 +148,7 @@
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/rowLastno/rowLastno.js

@@ -140,7 +140,7 @@
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/staDesc/staDesc.js

@@ -170,7 +170,7 @@
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/stkPlcm/stkPlcm.js

@@ -137,7 +137,7 @@
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/stoMan/stoQue.js

@@ -103,7 +103,7 @@
                alert("还没做");
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/user/user.js

@@ -133,7 +133,7 @@
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function() {
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function() {
                    var titles = [];
                    var fields = [];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/userLogin/userLogin.js

@@ -128,7 +128,7 @@
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function() {
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function() {
                    var titles = [];
                    var fields = [];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/wrkDetl/wrkDetl.js

@@ -148,7 +148,7 @@
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/wrkLastno/wrkLastno.js

@@ -136,7 +136,7 @@
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/wrkMast/wrkMast.js

@@ -238,7 +238,7 @@
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/static/js/wrkMastLog/wrkMastLog.js

@@ -175,7 +175,7 @@
                }
                break;
            case 'exportData':
                layer.confirm('确定导出Excel吗', function(){
                layer.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {

 src/main/webapp/views/basWrkStatus/basWrkStatus.html

@@ -22,7 +22,7 @@
    </div>

    <!-- 待添加 -->
    <div id="data-search-btn" class="layui-btn-container layui-form-item">
    <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>
        <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">重置</button>
    </div>