#

1

2025-11-29 8257d89c461f6553d66fad1e5e3df3d172a00924

#

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

@@ -48,6 +48,23 @@
        return R.ok(apiLogService.selectPage(new Page<>(curr, limit), wrapper));
    }

    @RequestMapping(value = "/apiLog/list/auth/v2")
    @ManagerAuth
    public R listFalse(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<ApiLog> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        wrapper.eq("result", 0);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
            wrapper.orderBy("create_time", false);
        }
        return R.ok(apiLogService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());

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

@@ -206,6 +206,14 @@
        return R.ok("组托成功");
    }

    @RequestMapping("/comb/agv/auth")
    @ManagerAuth(memo = "组托")
    public R combAgv(@RequestBody CombParam combParam){
//        mobileService.comb(combParam, getUserId());
        mobileService.combAgv(combParam, getUserId());
        return R.ok("组托成功");
    }

    @RequestMapping("/combAuto/auth")
    @ManagerAuth(memo = "组托")
    public R combAuto(@RequestBody CombParam combParam){

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

@@ -11,6 +11,7 @@
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
@@ -447,12 +448,9 @@
        }

        param.setTaskNo(Integer.parseInt(taskCode.substring(0, taskCode.indexOf("-"))));

//        if (Cools.isEmpty(param.getTimestamp())) {
//            return R.error("RGV任务号[timestamp]不能为空");
//        }
        boolean taskAgvReport = openService.TaskAgvReport(param);
        if (taskAgvReport){
            agvBindAndBin(String.valueOf(param.getTaskNo()));
            return R.ok();
        }
        return R.error("任务号不存在");
@@ -541,9 +539,30 @@
            }
        }
        if (bindCtnrAndBin) {
            asyncProcessAfterValidation(param);
            return new R(0,"成功");
        }
        return R.error("库位不存在或无明细");
    }

    @Async
    public void agvBindAndBin(String taskNo) {
        try {
            Thread.sleep(500);
            openService.agvBindAndBin(taskNo);
        } catch (Exception e) {
            log.error("异步处理AGV光栅后续逻辑失败", e);
        }
    }

    @Async
    public void asyncProcessAfterValidation(AgvGoTheArnParam param) {
        try {
            Thread.sleep(500);
            openService.agvApplicationPassedTheGrating(param);
        } catch (Exception e) {
            log.error("异步处理AGV光栅后续逻辑失败", e);
        }
    }

}

 src/main/java/com/zy/asrs/entity/param/AgvGoParam.java

New file
@@ -0,0 +1,14 @@
package com.zy.asrs.entity.param;

import lombok.Data;

import java.util.ArrayList;
import java.util.List;

@Data
public class AgvGoParam {
    String reqCode; //任务号
    String code; //
    String message; //  位置

}

 src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java

@@ -9,6 +9,6 @@
@Mapper
@Repository
public interface BasArmMastMapper extends BaseMapper<BasArmMast> {
    boolean updateArmMastStatus(@Param("armNo")int armNo, @Param("sortingLine")int sortingLine, @Param("status")int status, @Param("endStatus")int endStatus, @Param("staNoEnd")int staNoEnd);
    boolean updateArmMastStatus(@Param("armNo")int armNo, @Param("sortingLine")int sortingLine, @Param("staNoEnd")int staNoEnd, @Param("status")int status, @Param("endStatus")int endStatus);

}

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

@@ -4,6 +4,6 @@
import com.baomidou.mybatisplus.service.IService;

public interface BasArmMastService extends IService<BasArmMast> {
    boolean updateArmMastStatus(int armNo,int sortingLine,int status,int endStatus,int staNoEnd);
    boolean updateArmMastStatus(int armNo,int sortingLine,int staNoEnd,int status,int endStatus);

}

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

@@ -46,6 +46,7 @@
     */
    void comb(CombParam param, Long userId);
    void combAuto(CombParam param, Long userId);
    void combAgv(CombParam param, Long userId);

    /**
     * 齐套入库查询

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

@@ -53,5 +53,8 @@
    boolean taskAgvCreate(TaskAgvCreateParam param);
    List<AgvLocListDetlParam> getAgvLocList(AgvLocListParam param);
    boolean bindCtnrAndBin(bindCtnrAndBinParam param);
    boolean agvApplicationPassedTheGrating(ArmAgvGratingParam arm);
    boolean agvApplicationPassedTheGrating(ArmAgvGratingParam param);
    boolean agvApplicationPassedTheGrating(AgvGoTheArnParam param);
    boolean agvBindAndBin(String taskNo);

}

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

@@ -9,7 +9,7 @@
@Service("basArmMastService")
public class BasArmMastServiceImpl extends ServiceImpl<BasArmMastMapper, BasArmMast> implements BasArmMastService {
    @Override
    public boolean updateArmMastStatus(int armNo,int sortingLine,int status,int endStatus,int staNoEnd){
        return this.baseMapper.updateArmMastStatus(armNo,sortingLine,status,endStatus,staNoEnd);
    public boolean updateArmMastStatus(int armNo,int sortingLine,int staNoEnd,int status,int endStatus){
        return this.baseMapper.updateArmMastStatus(armNo,sortingLine,staNoEnd,status,endStatus);
    }
}

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

@@ -679,7 +679,153 @@
//            orderService.updateSettle(order.getId(), 2L, userId);
            OrderInAndOutUtil.updateOrder(Boolean.TRUE,order.getId(), 2L, userId);
        }
    }

    @Override
    @Transactional
    public void combAgv(CombParam param, Long userId) {
        if (Cools.isEmpty(param.getBarcode(), param.getCombMats(),param.getLocNo())) {
            throw new CoolException(BaseRes.PARAM);
        }
//        if(param.getCombMats().size()>1){
//            throw new CoolException("请提取一个商品，或者刷新重新组托！");
//        }
        // 判断是否有相同条码的数据
        if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
            throw new CoolException(param.getBarcode() + "数据正在进行入库");
        }

        if(param.getBarcode().length()!=6){
            throw new CoolException("条码长度不是6位===>>" + param.getBarcode());
        }
//        if (param.getCombMats().size()>1){
//            throw new CoolException("不允许混料===>>" + param.getBarcode());
//        }

        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
        int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
        int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode()));
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",param.getLocNo()));
        if (countLoc > 0 || countWrk > 0 || countwait > 0) {
            throw new CoolException("组托档/工作档/库存条码数据已存在===>>" + param.getBarcode());
        }
        if(locMast == null){
            throw new CoolException("不存在该库位" + param.getLocNo());
        }

        Date now = new Date();

        // 无单组托
        if (Cools.isEmpty(param.getOrderNo())) {

            // 生成入库通知档
            List<DetlDto> detlDtos = new ArrayList<>();
            param.getCombMats().forEach(elem -> {
                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(),elem.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(),
                        elem.getBoxType1(),elem.getBoxType2(),elem.getBoxType3(),  elem.getAnfme());
                if (DetlDto.has(detlDtos, detlDto)) {
                    DetlDto one = DetlDto.findDto(detlDtos, detlDto);
                    assert one != null;
                    one.setAnfme(one.getAnfme() + detlDto.getAnfme());
                } else {
                    detlDtos.add(detlDto);
                }
            });


            for (DetlDto detlDto : detlDtos) {
                Mat mat = matService.selectByMatnr(detlDto.getMatnr());
                if (Cools.isEmpty(mat)) {
                    throw new CoolException(detlDto.getMatnr() + "商品档案不存在");
                }
                WaitPakin waitPakin = new WaitPakin();
                waitPakin.sync(mat);
                waitPakin.setBatch(detlDto.getBatch());
                waitPakin.setZpallet(param.getBarcode());   // 托盘码
                waitPakin.setIoStatus("N");     // 入出状态
                waitPakin.setAnfme(detlDto.getAnfme());  // 数量
                waitPakin.setStatus("Y");    // 状态
                waitPakin.setAppeUser(userId);
                waitPakin.setAppeTime(now);
                waitPakin.setModiUser(userId);
                waitPakin.setModiTime(now);
                waitPakin.setStandby1(detlDto.getStandby1());
                waitPakin.setStandby2(detlDto.getStandby2());
                waitPakin.setStandby3(detlDto.getStandby3());
                waitPakin.setBoxType1(detlDto.getBoxType1());
                waitPakin.setBoxType2(detlDto.getBoxType2());
                waitPakin.setBoxType3(detlDto.getBoxType3());
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }
            }
            // 关联组托
        } else {
//            Order order = orderService.selectByNo(param.getOrderNo());
            Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, param.getOrderNo());
            if (Cools.isEmpty(order) || order.getSettle() > 2) {
                throw new CoolException("单据编号已过期");
            }
            // 生成入库通知档
            List<DetlDto> detlDtos = new ArrayList<>();
            param.getCombMats().forEach(elem -> {

                // 订单明细数量校验
//                OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
                OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), elem.getMatnr(), elem.getBatch(),elem.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(),
                        elem.getBoxType1(),elem.getBoxType2(),elem.getBoxType3());
                if (elem.getAnfme() > orderDetl.getEnableQty()) {
                    throw new CoolException(orderDetl.getMatnr() + "入库数量不合法");
                }
                // 修改订单作业数量
//                if (!orderDetlService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) {
//                    throw new CoolException("修改单据作业数量失败");
//                }
                OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE,order.getId(), elem.getMatnr(), elem.getBatch(),elem.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(),
                        elem.getBoxType1(),elem.getBoxType2(),elem.getBoxType3(), elem.getAnfme());
                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(),elem.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(),
                        elem.getBoxType1(),elem.getBoxType2(),elem.getBoxType3(),  elem.getAnfme());
                if (DetlDto.has(detlDtos, detlDto)) {
                    DetlDto one = DetlDto.findDto(detlDtos, detlDto);
                    assert one != null;
                    one.setAnfme(one.getAnfme() + detlDto.getAnfme());
                } else {
                    detlDtos.add(detlDto);
                }
            });
            for (DetlDto detlDto : detlDtos) {
                Mat mat = matService.selectByMatnr(detlDto.getMatnr());
                if (Cools.isEmpty(mat)) {
                    throw new CoolException(detlDto.getMatnr() + "商品档案不存在");
                }
                WaitPakin waitPakin = new WaitPakin();
                waitPakin.sync(mat);
                waitPakin.setOrderNo(order.getOrderNo());   // 单据编号
                waitPakin.setBatch(detlDto.getBatch());     // 序列码
                waitPakin.setZpallet(param.getBarcode());   // 托盘码
                waitPakin.setIoStatus("N");     // 入出状态
                waitPakin.setAnfme(detlDto.getAnfme());  // 数量
                waitPakin.setStatus("Y");    // 状态
                waitPakin.setAppeUser(userId);
                waitPakin.setAppeTime(now);
                waitPakin.setModiUser(userId);
                waitPakin.setModiTime(now);
                waitPakin.setStandby1(detlDto.getStandby1());
                waitPakin.setStandby2(detlDto.getStandby2());
                waitPakin.setStandby3(detlDto.getStandby3());
                waitPakin.setBoxType1(detlDto.getBoxType1());
                waitPakin.setBoxType2(detlDto.getBoxType2());
                waitPakin.setBoxType3(detlDto.getBoxType3());
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }
                locMast.setLocSts("R");
                locMastService.updateById(locMast);
            }
//            orderService.updateSettle(order.getId(), 2L, userId);
            OrderInAndOutUtil.updateOrder(Boolean.TRUE,order.getId(), 2L, userId);
        }
    }

    @Override

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

@@ -706,7 +706,8 @@
                        .eq("status", 1)
        );
        if (Cools.isEmpty(basArmMast)){
            throw new CoolException("未查询到相关机械臂拆码垛任务！！！"+ JSON.toJSONString(param));
            return;
//            throw new CoolException("未查询到相关机械臂拆码垛任务！！！"+ JSON.toJSONString(param));
        }
        if (Integer.parseInt(param.getPick_num()) !=1){
            basArmMast.setStatus(9);
@@ -871,23 +872,18 @@
        agvBindCtnrAndBinParam.setReqCode(String.valueOf(System.currentTimeMillis()));
        agvBindCtnrAndBinParam.setCtnrCode(param.getBarcode());
        agvBindCtnrAndBinParam.setCtnrTyp("1");
        agvBindCtnrAndBinParam.setPositionCode(
                basAgvLocNoSou != null && basAgvLocNoSou.getAgvLocNo() != null
                        ? basAgvLocNoSou.getAgvLocNo()
                        : ""
        );
        agvBindCtnrAndBinParam.setStgBinCode(
                basAgvLocNoEnd != null && basAgvLocNoEnd.getAgvLocNo() != null
                        ? basAgvLocNoEnd.getAgvLocNo()
                        : ""
        );
        if(basAgvLocNoEnd != null && basAgvLocNoEnd.getAgvLocNo() != null){
            agvBindCtnrAndBinParam.setStgBinCode(basAgvLocNoEnd.getAgvLocNo());
        }
        if(basAgvLocNoSou != null && basAgvLocNoSou.getAgvLocNo() != null){
            agvBindCtnrAndBinParam.setStgBinCode(basAgvLocNoSou.getAgvLocNo());
        }
        agvBindCtnrAndBinParam.setIndBind(param.getIndBind());
        try {
            String URL = "http://10.10.10.200:8181/rcms/services/rest/hikRpcService"; // AGV接口地址
            String mesPath = "bindCtnrAndBin"; // 接口路径
            String response = "";
            boolean success = false;

            try {
                log.info("AGV绑定容器接口请求参数: {}", JSON.toJSONString(agvBindCtnrAndBinParam));

@@ -928,6 +924,45 @@
        return false;
    }

    @Override
    @Transactional
    public boolean agvApplicationPassedTheGrating(AgvGoTheArnParam param) {
        String URL = "http://10.10.10.200:8181/rcms/services/rest/hikRpcService"; // AGV接口地址
        String AGVPath = "continueTask"; // 接口路径
        AgvGoParam agvGoParam = new AgvGoParam();
        agvGoParam.setCode("0");
        agvGoParam.setMessage("继续执行");
        agvGoParam.setReqCode(param.getReqCode());
        ReturnT<String> result = new PostMesDataUtils().postMesDataArmGrating("光栅下发后继续任务：", URL, AGVPath, param);
        if (result.getCode()==200){
            return true;
        }
        return false;
    }

    @Override
    @Transactional
    public boolean agvBindAndBin(String taskNo) {
        String URL = "http://10.10.10.200:8181/"; // AGV接口地址
        String AGVPath = "rcms/services/rest/hikRpcService/bindCtnrAndBin"; // 接口路径
        BasAgvMast basAgvMast = basAgvMastService.selectOne(new EntityWrapper<BasAgvMast>().eq("task_no",taskNo));
        BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
        BasAgvLocNo basAgvLocNoEnd = basAgvLocNoService.selectOne(
                new EntityWrapper<BasAgvLocNo>().eq("sta_no", basAgvMast.getStaNo())
        );
        AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam();
        agvBindCtnrAndBinParam.setReqCode(basAgvMast.getTaskNo() + "-" + basAgvMast.getTimestamp());
        agvBindCtnrAndBinParam.setCtnrCode(basAgvMast.getTimestamp().toString());
        agvBindCtnrAndBinParam.setCtnrTyp("1");
        agvBindCtnrAndBinParam.setStgBinCode(basAgvLocNoEnd.getAgvLocNo());
        agvBindCtnrAndBinParam.setIndBind("0");
        ReturnT<String> resultBind = new PostMesDataUtils().postMesDataArmGrating("AGV容器绑定解绑", URL,AGVPath, agvBindCtnrAndBinParam);
        if (resultBind.getCode()!=200){
            return true;
        }
        return false;
    }



}

 src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java

@@ -134,7 +134,7 @@
        for(Integer staNo: STA_WORK_Exception){
            BasDevp basDevp = basDevpService.selectById(staNo);
            basDevp.setDevNo(siteOutMap.get(basDevp.getDevNo()));
            if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
            if (basDevp.getWrkNo() > 10000 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
                ReturnT<String> result = wrkMastStaInItHandler.start(null,basDevp,23);//异常退出
                if (result.getCode()==200) {
                    continue;

 src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java

@@ -203,9 +203,9 @@
                            Double length = jsonObjectNew.get("length") != null ? new BigDecimal(jsonObjectNew.get("eap7_decimalfield7").toString()).doubleValue() : 0.0;
                            Double netweight = jsonObjectNew.get("netweight") != null ? new BigDecimal(jsonObjectNew.get("eap7_decimalfield").toString()).doubleValue() : 0.0;
                            // 生成商品档案
                            height = height*10;
                            width = width*10;
                            length = length*10;
                            Double height1 = height*10;
                            Double width1 = width*10;
                            Double length1 = length*10;
                            Mat mat = matService.selectByMatnr(matnr);
                            if (mat == null) {
                                mat = new Mat();
@@ -214,9 +214,9 @@
                                mat.setTagId(tag.getId());
                                mat.setWeight(grossweight);//净重
                                mat.setUnits(netweight);//毛重
                                mat.setManLength(length);
                                mat.setHeight(height);
                                mat.setWidth(width);
                                mat.setManLength(length1);
                                mat.setHeight(height1);
                                mat.setWidth(width1);
                                mat.setCreateTime(sdf1.parse(createTime));
                                mat.setUpdateTime(modifyTime);
                                mat.setStatus(1);

 src/main/java/com/zy/erp/kingdee/utils/PostMesDataUtils.java

@@ -175,6 +175,60 @@
        }
        return SUCCESS;
    }
    public ReturnT<String> postMesDataAgvGrating(String name, String URL, String mesPath, Object combParam){
//        if (true){
//            System.out.println("name:"+name+",URL:"+URL+",mesPath:"+mesPath+",combParam:"+combParam);
//            return SUCCESS;
//        }
        if(combParam != null){
            String response = "";
            boolean success = false;
            try {
//                Map<String, Object> map = new HashMap<>()
//                map.put("appkey","ea1f0459efc02a79f046f982767939ae");
                response = new HttpHandler.Builder()
//                        .setHeaders(map)
                        .setUri(URL)
                        .setPath(mesPath)
                        .setJson(JSON.toJSONString(combParam))
                        .build()
                        .doPost();
                System.out.println("response:"+response);
                JSONObject jsonObject = JSON.parseObject(response);

                if (jsonObject.getInteger("code").equals(200)) {
                    success = true;
                } else {
                    log.error("请求接口失败！！！url：{}；request：{}；response：{}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
                    throw new CoolException(name);
                }
            } catch (Exception e) {
                log.error("请求接口失败！！！url：{}；request：{}；response：{}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
//                      TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                return FAIL.setMsg(e.getMessage());
            } finally {
                try {
                    if (success){
                        // 保存接口日志
                        ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
                        apiLogService.save(
                                name,
                                URL +"/"+ mesPath,
                                null,
                                "127.0.0.1",
                                JSON.toJSONString(combParam),
                                response,
                                success
                        );
                    } else {
                        postMesDataCallApiLogSave(response,success,name, URL, mesPath, combParam);
                    }
                } catch (Exception e) {
                    log.error("", e); }
            }
        }
        return SUCCESS;
    }

    public void postMesDataCallApiLogSave(String response,boolean success,String name, String URL, String mesPath, Object combParam) {
        ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);

 src/main/webapp/static/js/apiLog/apiLogF.js

New file
@@ -0,0 +1,265 @@
var pageCurr;
layui.config({
    base: baseUrl + "/static/layui/lay/modules/"
}).use(['table','laydate', 'form', 'admin'], function(){
    var table = layui.table;
    var $ = layui.jquery;
    var layer = layui.layer;
    var layDate = layui.laydate;
    var form = layui.form;
    var admin = layui.admin;

    // 数据渲染
    tableIns = table.render({
        elem: '#apiLog',
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/apiLog/list/auth/v2',
        page: true,
        limit: 15,
        limits: [15, 30, 50, 100, 200, 500],
        toolbar: '#toolbar',
        cellMinWidth: 50,
        height: 'full-120',
        cols: [[
            // {type: 'checkbox'}
            // ,{field: 'id', align: 'center',title: 'ID'}
            // ,{field: 'uuid', align: 'center',title: '日志编号'}
            // ,
            {field: 'namespace', align: 'center',title: '名称空间',hide: false}
            ,{field: 'url', align: 'center',title: '接口地址',hide: false}
            ,{field: 'appkey', align: 'center',title: '平台密钥',hide: true}
            ,{field: 'timestamp', align: 'center',title: '时间戳',hide: true}
            ,{field: 'clientIp', align: 'center',title: '客户端IP',hide: false}
            ,{field: 'request', align: 'center',title: '请求内容',hide: false}
            ,{field: 'response', align: 'center',title: '操作内容',hide: false}
            // ,{field: 'err', align: 'center',title: '异常内容',hide: true}
            ,{field: 'result$', align: 'center',title: '结果', templet: '#resTpl', width: 80,hide: false}
            // ,{field: 'status$', align: 'center',title: '状态'}
            ,{field: 'createTime$', align: 'center',title: '添加时间',hide: false}
            // ,{field: 'updateTime$', align: 'center',title: '修改时间'}
            ,{field: 'memo', align: 'center',title: '备注', hide: true}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width: 80, hide: true}
        ]],
        request: {
            pageName: 'curr',
            pageSize: 'limit'
        },
        parseData: function (res) {
            return {
                'code': res.code,
                'msg': res.msg,
                'count': res.data.total,
                'data': res.data.records
            }
        },
        response: {
            statusCode: 200
        },
        done: function(res, curr, count) {
            if (res.code === 403) {
                top.location.href = baseUrl+"/";
            }
            pageCurr=curr;
            limit();
        }
    });

    // 监听排序事件
    table.on('sort(apiLog)', function (obj) {
        var searchData = {};
        $.each($('#search-box [name]').serializeArray(), function() {
            searchData[this.name] = this.value;
        });
        searchData['orderByField'] = obj.field;
        searchData['orderByType'] = obj.type;
        tableIns.reload({
            where: searchData,
            page: {curr: 1}
        });
    });

    // 监听头工具栏事件
    table.on('toolbar(apiLog)', function (obj) {
        var checkStatus = table.checkStatus(obj.config.id).data;
        switch(obj.event) {
            case 'addData':
                showEditModel();
                break;
            case 'deleteData':
               if (checkStatus.length === 0) {
                   layer.msg('请选择要删除的数据', {icon: 2});
                   return;
               }
               del(checkStatus.map(function (d) {
                   return d.id;
               }));
               break;
            case 'exportData':
                admin.confirm('确定导出Excel吗', {shadeClose: true}, function(){
                    var titles=[];
                    var fields=[];
                    obj.config.cols[0].map(function (col) {
                        if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
                            titles.push(col.title);
                            fields.push(col.field);
                        }
                    });
                    var exportData = {};
                    $.each($('#search-box [name]').serializeArray(), function() {
                        exportData[this.name] = this.value;
                    });
                    var param = {
                        'apiLog': exportData,
                        'fields': fields
                    };
                    $.ajax({
                        url: baseUrl+"/apiLog/export/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: JSON.stringify(param),
                        dataType:'json',
                        contentType:'application/json;charset=UTF-8',
                        method: 'POST',
                        success: function (res) {
                            layer.closeAll();
                            if (res.code === 200) {
                                table.exportFile(titles,res.data,'xls');
                            } else if (res.code === 403) {
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg, {icon: 2})
                            }
                        }
                    });
                });
                break;
        }
    });

    // 监听行工具事件
    table.on('tool(apiLog)', function(obj){
        var data = obj.data;
        switch (obj.event) {
            case 'edit':
                showEditModel(data);
                break;
            case "del":
                del([data.id]);
                break;
        }
    });

    /* 弹窗 - 新增、修改 */
    function showEditModel(mData) {
        admin.open({
            type: 1,
            area: '600px',
            title: (mData ? '修改' : '添加') + '订单状态',
            content: $('#editDialog').html(),
            success: function (layero, dIndex) {
                layDateRender(mData);
                form.val('detail', mData);
                form.on('submit(editSubmit)', function (data) {
                    var loadIndex = layer.load(2);
                    $.ajax({
                        url: baseUrl+"/apiLog/"+(mData?'update':'add')+"/auth",
                        headers: {'token': localStorage.getItem('token')},
                        data: data.field,
                        method: 'POST',
                        success: function (res) {
                            layer.close(loadIndex);
                            if (res.code === 200){
                                layer.close(dIndex);
                                layer.msg(res.msg, {icon: 1});
                                tableReload();
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            }else {
                                layer.msg(res.msg, {icon: 2});
                            }
                        }
                    })
                    return false;
                });
                $(layero).children('.layui-layer-content').css('overflow', 'visible');
                layui.form.render('select');
            }
        });
    }

    /* 删除 */
    function del(ids) {
        layer.confirm('确定要删除选中数据吗？', {
            skin: 'layui-layer-admin',
            shade: .1
        }, function (i) {
            layer.close(i);
            var loadIndex = layer.load(2);
            $.ajax({
                url: baseUrl+"/apiLog/delete/auth",
                headers: {'token': localStorage.getItem('token')},
                data: {ids: ids},
                method: 'POST',
                success: function (res) {
                    layer.close(loadIndex);
                    if (res.code === 200){
                        layer.msg(res.msg, {icon: 1});
                        tableReload();
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    } else {
                        layer.msg(res.msg, {icon: 2});
                    }
                }
            })
        });
    }

    // 搜索
    form.on('submit(search)', function (data) {
        pageCurr = 1;
        tableReload(false);
    });

    // 重置
    form.on('submit(reset)', function (data) {
        pageCurr = 1;
        clearFormVal($('#search-box'));
        tableReload(false);
    });

    // 时间选择器
    function layDateRender(data) {
        setTimeout(function () {
            layDate.render({
                elem: '#createTime\\$',
                type: 'datetime',
                value: data!==undefined?data['createTime\\$']:null
            });
            layDate.render({
                elem: '#updateTime\\$',
                type: 'datetime',
                value: data!==undefined?data['updateTime\\$']:null
            });

        }, 300);
    }
    layDateRender();

});

// 关闭动作
$(document).on('click','#data-detail-close', function () {
    parent.layer.closeAll();
});

function tableReload(child) {
    var searchData = {};
    $.each($('#search-box [name]').serializeArray(), function() {
        searchData[this.name] = this.value;
    });
    tableIns.reload({
        where: searchData,
        page: {curr: pageCurr}
     });
}

 src/main/webapp/views/apiLog/apiLogF.html

New file
@@ -0,0 +1,190 @@
<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="utf-8">
    <title></title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
</head>
<body>

<div class="layui-fluid">
    <div class="layui-card">
        <div class="layui-card-body">
            <div class="layui-form toolbar" id="search-box">
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <label class="layui-form-label">名称空间:</label>
                        <div class="layui-input-inline">
                            <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="url" 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>搜索
                        </button>
                        <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
                            <i class="layui-icon">&#xe666;</i>重置
                        </button>
                    </div>
                </div>
            </div>
            <table class="layui-hide" id="apiLog" lay-filter="apiLog"></table>
        </div>
    </div>
</div>

<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
<!--        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>-->
<!--        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button>-->
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">导出</button>
    </div>
</script>

<script type="text/html" id="operate">
<!--    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a>-->
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</a>
</script>

<script type="text/html" id="resTpl">
    <span name="settle"
          {{# if( d.result === 1){ }}
          class="layui-badge layui-badge-green" >{{d.result$}}</span>
    {{# }else { }}
    class="layui-badge layui-badge-red" >{{d.result$}}</span>
    {{# } }}
</script>

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/apiLog/apiLogF.js" charset="utf-8"></script>
</body>
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">
    <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
        <input name="id" type="hidden">
        <div class="layui-row">
            <div class="layui-col-md12">
                <div class="layui-form-item">
                    <label class="layui-form-label">日志编号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="uuid" placeholder="请输入日志编号">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">名称空间: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="namespace" placeholder="请输入名称空间">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">接口地址: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="url" placeholder="请输入接口地址">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">平台密钥: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="appkey" placeholder="请输入平台密钥">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">时间戳: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="timestamp" placeholder="请输入时间戳">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">客户端IP: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="clientIp" placeholder="请输入客户端IP">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">请求内容: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="request" placeholder="请输入请求内容">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">响应内容: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="response" placeholder="请输入响应内容">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">异常内容: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="err" placeholder="请输入异常内容">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">结果: </label>
                    <div class="layui-input-block">
                        <select name="result">
                            <option value="">请选择结果</option>
                            <option value="1">成功</option>
                            <option value="0">失败</option>
                        </select>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">状态: </label>
                    <div class="layui-input-block">
                        <select name="status">
                            <option value="">请选择状态</option>
                            <option value="1">正常</option>
                            <option value="0">禁用</option>
                        </select>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">添加时间: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="createTime" id="createTime$" placeholder="请输入添加时间">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">修改时间: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="updateTime" id="updateTime$" placeholder="请输入修改时间">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">备注: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="memo" placeholder="请输入备注">
                    </div>
                </div>

             </div>
        </div>
        <hr class="layui-bg-gray">
        <div class="layui-form-item text-right">
            <button class="layui-btn" lay-filter="editSubmit" lay-submit="">保存</button>
            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
        </div>
    </form>
</script>
</html>


 src/main/webapp/views/basArmMast/basArmMast.html

@@ -156,12 +156,12 @@
<!--                        <input class="layui-input" name="sortingLine" placeholder="请输入起点" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">分拣绑定标记: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="bindingTags" placeholder="请输入分拣绑定标记" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">分拣绑定标记: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="bindingTags" placeholder="请输入分拣绑定标记" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">优先级: </label>-->
<!--                    <div class="layui-input-block">-->
@@ -214,12 +214,12 @@
<!--                        <input class="layui-input" name="upc" placeholder="请输入" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">货源: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="supplier" placeholder="请输入货源" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">货源: </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="supplier" placeholder="请输入货源" lay-vertype="tips" lay-verify="required">-->
<!--                    </div>-->
<!--                </div>-->
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">: </label>-->
<!--                    <div class="layui-input-block">-->