自动化立体仓库 - WMS系统
LSH
2023-01-04 2afd0de5d9a8d0a339e26b8084a7d17110a1e84e
#中间表对接:日志文件优化
6个文件已修改
42 ■■■■ 已修改文件
src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/apiLog/apiLog.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/apiLog/apiLog.html 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
@@ -194,7 +194,7 @@
    }
    public void callApiLogSave(ErpDetTb erpDetTb, String tableName, String response, Boolean bool) {
        apiLogService.save("ERP下发订单信息", "中间表:" + tableName, "null", ip,
        apiLogService.save("ERP下发订单信息", tableName, "null", ip,
                "订单号:" + erpDetTb.getBillNo() + "、品号:" + erpDetTb.getPrdNo() + "、货品特征:" + erpDetTb.getPrdMark() + "、状态:" + erpDetTb.getStatus(),
                response, bool);
    }
src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java
@@ -1,5 +1,7 @@
package com.zy.ints.task.scheduler;
import com.zy.asrs.service.ApiLogService;
import com.zy.ints.entity.ErpDetTb;
import com.zy.ints.entity.ErpLk;
import com.zy.ints.erp.ErpSqlServer;
import lombok.extern.slf4j.Slf4j;
@@ -8,6 +10,7 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.util.Date;
import java.util.List;
/**
@@ -22,6 +25,10 @@
     */
    @Value("${erp.enabled}")
    private Boolean erpEnabled;
    @Value("${erp.useName.ip}")
    private String ip;
    @Autowired
    private ApiLogService apiLogService;
    @Autowired
    private ErpSqlServer erpSqlServer;
    /**
@@ -51,7 +58,14 @@
                }
            }
        }catch (Exception e){
            Date date = new Date();
            log.error(date + ": 表名:bas_erp_lk :" + e);
        }
    }
    public void callApiLogSave(ErpLk erpLk, String tableName, String response, Boolean bool) {
        apiLogService.save("ERP下发订单信息",  tableName, "null", ip,
                "品号:" + erpLk.getPrdNo() + "、货品特征:" + erpLk.getPrdMark() + "、数量:" + erpLk.getQty() + "、状态:" + erpLk.getStatus(),
                response, bool);
    }
}
src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java
@@ -141,7 +141,7 @@
    }
    public void callApiLogSave(Prdt prdt, String tableName, String response, Boolean bool) {
        apiLogService.save("ERP下发商品信息", "中间表:" + tableName, "null", ip,
        apiLogService.save("ERP下发商品信息", tableName, "null", ip,
                "品号:" + prdt.getPrdNo() + "、品名:" + prdt.getName() + "、类型:" + prdt.getType() + "、状态:" + prdt.getStatus(),
                response, bool);
    }
src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java
@@ -137,25 +137,25 @@
    }
    public void callApiLogSaveLkDetTb(LkDetTb lkDetTb, String tableName, String response, Boolean bool) {
        apiLogService.save("ERP下发订单信息", "中间表:" + tableName, "null", ip,
        apiLogService.save("上报完结订单明细信息", tableName, "null", ip,
                "订单号:" + lkDetTb.getBillNo() + "、品号:" + lkDetTb.getPrdNo() + "、货品特征:" + lkDetTb.getPrdMark() + "、状态:" + lkDetTb.getStatus(),
                response, bool);
    }
    public void callApiLogSaveLkDetTbBak(LkDetTbBak lkDetTbBak, String tableName, String response, Boolean bool) {
        apiLogService.save("ERP下发订单信息", "中间表:" + tableName, "null", ip,
        apiLogService.save("上报完结订单明细信息", tableName, "null", ip,
                "订单号:" + lkDetTbBak.getBillNo() + "、品号:" + lkDetTbBak.getPrdNo() + "、货品特征:" + lkDetTbBak.getPrdMark() + "、状态:" + lkDetTbBak.getStatus(),
                response, bool);
    }
    public void callApiLogSaveOrderDetl(OrderDetl orderDetl, String response, Boolean bool) {
        apiLogService.save("上报完结订单明细信息", "中间表:lk_det_tb", "null", ip,
        apiLogService.save("上报完结订单明细信息", "lk_det_tb", "null", ip,
                "订单号:" + orderDetl.getOrderNo() + "、品号:" + orderDetl.getMatnr() + "、货品特征:" + orderDetl.getBatch(),
                response, bool);
    }
    public void callApiLogSaveOrder(Order order, String response, Boolean bool) {
        apiLogService.save("完结订单信息上报完成", "中间表:lk_det_tb", "null", ip,
        apiLogService.save("完结订单信息上报完成", "lk_det_tb", "null", ip,
                "订单号:" + order.getOrderNo(), response, bool);
    }
}
src/main/webapp/static/js/apiLog/apiLog.js
@@ -25,12 +25,12 @@
            // ,{field: 'id', align: 'center',title: 'ID'}
            // ,{field: 'uuid', align: 'center',title: '日志编号'}
            ,{field: 'namespace', align: 'center',title: '名称空间'}
            ,{field: 'url', align: 'center',title: '接口地址'}
            ,{field: 'appkey', align: 'center',title: '平台密钥'}
            ,{field: 'url', align: 'center',title: '表名'}
            ,{field: 'appkey', align: 'center',title: '平台密钥',hide: true}
            // ,{field: 'timestamp', align: 'center',title: '时间戳'}
            ,{field: 'clientIp', align: 'center',title: '客户端IP'}
            ,{field: 'clientIp', align: 'center',title: '中间表IP'}
            ,{field: 'request', align: 'center',title: '请求内容'}
            ,{field: 'response', align: 'center',title: '响应内容'}
            ,{field: 'response', align: 'center',title: '操作内容'}
            // ,{field: 'err', align: 'center',title: '异常内容'}
            ,{field: 'result$', align: 'center',title: '结果', templet: '#resTpl', width: 80}
            // ,{field: 'status$', align: 'center',title: '状态'}
src/main/webapp/views/apiLog/apiLog.html
@@ -23,6 +23,12 @@
                            <input class="layui-input" type="text" name="namespace" placeholder="请输入..." autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <label class="layui-form-label">请求内容:</label>
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="request" placeholder="请输入(订单号或品号)" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">&emsp;
                        <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
                            <i class="layui-icon">&#xe615;</i>搜索