#通知档完善

luxiaotao1123

2020-08-20 088106d0d8a844b68a1e087a44b5eda350e8706a

#通知档完善

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -36,7 +36,7 @@
            throw new CoolException(BaseRes.PARAM);
        }
        int count = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                eq("zpallet", param.getBarcode()).eq("status", "N"));
                eq("zpallet", param.getBarcode()).eq("io_status", "N"));
        if (count > 0) {
            throw new CoolException("条码数据已存在");
        }
@@ -47,7 +47,7 @@
            }
            WaitPakin waitPakin = new WaitPakin();
            waitPakin.setZpallet(param.getBarcode());   // 托盘码
            waitPakin.setStatus("N");    // 状态
            waitPakin.setStatus("Y");    // 状态
            waitPakin.setAnfme(combMat.getCount());  // 数量
            waitPakin.setIoStatus("N");     // 入出状态
            waitPakin.setAppeUser(userId);

 src/main/java/com/zy/asrs/task/handler/NotifyLogHandler.java

@@ -21,9 +21,9 @@
    public ReturnT<String> start() {
        try {
            // 入库通知档转历史档
            int pakInLog = jdbcTemplate.update("insert into cust_wait_pakin_log select * from cust_wait_pakin where status = 'Y';");
            int pakInLog = jdbcTemplate.update("insert into cust_wait_pakin_log select * from cust_wait_pakin where io_status = 'F';");
            if (pakInLog > 0) {
                int pakInDelete = jdbcTemplate.update("delete from cust_wait_pakin where status = 'Y';");
                int pakInDelete = jdbcTemplate.update("delete from cust_wait_pakin where io_status = 'F';");
                if (pakInDelete <= 0) {
                    exceptionHandle("入库通知档转历史档失败");
                }

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -93,9 +93,9 @@
                                exceptionHandle("全板入库 ===>> 添加库存明细失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                            }
                        }
                        // 更新入库通知档 status ===>> Y
                        // 更新入库通知档 ioStatus ===>> Y
                        WaitPakin setParam = new WaitPakin();
                        setParam.setStatus("Y");
                        setParam.setIoStatus("Y");
                        boolean updateRes = waitPakinService.update(setParam
                                , new EntityWrapper<WaitPakin>().eq("zpallet", wrkDetl.getZpallet())
                                        .eq("matnr", wrkDetl.getMatnr())

 src/main/webapp/static/js/waitPakin/waitPakin.js

@@ -3,15 +3,15 @@
    var cols = [
    ];
    cols.push.apply(cols, detlCols);
    cols.push({field: 'status', align: 'center',title: '状态', templet:function(row){
                var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='待入库|已启动' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
                if(row.status !== 'Y'){html += " checked ";}
    cols.push({field: 'status', align: 'center',title: '数据状态', templet:function(row){
                var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='正常|锁定'' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
                if(row.status === 'Y'){html += " checked ";}
                html += ">";
                return html;
            }}
        ,{field: 'ioStatus', align: 'center',title: '入出状态', templet:function(row){
                var html = "<input value='ioStatus' type='checkbox' lay-skin='switch' lay-text='入库|出库' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
                if(row.ioStatus !== 'Y'){html += " checked ";}
                var html = "<input value='ioStatus' type='checkbox' lay-skin='switch' lay-text='运行中|待处理' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
                if(row.ioStatus === 'Y'){html += " checked ";}
                html += ">";
                return html;
            }}

 src/main/webapp/static/js/waitPakinLog/waitPakinLog.js

@@ -3,15 +3,15 @@
    var cols = [
    ];
    cols.push.apply(cols, detlCols);
    cols.push({field: 'status', align: 'center',title: '状态', templet:function(row){
                var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='待入库|已启动' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
                if(row.status !== 'Y'){html += " checked ";}
    cols.push({field: 'status', align: 'center',title: '数据状态', templet:function(row){
                var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='正常|锁定' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
                if(row.status === 'Y'){html += " checked ";}
                html += ">";
                return html;
            }}
        ,{field: 'ioStatus', align: 'center',title: '入出状态', templet:function(row){
                var html = "<input value='ioStatus' type='checkbox' lay-skin='switch' lay-text='入库|出库' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
                if(row.ioStatus !== 'Y'){html += " checked ";}
                var html = "<input value='ioStatus' type='checkbox' lay-skin='switch' lay-text='运行中|待处理' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
                if(row.ioStatus === 'Y'){html += " checked ";}
                html += ">";
                return html;
            }}