jiazx0107@163.com
2023-07-05 95aa8661cf7499638a9db6ee015be507599bac15
出入库业务逻辑判断
已修改8个文件
已添加1个文件
254 ■■■■■ 文件已修改
igds-core/src/main/java/com/ld/igds/inout/ApiInoutService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-core/src/main/java/com/ld/igds/inout/InoutApiConstant.java 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-core/src/main/java/com/ld/igds/inout/dto/ApiInoutData.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-core/src/main/java/com/ld/igds/io/impl/DefaultInoutApiServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutEventControlManager.java 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/inout/BHZNWeightServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-protocol-block/src/main/java/com/ld/igds/protocol/openapi/OpenApiInoutService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-protocol-block/src/main/java/com/ld/igds/protocol/weight/FzzyWeightServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/static/admin/inout/in-check.js 95 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-core/src/main/java/com/ld/igds/inout/ApiInoutService.java
@@ -51,7 +51,7 @@
     * @param param
     * @return
     */
    String gateControl(ApiInoutData param, InoutData data);
    String gateControl(ApiInoutData param);
    /**
@@ -60,7 +60,7 @@
     * @param param
     * @return
     */
    String lightControl(ApiInoutData param, InoutData data);
    String lightControl(ApiInoutData param);
    /**
igds-core/src/main/java/com/ld/igds/inout/InoutApiConstant.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,82 @@
package com.ld.igds.inout;
/**
 * @Desc: å‡ºå…¥åº“接口常量
 * @author: andy.jia
 * @update-time: 2023/7/4 23:28
 */
public class InoutApiConstant {
    /**
     * ç™»è®°å¤„车牌识别-1001
     */
    public static String DEVICE_CODE_1001 = "1001";
    /**
     * ç™»è®°å¤„道闸-2001
     */
    public static String DEVICE_CODE_2001 = "2001";
    /**
     * åœ°ç£…入口车牌识别-1002
     */
    public static String DEVICE_CODE_1002 = "1002";
    /**
     * åœ°ç£…出口车牌识别-1003
     */
    public static String DEVICE_CODE_1003 = "1003";
    /**
     * åœ°ç£…入口闸机-2002
     */
    public static String DEVICE_CODE_2002 = "2002";
    /**
     * åœ°ç£…出口闸机-2003
     */
    public static String DEVICE_CODE_2003 = "2003";
    /**
     * åœ°ç£…处光栅1-3001
     */
    public static String DEVICE_CODE_3001 = "3001";
    /**
     * åœ°ç£…处光栅2-3002
     */
    public static String DEVICE_CODE_3002 = "3002";
    /**
     * åœ°ç£…入口高频读卡器-4001
     */
    public static String DEVICE_CODE_4001 = "4001";
    /**
     * åœ°ç£…出口高频读卡器-4002
     */
    public static String DEVICE_CODE_4002 = "4002";
    /**
     * åœ°ç£…处身份证读卡器=5001
     */
    public static String DEVICE_CODE_5001 = "5001";
    /**
     * åœ°ç£…处LED大屏-6001
     */
    public static String DEVICE_CODE_6001 = "6001";
    /**
     * åœ°ç£…入口红绿灯-7001
     */
    public static String DEVICE_CODE_7001 = "7001";
    /**
     * åœ°ç£…出口红绿灯-7002
     */
    public static String DEVICE_CODE_7002 = "7002";
    /**
     * åœ°ç£…处广播设备-8001
     */
    public static String DEVICE_CODE_8001 = "8001";
    /**
     * è®¾å¤‡æ“ä½œ-关闭,红绿灯表示 çº¢ç¯
     */
    public static String ACTION_CODE_0 = "0";
    /**
     * è®¾å¤‡æ“ä½œ-开启,红绿灯表示 ç»¿ç¯
     */
    public static String ACTION_CODE_1 = "1";
}
igds-core/src/main/java/com/ld/igds/inout/dto/ApiInoutData.java
@@ -89,7 +89,7 @@
    //动作编码:0=关闭/红灯,1=打开/路灯
    private String actionCode;
    //动作编码,设备编号
    //设备编号
    private String deviceId;
igds-core/src/main/java/com/ld/igds/io/impl/DefaultInoutApiServiceImpl.java
@@ -33,12 +33,12 @@
    }
    @Override
    public String gateControl(ApiInoutData param, InoutData data) {
    public String gateControl(ApiInoutData param) {
        return null;
    }
    @Override
    public String lightControl(ApiInoutData param, InoutData data) {
    public String lightControl(ApiInoutData param) {
        return null;
    }
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutEventControlManager.java
@@ -10,6 +10,7 @@
import com.ld.igds.file.CoreFileService;
import com.ld.igds.inout.ApiInoutManager;
import com.ld.igds.inout.ApiInoutService;
import com.ld.igds.inout.InoutApiConstant;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.inout.dto.*;
import com.ld.igds.inout.service.InoutService;
@@ -420,14 +421,66 @@
     */
    @Async
    public void onInoutWeight(InoutData data, String curProgress, String nextProgress) {
        //获取地磅控制器
        InoutConf conf = this.getWeightGateway(data.getCompanyId(), data.getDeptId(), null);
        if (null == conf) {
            log.info("----------称重完成事件,没有获取到称重控制器--------------");
        }
        //1、通知称重显示屏
        //1、通知称重显示屏,设备编号6001
        ApiInoutData apiData = new ApiInoutData(conf);
        apiData.setTime(new Date());
        apiData.setDeviceId(InoutApiConstant.DEVICE_CODE_6001);
        ApiInoutService inoutApiService = apiInoutManager.getApiService(conf.getProtocol());
        inoutApiService.noticeLed(apiData, data);
        //2、语音通知
        apiData.setDeviceId(InoutApiConstant.DEVICE_CODE_8001);
        inoutApiService.noticeRadio(apiData, data);
        //3、开闸机
        if (InoutConstant.TYPE_IN.equals(data.getType())) {
            //结算重量大于0表示二次称重
            if (data.getNetWeight() > 0) {
                apiData.setDeviceId(InoutApiConstant.DEVICE_CODE_1002);
            } else {
                apiData.setDeviceId(InoutApiConstant.DEVICE_CODE_1003);
            }
            apiData.setActionCode(InoutApiConstant.ACTION_CODE_1);
            inoutApiService.gateControl(apiData);
        } else {
            //结算重量大于0表示二次称重
            if (data.getNetWeight() > 0) {
                apiData.setDeviceId(InoutApiConstant.DEVICE_CODE_1003);
            } else {
                apiData.setDeviceId(InoutApiConstant.DEVICE_CODE_1002);
            }
            apiData.setActionCode(InoutApiConstant.ACTION_CODE_1);
            inoutApiService.gateControl(apiData);
        }
        //4、开红绿灯
        if (InoutConstant.TYPE_IN.equals(data.getType())) {
            //结算重量大于0表示二次称重
            if (data.getNetWeight() > 0) {
                apiData.setDeviceId(InoutApiConstant.DEVICE_CODE_7001);
            } else {
                apiData.setDeviceId(InoutApiConstant.DEVICE_CODE_7002);
            }
            apiData.setActionCode(InoutApiConstant.ACTION_CODE_1);
            inoutApiService.lightControl(apiData);
        } else {
            //结算重量大于0表示二次称重
            if (data.getNetWeight() > 0) {
                apiData.setDeviceId(InoutApiConstant.DEVICE_CODE_7002);
            } else {
                apiData.setDeviceId(InoutApiConstant.DEVICE_CODE_7001);
            }
            apiData.setActionCode(InoutApiConstant.ACTION_CODE_1);
            inoutApiService.lightControl(apiData);
        }
    }
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/inout/BHZNWeightServiceImpl.java
@@ -55,7 +55,7 @@
     * @return
     */
    @Override
    public String gateControl(ApiInoutData param, InoutData data) {
    public String gateControl(ApiInoutData param) {
        try{
//           ReqGate reqGate = new ReqGate();
            BHZNClientEngine test = new BHZNClientEngine(
@@ -78,7 +78,7 @@
    }
    @Override
    public String lightControl(ApiInoutData param, InoutData data) {
    public String lightControl(ApiInoutData param) {
        return null;
    }
igds-protocol-block/src/main/java/com/ld/igds/protocol/openapi/OpenApiInoutService.java
@@ -87,12 +87,12 @@
    }
    @Override
    public String gateControl(ApiInoutData param, InoutData data) {
    public String gateControl(ApiInoutData param) {
        return "当前协议不支持";
    }
    @Override
    public String lightControl(ApiInoutData param, InoutData data) {
    public String lightControl(ApiInoutData param) {
        return null;
    }
igds-protocol-block/src/main/java/com/ld/igds/protocol/weight/FzzyWeightServiceImpl.java
@@ -96,7 +96,7 @@
    }
    @Override
    public String lightControl(ApiInoutData param, InoutData data) {
    public String lightControl(ApiInoutData param) {
        return null;
    }
@@ -108,7 +108,7 @@
     * @return
     */
    @Override
    public String gateControl(ApiInoutData param, InoutData data) {
    public String gateControl(ApiInoutData param) {
        return null;
    }
igds-web/src/main/resources/static/admin/inout/in-check.js
@@ -217,83 +217,6 @@
    // var url = "com.ld.igds.inout.ReportInoutCheck.d";
    // window.parent.openTab(url, "化验结果导出", "checkDataExport");
};
// æ ¹æ®æ¨¡å¼å¯åŠ¨å¼€å§‹æ‰¦æ ·
function checkExe(type) {
    checkDto.type = type;
    var param = JSON.stringify(checkDto);
    var index = layer.load();
    $.ajax({
        type: "POST",
        url: "../../api/check/check-exe",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: param,
        success: function (result) {
            layer.close(index);
            if (result.code != "0000") {
                layer.alert(result.msg);
            } else {
                layer.msg("操作命令发送成功!");
            }
        },
        error: function () {
            layer.close(index);
            layer.alert("后台异常,操作命令发送失败!");
        }
    });
};
// å…³é—­æ‰¦æ ·æœºå™¨
function checkStop() {
    var param = JSON.stringify(checkDto);
    var index = layer.load();
    $.ajax({
        type: "POST",
        url: "../../api/check/stop",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: param,
        success: function (result) {
            layer.close(index);
            if (result.code != "0000") {
                layer.alert(result.msg);
            } else {
                layer.msg("操作命令发送成功!");
            }
        },
        error: function () {
            layer.close(index);
            layer.alert("后台异常,操作命令发送失败!");
        }
    });
};
// æ‰¦æ ·æœºå¤ä½
function checkReset() {
    var param = JSON.stringify(checkDto);
    var index = layer.load();
    $.ajax({
        type: "POST",
        url: "../../api/check/reset",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: param,
        success: function (result) {
            layer.close(index);
            if (result.code != "0000") {
                layer.alert(result.msg);
            } else {
                layer.msg("操作命令发送成功!");
            }
        },
        error: function () {
            layer.close(index);
            layer.alert("后台异常,操作命令发送失败!");
        }
    });
};
// æ‰¦æ ·æœºè§£é™¤æ€¥åœ
function checkResetStop() {
    var param = JSON.stringify(checkDto);
@@ -318,22 +241,6 @@
        }
    });
};
//隐藏信息--替换为*
function replaceStr(str) {
    if (!str) {
        return "";
    }
    var split = str.split("");
    if (split.length == 1) {
        return "*";
    }
    if (split.length == 2 || split.length == 3) {
        return str.slice(0, 1) + "**"
    }
    return str.slice(0, 1) + "***" + str.slice(split.length - 1);
}
// æ›´æ–°åŒ–验结果提醒,只做提醒,不做自动判断
function updateCheckResultTip() {
@@ -673,7 +580,7 @@
            layer.close(index);
            $("#form-sacnCodeDetail")[0].reset();
            form.render();
            layer.alert("保存失败,请重新尝试!");
            alertError("保存失败,请重新尝试!")
        }
    });
}