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("ä¿å失败ï¼è¯·éæ°å°è¯ï¼") } }); }