From 95aa8661cf7499638a9db6ee015be507599bac15 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 05 七月 2023 01:26:07 +0800
Subject: [PATCH] 出入库业务逻辑判断
---
igds-core/src/main/java/com/ld/igds/io/impl/DefaultInoutApiServiceImpl.java | 4
igds-protocol-block/src/main/java/com/ld/igds/protocol/openapi/OpenApiInoutService.java | 4
igds-web/src/main/resources/static/admin/inout/in-check.js | 95 ------------------
igds-core/src/main/java/com/ld/igds/inout/ApiInoutService.java | 4
igds-core/src/main/java/com/ld/igds/inout/InoutApiConstant.java | 82 ++++++++++++++++
igds-core/src/main/java/com/ld/igds/inout/dto/ApiInoutData.java | 2
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutEventControlManager.java | 57 +++++++++++
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/inout/BHZNWeightServiceImpl.java | 4
igds-protocol-block/src/main/java/com/ld/igds/protocol/weight/FzzyWeightServiceImpl.java | 4
9 files changed, 149 insertions(+), 107 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/inout/ApiInoutService.java b/igds-core/src/main/java/com/ld/igds/inout/ApiInoutService.java
index 70d5a5e..b3f9547 100644
--- a/igds-core/src/main/java/com/ld/igds/inout/ApiInoutService.java
+++ b/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);
/**
diff --git a/igds-core/src/main/java/com/ld/igds/inout/InoutApiConstant.java b/igds-core/src/main/java/com/ld/igds/inout/InoutApiConstant.java
new file mode 100644
index 0000000..d2fe052
--- /dev/null
+++ b/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";
+ /**
+ * 鍦扮澶凩ED澶у睆-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";
+
+}
diff --git a/igds-core/src/main/java/com/ld/igds/inout/dto/ApiInoutData.java b/igds-core/src/main/java/com/ld/igds/inout/dto/ApiInoutData.java
index 52ba697..91abd12 100644
--- a/igds-core/src/main/java/com/ld/igds/inout/dto/ApiInoutData.java
+++ b/igds-core/src/main/java/com/ld/igds/inout/dto/ApiInoutData.java
@@ -89,7 +89,7 @@
//鍔ㄤ綔缂栫爜锛�0=鍏抽棴/绾㈢伅锛�1=鎵撳紑/璺伅
private String actionCode;
- //鍔ㄤ綔缂栫爜锛岃澶囩紪鍙�
+ //璁惧缂栧彿
private String deviceId;
diff --git a/igds-core/src/main/java/com/ld/igds/io/impl/DefaultInoutApiServiceImpl.java b/igds-core/src/main/java/com/ld/igds/io/impl/DefaultInoutApiServiceImpl.java
index 3ea581d..616e00f 100644
--- a/igds-core/src/main/java/com/ld/igds/io/impl/DefaultInoutApiServiceImpl.java
+++ b/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;
}
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutEventControlManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutEventControlManager.java
index c4c35af..8539d8b 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutEventControlManager.java
+++ b/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;
@@ -194,7 +195,7 @@
apiData.setMsg("绉伴噸宸插畬鎴�");
// apiInoutManager.getApiService(apiData.getProtocol()).noticeWeightDone(apiData);
- // apiInoutManager.getApiService(apiData.getProtocol()).noticeRadio(apiData);
+ // apiInoutManager.getApiService(apiData.getProtocol()).noticeRadio(apiData);
}
/**
@@ -420,15 +421,67 @@
*/
@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);
+ }
+
}
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/inout/BHZNWeightServiceImpl.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/inout/BHZNWeightServiceImpl.java
index d09d9be..b198afc 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/inout/BHZNWeightServiceImpl.java
+++ b/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;
}
diff --git a/igds-protocol-block/src/main/java/com/ld/igds/protocol/openapi/OpenApiInoutService.java b/igds-protocol-block/src/main/java/com/ld/igds/protocol/openapi/OpenApiInoutService.java
index 5949616..ab9f1a3 100644
--- a/igds-protocol-block/src/main/java/com/ld/igds/protocol/openapi/OpenApiInoutService.java
+++ b/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;
}
diff --git a/igds-protocol-block/src/main/java/com/ld/igds/protocol/weight/FzzyWeightServiceImpl.java b/igds-protocol-block/src/main/java/com/ld/igds/protocol/weight/FzzyWeightServiceImpl.java
index 901f6db..a5abe9e 100644
--- a/igds-protocol-block/src/main/java/com/ld/igds/protocol/weight/FzzyWeightServiceImpl.java
+++ b/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;
}
diff --git a/igds-web/src/main/resources/static/admin/inout/in-check.js b/igds-web/src/main/resources/static/admin/inout/in-check.js
index 01d5c04..54d4873 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-check.js
+++ b/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("淇濆瓨澶辫触锛岃閲嶆柊灏濊瘯锛�")
}
});
}
--
Gitblit v1.9.3